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

src/components/avatorGroup.vue

@@ -25,6 +25,7 @@
             src="@/assets/images/leader-name.png"
           />
         </div>
+        <div class="border" />
       </template>
       <div v-if="item.userTag && item.userTag.toLowerCase() == 'new'" class="is-new">
         <cr-image width="25px" src="@/assets/images/new-user.png" />
@@ -49,6 +50,7 @@
             src="@/assets/images/leader-name.png"
           />
         </div>
+        <div class="border" />
       </template>
       <div class="content" :class="{ avator: avators.length == 0 && n == 1 }">?</div>
     </div>
@@ -164,28 +166,44 @@ export default {
       border-radius: 50%;
     }
   }
-  .avator {
+  .border {
+    position: absolute;
+    top: 0;
+    left: 50%;
+    transform: translateX(-50%);
     background: url('../assets/images/leaderBorder.png');
+    background-size: cover;
+    z-index: 2;
+    width: 44px;
+    height: 100%;
+  }
+  .avator {
+    // background: url('../assets/images/leaderBorder.png');
     // border: px solid rgba(255, 212, 0, 0.24);
+    width: 44px;
+    height: 44px;
+    position: relative;
     background-size: cover;
     box-sizing: border-box;
     display: flex;
     align-items: center;
     justify-content: center;
     /deep/ img {
-      width: 37px;
-      height: 37px;
+      width: 44px;
+      height: 44px;
     }
   }
   .is-new {
     position: absolute;
     top: 0;
+    z-index: 3;
     right: -@padding-unit;
   }
   .is-leader {
     position: absolute;
     right: 4px;
     top: -9px;
+    z-index: 3;
     .crown {
       width: 22px;
       height: 20px;
@@ -197,6 +215,7 @@ export default {
     position: absolute;
     left: 50%;
     bottom: -6px;
+    z-index: 3;
     transform: translateX(-50%);
     &-icon {
       width: 100%;
@@ -226,7 +245,19 @@ export default {
   }
   .placeholder.leader {
     position: relative;
+    .border {
+      position: absolute;
+      top: 0;
+      left: 50%;
+      transform: translateX(-50%);
+      background: url('../assets/images/leaderBorder.png');
+      background-size: cover;
+      z-index: 2;
+      width: 44px;
+      height: 100%;
+    }
     .is-new {
+      z-index: 3;
       position: absolute;
       top: 0;
       right: -@padding-unit + 2;
@@ -235,12 +266,14 @@ export default {
       position: absolute;
       right: 4px;
       top: -9px;
+      z-index: 3;
       .crown {
         width: 22px;
         height: 20px;
       }
     }
     .leader-name {
+      z-index: 3;
       width: 35px;
       height: 17px;
       position: absolute;
@@ -257,7 +290,7 @@ export default {
       }
     }
     .avator {
-      background: #ffe1e1 url('../assets/images/leaderBorder.png');
+      // background: #ffe1e1 url('../assets/images/leaderBorder.png');
       // border: px solid rgba(255, 212, 0, 0.24);
       background-size: cover;
       box-sizing: border-box;
@@ -266,8 +299,8 @@ export default {
       justify-content: center;
       border: 0;
       /deep/ img {
-        width: 37px;
-        height: 37px;
+        width: 44px;
+        height: 44px;
       }
     }
   }

src/components/sharePic.vue

@@ -101,8 +101,8 @@
           class="skuPrice"
           style="width: 653px;font-size: 34px;padding-left: 32px;margin-right: 10px;"
         >
-          <span class="groupPriceContainer">拼团价 ¥</span>
-          <span class="groupPrice" style="font-size: 64px;margin-right: 15px;">¥0</span>
+          <span class="groupPriceContainer">成团价 ¥</span>
+          <span class="groupPrice" style="font-size: 64px;margin-right: 15px;">0</span>
           <span class="salePrice" style="line-height: 134px;font-size: 34px;"
             >售价¥{{ sharePicData.activityPrice }}</span
           >
@@ -190,6 +190,7 @@ export default {
       const [res] = await qiNiuApi.getQiniuToken();
       const token = res.token;
       let skuName = '';
+      // 将每个字符套入行内标签，用于解决canvas fillText的不换行问题
       const originSkuName = sharePicData.skuName || '';
       for (let i = 0; i < originSkuName.length; i++) {
         skuName += `<span>${originSkuName[i]}</span>`;
@@ -363,11 +364,11 @@ body {
 }
 .skuImg .skuInfo {
   position: absolute;
-  bottom: 0;
+  bottom: -1px;
   left: 0;
   display: flex;
   width: 100%;
-  background-image: url('https://img.lkbang.net/activity/share/default/skuInfoBg.png');
+  background-image: #fff url('https://img.lkbang.net/activity/share/default/skuInfoBg.png');
   background-repeat: no-repeat;
   background-size: cover;
 }
@@ -387,6 +388,7 @@ body {
 // font-weight: lighter;
 // }
 .skuImg .skuInfo .skuSuccess {
+  height: 100%;
   flex: 1;
   flex-shrink: 0;
   display: flex;

src/views/address/addressManage.vue

@@ -13,6 +13,8 @@
           v-model="address.receiverPhoneNo"
           class="address-input"
           name="手机号码"
+          type="tel"
+          max-length="11"
           label="手机号码"
           placeholder="请输入收货人手机号码"
         />
@@ -124,7 +126,7 @@ export default {
         this.$toast('请填写收货人姓名');
         return;
       }
-      if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.receiverPhoneNo)) {
+      if (!/^[1][0-9]{10}$/.test(data.receiverPhoneNo)) {
         this.$toast('请输入正确的手机号码');
         return;
       }

src/views/goodsDetail/components/bottomNav.vue

@@ -8,7 +8,7 @@
             :disabled="disabled"
             type="primary"
             block
-            @click="createOrJoin(1)"
+            @click="createOrJoin(2)"
           >
             立即开团
           </cr-button>

src/views/goodsDetail/index.vue

@@ -14,7 +14,7 @@
       <div class="goods-carousel">
         <cr-swipe class="goods-swiper" @change="onChange">
           <cr-swipe-item v-for="(item, index) in imgList" :key="index" class="goods-carousel-item">
-            <img :src="item | Img2Thumb" style="width: 100%" />
+            <img :src="item" style="width: 100%" />
           </cr-swipe-item>
           <template #indicator>
             <div class="custom-indicator">{{ swiperCurrent + 1 }}/{{ imgList.length }}</div>

src/views/pay/payWaiting.vue

@@ -17,17 +17,7 @@
       努力返回支付结果中，请留心查看！
     </p>
     <div :class="['actions', !isOrder && 'no-order']">
-      <cr-button
-        class="actions__back"
-        :plain="true"
-        type="primary"
-        shape="circle"
-        @click="goHome('正在支付')"
-        >{{ returnUrl ? '返回秒杀' : '返回首页' }}</cr-button
-      >
-      <cr-button v-if="isOrder" shape="circle" type="primary" @click="goOrderDetail('正在支付')"
-        >查看订单</cr-button
-      >
+      <cr-button type="primary" class="btn-primary" @click="navigateBack">返回</cr-button>
     </div>
   </div>
 </template>
@@ -78,6 +68,9 @@ export default {
     clearInterval(this.timer);
   },
   methods: {
+    navigateBack() {
+      this.$router.go(-1);
+    },
     getQuery() {
       this.returnUrl = cookies.get('returnUrl') || '';
       if (localStorage.get('hideOrder')) {