shish 2 ماه پیش
والد
کامیت
7bb42efca3
2فایلهای تغییر یافته به همراه19 افزوده شده و 16 حذف شده
  1. 18 15
      ghsApp/src/admin/home/me.vue
  2. 1 1
      ghsApp/src/admin/shop/renew.vue

+ 18 - 15
ghsApp/src/admin/home/me.vue

@@ -37,21 +37,19 @@
           </view>
           <view class="image-box" >
             <view class="dec">
-              <block v-if="myInfo.lifelong == 0">
-                <block v-if="showDeadline">
-                  <text class="dec-deadline-text" @click="goRenew(0)">到期时间 {{ myInfo.shopInfo && myInfo.shopInfo.deadline ? myInfo.shopInfo.deadline.substr(0,11) : '' }}</text>
-                  <view class="dec-renew" @click="goRenew(0)">
-                    <text class="dec-renew-label">去续费</text>
-                    <text class="iconfont iconxiangyou dec-renew-arrow"></text>
-                  </view>
-                </block>
-                <block v-else>
-                  <text class="dec-deadline-text" @click="goRenew(1)">打开小程序看时间</text>
-                  <view class="dec-renew" @click="goRenew(1)">
-                    <text class="dec-renew-label">去打开</text>
-                    <text class="iconfont iconxiangyou dec-renew-arrow"></text>
-                  </view>
-                </block>
+              <block v-if="showDeadline">
+                <text class="dec-deadline-text" @click="goRenew(0)">到期时间 {{ myInfo.shopInfo && myInfo.shopInfo.deadline ? myInfo.shopInfo.deadline.substr(0,11) : '' }}</text>
+                <view class="dec-renew" @click="goRenew(0)">
+                  <text class="dec-renew-label">去续费</text>
+                  <text class="iconfont iconxiangyou dec-renew-arrow"></text>
+                </view>
+              </block>
+              <block v-else>
+                <text class="dec-deadline-text" @click="goRenew(1)">打开小程序看时间</text>
+                <view class="dec-renew" @click="goRenew(1)">
+                  <text class="dec-renew-label">去打开</text>
+                  <text class="iconfont iconxiangyou dec-renew-arrow"></text>
+                </view>
               </block>
             </view>
             <image :src="`${constant.imgUrl}/ghs/me/upgrade2.png`"></image> 
@@ -325,6 +323,11 @@ export default {
   mixins: [list],
   computed: {
     ...mapGetters(["getLoginInfo", "getDictionariesInfo"]),
+    // 仅苹果 App 不显示到期/续费区域,小程序、安卓 App、H5 等均显示
+    showRenewDec() {
+      const { uniPlatform, platform } = uni.getSystemInfoSync()
+      return !(uniPlatform === 'app' && platform === 'ios')
+    },
   },
   data () {
     return {

+ 1 - 1
ghsApp/src/admin/shop/renew.vue

@@ -541,7 +541,7 @@ export default {
 
 .pkg-year-section-title {
     display: block;
-    font-size: 32upx;
+    font-size: 34upx;
     font-weight: 600;
     color: #64748b;
     text-align: center;