From 70695b87b7963a273165d508c3eebdfc973e7feb Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 26 Jun 2025 10:39:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=B8=89=E6=96=B9=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8Ffix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/info/sceneProductInfo/index.js     |  5 ++++-
 pages/order/components/date/index.js     | 16 ++++++++++++----
 pages/order/components/date/index.wxml   | 22 ++++++++++++----------
 pages/order/components/date/index.wxss   |  9 +++++++--
 subPackages/transferPage/transferPage.js | 20 ++++++++++++++++++--
 5 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 67be917..53b5501 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -793,7 +793,10 @@ Page({
     product.productNum = 1
     app.globalData.product = {
       ...sku,
-      ...product
+      ...product,
+
+    //     changeFlag: true,
+    //   date: {date: "2025-06-24"},
     }
     console.log(app.globalData.product);
     console.log(ticket_type);
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 0a26eb7..4e8ad5e 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -46,7 +46,8 @@ Component({
     tomorrow:util.formatMing(new Date()),
     afterTom:util.formatHou(new Date()),
     skuName:'',
-    monthList:[]
+    monthList:[],
+    scrollLeft: 0
   },
   lifetimes: {
     attached: function () {
@@ -122,14 +123,21 @@ Component({
               item.week = this.getDay(item.date)
             })
             let seldDate = ''
+            let leftIndex = 0;
             if (app.globalData.product.changeFlag) {
                 if( app.globalData.product.date) {
-                    res.data.forEach(item=> {
+                    
+                    res.data.forEach((item,index)=> {
                         if (item.date == app.globalData.product.date.date) {
-                        seldDate = item
+                            seldDate = item
+                            leftIndex = index
                         }
                     })
                 }
+
+                this.setData({
+                    scrollLeft: 70*leftIndex
+                })
                 setTimeout(() => {
                     this.changeDate(seldDate)
                 })
@@ -239,7 +247,7 @@ Component({
         for (let i = 0; i < res.data.length; i++) {
           
           if (res.data[i].stock_number > 0) {
-            if (app.globalData.product.changeFlag) { 
+            if (app.globalData.product.changeFlag && app.globalData.product.time) { 
                  if (res.data[i].start_time == app.globalData.product.time.start_time) {
                   timeIndex = i;
                   break;
diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml
index f94ab02..db88887 100644
--- a/pages/order/components/date/index.wxml
+++ b/pages/order/components/date/index.wxml
@@ -28,17 +28,19 @@
       使用日期
     </view>
     <view class="dates-boxes">
-      <view style="width: 580rpx;display: flex;overflow-x: scroll;">
+      <scroll-view scroll-x enable-flex scroll-left="{{scrollLeft}}"
+        style="height: 133rpx;width: 580rpx;display: flex;overflow-x: scroll;flex-direction: row;">
         <view bindtap="changeDate" data-date="{{item}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for-index="index" wx:for="{{monthList}}">
-        <!-- <view>{{tool.showAllSeldDate(item.date,index,today,tomorrow,afterTom)}}</view> -->
-        <view>{{item.week}}</view>
-        <view class="short-date">{{item.short_date}}</view>
-        <view class="price" wx:if="{{ !isTeam && item.stock==-1 || item.stock==null}}">不可定</view>
-        <view class="price" wx:elif="{{ !isTeam && item.stock!=0 && item.stock!=null && item.price!=null}}">{{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}}</view>
-        <!-- <view class="price" wx:if="{{item.stock==null || item.price==null}}">不可定</view> -->
-        <view class="price" wx:if="{{item.stock==0}}">{{item.tipText?item.tipText:'售罄'}}</view>
-      </view>
-      </view>
+            <!-- <view>{{tool.showAllSeldDate(item.date,index,today,tomorrow,afterTom)}}</view> -->
+            <view>{{item.week}}</view>
+            <view class="short-date">{{item.short_date}}</view>
+            <view class="price" wx:if="{{ !isTeam && item.stock==-1 || item.stock==null}}">不可定</view>
+            <view class="price" wx:elif="{{ !isTeam && item.stock!=0 && item.stock!=null && item.price!=null}}">{{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}}</view>
+            <!-- <view class="price" wx:if="{{item.stock==null || item.price==null}}">不可定</view> -->
+            <view class="price" wx:if="{{item.stock==0}}">{{item.tipText?item.tipText:'售罄'}}</view>
+        </view>
+        <view style="width: 2rpx;height: 1rpx;flex-shrink: 0;"></view>
+      </scroll-view>
       <view  class="more-item" bindtap="showMoreDate">
       <!-- <view wx:if="{{moreFlag || !activeDate}}" class="date-item more-item" bindtap="showMoreDate"> -->
         <view style="width:58rpx;margin-right:12rpx;">
diff --git a/pages/order/components/date/index.wxss b/pages/order/components/date/index.wxss
index 9d7444b..b954718 100644
--- a/pages/order/components/date/index.wxss
+++ b/pages/order/components/date/index.wxss
@@ -18,6 +18,7 @@
   align-items: center;
   padding: 0 0 31rpx;
   border:none;
+  position: relative;
   /* padding: 31rpx 0; */
   /* padding: 31rpx 21rpx; */
   /* border-top: 1rpx solid #ccc; */
@@ -66,15 +67,19 @@
 .more-item {
   /* width: 125rpx; */
   /* margin-right: 0; */
-  position: absolute;
+    position: absolute;
     right: 0;
+    top: 0;
     text-align: center;
-    padding: 0 26rpx 0 24rpx;
+    padding: 0 0rpx 0 16rpx;
     display: flex;
     font-weight: 400;
     font-size: 27rpx;
     color: #0B898E;
     align-items: center;
+    height: 133rpx;
+    background: white;
+    border-radius: 10rpx;
 }
 .date-times {
   display: flex;
diff --git a/subPackages/transferPage/transferPage.js b/subPackages/transferPage/transferPage.js
index 2cbb6e6..2f71980 100644
--- a/subPackages/transferPage/transferPage.js
+++ b/subPackages/transferPage/transferPage.js
@@ -39,8 +39,24 @@ Page({
             })
         },
         fail: (e)=>{
-            console.log(e)
-            wx.navigateBack()
+            try {
+                let errMsg = e.errMsg
+                if (errMsg.indexOf("TAP")>=0) {
+                    wx.showModal({
+                        title: "确认跳转",
+                        showCancel: false,
+                        success: ()=>{
+                            this.goOtherMiniProgrogram(data)
+                        }
+                    })
+                } else {
+                    wx.navigateBack()
+                }
+
+            } catch (e) {
+                wx.navigateBack()
+            }
+            console.log("aaa",e)
         }
     })
   },