Browse Source

Merge branch 'dev/v1.0.56_zsy' of jianyu/web into feature/v1.0.56

zhangsiya 1 year ago
parent
commit
622573d41a
1 changed files with 15 additions and 12 deletions
  1. 15 12
      apps/bigmember_pc/src/views/workspace/components/AccountInfo.vue

+ 15 - 12
apps/bigmember_pc/src/views/workspace/components/AccountInfo.vue

@@ -24,9 +24,9 @@
           <i class="vip-icon"> </i>
           <span>开通超级订阅</span>
         </span>
-        <span class="activity-span">
+        <span class="activity-span" v-if="attr.subVipActMsg">
           <i class="limit-time-icon"></i>
-          <span>限时立减99元</span>
+          <span>{{attr.subVipActMsg}}</span>
         </span>
       </p>
       <p class="handle-p">
@@ -53,9 +53,8 @@
       <div  class="user-info-line-value value-box bg-gold">
         <p>购买区域:{{ attr.buyMsg }}</p>
         <p class="handle-btn m-t-6"
-           v-if="attr.upgrade || attr.buyMsg === '全国'"
            @click="updateVip">
-          {{ attr.buyMsg === '全国' ? '升级咨询' : '去升级'}}
+          {{ attr.upgrade ? '去升级' : '升级咨询'}}
           <i class="iconfont icon-more"></i>
         </p>
       </div>
@@ -75,12 +74,8 @@
       <div class="gap"></div>
       <div  class="user-info-line-value value-box bg-blue">
         <p>购买区域:{{ attr.buyMsg }}</p>
-        <p class="handle-btn m-t-6" v-if="attr.upgrade && attr.buyMsg !== '全国'" @click="openCustomer">
-          去升级
-          <i class="iconfont icon-more"></i>
-        </p>
-        <p class="handle-btn m-t-6" v-if="attr.upgrade && attr.buyMsg === '全国'" @click="buyVip('buy')">
-          开通超级订阅
+        <p class="handle-btn m-t-6" v-if="attr.upgrade" @click="areaVipUpdate">
+          {{attr.upgrade ? '去升级' : '开通超级订阅'}}
           <i class="iconfont icon-more"></i>
         </p>
       </div>
@@ -136,12 +131,20 @@ export default {
     },
     // 升级超级订阅
     updateVip () {
-      if(this.attr.buyMsg !== '全国') {
-        window.open('/swordfish/page_big_pc/free/svip/buy?type=upgrade')
+      if(this.attr.upgrade) {
+        this.buyVip('upgrade')
       } else {
         this.openCustomer()
       }
     },
+    // 省份订阅包升级
+    areaVipUpdate () {
+      if(this.attr.upgrade) {
+        this.openCustomer()
+      } else {
+        this.buyVip('buy')
+      }
+    },
     // 联系客服
     openCustomer() {
       this.contactCustomer(this)