From afb7bcf6e31979be352bfcf14812d52339478cef Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期日, 25 六月 2023 08:55:23 +0800
Subject: [PATCH] Merge tag '苹果审核修改' into develop
---
uniapp/pages/mine/mine.vue | 68 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/uniapp/pages/mine/mine.vue b/uniapp/pages/mine/mine.vue
index 9ba1257..87f34a6 100644
--- a/uniapp/pages/mine/mine.vue
+++ b/uniapp/pages/mine/mine.vue
@@ -1,5 +1,8 @@
<template>
- <view class="minePage-wrapper">
+ <view v-if="isshowtype">
+ <minePage></minePage>
+ </view>
+ <view v-else class="minePage-wrapper">
<view class="fixed-box colCen" style="background:linear-gradient(263deg, #D20CFC, #8905F6);">
<view class="topbarbox"></view>
<view class="navigate-container rowCenBet">
@@ -263,10 +266,12 @@
import APPUpdate from "../../utils/appUpdate.js";
import inviteCodeModel from '../../components/inviteCode.vue'
import inviterModel from '../../components/inviterModel.vue'
+ import minePage from '../../components/sh_page/minePage.vue'
export default {
components: {
inviteCodeModel,
- inviterModel
+ inviterModel,
+ minePage,
},
data() {
return {
@@ -282,10 +287,11 @@
platform: '',
showtar: false,
bbcList:'',
-
sct: 0,
inviteCodeShow:false,
- inviterShow:false
+ inviterShow:false,
+ isshowtype:false,
+ hasshow:false
}
},
onPageScroll(e) {
@@ -298,6 +304,7 @@
this.getuserInfo();
this.centerInfo();
this.getmoneyInfo();
+ this.getInit();
uni.stopPullDownRefresh();
},
onLoad() {
@@ -306,24 +313,60 @@
url:"/pages/login/wxlogin"
})
}else{
- // #ifdef APP-PLUS
- this.appInfo = uni.getStorageSync('appInfo');
- console.log(this.appInfo.iosExamine);
- this.showtar = getApp().globalData.ifwt == 1 ? false : true;
- this.platform = plus.os.name
- // #endif
+ //getApp().watch(this.ifwtChange,'ifwt')
this.centerInfo()
this.getbanner()
}
-
},
onShow() {
if(this.hasLogin){
+ this.getInit();
this.getmoneyInfo()
this.getuserInfo()
}
+ if(!this.hasshow)
+ {
+ this.shShow();
+ }
},
methods: {
+ shShow()
+ {
+ var that=this;
+ this.$u.api.comminInt({}).then(e => {
+ that.hasshow=true;
+ // #ifdef APP-PLUS
+ if (plus.os.name == 'iOS') {
+ if (e.data.basic.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
+ that.isshowtype=true;
+ } else {
+ that.isshowtype=false;
+ }
+ }
+ // #endif
+ }).catch(function(err) {
+ console.log(err);
+ })
+ },
+ getInit()
+ {
+ console.log(getApp().globalData)
+ if(!getApp().globalData.hasinit)
+ {
+ console.log('鍒濆鍖�1111')
+ getApp().getAppInfo();
+ setTimeout(()=>{
+ this.getInit();
+ },2000)
+ }
+ // #ifdef APP-PLUS
+ console.log(getApp().globalData.ifwt)
+ this.appInfo = uni.getStorageSync('appInfo');
+ this.showtar = getApp().globalData.ifwt == 1 ? false : true;
+ this.platform = plus.os.name;
+
+ // #endif
+ },
getmoneyInfo() {
var that = this;
this.$u.api.getEstimateAmount({}).then(e => {
@@ -351,7 +394,6 @@
var that = this;
this.$u.api.getBanner({type:'2'}).then(e => {
if(e.code == 1)return that.$alert(e.msg);
- console.log(e.data.info)
that.bannerList = e.data.info;
}).catch(function (err) {
})
@@ -441,8 +483,6 @@
}
},
-
-
cpr_version(a, b) {
console.log(a);
var _a = this.toNum(a),
--
Gitblit v1.9.3