判断登录

@@ -114,12 +114,12 @@ function building() {
   return
   return
 }
 }
 function popRemark(type){
 function popRemark(type){
-  // if(!form.value){
-  //   building()
-  //   return
-  // }
+  if(!form.value){
+    building()
+    return
+  }
 
 
-  if((form.value.isJdView == 0&&type=='1') || (form.value.isCarView == 0&&type=='2') || (form.value.isFoodView == 0&&type=='3') || type=='0' || type=='4' || type=='5'){
+  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)){
     building()
     building()
     return
     return
   }
   }
@@ -131,35 +131,6 @@ function popRemark(type){
     }
     }
     proxy.$refs['orderRemarkRef'].open(params)
     proxy.$refs['orderRemarkRef'].open(params)
 
 
-  switch (type) {
-    case 0:
-      // 票务
-      // router.push({path: `/booking/ticket/${props.matchId}`})
-      building()
-      //   return
-      break;
-    case 1:
-      //酒店
-      router.push({path: `/booking/hotel/${props.matchId}`})
-      break;
-    case 2:
-      //车辆
-      router.push({path: `/booking/car/${props.matchId}`})
-      break;
-    case 3:
-      //餐饮
-      router.push({path: `/booking/dinner/${props.matchId}`})
-      break;
-    case 4:
-      //化妆
-      router.push({path: `/booking/makeup/${props.matchId}`})
-      break;
-    case 5:
-      //拍照
-      router.push({path: `/booking/photography/${props.matchId}`})
-      break;
-  }
-
 }
 }
 function goBooking(n) {
 function goBooking(n) {
   switch (n) {
   switch (n) {
@@ -182,12 +153,10 @@ function goBooking(n) {
       break;
       break;
     case 4:
     case 4:
       //化妆
       //化妆
-      building()
       router.push({path: `/booking/makeup/${props.matchId}`})
       router.push({path: `/booking/makeup/${props.matchId}`})
       break;
       break;
     case 5:
     case 5:
       //拍照
       //拍照
-      building()
       router.push({path: `/booking/photography/${props.matchId}`})
       router.push({path: `/booking/photography/${props.matchId}`})
       break;
       break;
   }
   }