diff --git a/assets/image/icon-banner.png b/assets/image/icon-banner.png index a02c22d..5dc7095 100644 Binary files a/assets/image/icon-banner.png and b/assets/image/icon-banner.png differ diff --git a/assets/image/icon-end.png b/assets/image/icon-end.png new file mode 100644 index 0000000..d73d8cc Binary files /dev/null and b/assets/image/icon-end.png differ diff --git a/assets/image/icon-qrcode.png b/assets/image/icon-qrcode.png new file mode 100644 index 0000000..3fadcd0 Binary files /dev/null and b/assets/image/icon-qrcode.png differ diff --git a/pages/htmls/auths/index.wxml b/pages/htmls/auths/index.wxml index efa7c1f..cf60797 100644 --- a/pages/htmls/auths/index.wxml +++ b/pages/htmls/auths/index.wxml @@ -4,15 +4,22 @@ - + + + + + + + + - + @@ -25,8 +32,8 @@ 更多详情请联系客服020-8251 6486 - + @@ -39,7 +46,6 @@ - diff --git a/pages/htmls/auths/index.wxss b/pages/htmls/auths/index.wxss index 7435e4b..67311ce 100644 --- a/pages/htmls/auths/index.wxss +++ b/pages/htmls/auths/index.wxss @@ -21,6 +21,13 @@ top: 0rpx; } +.end { + width: 100%; + flex-direction: column; + position: absolute; + bottom: 0px; +} + .dialog-input { padding:0rpx 16rpx; border:1rpx solid #eee; diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml index 8262350..c4e8fc9 100644 --- a/pages/process/index/index.wxml +++ b/pages/process/index/index.wxml @@ -99,7 +99,7 @@ --> - + diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml index 941d700..9a5b0c4 100644 --- a/pages/process/order-list/index.wxml +++ b/pages/process/order-list/index.wxml @@ -40,10 +40,13 @@ 审核 - + + 待过皮重 + + 待付款 - + 已完成 diff --git a/pages/process/payment/index.js b/pages/process/payment/index.js index 04b306e..fe4dbe4 100644 --- a/pages/process/payment/index.js +++ b/pages/process/payment/index.js @@ -77,9 +77,10 @@ Page({ } this.setData({ ['params.settleType']: e.currentTarget.dataset.name }) }, - lookItem: function(e){ + onChange: function(e){ + console.log(e.detail) var item = this.data.orderList[e.currentTarget.dataset.index] - item.checked = !item.checked + item.checked = !e.detail var amount = 0 this.data.params.ids = [] for (let index = 0; index < this.data.orderList.length; index++) { @@ -88,7 +89,11 @@ Page({ this.data.params.ids.push(this.data.orderList[index].id) } } - this.setData({ ['orderList[' + e.currentTarget.dataset.index + '].checked']: item.checked, amount }) + this.setData({ ['orderList[' + e.currentTarget.dataset.index + '].checked']: !e.detail, amount }) + }, + lookItem: function(e){ + var item = this.data.orderList[e.currentTarget.dataset.index] + // wx.navigateTo({ url: `/pages/process/order-info/index?id=${item.id}` }) }, bindInput: function (e) { this.data.params[e.target.id] = e.detail.value diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml index 53aae47..89d8bcb 100644 --- a/pages/process/payment/index.wxml +++ b/pages/process/payment/index.wxml @@ -48,10 +48,10 @@ (共{{orderList.length}}笔订单) - + - - + + {{item.factoryCustomerName}} {{item.factoryCustomerMobile || ''}} {{item.bangTime}}