配合多典花进行优化1

App.vue

@@ -9,9 +9,6 @@ export default {
 	},
 	onLaunch: async function () {
 
-
-
-
 		// #ifdef APP-PLUS
 		// var w = plus.webview.open('hybrid/html/advertise/advertise.html','splashscreen', {
 		// 	top: 0,

pages.json

@@ -229,13 +229,6 @@
             "enablePullDownRefresh": false,
             "navigationBarTitleText": ""
           }
-        },
-        {
-          "path": "finance/index",
-          "style": {
-            "enablePullDownRefresh": true,
-            "navigationStyle": "custom"
-          }
         }
       ]
     }

pages/index/index.vue

@@ -214,15 +214,12 @@ export default {
 		GetTop() {
 			var _this = this
 			uni.getSystemInfo({
-				success: (res) => {
+				success: () => {
 					const query = uni.createSelectorQuery().in(this);
 					query.select("#box").boundingClientRect((data) => {
 						_this.Topdistance = data.top
 					}).exec();
 
-				},
-				fail: (res) => {
-
 				}
 			})
 		},

pages/login/login.vue

@@ -35,18 +35,19 @@
 </template>
 
 <script>
+	import {
+		switchShowTabbar
+	} from '@/utils/index'
 
-import { switchShowTabbar } from '@/utils/index'
-
-export default {
+	export default {
 		data() {
 			return {
 				clickStatus: false,
 				mobile: '',
 				sendcode: '',
 				canSendCode: true,
-			timer: null,//倒计时
-			count: '',//倒计时
+				timer: null, //倒计时
+				count: '', //倒计时
 				smsDownCacheCode: '',
 
 				// 协议列表
@@ -61,12 +62,23 @@ export default {
 		methods: {
 			// 登录页返回
 			GoBack() {
+				const pages = getCurrentPages();
+				console.log(pages.length, '数量')
+				if (pages.length <= 1) {
+					uni.switchTab({
+						url: "/pages/index/index"
+					})
+				} else {
 					this.Back()
+				}
+
 			},
 			// 预加载
 			initPreloadH5() {
 				try {
-				const { h5Url } = JSON.parse(uni.getStorageSync('APP-SETTING'));
+					const {
+						h5Url
+					} = JSON.parse(uni.getStorageSync('APP-SETTING'));
 					// 预加载H5
 					plus.webview.prefetchURL(h5Url);
 
@@ -80,9 +92,11 @@ export default {
 			},
 			async init() {
 				const $App_Setting = uni.getStorageSync("APP-SETTING")
-			console.log($App_Setting,'内容呢')
+				console.log($App_Setting, '内容呢')
 				if ($App_Setting) {
-				const { protocol } = JSON.parse($App_Setting)
+					const {
+						protocol
+					} = JSON.parse($App_Setting)
 					this.protocolList = JSON.parse(protocol)
 				}
 			},
@@ -91,11 +105,15 @@ export default {
 			},
 			GetVerifyCode() {
 				const self = this
-			const params = {mobile:this.mobile}
-			console.log(params,'日')
+				const params = {
+					mobile: this.mobile
+				}
+				console.log(params, '日')
 				self.$request('/pawn/client/sendCode', 'POST', params).then(res => {
 					console.log(res, 'sendCode');
-				const { smsBizNo } = res.result
+					const {
+						smsBizNo
+					} = res.result
 					if (smsBizNo) {
 						self.countdowns()
 						self.smsDownCacheCode = smsBizNo
@@ -163,9 +181,14 @@ export default {
 					"verifyCode": self.sendcode
 				}
 				self.$request('/pawn/client/login', 'POST', params).then(res => {
-				const { userInfo, token } = res.result
+					const {
+						userInfo,
+						token
+					} = res.result
 					if (userInfo) {
-					const { deviceId } = userInfo
+						const {
+							deviceId
+						} = userInfo
 						uni.setStorageSync('deviceId', deviceId)
 					}
 
@@ -191,11 +214,15 @@ export default {
 					"promoCode": 'own'
 				}
 				self.$request('/app/v1/loginNoCheck', 'POST', params).then(res => {
-				const { deviceId, token } = res.result
-				const cacheData = Object.assign({}, res.result, { mobile: self.mobile })
+					const {
+						deviceId,
+						token
+					} = res.result
+					const cacheData = Object.assign({}, res.result, {
+						mobile: self.mobile
+					})
 
 					uni.setStorageSync('user_info_obj', JSON.stringify(cacheData));
-				uni.setStorageSync('mobileCall', self.mobile)
 					uni.setStorageSync('deviceId', deviceId)
 					uni.setStorageSync('tokenFinance', token)
 
@@ -215,7 +242,7 @@ export default {
 				this[key] = val
 			}
 		}
-}
+	}
 </script>
 
 <style src='./index.less' lang="less" scoped></style>
\ No newline at end of file

pages/my/index.vue

@@ -6,16 +6,14 @@
 			<view class='my-header'>
 				<image class='header-img' src='https://ddh.yyhock.com/ddhMall/my-icon.png'></image>
 				<view class='header-des'>
-					<view class='des-name' v-if="isLogin">{{ userTel }}</view>
+					<view class='des-name' v-if="isLogin">{{ mobile }}</view>
 					<view class='des-name' v-else @click='GoLogin'>注册/登录</view>
 					<view class='des-text'>多典花承诺保护您的信息安全</view>
 				</view>
 			</view>
-			<!-- 登录状态 -->
-			<template v-if="isLogin">
 
 			<!-- 我的还款&申请记录 -->
-				<template v-if="menuBar && menuBar.length > 0">
+			<template v-if="isLogin && loanSwitch">
 				<view class='my-line'>
 					<view class='line-left' v-for="item in menuBar" :key="item.id" @click="goBar(item)">
 						<image class='left-img' :src='item.iconUrl'></image>
@@ -54,10 +52,9 @@
 				</view>
 			</view>
 
-			</template>
-			<!-- 未登录状态 -->
 
-			<template v-else>
+			<!-- 未登录状态 -->
+			<template v-if="false">
 
 				<view class='my-box-s'>
 					<view class='s-con'>
@@ -132,16 +129,16 @@
 
 <script>
 import { switchShowTabbar } from '@/utils/index'
+import { isLogin } from '../../utils';
 const APP = JSON.parse(uni.getStorageSync('APP-SETTING'));
-const H5 = JSON.parse(uni.getStorageSync('H5-SETTING'));
-const hasToken = uni.getStorageSync('token') ? true : false;
 const mobile = uni.getStorageSync('l-mobile') ? uni.getStorageSync('l-mobile') : '';
 
 export default {
 	data() {
 		return {
-			isLogin: hasToken,
-			userTel: mobile,
+			isLogin: false,
+			loanSwitch: false,
+			mobile: '',
 			menuList: [],
 			mobileNum: '',
 			menuBar: [],
@@ -152,9 +149,15 @@ export default {
 		}
 	},
 	onShow() {
+		const token = uni.getStorageSync('token')
+		const loanSwitch = uni.getStorageSync('loanSwitch')
+		const mobile = uni.getStorageSync('l-mobile') ? uni.getStorageSync('l-mobile') : ''
 
-		this.init()
+		this.isLogin = token ? true : false
+		this.loanSwitch = loanSwitch ? true : false
+		this.mobile = mobile;
 
+		this.initMine()
 		// 显示隐藏tabBar
 		switchShowTabbar()
 		// 埋点
@@ -162,7 +165,7 @@ export default {
 	},
 	// 页面下拉刷新
 	async onPullDownRefresh() {
-		await this.init()
+		await this.initMine()
 		setTimeout(() => {
 			uni.stopPullDownRefresh();
 		}, 1000);
@@ -174,35 +177,14 @@ export default {
 		GoLogin() {
 			this.Go('uni:/pages/login/login')
 		},
-		// 初始化
-		init() {
-			const token = uni.getStorageSync('token')
-			console.log(token,'判断是否登录的依据')
-			if (token) { 
-				this.initMine() 
-			}
-			else {
-				this.isLogin = false
-				this.mobile = ''
-			}
-		},
 		// 初始化个人中心页面
 		initMine() {
 			const self = this
 			self.$request('/app/v1/userIndex', 'GET').then(res => {
-				const { menuBar, user, baseMenuBar, extMenuBarList } = res.result
-				const showIndex = uni.getStorageSync('showIndex')
-				console.log(showIndex, 'myindex')
-				if (showIndex == true) {
+				const { menuBar, baseMenuBar, extMenuBarList } = res.result
 				self.menuBar = menuBar
-				} else {
-					self.menuBar = []
-				}
 				self.menuList = baseMenuBar
 				self.extMenuBarList = extMenuBarList
-				self.userTel = ''
-				if (user.cell) self.userTel = user.cell
-				this.isLogin = true
 
 			}).catch(err => {
 				console.log(err, '请求出错')
@@ -231,29 +213,30 @@ export default {
 		},
 
 		goBar(item) {
-			let newPath
+			try {
+				const config = JSON.parse(uni.getStorageSync('APP-SETTING'));
+				const timestamp = new Date().getTime()
+				const token = uni.getStorageSync('tokenFinance')
+				const mobile = uni.getStorageSync('l-mobile')
+				const $src = config['h5Url'] + `?token=${token}&mobile=${mobile}&timestamp=${timestamp}#/${item.linkUrl}`
+				const newSrc = $src.split('?')
+				const targetSrc = `${newSrc[0]}?${encodeURIComponent(newSrc[1])}`
 				switch (item.title) {
 					case "我的还款":
 						this.buryingPoint('app:my_repayment_click')
-					// const url='http://192.168.0.82:8080/#/'
-					newPath = H5.h5Url + item.linkUrl //app.vue中的全局写法
-					// newPath =this.hFUrl+ item.linkUrl
-					uni.navigateTo({
-						url: `/pages/web/websrc?url=${newPath}`
-					})
 						break;
 					case "申请记录":
 						this.buryingPoint('app:my_application_record_click')
-					// const url='http://192.168.0.82:8080/#/loanRecord'
-					newPath = H5.h5Url + item.linkUrl
-					// newPath =this.hFUrl+ item.linkUrl
+						break;
+				}
 				uni.navigateTo({
-						url: `/pages/web/websrc?url=${newPath}`
+					url: `/pages/web/websrc?url=${targetSrc}`
 				})
-					break;
-				default:
-					break;
+
+			} catch (err) {
+				console.log(err)
 			}
+
 		},
 		goTel() {
 			const self = this

pages/web/web.vue

@@ -25,7 +25,7 @@ export default {
 			canBack: false,
 			webviewStyles: {
 				progress: {
-					color: '#FF4050'
+					color: '#5688E8'
 				}
 			},
 			deviceStatus: '',
@@ -70,7 +70,8 @@ export default {
 			const timestamp = new Date().getTime()
 			setTimeout(() => {
 				const token = uni.getStorageSync('tokenFinance')
-				const $src = config['h5Url'] + `?token=${token}&timestamp=${timestamp}`
+				const mobile = uni.getStorageSync('l-mobile')
+				const $src = config['h5Url'] + `?token=${token}&mobile=${mobile}&timestamp=${timestamp}`
 				console.log($src, '刷新的地址')
 				that.src = $src
 			}, 100);
@@ -103,10 +104,7 @@ export default {
 
 	},
 	onHide() {
-		// uni.removeStorageSync('hasRefresh')
-
 		const user_info_obj = uni.getStorageSync('user_info_obj') ? JSON.parse(uni.getStorageSync('user_info_obj')) : {}
-		user_info_obj.refreshIndex = false
 		uni.setStorageSync('user_info_obj', JSON.stringify(user_info_obj));
 	},
 	onShow() {

pages/web/websrc.vue

@@ -11,7 +11,6 @@ import { UploadFile } from './utils/uploads'
 import Permission from '@/js_sdk/wa-permission/permission' //权限工具类
 const LF = uni.requireNativePlugin('AThree-LFv2')
 let token = uni.getStorageSync('token')
-let reloadTimeOut = null
 export default {
 	name: "WEB",
 	data() {
@@ -22,7 +21,7 @@ export default {
 			canBack: false,
 			webviewStyles: {
 				progress: {
-					color: '#FF4050'
+					color: '#5688E8'
 				}
 			},
 			deviceStatus: '',
@@ -56,16 +55,10 @@ export default {
 		}, 1000) //如果是页面初始化调用时，需要延时一下
 		// #endif
 	},
-	onTabItemTap(e) {
-
-		console.log(e, 'tabItemTap')
-		this.wv && this.wv.evalJS(`callback({ 'action': 'OnShow' })`)
-	},
-
 	async onLoad(option) {
-		const that = this
-		if (option.url) that.src = option.url
-		console.log(option, '参数')
+		const that = this;
+		if (option.url) this.src = option.url
+		console.log(option.url,'地址')
 		uni.getStorage({
 			key: 'm-device-info',
 			success: function (res) {
@@ -74,31 +67,12 @@ export default {
 			}
 		})
 	},
-	onShow() {
-		console.log('onShow方法')
-		const canRefresh = uni.getStorageSync('canRefresh');
-		console.log(canRefresh, '可以刷新吗？')
-		if (canRefresh) {
-			uni.removeStorageSync('canRefresh')
-			if (reloadTimeOut) clearTimeout(reloadTimeOut)
-			reloadTimeOut = setTimeout(() => {
-				console.log('到这里了')
-				this.wv && this.wv.reload()
-			}, 400)
-		}
-	},
 	onUnload() {
-		const wv = this.$scope.$getAppWebview();
-		if(wv){
-			wv.clear()
-			wv.close()
-		}
 		const user_info_obj = uni.getStorageSync('user_info_obj')? JSON.parse(uni.getStorageSync('user_info_obj')):{}
-		user_info_obj.refreshIndex = true
 		uni.setStorageSync('user_info_obj', JSON.stringify(user_info_obj));
-
 	},
 	methods: {
+		
 		handleMessage(e) {
 			const data = e.detail.data;
 			if (!data || data.lenght === 0) {
@@ -250,6 +224,7 @@ export default {
 				this.toast('提示框报错')
 			}
 		},
+
 		// 实名认证正面
 		Camera_OCR_Front(config) {
 			console.log('实名认证前面', config)
@@ -389,6 +364,7 @@ export default {
 				this.toast('隐藏导航报错')
 			}
 		},
+
 		// 显示导航了
 		ShowNavBar() {
 			try {
@@ -446,6 +422,7 @@ export default {
 				console.log(err, 'LIVE活体识别错误')
 			}
 		},
+
 		// 活体认证
 		async uniFace(config) {
 			console.log(config, 'config')
@@ -462,6 +439,7 @@ export default {
 			}
 
 		},
+
 		// 获取设备信息
 		async GetDeviceInfo() {
 			try {

utils/index.js

@@ -58,14 +58,15 @@ export const switchShowTabbar = async () => {
         try {
             const res = await API.initTabBar()
             const { data } = res.result
-            uni.setStorageSync('showIndex', data)
-            if (data == true) {
+            if (data) {
+                uni.setStorageSync('loanSwitch',true)
                 uni.setTabBarItem({
                     index: 1,
                     text: '贷款',
                     visible: true,
                 })
             } else {
+                uni.setStorageSync('loanSwitch',false)
                 uni.setTabBarItem({
                     index: 1,
                     visible: false

utils/request.js

@@ -48,9 +48,13 @@ const request = async (url, type, data) => {
 					if (data.success == true) {
 						return resolve(data)
 					} else {
-						if (data.code == '403') uni.removeStorageSync('token')
-						return reject(data)
-
+						if (data.code == '403'){
+							// uni.removeStorageSync('token')
+							uni.clearStorageSync();
+						} 
+						return uni.redirectTo({
+							url:"/pages/login/login"
+						})
 					}
 				} else {
 					return reject({ ...data, message: res.errMsg })