Browse Source

fix: 免费用户和省份订阅包不显示30分钟生效提示

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>
tangshizhe 7 months ago
parent
commit
fb4f09b039

+ 8 - 1
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js

@@ -28,7 +28,13 @@ var subNode = new Vue({
       vSwitch: '', // 用户权限
       vSwitch: '', // 用户权限
       freeUserArea: {}, // 购买省份订阅包的用户所选择的地区
       freeUserArea: {}, // 购买省份订阅包的用户所选择的地区
       isNewVip: 0,
       isNewVip: 0,
-      entVipPower: false
+      entVipPower: false,
+      infoRoot: {}
+    }
+  },
+  computed: {
+    isFree () {
+      return this.initData?.isFree
     }
     }
   },
   },
   created () {
   created () {
@@ -178,6 +184,7 @@ var subNode = new Vue({
         url: '/bigmember/use/isAdd',
         url: '/bigmember/use/isAdd',
         type: 'POST',
         type: 'POST',
         success: function (res) {
         success: function (res) {
+          this.infoRoot = res.data || {}
           // 如果是商机管理、大会员、超级订阅会员有筛选权限
           // 如果是商机管理、大会员、超级订阅会员有筛选权限
           if (res.data.vipStatus > 0 && res.data.memberStatus > 0 && !res.data.isSubCount) {
           if (res.data.vipStatus > 0 && res.data.memberStatus > 0 && !res.data.isSubCount) {
             $('.custom-header-right').show()
             $('.custom-header-right').show()

+ 1 - 1
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html

@@ -299,7 +299,7 @@
               </li>
               </li>
             </ul>
             </ul>
           </li>
           </li>
-          <div class="subscribe-manage-tips">
+          <div class="subscribe-manage-tips" v-if="!isFree">
             <span>注:修改完订阅条件后,预计30分钟左右生效。</span>
             <span>注:修改完订阅条件后,预计30分钟左右生效。</span>
           </div>
           </div>
           <sub-component ref="subComponent"  get-container="body" :linkobj="linkObj" :initdata="initData" :v-switch="vSwitch" @back-init="refreshInitdata"></sub-component>
           <sub-component ref="subComponent"  get-container="body" :linkobj="linkObj" :initdata="initData" :v-switch="vSwitch" @back-init="refreshInitdata"></sub-component>

+ 5 - 0
src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -28,6 +28,11 @@ var subNode = new Vue({
             tutorialShow: false // 教程是否显示
             tutorialShow: false // 教程是否显示
         }
         }
     },
     },
+    computed: {
+      isFree () {
+        return this.infoRoot?.isFree
+      }
+    },
     created () {
     created () {
       if(getParam('vSwitch')) {
       if(getParam('vSwitch')) {
         this.vSwitch = getParam('vSwitch')
         this.vSwitch = getParam('vSwitch')

+ 1 - 1
src/web/templates/weixin/vipsubscribe/vip_index_new.html

@@ -171,7 +171,7 @@
             </li>
             </li>
           </ul>
           </ul>
         </li>
         </li>
-        <div class="subscribe-manage-tips">
+        <div class="subscribe-manage-tips" v-if="!isFree">
           <span>注:修改完订阅条件后,预计30分钟左右生效。</span>
           <span>注:修改完订阅条件后,预计30分钟左右生效。</span>
         </div>
         </div>
         <sub-component ref="subComponent" get-container="body" :linkobj="linkObj" :initdata="initData" @mounted="superOrderTemplateMounted" :v-switch="vSwitch"  @back-init="getUserType"></sub-component>
         <sub-component ref="subComponent" get-container="body" :linkobj="linkObj" :initdata="initData" @mounted="superOrderTemplateMounted" :v-switch="vSwitch"  @back-init="getUserType"></sub-component>