修改

src/components/col-share/index.module.less

@@ -274,6 +274,10 @@
     padding: 8px 46px;
   }
 
+  .savePictureBtn {
+    border-color: #fff;
+  }
+
   &.shareGroupTenantBtn {
     :global {
       .van-button--primary {

src/components/col-share/index.tsx

@@ -268,6 +268,7 @@ export default defineComponent({
               <Button
                 type="primary"
                 plain
+                class={styles.savePictureBtn}
                 round
                 loading={this.saveLoading}
                 loadingText="保存中"

src/views/member-center/index.module.less

@@ -412,7 +412,7 @@
   flex: 1 0 auto;
   width: 96px;
   min-height: 120px;
-  overflow: hidden;
+  // overflow: hidden;
   box-sizing: border-box;
   background: #ffffff;
   border-radius: 8px;
@@ -429,20 +429,20 @@
 
 
   .discountTag {
+    position: absolute;
+    top: 13px;
+    left: 0;
+    right: 0;
+    width: 100%;
     // background: linear-gradient(180deg, #FF491A 0%, #FF9F7E 100%);
     // color: #FFFFFF;
     display: inline-block;
     width: 48px;
     height: 16px;
-    background: url('./new-images/icon_discount-round.png') no-repeat center;
+    background: url('./new-images/icon_discount-text.png') no-repeat center;
     background-size: contain;
-    margin-top: 1px;
-  }
-
-  &.discountItem {
-    .price {
-      padding: 0;
-    }
+    // margin-top: 1px;
+    margin: 0 auto;
   }
 
   .iconPermanent {
@@ -457,11 +457,12 @@
   }
 
   .s_title {
+    position: relative;
     font-weight: 500;
     font-size: 13px;
     color: #333333;
     line-height: 18px;
-    padding-top: 25px;
+    padding-top: 30px;
     width: 100%;
     text-align: center;
   }
@@ -471,7 +472,7 @@
     font-weight: bold;
     font-size: 28px;
     color: #333333;
-    padding: 6px 0 9px;
+    padding: 3px 0 6px;
 
     span {
       font-size: 16px;
@@ -506,6 +507,7 @@
     white-space: nowrap;
     overflow: hidden;
     padding: 2px 8px 1px;
+    border-radius: 0 0 8px 8px;
     // border-radius: 0 0 8px 8px;
   }
 

src/views/member-center/index.tsx

@@ -222,8 +222,11 @@ export default defineComponent({
             userInfo.value.userVip.svipEndDate || new Date()
           ).toDate()
         } else if (userInfo.value.userVip.vipType === 'VIP') {
+          // 购买Vip时，先有vip的有效时间，如果没有则取SVIP有效时间，都没有默认当前
           startTime = dayjs(
-            userInfo.value.userVip.vipEndDate || new Date()
+            userInfo.value.userVip.vipEndDate ||
+              userInfo.value.userVip.svipEndDate ||
+              new Date()
           ).toDate()
         } else if (userInfo.value.userVip.vipType === 'PERMANENT_SVIP') {
           Toast('您已是永久SVIP会员')
@@ -555,8 +558,7 @@ export default defineComponent({
                               styles['system-item'],
                               member.id === state.selectMember.id
                                 ? styles.active
-                                : '',
-                              member.discount === 1 ? styles.discountItem : ''
+                                : ''
                             ]}
                             onClick={() => {
                               state.selectMember = member
@@ -567,10 +569,13 @@ export default defineComponent({
                               <span class={[styles.iconPermanent]}></span>
                             )}
 
-                            <p class={styles.s_title}>{member.title}</p>
-                            {member.discount === 1 && (
-                              <span class={styles.discountTag}></span>
-                            )}
+                            <p class={styles.s_title}>
+                              {member.title}
+                              {/* 优惠标识 */}
+                              {member.discount === 1 && (
+                                <span class={styles.discountTag}></span>
+                              )}
+                            </p>
                             <p class={styles.price}>
                               <span>￥</span>
                               {moneyFormat(calcSalePrice(member), '0,0[.]00')}

src/views/order-detail/orderStatus.ts

@@ -4,6 +4,7 @@ import { state } from '@/state'
 import request from '@/helpers/request'
 import { browser } from '@/helpers/utils'
 import { Dialog } from 'vant'
+import dayjs from 'dayjs'
 type orderType =
   | 'VIDEO'
   | 'LIVE'
@@ -71,6 +72,29 @@ export const resestState = () => {
   Object.assign(orderStatus, original())
 }
 
+
+// 购买会员多少数量满足条件
+export const memberNeedNumber = (item: any) => {
+  if (item.vipEndDays > 0) {
+    const endTime = dayjs(item.startTime).add(item.vipEndDays, 'day')
+    const unit = item.period === 'YEAR' ? 'years' : 'months'
+    const months = endTime.diff(dayjs(item.startTime), unit)
+    if (item.period === 'MONTH') {
+      return months + 1
+    } else if (item.period === 'QUARTERLY') {
+      return Math.ceil((months + 1) / 3)
+    } else if (item.period === 'YEAR_HALF') {
+      return Math.ceil((months + 1) / 6)
+    } else if (item.period === 'YEAR') {
+      return months + 1
+    } else {
+      return 1
+    }
+  }
+  return 1
+}
+
+
 export const orderInfos = () => {
   // 商品列表
   const orderList = orderStatus.orderObject.orderList || []
@@ -114,7 +138,8 @@ export const orderInfos = () => {
       params.bizContent = item.id
     } else if (item.orderType === "SVIP") {
       params.bizContent = item.id
-      params.vipEndDays = item.vipEndDays
+      const needNumber = memberNeedNumber(item)
+      params.vipEndDays = item.num > needNumber ? item.vipEndDays : null
       params.goodsNum = item.num
     } else if (item.orderType === 'MUSIC') {
       params.bizContent = {
@@ -160,7 +185,9 @@ export const orderTenantInfos = () => {
       params.bizId = item.id
     } else if (item.orderType === "SVIP") {
       params.bizContent = item.id
-      params.vipEndDays = item.vipEndDays
+      // params.vipEndDays = item.vipEndDays
+      const needNumber = memberNeedNumber(item)
+      params.vipEndDays = item.num > needNumber ? item.vipEndDays : null
       params.goodsNum = item.num
     } else if (item.orderType === 'MUSIC') {
       params.bizContent = {