From 740cf25fba0af1ae2f88b43d466af668b24e3995 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Sat, 6 Aug 2022 17:53:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6bug=20=EF=BC=8C?=
 =?UTF-8?q?=E6=96=87=E6=97=85=E9=89=B4=E8=B5=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.wxml                  | 11 ++++++++---
 pages/order/components/address/index.js |  2 +-
 pages/order/orderList/index.js          |  5 +++--
 pages/order/orderList/index.wxss        |  1 +
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 5924079..b56ae75 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -195,10 +195,10 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
         <view>廉洁地图</view>
       </view>
-      <view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
+      <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
         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/20220806/c544e31e5c9c910292450b2c349ae6e2.png" mode="widthFix"></image>
+        <view>文博会</view>
       </view>
       <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
         data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
@@ -215,6 +215,11 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
         <view>视觉中心</view>
       </view>
+      <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>
+      </view>
     </view>
   </scroll-view>
   <view class="scroll-line">
diff --git a/pages/order/components/address/index.js b/pages/order/components/address/index.js
index 1e87fde..7ba1295 100644
--- a/pages/order/components/address/index.js
+++ b/pages/order/components/address/index.js
@@ -205,7 +205,7 @@ Component({
                   icon:"success"
                 })
                 linkmanList.splice(index,1);
-                this.setData({
+                that.setData({
                   linkmanList:linkmanList
                 })
               }
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 30cc91c..16f787c 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -34,10 +34,11 @@ Page({
       gp_id: app.globalData.gp_id || app.globalData.team_id,
     })
     console.log(app.globalData);
-    let price = 0, sku_id = [];
+    let price = 0, sku_id = [] ,postFee= 0; 
     app.globalData.postProduct.map(item => {
       if (!app.globalData.kjId && !this.data.gp_id) {
         price = price + item.sku.price * item.productNum;
+        postFee +=item.postFee
       }
       else if (this.data.gp_id) {
         price = price + item.sku.event_price * item.productNum;
@@ -50,12 +51,12 @@ Page({
     })
     this.setData({
       showPrice: app.globalData.kjId ? 0 : price,
+      postFee:postFee,
       sku_id: sku_id.join(",")
     })
     if (!this.data.kjId && !this.data.gp_id) {
       this.couponCom = this.selectAllComponents("#coupon")[0];
     }
-  	console.log(this.data.showPrice)
   },
   order: function (){
     console.log(app.globalData.createDate);
diff --git a/pages/order/orderList/index.wxss b/pages/order/orderList/index.wxss
index 42bac92..5685983 100644
--- a/pages/order/orderList/index.wxss
+++ b/pages/order/orderList/index.wxss
@@ -1,5 +1,6 @@
 page{
   background: #f5f5f5;
+  padding-bottom: 130rpx;
 }
 .box{
 	margin: 30rpx 25rpx;

From 05caf35a5c1a57c1c8961d20869c031e42b02724 Mon Sep 17 00:00:00 2001
From: caichunsheng <dukang@xmainc.com>
Date: Mon, 8 Aug 2022 10:03:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=90=8E=E4=B8=8D=E8=83=BD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/address/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pages/order/components/address/index.js b/pages/order/components/address/index.js
index 7ba1295..28fcdb0 100644
--- a/pages/order/components/address/index.js
+++ b/pages/order/components/address/index.js
@@ -109,6 +109,9 @@ Component({
       wx.navigateTo({
         url: '/pages/user/address/add/index?id='+this.data.editId+'&from=order',
       })
+      this.setData({
+        editId:null
+      })
     },
     showLinkman:function(){
       this.setData({