fix(hiPay): safari 浏览器跳转问题修复

components/area-product-list/special-area-wrapper.vue

@@ -103,17 +103,17 @@ export default {
     ...mapGetters(['isZeroLevel']),
   },
   created() {
-    const userInfo = Object.keys(this.userInfo).length
-      ? this.userInfo
-      : uni.getStorageSync('userInfo')
-    if (userInfo.memberSign == MEMBER_SIGN.ZERO_LEVEL) {
-      this.upgrade.name = '会员专区'
-    } else {
-      this.getAreaListById(REISSUE_AREA.id, this.rescissionList)
-      this.getAreaListById(REGIEST_AREA.id, this.registList)
-      this.getAreaListById(REPURCHASE_AREA.id, this.repurchaseList)
-    }
-    this.getAreaListById(UPGRADE_AREA.id, this.upgradeList)
+    this.$store.dispatch('GetInfo').then(user => {
+      const userInfo = user
+      if (userInfo.memberSign == MEMBER_SIGN.ZERO_LEVEL) {
+        this.upgrade.name = '会员专区'
+      } else {
+        this.getAreaListById(REISSUE_AREA.id, this.rescissionList)
+        this.getAreaListById(REGIEST_AREA.id, this.registList)
+        this.getAreaListById(REPURCHASE_AREA.id, this.repurchaseList)
+      }
+      this.getAreaListById(UPGRADE_AREA.id, this.upgradeList)
+    })
   },
   methods: {
     getAreaListById(areaId, list) {

pages/index/index.vue

@@ -29,7 +29,7 @@
           </swiper>
         </view>
       </view>
-      <view v-if="specialAreaVisble" style="padding-bottom: 140rpx">
+      <view style="padding-bottom: 140rpx">
         <special-area-wrapper :userInfo="userInfo" size="small" />
       </view>
       <cl-tabbar :current="0"></cl-tabbar>
@@ -128,9 +128,6 @@ export default {
   },
   computed: {
     ...mapGetters(['priceSymbol', 'priceSymbolVisible', 'isZeroLevel']),
-    specialAreaVisble() {
-      return this.userInfo && Object.keys(this.userInfo).length
-    },
   },
   onLoad() {
     // this.getLanguage();

pages/pay/hiPay.vue

@@ -565,7 +565,9 @@ export default {
         if (navigator.userAgent.includes('MicroMessenger')) {
           window.location.href = url
         } else {
-          window.open(url)
+          requestAnimationFrame(() => {
+            window.open(url)
+          })
         }
       })
     },

pages/pay/success.vue

@@ -65,6 +65,7 @@ import { registeredAutoLogin } from '@/config/login.js'
 import successDialog from '@/components/successDialog.vue'
 import { setToken } from '@/config/auth.js'
 import store from '@/store'
+import { REGIEST_AREA } from '@/util/specialAreaMap.js'
 let paySetTimeoutFlag = null
 let getRegisterInfoTimeoutFlag = null
 export default {
@@ -134,7 +135,10 @@ export default {
         if (res.data == 1) {
           this.payStatus = 1
           clearTimeout(paySetTimeoutFlag)
-          if ([1, 7, 24].includes(Number(this.specialArea))) {
+          if (
+            [REGIEST_AREA.id].includes(Number(this.specialArea)) ||
+            this.isSharePay
+          ) {
             uni.showLoading({
               title: '注册信息加载中...',
               mask: false,