shish hace 2 meses
padre
commit
6d576becc3

+ 2 - 2
hdApp/src/admin/home/components/purchase-ghs-panel.vue

@@ -258,12 +258,12 @@ export default {
     ...mapGetters({ loginInfo: "getLoginInfo" }),
     workbenchTitle() {
       if (this.shopInfo && this.shopInfo.shopName == '首店') {
-        return this.shopInfo.merchantName || '进货'
+        return this.shopInfo.merchantName || '花掌柜'
       }
       const merchantName = (this.shopInfo && this.shopInfo.merchantName) ? this.shopInfo.merchantName : ''
       const shopName = (this.shopInfo && this.shopInfo.shopName) ? this.shopInfo.shopName : ''
       const title = merchantName + (shopName ? (' · ' + shopName) : '')
-      return title || '进货'
+      return title || '花掌柜'
     },
     isWithinTwoDays() {
       if (!this.supplierSearchTime) return false;

+ 15 - 2
hdApp/src/admin/home/me.vue

@@ -29,7 +29,7 @@
             </view>
           </view>
 
-          <view class="expire-card" @click="goRenew">
+          <view v-if="showExpireCard" class="expire-card" @click="goRenew">
             <view class="expire-main">
               <text class="expire-label">到期时间</text>
               <text class="expire-date">{{ deadlineText }}</text>
@@ -38,6 +38,7 @@
               <text class="renew-text">续费</text>
             </view>
           </view>
+
         </view>
       </view>
 
@@ -241,6 +242,18 @@ export default {
       }
       return deadline.substr(0, 10);
     },
+    // 苹果 App 不展示续费栏(应用商店审核要求),其他端正常展示
+    showExpireCard () {
+      // #ifdef APP-PLUS
+      try {
+        const systemInfo = uni.getSystemInfoSync();
+        if (systemInfo.platform === "ios") {
+          return false;
+        }
+      } catch (e) {}
+      // #endif
+      return true;
+    },
     shopEditUrl () {
       const shopInfo = this.myInfo.shopInfo || {};
       const id = shopInfo.id || this.myInfo.shopId || "";
@@ -497,7 +510,7 @@ export default {
 
 .page-hero {
   position: relative;
-  padding: 0 24upx 24upx;
+  padding: 0 24upx 20upx;
   overflow: hidden;
   background: linear-gradient(
     180deg,