Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
636fb586 by zhangmeng
Options

Merge branch 'stage' into dev 

# Conflicts:
#	src/viewsPc/components/homeQuick.vue
2 parents 5fcac262 d80260f3
Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
src/viewsPc/match/components/quick-row.vue
......@@ -119,7 +119,7 @@ function popRemark(type){
return
}
if((form.value.isJdView == 0&&type=='1') || (form.value.isCarView == 0&&type=='2') || (form.value.isFoodView == 0&&type=='3') || type=='0' || (form.value.isMealView == 0&&type=='4') || (type=='5'&&form.value.isPhotoView == 0)){
if((form.value.isJdView == 0&&type=='1') || (form.value.isCarView == 0&&type=='2') || (form.value.isFoodView == 0&&type=='3')|| (form.value.isMealView == 0&&type=='4') || (type=='5'&&form.value.isPhotoView == 0)|| type=='0' ){
building()
return
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!