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

@@ -52,7 +52,7 @@
           </el-card>
           </el-card>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
-      <el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description="" />
+      <el-empty v-show="!loading&&list.length===0" :image="`/img/order_no.png`" :image-size="228" description="" />
       <div style="height: 50px" />
       <div style="height: 50px" />
     </div>
     </div>
   </div>
   </div>

@@ -73,7 +73,7 @@
                 <div v-if="needPersonNum>0" class="fakeFormItem">
                 <div v-if="needPersonNum>0" class="fakeFormItem">
                   <label>需填写{{ needPersonNum }}位游客</label>
                   <label>需填写{{ needPersonNum }}位游客</label>
                   <div>
                   <div>
-                    <div v-show="needPersonNum > hasPersonNum">还需填写{{ needPersonNum-hasPersonNum }}位游客</div>
+                    <label class="text-warning" v-show="needPersonNum > hasPersonNum">还需填写{{ needPersonNum-hasPersonNum }}位游客</label>
                   </div>
                   </div>
                 </div>
                 </div>
                 <div v-for="(n,i) in gateList" :key="i">
                 <div v-for="(n,i) in gateList" :key="i">
@@ -237,6 +237,7 @@ const checkPersonNum = () => {
   _.each(gateList.value, item => {
   _.each(gateList.value, item => {
     needPersonNum.value += item.count
     needPersonNum.value += item.count
     _.each(item.personArr, person => {
     _.each(item.personArr, person => {
+      console.log(person)
       if (person.customerId) {
       if (person.customerId) {
         hasPersonNum.value++
         hasPersonNum.value++
       }
       }
@@ -359,8 +360,10 @@ function submit() {
 
 
     submitOrderScenic(form.value).then(res => {
     submitOrderScenic(form.value).then(res => {
       if (res.data) {
       if (res.data) {
-        if (res.data.roomNum == -100) {
+        if (res.data.orderId == -400) {
           ElMessage.warning(language.value == 0 ? '剩余票数不足' : 'The remaining number of rooms is insufficient')
           ElMessage.warning(language.value == 0 ? '剩余票数不足' : 'The remaining number of rooms is insufficient')
+        } else if (res.data.orderId == -300) {
+          ElMessage.warning(language.value == 0 ? '提交失败,请稍后再试' : 'Submission failed, please try again later')
         } else {
         } else {
           // 去付钱
           // 去付钱
           router.push({
           router.push({

@@ -123,7 +123,7 @@ function popRemark(type) {
       (form.value.isMealView == 0 && type == '4') ||
       (form.value.isMealView == 0 && type == '4') ||
       (form.value.isPhotoView == 0 && type == '5') ||
       (form.value.isPhotoView == 0 && type == '5') ||
       (form.value.isTicket == 0 && type == '0') ||
       (form.value.isTicket == 0 && type == '0') ||
-      (form.value.isTravel == 0 && type == '8')
+      (form.value.isScenicView == 0 && type == '8')
   ) {
   ) {
     building()
     building()
     return
     return

@@ -172,6 +172,8 @@
             </el-button>
             </el-button>
             
             
             <span v-if="language==0&& insuranceFlag!=0||language==1&&insuranceFlag==1" class="checkbox">
             <span v-if="language==0&& insuranceFlag!=0||language==1&&insuranceFlag==1" class="checkbox">
+              <br v-if="language == 1">
+              <br v-if="language == 1">
               <el-checkbox
               <el-checkbox
                 v-model="checked"
                 v-model="checked"
                 :label="language==0?'我同意授权赛事方帮忙购买保险':'I agree to authorize the event organizer to purchase insurance on my behalf'"
                 :label="language==0?'我同意授权赛事方帮忙购买保险':'I agree to authorize the event organizer to purchase insurance on my behalf'"
@@ -481,11 +483,13 @@ function submitForm(n) {
 
 
 function commit() {
 function commit() {
   if (language.value == 0 && insuranceFlag.value == 2 && checked.value == '0') {
   if (language.value == 0 && insuranceFlag.value == 2 && checked.value == '0') {
-    ElMessageBox.confirm(language.value == 0 ? '你是否同意赛事放帮忙购买保险？' : 'Do you agree to have the event organizer help purchase insurance?',
+    ElMessageBox.confirm(language.value == 0 ? '你是否同意赛事方帮忙购买保险？' : 'Do you agree to have the event organizer help purchase insurance?',
       language.value == 0 ? '提示' : 'Tip', {
       language.value == 0 ? '提示' : 'Tip', {
         confirmButtonText: language.value == 0 ? '是' : 'Yes',
         confirmButtonText: language.value == 0 ? '是' : 'Yes',
         cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
         cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
-        type: 'warning'
+        type: 'warning',
+        closeOnClickModal: false,
+        showClose: false
       }).then(() => {
       }).then(() => {
       checked.value = '1'
       checked.value = '1'
       router.push({
       router.push({
@@ -909,7 +913,7 @@ function handelInsurance() {
 
 
 .father {
 .father {
   position: relative;
   position: relative;
-  height: 50px;
+  height: 85px;
 }
 }
 
 
 .checkbox {
 .checkbox {

@@ -183,6 +183,8 @@
             </el-button>
             </el-button>
             
             
             <span v-if="language==0&& insuranceFlag!=0||language==1&&insuranceFlag==1" class="checkbox">
             <span v-if="language==0&& insuranceFlag!=0||language==1&&insuranceFlag==1" class="checkbox">
+              <br v-if="language == 1">
+              <br v-if="language == 1">
               <el-checkbox
               <el-checkbox
                 v-model="checked"
                 v-model="checked"
                 :label="language==0?'我同意授权赛事方帮忙购买保险':'I agree to authorize the event organizer to purchase insurance on my behalf'"
                 :label="language==0?'我同意授权赛事方帮忙购买保险':'I agree to authorize the event organizer to purchase insurance on my behalf'"
@@ -437,11 +439,13 @@ function submitForm() {
         type: 'warning'
         type: 'warning'
       })
       })
   } else if (language.value == 0 && insuranceFlag.value == '2' && checked.value == 0) {
   } else if (language.value == 0 && insuranceFlag.value == '2' && checked.value == 0) {
-    ElMessageBox.confirm(language.value == 0 ? '你是否同意赛事放帮忙购买保险？' : 'Do you agree to have the event organizer help purchase insurance?',
+    ElMessageBox.confirm(language.value == 0 ? '你是否同意赛事方帮忙购买保险？' : 'Do you agree to have the event organizer help purchase insurance?',
       language.value == 0 ? '提示' : 'Tip', {
       language.value == 0 ? '提示' : 'Tip', {
         confirmButtonText: language.value == 0 ? '是' : 'Yes',
         confirmButtonText: language.value == 0 ? '是' : 'Yes',
         cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
         cancelButtonText: language.value == 0 ? '否，进入下一步' : 'NO,Go Next',
-        type: 'warning'
+        type: 'warning',
+        closeOnClickModal: false,
+        showClose: false
       }).then(() => {
       }).then(() => {
       checked.value = '1'
       checked.value = '1'
       router.push({
       router.push({
@@ -1083,7 +1087,7 @@ function handelInsurance() {
 
 
 .father {
 .father {
   position: relative;
   position: relative;
-  height: 60px;
+  height: 85px;
 }
 }
 
 
 .checkbox {
 .checkbox {

@@ -249,6 +249,7 @@ const ocrSuccess = (res) => {
     form.value.passportNumber = res.data.code
     form.value.passportNumber = res.data.code
     form.value.birth = res.data.birth?.slice(0, 10)
     form.value.birth = res.data.birth?.slice(0, 10)
     form.value.sex = res.data.sex
     form.value.sex = res.data.sex
+    form.value.certName = res.data.name
   } else if (res.code == 500) {
   } else if (res.code == 500) {
     ElMessage.warning(res.msg)
     ElMessage.warning(res.msg)
   }
   }

@@ -171,7 +171,7 @@ function popRemark(type) {
     || (form.value.isMealView == 0 && type == '4')
     || (form.value.isMealView == 0 && type == '4')
     || (form.value.isPhotoView == 0 && type == '5')
     || (form.value.isPhotoView == 0 && type == '5')
     || (form.value.isTicket == 0 && type == '0')
     || (form.value.isTicket == 0 && type == '0')
-    || (form.value.isTravel == 0 && type == '8')
+    || (form.value.isScenicView == 0 && type == '8')
   ) {
   ) {
     building()
     building()
     return
     return