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 @@ 廉洁地图 - - - 书香借阅 + + 文博会 @@ -215,6 +215,11 @@ 视觉中心 + + + 书香借阅 + diff --git a/pages/order/components/address/index.js b/pages/order/components/address/index.js index 1e87fde..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({ @@ -205,7 +208,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;