Răsfoiți Sursa

feat: 过期提醒逻辑完善

zhangyuhan 3 zile în urmă
părinte
comite
dac003d8e0

+ 1 - 1
apps/bigmember_pc/src/views/order/components/analysis-report/info.vue

@@ -34,7 +34,7 @@
                 </div>
                 <div class='flex flex-(col items-center)' v-if='!useNowState.inPack && !useNowState.isFirstBuy'>
                   <div class='spec-first-tip'>开通优惠卡享特价:299</div>
-                  <span class='spec-first-tip--expire' v-if='useNowState.isBuyPackExpire'>会员已过期:{{useNowState.buyPackExpireDay}}天</span>
+                  <span class='spec-first-tip--expire' v-if='useNowState.isBuyPackExpire'>{{useNowState.buyPackExpireTip}}</span>
                 </div>
                 <div class='spec-first-tip' v-if='!useNowState.inPack && useNowState.isFirstBuy'>首购立享会员特价</div>
               </div>

+ 2 - 2
apps/bigmember_pc/src/views/order/components/analysis-report/model/account.js

@@ -23,8 +23,8 @@ const zhimaReportAccountInfo = computed(() => {
     packCount: accountInfoModel.value?.balance,
     packTime: accountInfoModel.value?.minEndTime?.split(' ')[0],
     // 之前买过权益包并过期
-    isBuyPackExpire: false,
-    buyPackExpireDay: 88,
+    isBuyPackExpire: accountInfoModel.value?.expiredMsg?.length > 0,
+    buyPackExpireTip: accountInfoModel.value?.expiredMsg || '',
     // 是否首次购买优惠
     isFirstBuy: accountInfoModel.value?.firstMsg?.length > 0
   }

+ 1 - 12
apps/mobile/src/views/create-order/components/analysis-report/FooterProductionCard.vue

@@ -96,18 +96,7 @@ export default {
   },
   mixins: [orderActivityHelper],
   setup() {
-    const store = useStore()
-
-    // 直接调用 mutation
-    const updateProductSpecId = (payload) => store.commit('createOrder/updateProductSpecId', payload)
-
-    const { zhimaReportAccountInfo, getAccountInfoModel } = useAccountInfoModel((model) => {
-      if (!model.isFirstBuy && !model.inPack) {
-        updateProductSpecId(1514)
-      } else {
-        updateProductSpecId(1511)
-      }
-    })
+    const { zhimaReportAccountInfo, getAccountInfoModel } = useAccountInfoModel()
     return {
       zhimaReportAccountInfo,
       getAccountInfoModel