From 6dd325c245cc83957ed4c98c37b76be815ce5138 Mon Sep 17 00:00:00 2001
From: Tuzki <1720599558@qq.com>
Date: Sun, 22 Sep 2024 17:45:58 +0800
Subject: [PATCH] =?UTF-8?q?###=E4=BF=AE=E5=A4=8D=E5=92=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-修复书票组件中条件判断缺失空格问题，确保语法一致性。- 优化登录弹窗的展示与关闭逻辑，提升用户体验。
- 修复加载动画组件对透明度设置不当，确保动画效果正确。- 调整配置文件中的URL格式，去除不必要的斜杠。- 优化智能机器人页面的布局，调整间距以适应新内容。### 代码审查细节

- 在`bookTicket.vue`中，增加空格以确保条件判断的可读性。
- 在`f-login.vue`中，简化`u-popup`组件的展示逻辑。
- 在`loading.vue`中，调整加载动画的透明度设置。
- 在`config.js`中，标准化API根路径的格式。
- 在`zhinengjiqiren.vue`中，增加间距以适应智能机器人页面的新内容。

### 测试- 确保书票组件中的条件判断在各种场景下均能正确执行。
- 验证登录弹窗的显示与关闭逻辑在不同设备上的一致性。- 加载动画应在各种主题模式下正常工作。
- 智能机器人页面应适应不同屏幕尺寸，无布局问题。
---
 common/config.js                            |  3 +-
 components/f-loading/loading.vue            |  4 +-
 components/f-login/f-login.vue              | 46 +++++++++------------
 static/css/common.css                       |  4 +-
 subPageB/jiqiren/jiqiren/zhinengjiqiren.vue |  2 +-
 subPageC/bookTicket/bookTicket.vue          | 42 ++++++++++++-------
 6 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/common/config.js b/common/config.js
index b80c1e0..4981853 100644
--- a/common/config.js
+++ b/common/config.js
@@ -5,9 +5,10 @@
 const REAUEST_ROOTPATH = "https://eluyou.ailuquan.cn";
 //  const REAUEST_ROOTPATH = "http://192.168.0.181:8083/";
 // const ROOTPATH = "http://192.168.130.205:8083";
-const ROOTPATH = "https://eluyou.ailuquan.cn/";
+const ROOTPATH = "https://eluyou.ailuquan.cn";
 //票务根
 const PWPATH = "http://192.168.130.157:48080";
+// const PWPATH = "https://eluyou.ailuquan.cn";
 //手绘图项目名称
 const HANDDRAWNNAME = "";
 module.exports = {
diff --git a/components/f-loading/loading.vue b/components/f-loading/loading.vue
index b166fc2..ace5bdf 100644
--- a/components/f-loading/loading.vue
+++ b/components/f-loading/loading.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="mask mask-show u_loading" :data-theme="isDark?'dark':'light'" v-if="loadingShow" @touchmove.stop.prevent="preventTouchMove">
 		<!-- 加载动画开始 -->
-		<view class="preloader u-flex u-flex-column u-flex-center">
+		<view class="preloader u-flex u-flex u-flex-center">
 		  <view class="loader">
               <view></view>
               <view></view>
@@ -52,7 +52,7 @@ export default {
         flex-wrap: wrap;
     }
     &.mask-show {
-        background: rgba(255,255,255, 0);
+        background: rgba(255,255,255, 0.15);
     }
     .title {
     	color: #666;
diff --git a/components/f-login/f-login.vue b/components/f-login/f-login.vue
index f21d435..2e187f5 100644
--- a/components/f-login/f-login.vue
+++ b/components/f-login/f-login.vue
@@ -1,12 +1,6 @@
 <template>
   <view>
-    <u-popup
-      :show="loginPopupShow"
-      mode="bottom"
-      :round="10"
-      @close="closeLogin"
-      zIndex="999998"
-    >
+    <u-popup :show="loginPopupShow" mode="bottom" :round="10" @close="closeLogin" zIndex="10071">
       <view class="f__login">
         <view class="loginLoading" v-if="isLoading">
           <u-loadmore status="loading" loadingText="正在登录..."></u-loadmore>
@@ -16,21 +10,12 @@
         <view class="loginButton" v-if="!isPhoneLogin">
           <!-- #ifdef MP-WEIXIN -->
           <!-- <button class="button" @click="onAuthorization" :style="{background:PrimaryColor}">微信授权登录</button> -->
-          <button
-            class="button marginT"
-            open-type="getPhoneNumber"
-            @getphonenumber="decryptPhoneNumber"
-            :style="{ background: PrimaryColor }"
-          >
-            微信手机号登录</button
-          ><!-- 此功能需微信认证 -->
+          <button class="button marginT" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber"
+            :style="{ background: PrimaryColor }">
+            微信手机号登录</button><!-- 此功能需微信认证 -->
           <!-- #endif -->
-          <button
-            class="button"
-            @click="closeLogin"
-            style="background: #fff; margin-top: 24rpx"
-            :style="{ border: '2rpx solid ' + PrimaryColor, color: PrimaryColor }"
-          >
+          <button class="button" @click="closeLogin" style="background: #fff; margin-top: 24rpx"
+            :style="{ border: '2rpx solid ' + PrimaryColor, color: PrimaryColor }">
             暂不登录
           </button>
         </view>
@@ -100,7 +85,7 @@ export default {
     //授权手机号登录
     decryptPhoneNumber(e) {
       console.log(e, "授权手机号");
-      // store.commit("setLoadingShow", true);
+      store.commit("setLoadingShow", true);
       var that = this;
       debugger
       // #ifdef MP-WEIXIN
@@ -146,7 +131,6 @@ export default {
                     // this.setUserInfo(userInfo)
                     //生成token
                     this.setUserInfo(userInfo);
-                    store.commit("setLoadingShow", false);
                     setTimeout(() => {
                       uni.showToast({
                         title: "登录成功",
@@ -155,8 +139,9 @@ export default {
 
                       this.closeLogin();
                     }, 100);
-                  }).catch((err) => {
                     store.commit("setLoadingShow", false);
+
+                  }).catch((err) => {
                     this.closeLogin()
 
                     // this.isPhoneLogin = true;
@@ -164,11 +149,12 @@ export default {
                       title: err.msg,
                       icon: "none",
                     });
+                    store.commit("setLoadingShow", false);
+
                   });
                 },
                 fail: (error) => {
                   // 授权失败请使用验证码登录
-                  store.commit("setLoadingShow", false);
                   this.closeLogin()
 
                   // this.isPhoneLogin = true;
@@ -176,6 +162,8 @@ export default {
                     title: "登陆失败,请重试",
                     icon: "none",
                   });
+                  store.commit("setLoadingShow", false);
+
                 },
               });
             }
@@ -185,24 +173,28 @@ export default {
                 icon: "none",
               });
               this.closeLogin()
+              store.commit("setLoadingShow", false);
+
             }
           });
         } else {
           // 授权失败请使用验证码登录
-          store.commit("setLoadingShow", false);
 
           this.isPhoneLogin = true;
           uni.showToast({
             title: "登录失败,请重试",
             icon: "none",
           });
+          store.commit("setLoadingShow", false);
+
         }
       } else {
         uni.showToast({
-          title: "暂无法登录,请重试",
+          title: "已拒绝",
           icon: "none",
         });
         this.closeLogin()
+        store.commit("setLoadingShow", false);
       }
       // #endif
     },
diff --git a/static/css/common.css b/static/css/common.css
index 7157adb..0fd25a1 100644
--- a/static/css/common.css
+++ b/static/css/common.css
@@ -169,7 +169,7 @@ page{ background: #f5f5f5;}
 
 .jqr_main{ margin-bottom: 240rpx;  position: relative; z-index: 3;}
 .jqr_dig_pic{ width: 60rpx; height: 60rpx; margin:0 0rpx 0 40rpx}
-.jqr_box, .jqr_box_txt{ background: #fff;  border-radius: 0% 30rpx 30rpx 30rpx; border:2rpx solid #eee; box-shadow: rgba(200,200,200,.3) 0 0 10rpx; overflow: hidden;margin-left: 20rpx; width:100%;  padding:20rpx 0rpx 100rpx 0rpx }
+.jqr_box, .jqr_box_txt{ background: #fff;  border-radius: 0% 30rpx 30rpx 30rpx; border:2rpx solid #eee; box-shadow: rgba(200,200,200,.3) 0 0 10rpx; overflow: hidden;margin-left: 20rpx; width:100%;  padding:20rpx 0rpx 125rpx 0rpx }
 .left_dig, .right_dig{ margin-bottom: 40rpx; position: relative; }
 .right_dig .jqr_box{background:linear-gradient(225deg,#18cec3,#6fa2ff);  border-radius: 30rpx 0 30rpx 30rpx; margin-left: 0; border:none; padding-bottom:30rpx ; }
 .left_dig{ margin-top:60rpx}
@@ -187,7 +187,7 @@ page{ background: #f5f5f5;}
 .right_dig .qus_txt{  color: #fff;}
 
 .dig_gd{max-height:400rpx ; overflow: hidden; position: relative;}
-.dig_more{ height: 80rpx; width:100%;  background: #f5f5f5; text-align: center; color: #666; font-size: 28rpx; line-height: 80rpx;border-radius: 0 0 30rpx 30rpx; position: absolute; bottom:0; left:0; z-index: 10;}
+.dig_more{ height: 80rpx; width:100%;  background: #f5f5f5; text-align: center; color: #666; font-size: 28rpx; line-height: 80rpx;border-radius: 0 0 30rpx 30rpx; position: absolute; left:0; z-index: 10;}
 
 .jqr_box_txt .janw_link:before{ display: none;}
 
diff --git a/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue b/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue
index 4a43407..69c87ff 100644
--- a/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue
+++ b/subPageB/jiqiren/jiqiren/zhinengjiqiren.vue
@@ -444,7 +444,7 @@ innerAudioContext.autoplay = true;
 	}
 
 	.jqr_dig_scroll{
-		padding-bottom: 150rpx;
+		padding-bottom: 200rpx;
 	}
 
 	.jqr_tol_box{
diff --git a/subPageC/bookTicket/bookTicket.vue b/subPageC/bookTicket/bookTicket.vue
index 8cbf56d..c360761 100644
--- a/subPageC/bookTicket/bookTicket.vue
+++ b/subPageC/bookTicket/bookTicket.vue
@@ -52,7 +52,7 @@
       <view class="m-one-third-row">
         <view class="m-ticket-count">
           <view class="m-ticket-count-label">购票数量</view>
-          <view class="m-ticket-count-value" v-if="ticket&&ticket.qmxId == null">
+          <view class="m-ticket-count-value" v-if="ticket && ticket.qmxId == null">
             <uni-number-box v-if="maxNum == -1" :min="0" v-model="ticket.num" :disabled="!ticket.date"
               @change="changeCount($event, ticket)" />
             <uni-number-box v-else :min="0" :max="maxNum" v-model="ticket.num" :disabled="!ticket.date"
@@ -75,8 +75,8 @@
         </view>
       </view>
     </view>
-    <view class="m-card m-card-two" v-if="ticket && ticket.touristInformation != 1 && ticket.date!=null">
-      <view class="m-card-title" v-if="ticket &&ticket.qmxId != null">
+    <view class="m-card m-card-two" v-if="ticket && ticket.touristInformation != 1 && ticket.date != null && ticket.num >0">
+      <view class="m-card-title" v-if="ticket && ticket.qmxId != null">
         <view class="contact-user-box"
           v-if="ticket.qmxTicketInfoVO.needContactName != false || ticket.qmxTicketInfoVO.needContactPhone != false || ticket.qmxTicketInfoVO.needContactIdCard != false">
           <view class="m-title">联系人信息</view>
@@ -333,12 +333,12 @@
       </view>
     </uni-popup>
     <!-- 新增 -->
-    <uni-popup ref="mAddPerson" type="bottom" border-radius="10px 10px 0 0" :safe-area="false">
+    <uni-popup ref="mAddPerson" type="bottom" border-radius="10px 10px 0 0" :safe-area="false" :mask-click="false">
       <view class="m-purchase-notice m-pop-bg">
         <view class="m-green-bg"></view>
         <view class="m-red-bg"></view>
         <view class="m-pop-title">{{ titleName }}游客</view>
-        <view class="m-form-box" v-if="ticket&& ticket.qmxId == null">
+        <view class="m-form-box" v-if="ticket && ticket.qmxId == null">
           <uni-forms class="m-form" ref="peopleForm" :modelValue="baseFormData">
             <uni-row class="m-row">
               <!-- <uni-col class="m-col" :span="ticket.ischeckedIdcard == 1 ? 18 : 24"> -->
@@ -418,8 +418,11 @@ const validateID = (idType, value) => {
   let regex;
   debugger
   switch (idType) {
+    case 1: // 身份证
+      regex = /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/;
+      break;
     case '1': // 身份证
-      regex = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+      regex = /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/;
       break;
     case '2': // 护照
       regex = /^[A-Za-z0-9]{5,20}$/;
@@ -454,6 +457,7 @@ const validateID = (idType, value) => {
     default:
       return false;
   }
+  console.log(idType, value, regex.test(value))
   return regex.test(value);
 };
 export default {
@@ -737,7 +741,7 @@ export default {
     getdateTicket() {
       let that = this;
       debugger
-      if (this.ticket&&this.ticket.qmxId == null) {
+      if (this.ticket && this.ticket.qmxId == null) {
         if (this.ticket.datesettings == 1) {
           // 不限库存
           this.ticket.date = that.parseTime(new Date())
@@ -861,7 +865,7 @@ export default {
       if (fullDate < that.parseTime(new Date())) {
         fullDate = that.parseTime(new Date());
       }
-      if (that.ticket&&that.ticket.qmxId == null) {
+      if (that.ticket && that.ticket.qmxId == null) {
         if (that.ticket.inventorySettings == 1 || that.ticket.inventorySettings == 2) {
           const params = {
             ticketId: that.ticket.id,
@@ -949,7 +953,7 @@ export default {
     },
     //计算需要填写的人员信息数量
     peopleNums() {
-      if(this.ticket.touristInformation == 3){
+      if (this.ticket.touristInformation == 3) {
         return Number(this.ticket.usersNumber ? this.ticket.usersNumber : 0) * Number(this.ticket.num ? this.ticket.num : 0);
       }
       if (this.ticket.touristInformation == 2) {
@@ -1096,7 +1100,7 @@ export default {
             phoneNumber: null,
             id: null,
             selected: false,
-            idtype: this.ticket&&this.ticket.qmxId == null ? '1' : this.ticketIdType
+            idtype: this.ticket && this.ticket.qmxId == null ? '1' : this.ticketIdType
           }
 
         })
@@ -1120,7 +1124,7 @@ export default {
         phoneNumber: null,
         id: null,
         selected: false,
-        idtype: this.ticket&&this.ticket.qmxId == null ? '1' : this.ticketIdType
+        idtype: this.ticket && this.ticket.qmxId == null ? '1' : this.ticketIdType
       }
       this.$refs.mAddPerson.open();
       this.$refs.scroll.close();
@@ -1133,7 +1137,7 @@ export default {
       this.$refs.scroll.close();
       this.$refs.mAddPerson.open();
       this.titleName = "编辑";
-      if (this.ticket&&this.ticket.qmxId == null) {
+      if (this.ticket && this.ticket.qmxId == null) {
         this.baseFormData = val;
       } else {
         this.baseFormData = val;
@@ -1216,7 +1220,7 @@ export default {
 
             debugger
 
-            if (that.ticket&&that.ticket.qmxId == null) {
+            if (that.ticket && that.ticket.qmxId == null) {
 
               if (that.ticket.touristInformation == 1) {
                 const httpData = {
@@ -1398,8 +1402,16 @@ export default {
           true
         )
         .then(res => {
-          this.orderInfo = res.data;
-          this.isPayPopup = true;
+          if (res.code == 0 && res.data != null) {
+            this.orderInfo = res.data;
+            this.isPayPopup = true;
+          }
+          else {
+            uni.showToast({
+              title: res.msg+'请检查',
+              icon: 'none'
+            });
+          }
         })
         .catch(err => {
           console.log(err);