From 516b781feb0f866326053e08a58b01792672b48c Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Thu, 6 May 2021 10:15:36 +0800 Subject: [PATCH] no message --- app.js | 2 +- components/submit-layout/index.wxml | 1 + pages/agent/appointment/index.wxml | 1 - pages/agent/order-detail/index.wxml | 1 - pages/message/notification/index.js | 7 ++++++- pages/message/notification/index.wxml | 2 +- pages/settlement/withdrawal/index.js | 11 ++++++----- pages/settlement/withdrawal/index.json | 3 ++- pages/settlement/withdrawal/index.wxml | 23 ++++++++++++++++++----- pages/storage/order-create/index.wxml | 1 - pages/storage/order-settlement/index.wxml | 1 - pages/storage/pound-info/index.wxml | 1 - 12 files changed, 35 insertions(+), 19 deletions(-) diff --git a/app.js b/app.js index 539fc8d..7710cb7 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,6 @@ //app.js App({ - evn: 0, // 0: 开发版本；1：测试版本；2：生产版本 + evn: 1, // 0: 开发版本；1：测试版本；2：生产版本 tmplIds: ['AFoM5TOfsgERsfcetNSB0UlmEixnLF1ySXr54Bqno2M', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'], version: '1.4.1', xAppId: '503258978847953926', diff --git a/components/submit-layout/index.wxml b/components/submit-layout/index.wxml index a2dd113..bf19ba4 100644 --- a/components/submit-layout/index.wxml +++ b/components/submit-layout/index.wxml @@ -1,3 +1,4 @@ + \ No newline at end of file diff --git a/pages/agent/appointment/index.wxml b/pages/agent/appointment/index.wxml index 0fe4eca..cc9c9c4 100644 --- a/pages/agent/appointment/index.wxml +++ b/pages/agent/appointment/index.wxml @@ -90,7 +90,6 @@ show-confirm-bar="{{false}}" bindinput="bindInput" placeholder-style="color:#aaa" placeholder="点击输入备注，最多100字"> - 提交订单 diff --git a/pages/agent/order-detail/index.wxml b/pages/agent/order-detail/index.wxml index a81c625..f27e2dc 100644 --- a/pages/agent/order-detail/index.wxml +++ b/pages/agent/order-detail/index.wxml @@ -43,7 +43,6 @@ - 取消订单 diff --git a/pages/message/notification/index.js b/pages/message/notification/index.js index 4dadac3..ae4d4e9 100644 --- a/pages/message/notification/index.js +++ b/pages/message/notification/index.js @@ -10,13 +10,18 @@ Component({ data: { StatusBar: app.globalData.StatusBar, CustomBar: app.globalData.CustomBar, + isAdmin: false, notice: false, message: null, numb: 0 }, lifetimes: { attached: function () { - this.setData({ StatusBar: app.globalData.StatusBar, CustomBar: app.globalData.CustomBar }) + this.setData({ + StatusBar: app.globalData.StatusBar, + CustomBar: app.globalData.CustomBar, + isAdmin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 + }) } }, methods: { diff --git a/pages/message/notification/index.wxml b/pages/message/notification/index.wxml index dd4073f..70079d6 100644 --- a/pages/message/notification/index.wxml +++ b/pages/message/notification/index.wxml @@ -6,7 +6,7 @@ 稍后处理 - 绑定员工 + 绑定员工 绑定客户 diff --git a/pages/settlement/withdrawal/index.js b/pages/settlement/withdrawal/index.js index 8305a73..83c959c 100644 --- a/pages/settlement/withdrawal/index.js +++ b/pages/settlement/withdrawal/index.js @@ -39,11 +39,11 @@ Page({ this.data.columns = [] for (let index = 0; index < res.data.length; index++) { const element = res.data[index] - this.data.columns.push(element.bankName + '(' + element.cardNoSuffix + ')') + this.data.columns.push(element.bankName + '(' + element.cardNoSuffix + '-' + element.ownerName + ')') } if (res.data && res.data.length && res.data[0].cardName) { const element = res.data[0] - var defaultCard = { cardId: element.id, cardName: element.bankName + '(' + element.cardNoSuffix + ')' } + var defaultCard = { cardId: element.id, cardName: element.bankName + '(' + element.cardNoSuffix + '-' + element.ownerName + ')' } this.setData({ banckCardList: res.data, columns: this.data.columns, chooseBankCard: defaultCard }) } else { this.setData({ banckCardList: res.data, columns: this.data.columns }) @@ -56,6 +56,9 @@ Page({ getUserInfo: function () { wx.showLoading({ title: '加载中', mask: true }) getBalanceInfo().then(result => { + if(!result.data){ + return + } this.setData({ accountMoney: result.data.accountMoney, xsaccountMoney: math.minus(result.data.accountMoney, result.data.frozenMoney) }) }).catch(err => { console.log(err) @@ -98,11 +101,9 @@ Page({ } }, onConfirm: function({detail}){ - console.log(detail) var nowItem = this.data.banckCardList[detail.index] - console.log(detail.index) console.log(nowItem) - this.data.chooseBankCard.cardName = nowItem.bankName + this.data.chooseBankCard.cardName = nowItem.bankName + '(' + nowItem.cardNoSuffix + '-' + nowItem.ownerName + ')' this.data.chooseBankCard.cardId = nowItem.id this.setData({ visible: false, chooseBankCard: this.data.chooseBankCard }) }, diff --git a/pages/settlement/withdrawal/index.json b/pages/settlement/withdrawal/index.json index f5710a6..045da6b 100644 --- a/pages/settlement/withdrawal/index.json +++ b/pages/settlement/withdrawal/index.json @@ -1,10 +1,11 @@ { "usingComponents": { "van-cell": "/components/cell/index", - "van-cell-group": "/components/cell-group/index", "van-dialog": "/components/dialog/index", "van-picker": "/components/picker/index", "van-popup": "/components/popup/index", + "van-checkbox": "/components/checkbox/index", + "submit-layout": "/components/submit-layout/index", "van-button": "/components/button/index" } } \ No newline at end of file diff --git a/pages/settlement/withdrawal/index.wxml b/pages/settlement/withdrawal/index.wxml index e49bf49..454e5fa 100644 --- a/pages/settlement/withdrawal/index.wxml +++ b/pages/settlement/withdrawal/index.wxml @@ -20,19 +20,32 @@ 提现金额 ￥ - + - 账户余额￥{{formate.formateAmount(xsaccountMoney)}} + 账户余额￥{{formate.formateAmount(xsaccountMoney, 2)}} 全部提现 - - 提现 - + + + + {{item.title || '代卖业务'}}{{item.status == 1 ? '(提现中)': ''}} + {{item.createTime}} + + + 金额：{{item.money}} + + + + + + + 申请提现 + diff --git a/pages/storage/order-create/index.wxml b/pages/storage/order-create/index.wxml index 57b2700..2373b7b 100644 --- a/pages/storage/order-create/index.wxml +++ b/pages/storage/order-create/index.wxml @@ -106,7 +106,6 @@ - 提交 diff --git a/pages/storage/order-settlement/index.wxml b/pages/storage/order-settlement/index.wxml index e07478f..dd5a3bf 100644 --- a/pages/storage/order-settlement/index.wxml +++ b/pages/storage/order-settlement/index.wxml @@ -154,7 +154,6 @@ - 关闭订单 确认收款 diff --git a/pages/storage/pound-info/index.wxml b/pages/storage/pound-info/index.wxml index 680c590..f2f90b2 100644 --- a/pages/storage/pound-info/index.wxml +++ b/pages/storage/pound-info/index.wxml @@ -58,7 +58,6 @@ - 删除 关联出货单