Merge branch 'iteration-20240715'

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

@@ -319,7 +319,7 @@
   line-height: 18px;
 
   .discountAvatar {
-    margin-left: 15px;
+    margin-left: 12px;
     width: 34px;
     height: 34px;
     border-radius: 50%;
@@ -452,7 +452,7 @@
     top: -7px;
     width: 77px;
     height: 20px;
-    background: url('./new-images/icon-permanent.png') no-repeat center;
+    background: url('./new-images/icon-permanent1.png') no-repeat center;
     background-size: contain;
 
   }
@@ -537,7 +537,7 @@
     justify-content: space-between;
     padding: 0 20px;
     width: calc(100% - 32px);
-    margin: 0 16px;
+    margin: 0 0 0 16px;
     // margin: 0;
     min-height: 81px;
     border: 2px solid #0ED8B0;
@@ -545,13 +545,16 @@
 
     .iconPermanent {
       left: -2px;
+      background: url('./new-images/icon-permanent.png') no-repeat center;
+      background-size: contain;
     }
 
     .discountTag {
       position: absolute;
-      left: -2px;
+      right: -2px;
       top: -2px;
-      background: url('./new-images/icon_discount.png') no-repeat center;
+      left: auto;
+      background: url('./new-images/icon_discount2.png') no-repeat center;
       background-size: contain;
       width: 48px;
       height: 16px;

src/views/member-center/index.tsx

@@ -171,7 +171,7 @@ export default defineComponent({
         window.scrollY ||
         window.pageYOffset ||
         document.documentElement.scrollTop
-      state.titleOpacity = height > 80 ? 1 : 0
+      state.titleOpacity = height > 30 ? 1 : 0
     })
 
     /** 切换购买类型 */
@@ -289,6 +289,7 @@ export default defineComponent({
             salePrice: member.salePrice,
             period: member.period,
             vipEndDays: userInfo.value.userVip?.vipEndDays || 0, // 会员剩余天数
+            svipEndDays: userInfo.value.userVip?.svipEndDays || 0,
             discount: member.discount, // 是否有折扣
             discountPrice: member.discountPrice, // 折扣金额
             price: calcSalePrice(member),

src/views/order-detail/index.tsx

@@ -526,7 +526,7 @@ export default defineComponent({
                 return (
                   <OrderVip
                     item={item}
-                    disabled={orderStatus.orderObject.orderNo ? true : false}
+                    disabled={this.disabledCoupon}
                     onPriceChange={(price: number) => {
                       // 重置金额
                       this.orderAmount = Number(price)

src/views/order-detail/order-vip/index.tsx

@@ -43,6 +43,16 @@ export default defineComponent({
         }
       }
       return 1
+    },
+    startTime() {
+      const item = this.item
+      if (this.disabled) {
+        return item.startTime
+      }
+      if (item.svipEndDays > 0) {
+        return dayjs(item.startTime).add(1, 'day').format('YYYY-MM-DD')
+      }
+      return item.startTime
     }
   },
   render() {
@@ -145,7 +155,7 @@ export default defineComponent({
                       <span style={{ paddingLeft: '5px' }}>生效时间</span>
                     </div>
                     <div class={styles.timer}>
-                      {item.startTime} 至 {item.endTime}
+                      {this.startTime} 至 {item.endTime}
                     </div>
                   </div>
                 )