修改

src/student/activePage/double12Active/index.tsx

@@ -190,6 +190,7 @@ export default defineComponent({
           recomUserId: '',
           activityBuyCount: 0, // 活动购买限制次数
           activityList: [], // 活动赠送的东西
+          discountCardFlag: userInfo.value.discountCardFlag,
           discountEndTime: userInfo.value.discountEndTime, // 畅学卡结束时间
           discountStartTime: userInfo.value.discountStartTime // 畅学卡开始时间
         }

src/student/teacher-dependent/model/fans-list/index.tsx

@@ -79,6 +79,6 @@ export default defineComponent({
           />
         ))}
       </div>
-    ) : <div class={styles.noFans}>您还没有粉丝群哦！</div>}</div>
+    ) : <div class={styles.noFans}>暂时还没有粉丝群哦！</div>}</div>
   }
 })

src/student/trade/tradeOrder.ts

@@ -13,7 +13,7 @@ const apiSuffix =
 // MUSIC: '单曲点播'
 
 /** 计算畅学卡时间 */
-export const discountTimer = (discountEndTime: any, period: string) => {
+export const discountTimer = (discountEndTime: any, period: string, isFlag?: false) => {
   const startTime = discountEndTime || new Date()
   let endTime = dayjs(new Date()).format('YYYY-MM-DD')
   if (period === 'MONTH') {
@@ -26,7 +26,7 @@ export const discountTimer = (discountEndTime: any, period: string) => {
     endTime = dayjs(startTime).add(1, 'year').format('YYYY-MM-DD')
   }
   return {
-    startTime: dayjs(startTime).format('YYYY-MM-DD'),
+    startTime: isFlag ?  dayjs(startTime).add(1, 'day').format('YYYY-MM-DD') : dayjs(startTime).format('YYYY-MM-DD'),
     endTime
   }
 }
@@ -188,6 +188,7 @@ export const formatOrderDetail = async (item: any, amount?: IAmount) => {
             startTime: dayjs(startTime).format('YYYY-MM-DD'),
             endTime: dayjs(endTime).format('YYYY-MM-DD'),
             activityList: [], // 活动赠送的东西
+            discountCardFlag: state.user.data.discountCardFlag,
             discountEndTime: state.user.data.discountEndTime, // 畅学卡结束时间
             discountStartTime: state.user.data.discountStartTime // 畅学卡开始时间
           }
@@ -224,7 +225,7 @@ export const formatOrderDetail = async (item: any, amount?: IAmount) => {
     case 'DISCOUNT':
       {
         const users = state.user.data || {}
-        const endTime = users.discountCardFlag ? users.discountEndTime : new Date()
+        const endTime = users.discountCardFlag ? dayjs(users.discountEndTime || new Date()).add(1, 'day').toDate() : new Date()
         tempList = {
           orderType: item.goodType,
           goodName: item.goodName,
@@ -233,7 +234,7 @@ export const formatOrderDetail = async (item: any, amount?: IAmount) => {
           title: item.goodName || '',
           // 判断是否有优惠金额
           price: item.expectPrice,
-          ...discountTimer(endTime, item.period)
+          ...discountTimer(endTime, item.period, users.discountCardFlag)
         }
       }
       break

src/student/video-class/video-detail.tsx

@@ -64,7 +64,7 @@ export default defineComponent({
         )
         const result = res.data || {}
         const lessonGroup = result.lessonGroup || {}
-        const teachertTag = result.teachertTag || ''
+        // const teachertTag = result.teachertTag || ''
         const userInfo = state.user.data as any
         const alreadyBuy =
           lessonGroup.payType === 'VIP'
@@ -226,14 +226,18 @@ export default defineComponent({
       if (this.userInfo.payType !== 'VIP') {
         return
       }
-      request
+      if(this.pageVisibility === 'visible') {
+        request
         .get('/api-student/student/queryUserInfo', {
           initRequest: true // 初始化接口
         })
         .then((res: any) => {
           setLogin(res.data)
-          this.userInfo.alreadyBuy = res.data?.isVip ? true : false
+          this.userInfo.alreadyBuy = this.userInfo.alreadyBuy || res.data.userVip?.vipType !== 'NOT_VIP'
+            ? true
+            : false
         })
+      }
     }
   },
   render() {

src/views/member-center/index.tsx

@@ -80,6 +80,7 @@ export default defineComponent({
         avatar: users?.heardUrl,
         id: users?.userId,
         userVip: users?.userVip,
+        discountCardFlag: users?.discountCardFlag,
         discountEndTime: users?.discountEndTime,
         discountStartTime: users?.discountStartTime
       }
@@ -319,6 +320,7 @@ export default defineComponent({
           recomUserId: state.recomUserId,
           activityBuyCount: 0, // 活动购买限制次数
           activityList: [], // 活动赠送的东西
+          discountCardFlag: userInfo.value.discountCardFlag, // 畅学卡结束时间
           discountEndTime: userInfo.value.discountEndTime, // 畅学卡结束时间
           discountStartTime: userInfo.value.discountStartTime // 畅学卡开始时间
         }

src/views/order-detail/add-discount/index.tsx

@@ -71,7 +71,7 @@ export default defineComponent({
           (props.actualPrice * discountDetail.value.discountRate / 100)
         ))
         const users = state.user.data
-        const startTime = users.discountCardFlag ? users.discountEndTime || new Date() : new Date()
+        const startTime = users.discountCardFlag ? dayjs(users.discountEndTime || new Date()).add(1, 'day').toDate() : new Date()
         let endTime = dayjs(new Date()).format('YYYY-MM-DD')
         if (discountDetail.value.period === 'MONTH') {
           endTime = dayjs(startTime).add(1, 'month').format('YYYY-MM-DD')

src/views/order-detail/index.tsx

@@ -575,6 +575,20 @@ export default defineComponent({
                         )
                       )
                       this.orderPrice = lastAmount >= 0 ? lastAmount : 0
+
+                      this.orderGoodsType.forEach((child: any)=> {
+                        if(child.orderType === item.orderType) {
+                          child.price = Number(price)
+                        }
+                      })
+                      // 畅学卡变更状态时需要重新选择优惠券
+                      orderStatus.orderObject.couponId = ''
+                      orderStatus.orderObject.couponDiscountPrice = 0
+                      // 更新优惠券列表
+                      const useCouponRef: any =  this.$refs.useCouponRef
+                      if(useCouponRef) {
+                        useCouponRef.resetCouponList()
+                      }
                     }}
                   />
                 )
@@ -603,6 +617,20 @@ export default defineComponent({
                         )
                       )
                       this.orderPrice = lastAmount >= 0 ? lastAmount : 0
+
+                      this.orderGoodsType.forEach((child: any)=> {
+                        if(child.orderType === item.orderType) {
+                          child.price = Number(price)
+                        }
+                      })
+                      // 畅学卡变更状态时需要重新选择优惠券
+                      orderStatus.orderObject.couponId = ''
+                      orderStatus.orderObject.couponDiscountPrice = 0
+                      // 更新优惠券列表
+                      const useCouponRef: any =  this.$refs.useCouponRef
+                      if(useCouponRef) {
+                        useCouponRef.resetCouponList()
+                      }
                     }}
                   />
                 )
@@ -657,7 +685,6 @@ export default defineComponent({
                   vipType: string
                 }) => {
                   // 畅学卡变更状态时需要重新选择优惠券
-                  // debugger
                   orderStatus.orderObject.couponId = ''
                   orderStatus.orderObject.couponDiscountPrice = 0
                   // 是否选中畅学卡

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

@@ -60,12 +60,12 @@ export default defineComponent({
     },
     // 畅学卡 活动计算
     studyCardTimes() {
-      const { activityList, discountEndTime } = this.item
+      const { activityList, discountEndTime, discountCardFlag } = this.item
       const studyCardVals = (activityList || []).filter(item => {
         return item.goodType === 'DISCOUNT'
       })
       if (studyCardVals.length) {
-        const startTime = dayjs(discountEndTime || new Date()).toDate()
+        const startTime = discountCardFlag ? dayjs(discountEndTime || new Date()).toDate() : dayjs(new Date()).toDate()
         let endTime = startTime
         studyCardVals.map(studyCardVal => {
           if (studyCardVal.unit === 'MONTH') {
@@ -87,7 +87,7 @@ export default defineComponent({
           }
         })
         return {
-          startTime: dayjs(startTime).format('YYYY-MM-DD'),
+          startTime: discountCardFlag ? dayjs(startTime).add(1, 'day').format('YYYY-MM-DD') : dayjs(startTime).format('YYYY-MM-DD'),
           endTime: dayjs(endTime).format('YYYY-MM-DD')
         }
       } else {

src/views/order-detail/use-coupons/choice-coupon.tsx

@@ -6,6 +6,7 @@ import Item from '@/views/coupons/item'
 import { Button, Loading } from 'vant'
 import { defineComponent, PropType } from 'vue'
 import styles from './index.module.less'
+import { couponEnum } from '.'
 
 export default defineComponent({
   name: 'choice-coupon',
@@ -103,7 +104,7 @@ export default defineComponent({
               }
             })
           } else {
-            const disItem: any = this.orderGoodsType.find((goods: any) => goods.orderType === item.couponCategory)
+            const disItem: any = this.orderGoodsType.find((goods: any) => couponEnum[goods.orderType] === item.couponCategory)
             const useLastAmount = disItem ? disItem.price - (usedMap.get(item.couponCategory) || 0) : 0
             disabled = Number(item.useLimit) > useLastAmount
           }

src/views/order-detail/use-coupons/index.tsx

@@ -151,7 +151,7 @@ export default defineComponent({
             })
             item.disabled = disabled
           } else {
-            const disItem: any = this.orderGoodsType.find((goods: any) => goods.orderType === item.couponCategory)
+            const disItem: any = this.orderGoodsType.find((goods: any) => couponEnum[goods.orderType] === item.couponCategory)
             const useLastAmount = disItem.price || 0
             // 如果使用金额大于订单金额则优惠券不可用
             if (item.useLimit > useLastAmount) {