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

src/App.vue

@@ -57,6 +57,9 @@ export default {
         pointer: this
       });
       store.dispatch('change_is_weixin_browser', !isApp && !isWxMp && isWechat ? true : false);
+      this.$nextTick(() => {
+        document.querySelectorAll('.cr-overlay').forEach(e => e.parentNode.removeChild(e));
+      });
     }
   },
   methods: {

src/components/bottomNav.vue

@@ -191,6 +191,7 @@ export default {
   }
 }
 .confirm-order-btn {
+  outline: none;
   width: 130px !important;
   margin-right: 10px !important;
 }

src/components/groupBuySuccessInfo.vue

 <template>
   <div class="success-info">
     <p class="desc">
-      已有<span>{{ groupInfo.groupBuySuccessPersonCount || 0 }}人</span>拼团成功
+      已有<span>{{ groupInfo.groupBuySuccessPersonCount || 0 }}人</span>参与拼团
     </p>
     <avator-swiper :avator-data="avatorData" />
   </div>

src/components/sharePic.vue

@@ -111,7 +111,7 @@
           <p style="font-size: 34px;margin-bottom: 15px;">
             已有<span>{{ sharePicData.groupBuySuccessGuys }}人</span>
           </p>
-          <p>拼团成功</p>
+          <p>参与拼团</p>
         </div>
       </div>
     </div>

src/components/swipeCustomerInfo.vue

@@ -79,15 +79,17 @@ export default {
   box-sizing: border-box;
   display: inline-flex;
   align-items: center;
+  align-content: center;
   height: 30px;
-  background: rgba(0, 0, 0, 0.2);
+  background: rgba(0, 0, 0, 0.4);
   border-radius: 15px;
-  padding: @padding-unit;
+  padding: 0 @padding-unit;
   &-icon {
     flex-shrink: 0;
     width: 24px;
     height: 24px;
-    margin-right: @padding-unit + 2;
+    margin-top: 2px;
+    margin-right: @padding-unit;
     .avatar {
       /deep/ img {
         border-radius: 50%;
@@ -97,6 +99,7 @@ export default {
     }
   }
   &-info {
+    text-align: center;
     flex-shrink: 0;
     padding-right: @padding-x;
     .text-12();

src/views/goodsDetail/components/bottomNav.vue

@@ -135,11 +135,16 @@ export default {
   width: 100%;
   background: @white;
   border-top: 2px solid #f7f7f7;
-  padding: 10px 12px;
+  padding-bottom: calc(10px + constant(safe-area-inset-bottom));
+  padding-bottom: calc(10px + env(safe-area-inset-bottom));
+  padding-top: 10px;
+  padding-left: 12px;
+  padding-right: 12px;
   box-sizing: border-box;
   z-index: 2;
   button {
     flex: 1;
+    font-size: 16px;
     &.mutiplie {
       margin: 0 @padding-xs;
     }

src/views/goodsDetail/components/groupDescInfo.vue

@@ -70,7 +70,7 @@ export default {
       observer: null,
       statusTextMap: {
         0: '发起拼团，邀请好友一起拼团吧！',
-        2: '恭喜成团，等待发货！',
+        2: '恭喜成团！',
         3: '哎呀，拼团时间已过，尚未成团！',
         4: '已发货'
       }
@@ -135,6 +135,7 @@ export default {
 }
 .button-area {
   button {
+    font-size: 16px;
     margin-bottom: @padding-md;
   }
 }

src/views/goodsDetail/index.less

@@ -44,19 +44,19 @@
 
 .goods {
   &-share-button{
-    width: 40px;
-    height: 40px;
+    width: 44px;
+    height: 44px;
     position: fixed;
-    right: 0;
+    right: 10px;
     bottom: 120px;
     z-index: 3;
     /deep/ img {
-      width: 40px;
-      height: 40px;
+      width: 44px;
+      height: 44px;
     }
   }
   &-container {
-      padding-bottom: 60px;
+      padding-bottom: calc(60px + env(safe-area-inset-bottom));
       box-sizing: border-box;
       font-size: 16px;
       &-lose {

src/views/goodsDetail/index.vue

@@ -344,16 +344,18 @@ export default {
         // 校验是否允许开团或者参团
         this.$dialog({
           message: checkStatus.failedReason || '',
-          showCancelButton: false,
-          confirmButtonText: '查看其他商品',
-          onConfirm: () => {
-            this.$router.replace({
-              path: '/groupBuy/list',
-              query: {
-                activityId: this.detailParam.activityId
-              }
-            });
-          }
+          cancelButtonText: '知道了',
+          showConfirmButton: false,
+          cancelButtonColor: '#ec1500'
+          // confirmButtonText: '返回活动',
+          // onConfirm: () => {
+          //   this.$router.replace({
+          //     path: '/groupBuy/list',
+          //     query: {
+          //       activityId: this.detailParam.activityId
+          //     }
+          //   });
+          // }
         });
         return;
       }

src/views/goodsDetail/smallPic.vue

@@ -226,6 +226,10 @@ export default {
       this.detailInfo = res;
       this.setStartStatus(res);
       try {
+        this.detailInfo.contentDetailUrl = this.detailInfo.contentDetailUrl.replace(
+          'http://',
+          'https://'
+        );
         const detailImages = await goods.getDetailPic(this.detailInfo.contentDetailUrl);
         // const imgReg = new RegExp('(?<=src=").[^"]*', 'g');
         // this.detailImgList = (detailImages || '').match(imgReg);

src/views/pay/index.less

@@ -33,13 +33,16 @@
 .payBtn{
   width: 100%;
   position: fixed;
-  padding: @padding-xs @padding-lg;
+  padding-left: @padding-lg;
+  padding-right: @padding-lg;
+  padding-top: 10px;
   box-sizing: border-box;
   z-index: 99;
   bottom: 0;
   left:0;
   background-color:@white;
-  .iphonex-fix-margin;
+  padding-bottom: calc(10px + constant(safe-area-inset-bottom));
+  padding-bottom: calc(10px + env(safe-area-inset-bottom));
   button{
     .text-16;
     width: 100%;