From 179b0d2512fb888f48f2d143244b6715c81d939f Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Tue, 14 Apr 2020 10:35:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/image/icon_kefu.png | Bin 1963 -> 0 bytes assets/image/icon_wechat.svg | 3 +++ pages/mall/order-info/index.wxml | 2 +- pages/mall/order-offer/index.js | 2 +- pages/mall/order-offer/index.wxml | 2 +- pages/mall/order-result/index.js | 32 +++++++++++++++++++++++++++--- 6 files changed, 35 insertions(+), 6 deletions(-) delete mode 100644 assets/image/icon_kefu.png create mode 100644 assets/image/icon_wechat.svg diff --git a/assets/image/icon_kefu.png b/assets/image/icon_kefu.png deleted file mode 100644 index 97fd7b43c018cf7ad5b5e35e1e240940b42f0cab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1963 zcmV;c2UPfpP)Px+Wl2OqRA>d=nQLrRMHI)k+b6UQD5aP_#5Phu6vR^cq7jp#)X)TojVOr5D8WF| zM1#hNQW2F3Q4;h6#`;BhSs@~js^3=lsvS&fM7$M-WnadU|+RSlA?zv%9-HG(0@Kue!SWdJs%GLhMkQo0}Wk z+uOThcz8G~BqSu8@^18oYr0!$yFlAH_{Rzh3s04llniMy0h1GQAUiudvA@5+7*HFq zJS9Nu&Bz}lzunl_*cxD8LwsBg6ciLhwzs$M1o$R2=_73@_p{Q4Txmo^#O|7!nt%N4 zV~7RpKvq`PTt@v68s-~XY^bojnw(DOs=B(m9|BS53`BU*qD5;41_m1GV+Fnw5FY|! zU1(@%1~OAqQ&S@;BgoP4b19!grh;;qY)Z^#%HZH&H8vhHHTWR>o`H;vjMW(VgdD2r zybP$VDJdyO%gf9Av^GmJGc$7*U}f(-jet0)reU1jSYKcNzRL7g_sapmFCQ8jI))O% z7@!9Lu$57M$6w$&2ppNujD8INF0~EagX9%B@rBB_s{3?+HGdmxUXH$KML`D!iW(Xk zsubS1s&XK-wY9xV=ciN!=)X?R#))bo3GQb}G7^ z;F0L=kt`ix$`+`SM8-Om4tAZv8ekUAs&R_nR>||=R zi&U41BQGy+dVGBRYqUI04s&;4`fg83O1j+A((<#L7p#(x9A{To*IHIVF*a^i?4%_o zCKe?mB>Vvmxf!^U5#{&{l>0~}dHP6`=PyfX8>hr}&lY<)#GZ(zrlwCBu)?u4GCMC2 zkKPg)*9@@3lkixk%qw^iM)7?z0_NCr{pwjn!hyM_QJgocvvLb90kx4{#%V zg${Ab_lN0cBRPcbi>IN@@g!g{hce^`{mZtl=);2B@8+WQ5!SR6`yzoaq zHBYKCZ1!2Qgl<)tC~|qM^4Pr1Dos6EqwOF~IB=lFLaB)d)&z-g#z|z+!5eEleZ1*% z@c|sLPQh*&$i}qvA8Y(yIuLF#$W}ZHvGKE54yLCTNGqEr9;;4XFr4}=b2dk-8p0hM zU)dTo^`@vbjhk%OdSzYid|LzB^io7NmS ziH%0J7q-_D8#c@Jg1{L=eGfe2MvA;Vy_|RLe1cU2ozqnXQb(YNPDbDuZSUt*Vjds% zKkD)mp=F@BGF!a^$zz!WS$)5LMvPkJVzP{$6_0cP7T_Jomf8(o>=LNH1Ve?60Xl-L zgTEFP6(tYLBMsazPg7q<*7t+RsOj6dxHx?|sqGW0GdPdo#MQBs&@K;NPwG2aPjGUW?)8j(CZm23`4rV8efRhR zFY>m{fPBjyKYn}*I$tG6igJr|4PeEr;g95x!JeL;EzmFGfN3D%9fh|>uJRT-Of1_R zAkdUxbel=LcVa&vmm@#TLZqBM_ozIrShRVtY;geav(bD`A4v~uV>5y!2Qrz3C6M0qb^^Yb%VU`@VE(q-a*V3Ra&mHJ x@ + + \ No newline at end of file diff --git a/pages/mall/order-info/index.wxml b/pages/mall/order-info/index.wxml index 0940a24..4125a66 100644 --- a/pages/mall/order-info/index.wxml +++ b/pages/mall/order-info/index.wxml @@ -63,7 +63,7 @@ diff --git a/pages/mall/order-offer/index.js b/pages/mall/order-offer/index.js index dddc248..b908ac8 100644 --- a/pages/mall/order-offer/index.js +++ b/pages/mall/order-offer/index.js @@ -127,7 +127,7 @@ Page({ data.success = function(res){ util.showToast('订单支付成功') wx.redirectTo({ - url: '/pages/mall/order-result/index?type=1' + url: '/pages/mall/order-result/index?type=2' }) } data.fail = function(res){ diff --git a/pages/mall/order-offer/index.wxml b/pages/mall/order-offer/index.wxml index c606b8a..a302b3c 100644 --- a/pages/mall/order-offer/index.wxml +++ b/pages/mall/order-offer/index.wxml @@ -85,7 +85,7 @@ diff --git a/pages/mall/order-result/index.js b/pages/mall/order-result/index.js index af9d7fa..5abab82 100644 --- a/pages/mall/order-result/index.js +++ b/pages/mall/order-result/index.js @@ -18,7 +18,7 @@ Page({ title: '支付成功', label: '订单提交成功', message: '订单状态返回我的订单查看', - type: 0 + type: 0 // 0: 订单提交失败; 1：订单提交成功；2：支付成功 }, /** @@ -27,6 +27,19 @@ Page({ onLoad: function (options) { this.data.type = Number(options.type) if(this.data.type == 0){ + var msg = '订单状态返回我的订单查看' + if(options.message){ + msg = options.message + } + this.setData({ + ['icon.type']: 'success', + ['icon.color']: '#008AFF', + ['buttons[0].type']: 'positive', + title: '支付失败', + label: '订单提交失败', + message: msg + }) + } else if(this.data.type == 1){ var msg = '订单状态返回我的订单查看' if(options.message){ msg = options.message @@ -35,8 +48,21 @@ Page({ ['icon.type']: 'warn', ['icon.color']: '#ef473a', ['buttons[0].type']: 'light', - title: '支付失败', - label: '订单提交失败', + title: '下单成功', + label: '订单提交成功', + message: msg + }) + } else if(this.data.type == 2){ + var msg = '订单状态返回我的订单查看' + if(options.message){ + msg = options.message + } + this.setData({ + ['icon.type']: 'warn', + ['icon.color']: '#ef473a', + ['buttons[0].type']: 'light', + title: '支付成功', + label: '订单提交成功', message: msg }) }