Merge branch 'dev-a' into devdev

@@ -97,20 +97,48 @@ function building() {
   return
 }
 function popRemark(type){
-  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'){
-    building()
-    return
-  }
-  const params = {
-    matchId: props.matchId,
-    title: language.value == 0 ?'预订说明':'Booking Instructions',
-    type: type
+
+  switch (type) {
+    case 0:
+      // 票务
+      router.push({path: `/booking/ticket/${props.matchId}`})
+      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;
   }
-  proxy.$refs['orderRemarkRef'].open(params)
+
+  // 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'){
+  //   building()
+  //   return
+  // }
+  // const params = {
+  //   matchId: props.matchId,
+  //   title: language.value == 0 ?'预订说明':'Booking Instructions',
+  //   type: type
+  // }
+  // proxy.$refs['orderRemarkRef'].open(params)
 }
 function goBooking(n) {
   switch (n) {