Merge branch 'master' of http://code.xmainc.com:3000/panyiping/jundaosuzhou_wechatxcx

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">

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({
@@ -205,7 +208,7 @@ Component({
                   icon:"success"
                 })
                 linkmanList.splice(index,1);
-                this.setData({
+                that.setData({
                   linkmanList:linkmanList
                 })
               }

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);

pages/order/orderList/index.wxss

@@ -1,5 +1,6 @@
 page{
   background: #f5f5f5;
+  padding-bottom: 130rpx;
 }
 .box{
 	margin: 30rpx 25rpx;