Merge branch 'master' into newPay

miniprogram/pages/orders/order-detail.ts

@@ -156,6 +156,9 @@ Page({
         console.log('支付失败', ressonInfo)
         // wx.showToast({ title: '支付失败！', icon: 'none' });
         that.onPayError()
+        wx.redirectTo({
+          url: '/pages/orders/order-result?orderNo=' + orderNo
+        })
       }
     })
   },

miniprogram/pages/orders/order-result.ts

@@ -15,7 +15,7 @@ Page({
         title: '等待付款',
         content: '请尽快完成支付，以便我们为您处理订单'
       },
-      SUCCESS: {
+      PAID: {
         logo: './images/success.png',
         title: '交易完成',
         content: '登录「音乐数字课堂」APP使用AI学练'

miniprogram/pages/orders/order-result.wxml

@@ -61,7 +61,7 @@
     </view>
   </scroll-view>
 
-  <view class="order-btn">
+  <view class="order-btn" wx:if="{{ goodsInfo.wechatStatus != 'WAIT_PAY' }}">
     <button type="primary" bind:tap="onSubmit">再来一单</button>
   </view>
 </view>

miniprogram/pages/orders/orders.ts

@@ -112,7 +112,7 @@ Page({
     const template: any = {
       WAIT_PAY: '等待付款',
       WAIT_USE: '等待使用',
-      SUCCESS: '交易完成',
+      PAID: '交易完成',
       CLOSED: '交易取消',
       REFUNDED: '退款成功'
     }