Merge branch 'develop' of https://gitee.com/yudaocode/yudao-mall-uniapp

Author: YunaiV

pages/pay/result.vue

@@ -17,7 +17,7 @@
       <view class="tip-text ss-m-b-30" v-if="payResult === 'success'">支付成功</view>
       <view class="tip-text ss-m-b-30" v-if="payResult === 'failed'">支付失败</view>
       <view class="tip-text ss-m-b-30" v-if="payResult === 'closed'">该订单已关闭</view>
-      <view class="tip-text ss-m-b-30" v-if="payResult === 'waiting'">检测支付结果...</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'waiting'">正在查询支付结果...</view>
       <view class="pay-total-num ss-flex" v-if="payResult === 'success'">
         <view>￥{{ fen2yuan(state.orderInfo.price) }}</view>
       </view>
@@ -119,7 +119,7 @@
   async function getOrderInfo(id) {
     state.counter++;
     // 1. 加载订单信息
-    const { data, code } = await PayOrderApi.getOrder(id);
+    const { data, code } = await PayOrderApi.getOrder(id, true);
     if (code === 0) {
       state.orderInfo = data;
       if (!state.orderInfo || state.orderInfo.status === 30) {

sheep/platform/pay.js

@@ -93,7 +93,7 @@ export default class SheepPay {
       };
       // 特殊逻辑：微信公众号、小程序支付时，必须传入 openid
       if (['wx_pub', 'wx_lite'].includes(channel)) {
-        const openid = await sheep.$platform.useProvider('wechat').getOpenid();
+        const openid = await sheep.$platform.useProvider('wechat').getOpenid(true);
         // 如果获取不到 openid，微信无法发起支付，此时需要引导
         if (!openid) {
           this.bindWeixin();