Merge branch 'stage' into dev

# Conflicts:
#	src/viewsPc/components/homeQuick.vue

@@ -119,7 +119,7 @@ function popRemark(type){
     return
     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()
     building()
     return
     return
   }
   }