From bb30f9b4749f36a20f8b6726fa08d53597f54576 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Thu, 27 Jun 2024 16:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=A6=E5=88=B8=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=B9=A6=E4=BB=93=E6=9B=BF=E6=8D=A2=E6=8A=95?=
 =?UTF-8?q?=E8=B5=84=E5=AF=BC=E5=BC=95=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                     |  2 +-
 pages/index/index.wxml     | 19 +++++++++----------
 pages/index/index.wxss     |  2 +-
 pages/order/pay/index.js   |  7 ++++---
 pages/order/scene/index.js |  3 ++-
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app.js b/app.js
index c779918..e829353 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.isTest123? true : false;
+      data.isTest = data.isTest124? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7c1803d..8f1cae7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -295,14 +295,11 @@
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/5b0b1be9942bfae84ddbd218421e098f.png" mode="widthFix"></image>
           <view class="text">文旅单位</view>
         </view>
-        <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+        <!-- <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
           class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
-          <view>书香借阅</view> -->
-          <!-- 元旦修改 -->
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
           <view class="text">书仓</view>
-        </view>
+        </view> -->
         <view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
           class="pbservice-item">
           <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
@@ -342,14 +339,16 @@
           <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
           <view>云上文博会</view>
         </view> -->
-        <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+        <view bindtap="gotoPath" data-event="book_click" data-title="书仓" data-path="/pages/pbService/library/index"
+          class="pbservice-item">
+          <image src="https://static.ticket.sz-trip.com/uploads/20240606/92ddf619960de959f760d5690ed5007a.png" mode="widthFix"></image>
+          <view class="text">书仓</view>
+        </view>
+        <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
           class="pbservice-item">
-          <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
-          <view>投资导引图</view> -->
-          <!-- 元旦修改 -->
           <image src="https://static.ticket.sz-trip.com/uploads/20240606/c66d07e172fe3dd66afc0c69340a7b7d.png" mode="widthFix"></image>
           <view class="text">投资导引图</view>
-        </view>
+        </view> -->
         <!-- <view bindtap="gotoUrl" data-title="数字文物"
           data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
           <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index c31ae1d..0206548 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -358,7 +358,7 @@ page {
 .pbservice {
   /* width: calc(175rpx * 6); */
   /* 元旦修改 */
-  width: calc(190rpx * 8);
+  width: calc(190rpx * 7);
   display: flex;
   margin-top: 20rpx;
   flex-wrap: wrap;
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index c1e6dd1..b39ef3a 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -84,9 +84,10 @@ Page({
       order_id:this.data.id
     }).then(res=>{
 	  // 书券产品
-	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265){
+	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265|| res.data.order_product_list[0].product_id == 421929){
 		  this.setData({
-		    isBook:true
+        isBook:true,
+        payIndex:1
 		  })
 	  }
       if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){
@@ -227,7 +228,7 @@ Page({
             })
             setTimeout(()=>{
               wx.redirectTo({
-                url: '../payresult/index?tid='+this.data.id+'&ids='+_this.data.ids.join(',')
+                url: '../payresult/index?tid='+this.data.id+'&ids='+this.data.ids.join(',')
               })
             },1000)
           }
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 81be03d..82b8e39 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -78,8 +78,9 @@ Page({
       product: app.globalData.product,
       singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
+    console.log(this.data.singlePrice);
+    this.showAllPrice()
     this.getNewCoupon()
-    // this.showAllPrice()
   //  console.log('********',this.data.product);
     if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') {
       this.couponCom = this.selectAllComponents("#coupon")[0];