Merge branch 'dev' of https://code.itechtop.cn/yangyang/dance-pc into dev

@@ -109,23 +109,13 @@ function popRemark(type) {
     building()
     building()
     return
     return
   }
   }
-  // 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')
-  //     || (form.value.isPhotoView == 0 && type == '5')
-  // ) {
-  //   building()
-  //   return
-  // }
   if ((form.value.isJdView == 0 && type == '1')
   if ((form.value.isJdView == 0 && type == '1')
-    || (type == '2')
-    || ( type == '3')
-    || (form.value.isMealView == 0 && type == '4')
-    || (type == '5')
-    // || (type == '0')
-  )
-  {
+      || (form.value.isCarView == 0 && type == '2')
+      || (form.value.isFoodView == 0 && type == '3')
+      || (form.value.isMealView == 0 && type == '4')
+      || (form.value.isPhotoView == 0 && type == '5')
+      // || (type == '0')
+  ) {
     building()
     building()
     return
     return
   }
   }