字段修改

@@ -141,13 +141,13 @@ const timeVal=ref(null)
 const money = ref(0)
 const money = ref(0)
 const rules = ref({
 const rules = ref({
   num: [
   num: [
-    { required: true, message: '预约数量不能为空', trigger: 'blur' },
+    { required: true, message: language.value==0?'预约数量不能为空':"phone is required", trigger: 'blur' },
   ],
   ],
   contacts: [
   contacts: [
-    { required: true, message: '请输入预约联系人', trigger: 'blur' },
+    { required: true, message:language.value==0?'请输入预约联系人':'phone is required', trigger: 'blur' },
   ],
   ],
   phoned: [
   phoned: [
-    { required: true, message: '请输入联系电话', trigger: 'change' },
+    { required: true, message: language.value==0? '请输入联系电话':"phone is required", trigger: 'blur' },
   ],
   ],
 
 
 })
 })

@@ -466,11 +466,11 @@ function getData() {
   }
   }
   if(type.value=='makeUp') {
   if(type.value=='makeUp') {
     MakeUpOrder()
     MakeUpOrder()
-    MakeUpIno()
+    // MakeUpIno()
   }
   }
   if(type.value=='photography') {
   if(type.value=='photography') {
     photographyOrder()
     photographyOrder()
-    photographyInfo()
+    // photographyInfo()
   }
   }
 
 
   console.log(payType.value)
   console.log(payType.value)
@@ -547,6 +547,8 @@ function MakeUpOrder(){
  return  booking.getMealOrderInfo({orderId: orderId.value}).then(res => {
  return  booking.getMealOrderInfo({orderId: orderId.value}).then(res => {
     form.value=res.data
     form.value=res.data
     totalFee.value=language.value==0?form.value.total:form.value.totalEn
     totalFee.value=language.value==0?form.value.total:form.value.totalEn
+   MakeUpIno()
+   console.log(res)
   }).catch(err => {
   }).catch(err => {
     console.log(err)
     console.log(err)
     errorBox.value = true
     errorBox.value = true
@@ -554,8 +556,9 @@ function MakeUpOrder(){
 }
 }
 
 
 function MakeUpIno(){
 function MakeUpIno(){
-  booking.getMealOrderInfoByLogex({orderId: orderId.value}).then(res=>{
+  booking.getMealOrderInfoByLogex({asmId: form.value.asmId}).then(res=>{
       formInfo.value=res.data
       formInfo.value=res.data
+      console.log(res)
     })
     })
     .catch((e) => {
     .catch((e) => {
       console.log(e)
       console.log(e)
@@ -568,6 +571,7 @@ function photographyOrder(){
  return booking.getPhotoOrderInfo({orderId: orderId.value}).then(res => {
  return booking.getPhotoOrderInfo({orderId: orderId.value}).then(res => {
     form.value=res.data
     form.value=res.data
     totalFee.value=language.value==0?form.value.total:form.value.totalEn
     totalFee.value=language.value==0?form.value.total:form.value.totalEn
+   photographyInfo()
   }).catch(err => {
   }).catch(err => {
     console.log(err)
     console.log(err)
     errorBox.value = true
     errorBox.value = true
@@ -575,7 +579,7 @@ function photographyOrder(){
 }
 }
 
 
 function photographyInfo(){
 function photographyInfo(){
-  booking.getPhotoOrderInfoByLogex({orderId: orderId.value}).then(res=>{
+  booking.getPhotoOrderInfoByLogex({aspId: form.value.aspId}).then(res=>{
       formInfo.value=res.data
       formInfo.value=res.data
     })
     })
     // .catch((e) => {
     // .catch((e) => {

@@ -27,7 +27,7 @@
           <el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
           <el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
             <LocationFilled/>
             <LocationFilled/>
           </el-icon>
           </el-icon>
-         {{form.rearks}}
+         {{form.remarks}}
         </el-row>
         </el-row>
       </el-card>
       </el-card>
       <div class="mt30">
       <div class="mt30">

@@ -29,7 +29,7 @@
               <el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
               <el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
                 <LocationFilled/>
                 <LocationFilled/>
               </el-icon>
               </el-icon>
-              {{formData.rearks}}
+              {{formData.remarks}}
 
 
             </el-row>
             </el-row>
             <hr style="border:1px solid #D3D1F6 ">
             <hr style="border:1px solid #D3D1F6 ">
@@ -139,15 +139,14 @@ const timeVal=ref(null)
 const money = ref(0)
 const money = ref(0)
 const rules = ref({
 const rules = ref({
   num: [
   num: [
-    { required: true, message: '预约数量不能为空', trigger: 'blur' },
+    { required: true, message: language.value==0?'预约数量不能为空':"phone is required", trigger: 'blur' },
   ],
   ],
   contacts: [
   contacts: [
-    { required: true, message: '请输入预约联系人', trigger: 'blur' },
+    { required: true, message:language.value==0?'请输入预约联系人':'phone is required', trigger: 'blur' },
   ],
   ],
   phoned: [
   phoned: [
-    { required: true, message: '请输入联系电话', trigger: 'change' },
+    { required: true, message: language.value==0? '请输入联系电话':"phone is required", trigger: 'blur' },
   ],
   ],
-
 })
 })
 const radioList=ref([])
 const radioList=ref([])
 
 
@@ -315,21 +314,21 @@ function changeMaony(){
   border: 1px solid #DCDFE6;
   border: 1px solid #DCDFE6;
 }
 }
 
 
-.ccitemBox {
-  overflow: auto;
-
-  label {
-    margin: 10px 0;
-    display: block;
-    min-height: 30px;
-
-    span {
-      color: #FF8124;
-      font-family: DIN Alternate;
-      font-size: 24px;
-    }
-  }
-}
+//.ccitemBox {
+//  overflow: auto;
+//
+//  label {
+//    margin: 10px 0;
+//    display: block;
+//    min-height: 30px;
+//
+//    span {
+//      color: #FF8124;
+//      font-family: DIN Alternate;
+//      font-size: 24px;
+//    }
+//  }
+//}