版本优化

assets/image/icon_wechat.svg

@@ -0,0 +1,3 @@
+<svg t="1586830993045" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2613" width="128" height="128">
+	<path d="M588.288 370.176c30.208 0 55.808-22.528 55.808-55.808s-25.6-55.808-55.808-55.808-55.296 22.528-55.296 55.808 25.088 55.808 55.296 55.808zM336.896 258.56c-30.208 0-55.296 22.528-55.296 55.808s25.088 55.808 55.296 55.808 55.808-22.528 55.808-55.808-25.6-55.808-55.808-55.808z m239.104 308.224c-18.432 0-37.376 20.992-37.376 41.472 0 20.992 18.944 41.472 37.376 41.472 28.16 0 46.592-20.48 46.592-41.472 0-20.48-18.432-41.472-46.592-41.472z m167.424 0c-18.432 0-36.864 20.992-36.864 41.472 0 20.992 18.432 41.472 36.864 41.472 28.16 0 46.592-20.48 46.592-41.472 0-20.48-18.944-41.472-46.592-41.472zM957.44 660.48c0-75.264-37.888-143.36-96.256-191.488 0.512-3.584 0.512-6.656 0.512-9.728 0-288.256-205.312-394.752-400.384-394.752-218.112 0-396.8 155.648-396.8 353.792 0 114.176 59.392 207.872 158.72 280.576l1.024 93.184 98.304-40.96c34.304 7.168 50.176 10.752 72.704 12.288 44.544 92.672 147.456 157.696 269.824 157.696 34.304 0 69.12-9.216 103.424-17.92l94.72 54.272-26.112-90.112c68.608-53.76 120.32-125.952 120.32-206.848z m-586.24 0c0 15.36 1.536 30.208 4.096 44.544-8.704-1.536-18.432-3.584-31.744-6.144-3.584-0.512-6.656-1.536-10.24-2.048l-16.896-3.584-15.872 6.656-21.504 9.216v-10.24l-0.512-28.16-22.528-16.384c-44.544-32.768-78.848-69.12-101.376-108.032-11.264-19.456-19.968-39.936-25.6-60.928-5.632-21.504-8.704-44.032-8.704-67.072 0-79.36 34.816-153.6 97.792-209.408 31.232-27.648 67.584-49.664 108.544-64.512 42.496-15.872 87.552-24.064 134.656-24.064 45.056 0 88.576 6.144 128.512 18.432 41.984 13.312 78.848 32.768 109.568 57.856 32.768 27.136 58.88 61.44 76.288 101.888 17.408 38.912 27.136 83.968 29.696 134.144-42.496-21.504-90.624-33.28-140.288-33.28-164.864 0-293.888 117.248-293.888 261.12z m431.104 163.328l-26.112 20.48h-0.512l-22.016 5.632c-31.744 8.192-61.952 16.384-89.6 16.384-33.28 0-65.536-5.632-95.232-16.896-28.672-10.752-53.76-26.112-75.776-45.568-43.008-38.4-66.56-89.088-66.56-142.848s23.552-104.448 66.56-142.848c21.504-19.456 47.104-34.816 75.776-45.568 30.208-11.264 61.952-16.896 95.232-16.896 31.232 0 61.952 5.632 91.136 16.896 28.672 10.752 54.272 26.112 76.288 45.568 22.016 19.456 38.912 41.472 51.2 65.536 12.288 24.576 18.432 50.688 18.432 76.8 0 28.16-8.704 56.32-26.112 84.48-16.896 27.648-41.472 53.76-72.704 78.848z" p-id="2614"></path>
+</svg>

pages/mall/order-info/index.wxml

@@ -63,7 +63,7 @@
 	<view style="height:150rpx;"></view>
 	<view class="cu-bar bg-white shadow foot flex flex-justify" style="height:{{isIPhoneX?154:120}}rpx;padding:32rpx;padding-bottom:{{isIPhoneX?66:32}}rpx">
 		<button class="action" open-type="contact" style="background-color: #fff;border-radius: 0;margin-left:-20rpx">
-			<image style="width:48rpx;height:48rpx" src="/assets/image/icon_kefu.png"></image>
+			<image style="width:60rpx;height:60rpx" src="/assets/image/icon_wechat.svg"></image>
 		</button>
 		<view class="flex align-end">
 			<view wx:if="{{amount}}">

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){

pages/mall/order-offer/index.wxml

@@ -85,7 +85,7 @@
 
 <view class="cu-bar bg-white foot flex flex-justify" style="height:{{isIPhoneX?154:120}}rpx;padding:32rpx;padding-bottom:{{isIPhoneX?66:32}}rpx">
 	<button class="action" open-type="contact" style="background-color: #fff;border-radius: 0;margin-left:-20rpx">
-		<image style="width:48rpx;height:48rpx" src="/assets/image/icon_kefu.png"></image>
+		<image style="width:60rpx;height:60rpx" src="/assets/image/icon_wechat.svg"></image>
 	</button>
 	<view class="flex align-end">
 		<!-- <view class="text-gray" style="font-size:12px">共{{form.number}}{{form.unit}}</view> -->

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
       })
     }