登录后只有产品页需要返回

center/memberinfo.vue

@@ -34,7 +34,7 @@
 				<u-cell title="会员等级" :value="memberInfo.levelName"></u-cell>
 				<u-cell title="实名制认证" @click="factorAuth" :value="memberInfo.isAuth==1?'已认证':'去认证'"></u-cell>
 			</u-cell-group>
-			<u-button text="取消登录" type="warning" @click="logOut" style="margin-top: 30rpx;"></u-button>
+			<u-button text="取消登录" type="warning" @click="logOut" :customStyle="{'margin-top': '120rpx'}"></u-button>
 			<u-datetime-picker
 				:show="timeShow"
 				:minDate="new Date().getTime()-365*100*24*3600*1000"

common/request.js

@@ -38,20 +38,11 @@ module.exports = (vm) => {
 			let backUrl = pages[pages.length - 1].route;
 			let options =uni.$u.queryParams( pages[pages.length - 1].options);
 			let fullBackUrl = backUrl+options;
-			const loginUrl = 'login'
-			if (backUrl.indexOf(loginUrl) > 0) {
-				uni.removeStorage({
-					key: 'backUrl',
-					success: function (res) {
-						// console.log('success');
-					}
-				});
-			} else {
-				// uni.showToast({
-				// 	title: res.msg + "即将跳转到登录页",
-				// 	icon: "none",
-				// 	duration: 2000
-				// });
+			
+			const backArr = ['productdetails'];
+			const hasBackArr = backArr.some(backPage => backUrl.includes(backPage));
+			if(hasBackArr){
+				console.log('包含');
 				uni.setStorage({
 					key: 'backUrl',
 					data: fullBackUrl,
@@ -59,10 +50,43 @@ module.exports = (vm) => {
 						// console.log('setStorage success');
 					}
 				});
-				setTimeout(() => {
-					uni.$u.route('/pages/login/login');
-				}, 1000)
+			}else{
+				console.log('不包含');
+				uni.removeStorage({
+					key: 'backUrl',
+					success: function (res) {
+						// console.log('success');
+					}
+				});
 			}
+			setTimeout(() => {
+				uni.$u.route('/pages/login/login');
+			}, 1000)
+			// const loginUrl = 'login'
+			// if (backUrl.indexOf(loginUrl) > 0) {
+			// 	uni.removeStorage({
+			// 		key: 'backUrl',
+			// 		success: function (res) {
+			// 			// console.log('success');
+			// 		}
+			// 	});
+			// } else {
+			// 	// uni.showToast({
+			// 	// 	title: res.msg + "即将跳转到登录页",
+			// 	// 	icon: "none",
+			// 	// 	duration: 2000
+			// 	// });
+			// 	uni.setStorage({
+			// 		key: 'backUrl',
+			// 		data: fullBackUrl,
+			// 		success: function () {
+			// 			// console.log('setStorage success');
+			// 		}
+			// 	});
+			// 	setTimeout(() => {
+			// 		uni.$u.route('/pages/login/login');
+			// 	}, 1000)
+			// }
 		}
 	}
 	

pages/login/login.vue

@@ -294,14 +294,7 @@
 							this.$u.vuex('vuex_member_info.name', '微信用户');
 							this.updateMemberInfo();
 						}else{
-							let url = this.backUrl&&this.backUrl.length>0?this.backUrl:'/pages/index/index';
-							
-							// let queryParams = uni.$u.queryParams(targetRoute.query);
-							// uni.reLaunch({url: targetRoute.url+queryParams});
-							uni.reLaunch({url: url});
-							// uni.navigateTo({
-							// 	url: url
-							// })
+							this.goBack();
 						}
 						// 下面需要获取微信头像和昵称
 						// if(res.data.name){
@@ -319,6 +312,16 @@
 					}
 				})
 			},
+			goBack(){
+				let url = this.backUrl&&this.backUrl.length>0?this.backUrl:'/pages/index/index';
+				uni.removeStorage({
+					key: 'backUrl',
+					success: function (res) {
+						// console.log('success');
+						uni.reLaunch({url: url});
+					}
+				});
+			},
 			updateMemberInfo(){
 				let params ={
 					id:this.userInfo.id,
@@ -326,11 +329,7 @@
 					name:'微信用户'
 				};
 				this.$u.api.updateMemberInfo(params).then(res=>{
-					let url = this.backUrl&&this.backUrl.length>0?this.backUrl:'/pages/index/index';
-					uni.reLaunch({url: url});
-					// uni.navigateTo({
-					// 	url: url
-					// })
+					this.goBack();
 				}).catch(err=>{
 					console.log('err',err);
 				})