From 59859ce5838028e934312c8327ee8529fa01feb7 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Tue, 27 Apr 2021 21:04:52 +0800 Subject: [PATCH] no message --- assets/image/ico_address.png | Bin 0 -> 1179 bytes .../order-detail/delivery-info/index.json | 2 +- .../order-detail/delivery-info/index.wxml | 6 +-- pages/agent/order-detail/index.js | 39 +++++++----------- .../order-detail/item-car-info/index.json | 1 - .../order-detail/item-car-info/index.wxml | 1 - pages/login/index.js | 2 +- 7 files changed, 19 insertions(+), 32 deletions(-) create mode 100644 assets/image/ico_address.png diff --git a/assets/image/ico_address.png b/assets/image/ico_address.png new file mode 100644 index 0000000000000000000000000000000000000000..9c6d404088b3211a0463b261214c35a640985cef GIT binary patch literal 1179 zcmV;M1Z4Y(P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q00000 z1E2u_0{{R30RRC20H6W@1ONa40RR91LZAZx1ONa40RR91LI3~&0O+lO7XSbNdr(YN zMNDaN|8g+@V=n(+FaL@!|9wOMS}*@~GyjM$|5h&lb1?sfFaM7(|NsC0f-nDFF8^>Y z|5+~ohA;nrF8@_7|6wlwYcBt0F8_8e|9db0Q7-?AFaM1%|Bx^L^X~uH$N!OG|HiKW zc}M@}-T%3o|Ehrhj8FfCK>we6-3x1=0000DbW%=J094eV<_U@*k>x(p`g9f$yZ`_L zRY^oaR9M56nCY6TFbswTQ9uq3F32ML=G^}k9@aKV1B3ZF&-nT!P17$P4r^g*=cBHB zo)_xQ(bCMrmvK4j!D|R_h;RtUy6peFdA5T-Bw}JjkzwuAVjg|p4;ID<@FqeZj~$TH z*@pzIqDMTg)@hrd*+0HdRZN5#@wgh=ri7n9wpBc?*9{@2euD_M79-;7tW?CbZwtcT zR&l)>EaTD>_NutwjSH_~MBo#7@ha|&4%2?#ZX}Va&Fjp~>b(5`#A8AzjFbL^h=EY# zu8h2(D(-IwpUe3v5K~`N5HLbIfEXC>w}m?DNf1Tm(#Q&;;{66acCu&0&z#7w%SB5O zhD_xgV-@<_ zA5je47ipSmiVmy()o;F3u{w@Tf z0Ub`uX<)=SFKRhtW<=}aQV>K;RrvBN-LmQd9k?`&iugAp;Jm2Nh^W!<_;3g%5#KLY z?|Mn+MXJvZz)sNqm;hBBt_#G0l)CM0I4U1@^h)Kj! zui1cjWxNPZg{EHi@j3hDUm{M0sg9iKSymr{JYo?JGx#QNpdM_eAd+S9UARPofL64j z{sN3&`UuSa;#DI;9fh2V#NeKy#dqRItw3H&&I^ls5QTMxJz9pU%K;A}d6tFO@@kj{ zaeOnvlIB1;kpQJqggio+gP|JAi43N(5vLLIiCDZ*0={!jr4D&S0*n%}YmhNs*{oyS zFSTpPG@?ylxGODozp}NgHS3D^k_5wzdg)TrIeD0xlDO z?j!6nfmWJ7_YuR~TCDc$BaZp!dWRDU>7j1!nf;QYIzp2*&< teOmhirJ8%!e(~c2X|1n*eE9MwkpDA%0D^|%$ejQH002ovPDHLkV1gkR8;}41 literal 0 HcmV?d00001 diff --git a/pages/agent/order-detail/delivery-info/index.json b/pages/agent/order-detail/delivery-info/index.json index a14199f..2bd2869 100644 --- a/pages/agent/order-detail/delivery-info/index.json +++ b/pages/agent/order-detail/delivery-info/index.json @@ -1,6 +1,6 @@ { "component": true, "usingComponents": { - "wux-button": "/components/button/index" + "van-button": "/components/button/index" } } \ No newline at end of file diff --git a/pages/agent/order-detail/delivery-info/index.wxml b/pages/agent/order-detail/delivery-info/index.wxml index 1a03280..6cbcb2e 100644 --- a/pages/agent/order-detail/delivery-info/index.wxml +++ b/pages/agent/order-detail/delivery-info/index.wxml @@ -1,5 +1,4 @@ - @@ -7,10 +6,9 @@ 送货信息 纸厂开户账号 - + {{orderInfo.millSupplierId || ''}} - 复制 - + 复制 diff --git a/pages/agent/order-detail/index.js b/pages/agent/order-detail/index.js index e17ee8c..9a5c4ec 100644 --- a/pages/agent/order-detail/index.js +++ b/pages/agent/order-detail/index.js @@ -5,7 +5,6 @@ import { getProxyOrderInfo, cancelProxyOrder, cancelReservation, cancelProxyOrde const util = require('../../../utils/util') const math = require('../../../utils/math') const event = require('../../../utils/event') -const app = getApp() Scene({ /** @@ -14,8 +13,7 @@ Scene({ data: { id: null, cancel: true, - orderInfo: null, - orderInfoStepLs:null + orderInfo: null }, /** * 生命周期函数--监听页面加载 @@ -55,32 +53,25 @@ Scene({ } } this.setData({ orderInfo: result.data, cancel: this.data.cancel }) - var orderInfoStepLs = result.data.orderItems - result.data.orderItems.forEach((element1, index1) => { - for (let i = 0; i { wx.hideLoading() util.showToast(err) }) }, - getStr: function (index) { - switch (index) { - case 0: - return "订单已提交,待预约"; - case 1: - return "预约成功,待送货"; - case 2: - return "已收货,待审核"; - case 3: - return "已审核,结算中"; - case 4: - return "已结算,订单完成"; - } - }, + cancelOrder: function () { + Dialog.confirm({ title: '温馨提示', message: '确定预约的日期无法送货，需要销售重新到纸厂进程预约？' }).then(() => { + wx.showLoading({ title: '处理中', mask: true }) + cancelProxyOrder(that.data.orderInfo.orderId).then(result => { + wx.hideLoading() + that.setData({ ['orderInfo.status']: 55 }) + event.emit('ProxyMessage', { what: 400, desc: 'ProxyChange' }) + util.showToast('订单已经取消') + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + }) + } }) \ No newline at end of file diff --git a/pages/agent/order-detail/item-car-info/index.json b/pages/agent/order-detail/item-car-info/index.json index 88730b3..0015676 100644 --- a/pages/agent/order-detail/item-car-info/index.json +++ b/pages/agent/order-detail/item-car-info/index.json @@ -1,7 +1,6 @@ { "component": true, "usingComponents": { - "wux-button": "/components/button/index", "van-collapse": "/components/collapse/index", "van-collapse-item": "/components/collapse-item/index", "wux-steps": "/components/steps/index", diff --git a/pages/agent/order-detail/item-car-info/index.wxml b/pages/agent/order-detail/item-car-info/index.wxml index 4e54522..295fa90 100644 --- a/pages/agent/order-detail/item-car-info/index.wxml +++ b/pages/agent/order-detail/item-car-info/index.wxml @@ -1,5 +1,4 @@ - diff --git a/pages/login/index.js b/pages/login/index.js index 5e46729..27e6c38 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -128,7 +128,7 @@ Page({ }) return } - // headerFactoryId(app.userInfo.factoryId) + headerFactoryId(app.userInfo.factoryId) // wx.redirectTo({ url: '/pages/agent/result/index' }) wx.redirectTo({ url: '/pages/index/index' }) } else {