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

apps/mobile/src/components/mine/MineHeader.vue

@@ -29,7 +29,7 @@
         </div>
       </div>
       <div class="app-header-set clickable"  @click="jumpSetting">
-        <AppIcon name="Setting" size="20" color="#fff"/>
+        <AppIcon name="Setting" size="24" color="#fff"/>
       </div>
     </div>
     <div class="account-info" v-if="Array.isArray(accountList) && accountList.length > 0">
@@ -43,7 +43,7 @@
         <div class="account-handle account-handle--free bg-line-gold" v-if="activeAccountType.name === '注册用户'">
           <p>
             <i class="j-icon vip-icon"></i>
-            <span class="text">开通超级订阅</span>
+            <span class="text bold">开通超级订阅</span>
             <span class="activity-tip" v-if="activeAccountType.attr.subVipActMsg">
               <i class="limit-time-icon"></i>
               {{ activeAccountType.attr.subVipActMsg }}
@@ -56,14 +56,14 @@
         </div>
         <div class="account-handle account-handle--vip " v-else-if="activeAccountType.name === '超级订阅' && activeAccountType.attr">
           <div class="account-handle-item bg-line-gold">
-            <p>到期时间：{{ activeAccountType.vipEntTime }}</p>
+            <p class="bold">到期时间：{{ activeAccountType.vipEntTime }}</p>
             <p class="self-handle-btn" @click="renewVip">
               去续费 <AppIcon name="youbian" size="16" color="#171826" />
             </p>
           </div>
           <div class="gap"></div>
           <div class="account-handle-item bg-line-gold">
-            <p>购买区域：{{ activeAccountType.attr.buyMsg }}</p>
+            <p class="bold">购买区域：{{ activeAccountType.attr.buyMsg }}</p>
             <p class="self-handle-btn" @click="updateVip(activeAccountType.attr)">
               <span>{{activeAccountType.attr.upgrade ? '去升级' : '升级咨询'}}</span>
               <AppIcon name="youbian" size="16" color="#171826" />
@@ -72,14 +72,14 @@
         </div>
         <div class="account-handle account-handle--vip " v-else-if="activeAccountType.name === '省份订阅包' && activeAccountType.attr">
           <div class="account-handle-item bg-line-blue">
-            <p>到期时间：{{ activeAccountType.vipEntTime }}</p>
+            <p class="bold">到期时间：{{ activeAccountType.vipEntTime }}</p>
             <p class="self-handle-btn" @click="areaVip('renew')">
               去续费 <AppIcon name="youbian" size="16" color="#171826" />
             </p>
           </div>
           <div class="gap"></div>
           <div class="account-handle-item" :class="activeAccountType.attr.upgrade ? 'bg-line-blue' : 'bg-line-gold'">
-            <p>购买区域：{{ activeAccountType.attr.buyMsg }}</p>
+            <p class="bold">购买区域：{{ activeAccountType.attr.buyMsg }}</p>
             <p class="self-handle-btn" @click="areaVipUpdate(activeAccountType.attr)">
               <span>{{activeAccountType.attr.upgrade ? '去升级' : '开通超级订阅'}} </span>
               <AppIcon name="youbian" size="16" color="#171826" />
@@ -88,7 +88,7 @@
         </div>
         <!--大会员和商机管理-->
         <div class="account-handle account-handle--big-ent bg-line-gold" v-else>
-          <p>您的会员到期时间：{{ activeAccountType.vipEntTime }}</p>
+          <p class="bold">{{accountList.length > 1 ? '到期时间：' : '您的会员到期时间：'}}{{ activeAccountType.vipEntTime }}</p>
           <p class="self-handle-btn" @click="renewConsult">
             续费咨询 <AppIcon name="youbian" size="16" color="#171826" />
           </p>
@@ -374,7 +374,7 @@ export default {
   position: relative;
   display: flex;
   flex-direction: column;
-  padding: 0 8px 79px;
+  padding: 0 8px 74px;
   flex-shrink: 0;
   background-repeat: no-repeat;
   background-position: center top;
@@ -389,7 +389,8 @@ export default {
     background-image: url(@/assets/image/mine/bg-gold.png);
   }
   .app-header-set {
-    padding: 4px 0 0;
+    margin-right: 4px;
+    margin-top:2px;
     align-self: flex-start;
   }
   .header-info {
@@ -578,7 +579,7 @@ export default {
         justify-content: center;
         flex: 1;
         text-align: center;
-        padding: 8px 0;
+        padding: 8px 0 14px;
         border-radius: 12px 12px 0 0;
         color: #171826;
         box-shadow: 0px -2px 8px 0px rgba(169, 117, 39, 0.15);
@@ -591,7 +592,7 @@ export default {
         }
       }
       &--free {
-        padding: 8px 12px 14px;
+        padding: 8px 12px 16px;
         border-radius: 12px 12px 0 0;
         flex-direction: column;
         position: relative;
@@ -614,9 +615,14 @@ export default {
             color: #fff;
           }
         }
+        p:nth-of-type(2) {
+          font-size: 12px;
+          line-height: 18px;
+        }
+
         .self-handle-btn{
           position: absolute;
-          bottom: 10px;
+          bottom: 18px;
           right: 12px;
           font-size:12px;
           line-height: 18px;
@@ -632,7 +638,7 @@ export default {
       &--big-ent {
         color: #171826;
         align-items: center;
-        padding: 9px 16px 9px 12px;
+        padding: 9px 16px 14px 12px;
         border-radius: 12px 12px 0px 0px;
         box-shadow: 0 -2px 8px 0 rgba(169, 117, 39, 0.15);
       }
@@ -679,12 +685,16 @@ export default {
     }
   }
 }
+.bold {
+  font-weight: bold;
+}
 ::v-deep {
   .order-tabs {
     position: absolute;
     width:100%;
     left:0;
-    bottom:-1px;
+    bottom: 0px;
+    //height: 81px;
     border-top-right-radius: 16px;
     box-shadow: 0 -8px 12px 0 rgba(92, 31, 5, 0.15);
     background: linear-gradient(180deg, #fff 0%, #F5F6F7 100%);