diff --git a/assets/image/icon_kefu.png b/assets/image/icon_kefu.png deleted file mode 100644 index 97fd7b4..0000000 Binary files a/assets/image/icon_kefu.png and /dev/null differ diff --git a/assets/image/icon_wechat.svg b/assets/image/icon_wechat.svg new file mode 100644 index 0000000..0716495 --- /dev/null +++ b/assets/image/icon_wechat.svg @@ -0,0 +1,3 @@ + + + \ 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 }) }