Merge branch 'feat/group-buy' of git.quantgroup.cn:ui/group-buy-ui into feat/group-buy

src/views/goodsDetail/components/groupDescInfo.vue

@@ -2,10 +2,15 @@
   <div class="group-info-desc">
     <div class="desc-item">
       <template v-if="groupInfo.groupBuyStatus == 1">
-        <p class="desc">
-          还差<span>{{ groupInfo.groupBuyNeedUserCount }}人</span>成团，距结束还剩
-        </p>
-        <countDown v-if="!!timestemp" :block-no-bg="true" :end-time="timestemp" />
+        <template v-if="!groupInfo.joinGroup && !groupInfo.canJoinGroupBuyAgain">
+          拼团失败!
+        </template>
+        <template v-else>
+          <p class="desc">
+            还差<span>{{ groupInfo.groupBuyNeedUserCount }}人</span>成团，距结束还剩
+          </p>
+          <countDown v-if="!!timestemp" :block-no-bg="true" :end-time="timestemp" />
+        </template>
       </template>
       <template v-else>
         <template v-if="groupInfo.groupBuyStatus != 2">

src/views/order/createOrder.vue

@@ -235,6 +235,8 @@ export default {
           this.nativeBridge.openNewUrl({
             newUrl: `/pages/pay/index?orderNo=${data.orderNo}`
           });
+          // const wx = require('weixin-js-sdk');
+          // wx.miniProgram.redirectTo();
         } else if (isApp) {
           this.$router.replace({ path: `/pay?orderNo=${data.orderNo}` });
         } else {

src/views/pay/index.vue

@@ -539,7 +539,7 @@ export default {
           reason: error,
           orderNo: this.orderNo,
           payType: this.payType,
-          finalAmt: this.amountInfo.finalAmt || '',
+          amount: this.amountInfo.finalAmt || '',
           freeAmount: this.amountInfo.freeAmount || ''
         }
       });