Merge remote-tracking branch 'origin/dev' 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

@@ -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