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

src/components/bottomNav.vue

@@ -103,7 +103,11 @@ export default {
   align-items: center;
   width: 100%;
   height: 30px;
-  padding: 10px 0;
+  padding-bottom: calc(10px + constant(safe-area-inset-bottom));
+  padding-bottom: calc(10px + env(safe-area-inset-bottom));
+  padding-top: 10px;
+  padding-left: 0;
+  padding-right: 0;
   background: @white;
   border-top: 1px solid #f7f7f7;
   &-radio {

src/components/groupShare.vue

@@ -223,6 +223,7 @@ export default {
         message: '请点击小程序右上角更多进行分享~',
         showCancelButton: false,
         confirmButtonText: '我知道了哦～',
+        closeOnClickOverlay: !isApp && !isWxMp ? false : true,
         onConfirm: () => {}
       });
     },
@@ -248,6 +249,7 @@ export default {
     tipDialogMessage() {
       this.$dialog({
         message: '请在App或小程序中进行分享~',
+        closeOnClickOverlay: !isApp && !isWxMp ? false : true,
         title: '',
         showCancelButton: false,
         confirmButtonText: '我知道了'

src/components/rules.vue

@@ -31,6 +31,7 @@
 }
 </style>
 <script>
+import { isApp, isWxMp } from '@/service/validation.service';
 export default {
   props: {
     groupInfo: {
@@ -44,6 +45,7 @@ export default {
     showRules() {
       this.$dialog({
         messageAlign: 'left',
+        closeOnClickOverlay: !isApp && !isWxMp ? false : true,
         message: this.groupInfo.groupBuyDesc || '',
         title: '拼团须知',
         showCancelButton: false,

src/mixins/goodsCheck.mixin.js

@@ -39,6 +39,7 @@ export default {
         this.$dialog({
           message: '参与拼团活动需要您先进行登录哦~',
           title: '',
+          closeOnClickOverlay: true,
           showCancelButton: false,
           confirmButtonText: '登录',
           onConfirm: () => {
@@ -51,6 +52,7 @@ export default {
               this.$dialog({
                 message: '请在App或小程序中参与活动~',
                 title: '',
+                closeOnClickOverlay: true,
                 showCancelButton: false,
                 confirmButtonText: '我知道了'
               });

src/store/module.js

@@ -110,7 +110,7 @@ const mutations = {
           let getScheme = async function() {
             const [res] = await groupBuy.getScheme({
               miniUrl: 'pages/groupbuy/webview',
-              // miniUrl: 'pages/product/goodDetail',
+              // miniUrl: 'pages/product/goodDetail'
               params: `url=${encodeURIComponent(
                 JSON.stringify(paramsParentheses(pointer) + '&vccToken={token}')
               )}`

src/views/address/addressManage.vue

@@ -171,6 +171,7 @@ export default {
       const _this = this;
       this.$dialog({
         title: '',
+        closeOnClickOverlay: true,
         message: '确认删除该地址?',
         onConfirm: function() {
           _this.deleteAddr();

src/views/goodsDetail/components/groupDescInfo.vue

@@ -70,7 +70,7 @@ export default {
       observer: null,
       statusTextMap: {
         0: '发起拼团，邀请好友一起拼团吧！',
-        2: '恭喜成团！',
+        2: '恭喜成团!',
         3: '哎呀，拼团时间已过，尚未成团！',
         4: '已发货'
       }

src/views/goodsDetail/index.vue

@@ -206,6 +206,7 @@ import localStorage from '@/service/localStorage.service';
 import goodsCheckMixin from '@/mixins/goodsCheck.mixin';
 import { EventBus } from '@/service/utils.service';
 import { saTrackEvent } from '@/service/sa.service';
+import { isApp, isWxMp } from '@/service/validation.service';
 export default {
   // eslint-disable-next-line vue/name-property-casing
   name: 'goodDetail',
@@ -346,7 +347,8 @@ export default {
           message: checkStatus.failedReason || '',
           cancelButtonText: '知道了',
           showConfirmButton: false,
-          cancelButtonColor: '#ec1500'
+          cancelButtonColor: '#ec1500',
+          closeOnClickOverlay: !isApp && !isWxMp ? false : true
           // confirmButtonText: '返回活动',
           // onConfirm: () => {
           //   this.$router.replace({
@@ -438,6 +440,7 @@ export default {
           this.$dialog({
             message: '哎呀，活动太火爆，该商品已经卖光，换一个商品试试吧！',
             title: '',
+            closeOnClickOverlay: !isApp && !isWxMp ? false : true,
             showCancelButton: false,
             confirmButtonText: '查看其他商品',
             onConfirm: () => {

src/views/goodsDetail/smallPic.less

@@ -58,7 +58,7 @@
   &-group-buy-head-content{
     height: 64px;
     width: 100%;
-    padding: 0 @padding-sm;
+    // padding: 0 @padding-sm;
     display: flex;
     align-items: center;
     justify-content: space-between;

src/views/goodsList/components/goodsCard.vue

@@ -122,6 +122,7 @@ export default {
 
         this.$dialog({
           message,
+          closeOnClickOverlay: true,
           showCancelButton: true,
           confirmButtonText,
           onConfirm: () => {

src/views/order/createOrder.vue

@@ -170,6 +170,7 @@ export default {
     async handleBuy() {
       if (!this.orderInfo.addrReceiverInfo?.addrReceiverId) {
         this.$dialog({
+          closeOnClickOverlay: true,
           message: '你还没有选择收货地址哦！',
           showCancelButton: false,
           confirmButtonText: '去添加',

src/views/orderList/components/List.vue

@@ -167,10 +167,6 @@ export default {
       });
     },
     goGroupDetails(skuInfo) {
-      saTrackEvent('H5_MyPuzzlePageGroupOrderBtnClick', {
-        sku_no: skuInfo.skuList[0].skuNo,
-        group_id: skuInfo.activityHundredGroupId
-      });
       if (isWxMp) {
         this.nativeBridge.openNewUrl({
           newUrl: `/pages/order/orderDetail?orderNo=${skuInfo.orderNo}`
@@ -195,6 +191,7 @@ export default {
       } else {
         // todo 处理纯h5情况
         this.$dialog({
+          closeOnClickOverlay: !isApp && !isWxMp ? false : true,
           message: '请在App或小程序中参与活动~',
           title: '',
           showCancelButton: false,
@@ -213,6 +210,14 @@ export default {
 
     toDetail(goodsItem) {
       const { skuList, activityInfoId, activityHundredGroupId } = goodsItem;
+      try {
+        saTrackEvent('H5_MyPuzzlePageGroupOrderBtnClick', {
+          sku_no: skuList[0].skuNo,
+          group_id: activityHundredGroupId
+        });
+      } catch (e) {
+        console.log(e);
+      }
       this.$router.push({
         path: '/groupBuy/skuInfoSmallPic',
         query: {

src/views/pay/STATIC_DATA.js

@@ -119,6 +119,7 @@ function havePayingOrder() {
   this.$dialog({
     message: '您的享花卡额度被其他订单占用，暂时不可使用享花卡支付哦！',
     confirmButtonText: '重新选择',
+    closeOnClickOverlay: true,
     showCancelButton: false,
     confirmButtonColor: '#EC1500'
   });

src/views/pay/index.less

@@ -61,10 +61,13 @@
   }
 }
 .btn{
-  height:50px;
   width: 100%;
   position: fixed;
-  padding: 0 @padding-lg;
+  padding-left: @padding-lg;
+  padding-right: @padding-lg;
+  padding-top: 10px;
+  padding-bottom: calc(10px + constant(safe-area-inset-bottom));
+  padding-bottom: calc(10px + env(safe-area-inset-bottom));
   box-sizing: border-box;
   bottom: 0;
   left:0;

src/views/pay/index.vue

@@ -54,30 +54,34 @@
       </cr-button>
     </p>
     <p v-if="overtime" class="btn">
-      <cr-button v-if="isOrder" type="default" class="btn-default" @click="goOrderList"
+      <!-- <cr-button v-if="isOrder" type="default" class="btn-default" @click="goOrderList"
         >我的订单</cr-button
-      >
-      <cr-button type="primary" class="btn-primary" @click="goHome">返回商城</cr-button>
+      > -->
+      <cr-button type="primary" class="btn-primary" @click="navigateBack">返回</cr-button>
     </p>
     <p class="placeholder" />
     <!-- 支付密码弹窗 -->
-    <cr-pwd-field
-      ref="pwd"
-      v-model="pwdModal"
-      :amount="amount"
-      @getData="getPwd"
-      @retrieveLink="retrieveLink"
-    />
+    <template v-if="pwdModal">
+      <cr-pwd-field
+        ref="pwd"
+        v-model="pwdModal"
+        :amount="amount"
+        @getData="getPwd"
+        @retrieveLink="retrieveLink"
+      />
+    </template>
 
     <!-- 短信验证弹窗 -->
-    <cr-sms-code-modal
-      v-model="smsModal"
-      :error-info="error"
-      :order-no="orderNo"
-      :flow-order-no="flowOrderNo"
-      @close="smsModal = false"
-      @submit="getSms"
-    />
+    <template v-if="smsModal">
+      <cr-sms-code-modal
+        v-model="smsModal"
+        :error-info="error"
+        :order-no="orderNo"
+        :flow-order-no="flowOrderNo"
+        @close="smsModal = false"
+        @submit="getSms"
+      />
+    </template>
 
     <!-- 享花券弹窗 -->
     <cr-popup v-model="couponPopup" closeable round position="bottom">
@@ -101,7 +105,7 @@ import { isWechat } from '@/service/validation.service';
 import { encryptByDESModeEBC } from '@/service/encrypt';
 import localStorage from '@/service/localStorage.service';
 import { throttle } from '@/service/utils.service';
-import { goUrlExtends } from './extends';
+// import { goUrlExtends } from './extends';
 import cookies from '@/service/cookieStorage.service';
 import { saTrackEvent } from '@/service/sa.service';
 import {
@@ -145,7 +149,7 @@ export default {
       pay: this
     };
   },
-  extends: goUrlExtends,
+  // extends: goUrlExtends,
   data() {
     return {
       isOrder: true,
@@ -238,6 +242,9 @@ export default {
     this.getCouponList(this.orderNo);
   },
   methods: {
+    navigateBack() {
+      this.$router.go(-1);
+    },
     getQuery() {
       this.returnUrl = cookies.get('returnUrl') || '';
       if (localStorage.get('hideOrder')) {
@@ -441,6 +448,7 @@ export default {
       }
       if (this.payType === CREDIT_PAY && this.canUseAmount < 0) {
         this.$dialog({
+          closeOnClickOverlay: true,
           message: '您的消费额度不足，请更换支付方式！',
           confirmButtonText: '知道了',
           showCancelButton: false,
@@ -503,7 +511,9 @@ export default {
       ) {
         /* 密码或者短信鉴权 */
         this.close();
-        this[`${creditPayStatusType[creditPayStatus]}Modal`] = true;
+        this.$nextTick(() => {
+          this[`${creditPayStatusType[creditPayStatus]}Modal`] = true;
+        });
         return;
       } else if (creditPayStatus === FACE_VERIFICATION_CODE_PAY) {
         /* 人脸鉴权 */

src/views/pay/payResult.vue

@@ -74,6 +74,7 @@ import groupBuyApi from '@/api/groupBuy';
 // import Goods from '@/components/RecoGoods/RecoGoods.vue';
 import { isApp, isWxMp } from '@/service/validation.service';
 import { EventBus } from '@/service/utils.service';
+import MpBridge from '@/service/mp';
 export default {
   components: {
     // Goods,
@@ -123,6 +124,7 @@ export default {
         this.$router.replace({ path: '/orderList/0' });
       } else {
         if (isWxMp) {
+          this.nativeBridge = new MpBridge();
           this.nativeBridge.openNewUrl({
             newUrl: `/pages/pay/index?orderNo=${this.orderNo}`
           });