浏览代码

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

zhangsiya 1 年之前
父节点
当前提交
0dc1394dd7

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

@@ -70,9 +70,9 @@
         </p>
       </div>
       <div class="gap"></div>
-      <div  class="user-info-line-value value-box bg-blue">
+      <div  class="user-info-line-value value-box" :class="attr.upgrade ? 'bg-blue' : 'bg-gold'">
         <p>购买区域:{{ attr.buyMsg }}</p>
-        <p class="handle-btn m-t-6" v-if="attr.upgrade" @click="areaVipUpdate">
+        <p class="handle-btn m-t-6"  @click="areaVipUpdate">
           {{attr.upgrade ? '去升级' : '开通超级订阅'}}
           <i class="iconfont icon-more"></i>
         </p>

+ 11 - 3
apps/mobile/src/components/mine/MineHeader.vue

@@ -42,7 +42,7 @@
       <div class="account-info-content" v-if="activeAccountType">
         <div class="account-handle account-handle--free bg-line-gold" v-if="activeAccountType.name === '注册用户'">
           <p>
-            <i class="vip-icon"></i>
+            <i class="j-icon vip-icon"></i>
             <span class="text">开通超级订阅</span>
             <span class="activity-tip" v-if="activeAccountType.attr.subVipActMsg">
               <i class="limit-time-icon"></i>
@@ -71,7 +71,7 @@
           </div>
         </div>
         <div class="account-handle account-handle--vip " v-else-if="activeAccountType.name === '省份订阅包' && activeAccountType.attr">
-          <div class="account-handle-item bg-line-gold">
+          <div class="account-handle-item bg-line-blue">
             <p>到期时间:{{ activeAccountType.vipEntTime }}</p>
             <p class="self-handle-btn" @click="areaVip('renew')">
               去续费 <AppIcon name="youbian" size="16" color="#171826" />
@@ -374,7 +374,7 @@ export default {
   position: relative;
   display: flex;
   flex-direction: column;
-  padding: 0 12px 79px;
+  padding: 0 8px 79px;
   flex-shrink: 0;
   background-repeat: no-repeat;
   background-position: center top;
@@ -664,6 +664,14 @@ export default {
       }
     }
   }
+  .single-identity-container{
+    .change-identity{
+      background: #171826 !important;
+      border-color: #171826 !important;
+      color: #FAE7CA !important;
+
+    }
+  }
 }
 ::v-deep {
   .order-tabs {

+ 1 - 2
apps/mobile/src/components/mine/SignIn.vue

@@ -215,8 +215,7 @@ export default {
     border-right: 1px solid rgba(0, 0, 0, 0.1);
     em {
       color: #C26F33;
-      font-weight: 600;
-      font-size: 16px;
+      font-size: 14px;
     }
   }
   .points-record {