From 87d436f41abb693fa0be00493d7566db66d0048c Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 23 Jan 2025 11:00:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E5=AF=84=E7=AE=97=E8=BF=90=E8=B4=B9?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=9C=80=E5=A4=A7=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           |  2 +-
 pages/index/index.wxml           | 13 ++++++++++++-
 pages/order/orderList/index.js   | 12 +++++++++---
 pages/order/pay/index.wxml       |  3 ++-
 pages/order/postOrder/index.wxml |  2 +-
 pages/order/scene/index.js       |  4 ++++
 pages/order/scene/index.wxml     |  2 +-
 7 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/app.js b/app.js
index 8aa3646..170af3f 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest156? true : false;
+      data.isTest = data.isTest? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index bf41bb6..e67ee4f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -19,7 +19,7 @@
   </navigator>
 </view>
 <view style="position:relative;z-index: 1;" >
-  <swiper class="swiper" autoplay="{{true}}" interval="{{5000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
+  <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" bindchange="changeBannerIndex" 	circular>
     <block wx:for="{{banner}}" wx:key="index">
       <swiper-item bindtap="bannerClick" data-item="{{item}}">
         <image src="{{item.head_img}}" mode="scaleToFill"></image>
@@ -107,6 +107,11 @@
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/jcyc.png" mode="widthFix"></image>
             <view class="text">剧场演出</view>
           </view>
+          <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250122/abd1f734fa04b783d8083ea1139b91fd.png" mode="widthFix"></image>
+            <view class="text">酒店住宿</view>
+        </view>
+
           <view bindtap="gotoUrl" data-event="card" data-title="一卡游苏州" data-url="https://m.cloud.sz-trip.com/OneDayTravelNew" class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/yry.png" mode="widthFix"></image>
             <view class="text">一日游</view>
@@ -124,6 +129,12 @@
             <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/fyzm.png" mode="widthFix"></image>
             <view class="text">非遗专卖</view>
           </view>
+
+          <view bindtap="gotoUrl" data-event="movie" data-title="研学游" data-url="https://m.cloud.sz-trip.com/LearningTravel" class="pbservice-item">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250122/0022aa79a96e8c6e23aa914c74cfb136.png" mode="widthFix"></image>
+            <view class="text">研学游</view>
+        </view>
+
         </view>
       </scroll-view>
       <view class="scroll-line">
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 27c84fd..5ffd963 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -25,7 +25,7 @@ Page({
   linkmanList:[],
   finalPrice: 0,
 
-  showCoupon: false,
+  showCoupon: true,
   },
 
   /**
@@ -38,16 +38,22 @@ Page({
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       flag:options.flag,
-      showCoupon: (app.globalData.list || []).length<=0,
+    //   showCoupon: (app.globalData.list || []).length<=0,
       // linkmanList: app.globalData.linkmanList
     })
     console.log('-------------',this.data.ticketList);
     // debugger
     let price = 0, sku_id = [] ,postFee= 0; 
     app.globalData.postProduct.map(item => {
+        try {
+            item.postFee = parseFloat(item.postFee)
+        } catch(e){
+            item.postFee = 0
+        }
+
       if (!app.globalData.kjId && !this.data.gp_id) {
         price = price + item.sku.price * item.productNum;
-        postFee +=item.postFee
+        postFee += item.postFee
       }
       else if (this.data.gp_id) {
         price = price + item.sku.event_price * item.productNum;
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index c67f2a2..93508e9 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -82,8 +82,9 @@
         </view>
       </view>
     </view>
-    <view style="padding:20rpx 0 60rpx;">
+    <view style="padding:20rpx 0 30rpx;">
         <view class="btn" style="margin:0 100rpx" bindtap="closeTipMask">确认{{showTipMaskSecond<=0?'':'（'+showTipMaskSecond+'s）'}}</view>
+        <view style="padding:30rpx 60rpx 0rpx;color: #d62828;font-size: 22rpx;font-weight: bold;">数币红包可使用1000元旅游红包，1000元购物红包无法在本平台使用</view>
 
     </view>
       
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index fd18ba0..0dedbe3 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -34,7 +34,7 @@
     <input type="text" bindinput="inputRemark" data-index="{{index}}" placeholder="选填"></input>
   </view>
   <view class="all-money-box" wx:if="{{from=='cart'}}">
-    小计：<text class="unit">￥</text><text class="s-price">{{item.sku.price * item.productNum /100}}</text>
+    小计：<text class="unit">￥</text><text class="s-price">{{(item.sku.price * item.productNum + item.postFee || 0) /100}}</text>
   </view>
   <!-- 补贴 -->
   <view class="box-title allowance" wx:if="{{allowance_price}}">
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 9577afb..56e5a75 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -310,6 +310,10 @@ Page({
     this.totalPrice(this.data.singlePrice)
   },
   totalPrice(price) {
+    this.setData({
+        singlePrice:price
+    })
+
     let allPrice
     if (this.data.coupon) {
       if (this.data.coupon.activity.discount_type == 'pricebreak') {
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 8fa77b0..0a896a9 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -34,7 +34,7 @@
   </view>
   <view class="box">
     <view class="box-title">
-      <view style="flex:1">{{product && product.isGroup!=1?product.sku.sku_name:'预约人数'}}</view>
+      <view class="textOver2" style="flex:1">{{product && product.isGroup!=1?product.sku.sku_name:'预约人数'}}</view>
       <!-- <view style="flex:1">{{product && product.isGroup!=1?'购票数量':'预约人数'}}</view> -->
       <!-- <view class="iconfont icon-sami-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="minus"></view> -->
       <view class="s-price">