From 9a0dd1ba58a411d68f70ba964dc3118131ca8874 Mon Sep 17 00:00:00 2001
From: Tuzki <1720599558@qq.com>
Date: Sun, 29 Sep 2024 17:22:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4=E5=92=8C?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-优化了bookTicket.vue组件中的日期选择逻辑，改善了用户界面中的至日期显示。
- 修改了计数选择组件的属性，增强了可读性和功能性。
- 调整了popup组件的属性，提升了用户体验。
- 重构了checkOrder方法，使其更加清晰。
-移除了无用的console.log，清理了代码。
- 在utils.js中添加了坐标信息的日志，有助于调试和地理位置功能的实现。
---
 subPageC/bookTicket/bookTicket.vue         | 32 +++++++++++-----------
 uni_modules/jr-weather/components/utils.js |  1 +
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/subPageC/bookTicket/bookTicket.vue b/subPageC/bookTicket/bookTicket.vue
index ef8136a..dbeb384 100644
--- a/subPageC/bookTicket/bookTicket.vue
+++ b/subPageC/bookTicket/bookTicket.vue
@@ -10,10 +10,10 @@
             使用有效期：
           </view>
           <view class="m-ticket-use-time-value" v-if="ticket && ticket.qmxId != null">{{
-            parseArrTime(ticket.usevalidityStart) }}至{{ parseArrTime(ticket.usevalidityEnd) }}</view>
-          <view class="m-ticket-use-time-value" v-else>{{ parseTime(ticket.usevalidityStart) }}至{{
+            parseArrTime(ticket.usevalidityStart) }}&nbsp;至&nbsp;{{ parseArrTime(ticket.usevalidityEnd) }}</view>
+          <view class="m-ticket-use-time-value" v-else>{{ parseTime(ticket.usevalidityStart) }}&nbsp;至&nbsp;{{
             parseTime(ticket.usevalidityEnd)
-          }}</view>
+            }}</view>
         </view>
         <view class="m-ticket-use-time" v-if="ticket && ticket.datesettings == 1">
           <view class="m-ticket-use-time-label">
@@ -61,8 +61,9 @@
               @change="changeCount($event, ticket)" />
           </view>
           <view class="m-ticket-count-value" v-else>
-            <uni-number-box :min="ticket.qmxTicketInfoVO.minBuyNum ? ticket.qmxTicketInfoVO.minBuyNum:0" :max="ticket.qmxTicketInfoVO.maxBuyNum ? ticket.qmxTicketInfoVO.maxBuyNum :maxBuyNums" :disabled="!ticket.date"
-              v-model="ticket.num" @change="changeCount($event, ticket)" />
+            <uni-number-box :min="ticket.qmxTicketInfoVO.minBuyNum ? ticket.qmxTicketInfoVO.minBuyNum:0"
+              :max="ticket.qmxTicketInfoVO.maxBuyNum ? ticket.qmxTicketInfoVO.maxBuyNum :maxBuyNums"
+              :disabled="!ticket.date" v-model="ticket.num" @change="changeCount($event, ticket)" />
           </view>
         </view>
       </view>
@@ -224,7 +225,7 @@
     <wu-calendar :date="choseDate" ref="calendar" :useToday="false" @monthSwitch="changeMonth" :startDate="startDate"
       :selected="selected" :confirmFullDate="true" @confirm="calendarConfirm" :insert="false"></wu-calendar>
     <!-- 重复订单提醒 -->
-    <uni-popup ref="warningPop" type="center" border-radius="20rpx">
+    <uni-popup ref="warningPop" type="center" border-radius="20rpx" :is-mask-click="false">
       <view class="m-pop-bg">
 
 
@@ -273,17 +274,17 @@
               <view class="m-tag m-tag-red">购票限制</view>
               <view class="m-notice-row-content">{{
                 ticketInfos.buyticketlimit == 1
-                  ? "不限"
-                  : "每人限购" + ticketInfos.ticketlimitnum + "张"
-              }}</view>
+                ? "不限"
+                : "每人限购" + ticketInfos.ticketlimitnum + "张"
+                }}</view>
             </view>
             <view class="m-notice-row">
               <view class="m-tag m-tag-blue">使用时段</view>
               <view class="m-notice-row-content">{{
                 ticketInfos.usertimeslotStart == ticketInfos.usertimeslotEnd
-                  ? "全天"
-                  : ticketInfos.usertimeslotStart + "至" + ticketInfos.usertimeslotEnd
-              }}</view>
+                ? "全天"
+                : ticketInfos.usertimeslotStart + "至" + ticketInfos.usertimeslotEnd
+                }}</view>
             </view>
           </view>
           <view class="m-driver"></view>
@@ -344,7 +345,7 @@
       </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">
       <view class="m-purchase-notice m-pop-bg">
         <view class="m-green-bg"></view>
         <view class="m-red-bg"></view>
@@ -1201,7 +1202,7 @@ export default {
     //查看是否有重复订单
     checkOrder(val) {
       // if (this.ticket.qmxId == null) {
-
+      let that = this;
       if (this.ticket.touristInformation == 2) {
         if (!this.selectUserList || this.selectUserList.length < 1) {
           uni.showToast({ title: "暂无游客信息", icon: "none" });
@@ -1227,7 +1228,6 @@ export default {
         }
       }
       // }
-      let that = this;
       const userInfo = uni.getStorageSync("userInfo");
       const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
       let appId = extConfig.app_id
@@ -2359,8 +2359,8 @@ export default {
       align-items: center;
 
       .content-box-label {
-        font-size: 24rpx;
         text-align: right;
+        color: #666666;
       }
     }
 
diff --git a/uni_modules/jr-weather/components/utils.js b/uni_modules/jr-weather/components/utils.js
index 37db781..23adad7 100644
--- a/uni_modules/jr-weather/components/utils.js
+++ b/uni_modules/jr-weather/components/utils.js
@@ -11,6 +11,7 @@ function getLocationAndWeather(amapMiniKey,amapWebKey) {
 		});
 		amapPlugin.getRegeo({
 			success: (res) => {
+				console.log(res,'坐标信息')
 				city = res[0].regeocodeData.addressComponent.city
 				adcode = res[0].regeocodeData.addressComponent.adcode
 				uni.request({