修改

components/auth/index.vue

@@ -43,6 +43,12 @@
 				this.isOpenAuth = mallConfig.mall.setting.is_show_auth;
 			}
 			this.getUserInfo()
+			// if(uni.getStorageSync('mall_UserInfo')&&uni.getStorageSync('mall_UserInfo').OpenId&&uni.getStorageSync('b2b_user')){
+			// 	console.log(uni.getStorageSync('b2b_user').salesBaseInfo)
+			// 	if(uni.getStorageSync('b2b_user').salesBaseInfo==''){
+			// 		this.getLogin(uni.getStorageSync('mall_UserInfo').OpenId)
+			// 	}
+			// }
 		},
 		methods: {
 			getoldUser() {
@@ -223,6 +229,7 @@
 									b2bResult.contactNumber = b2bData.contactNumber;
 									uni.setStorageSync('b2b_user', b2bResult)
 									that.$emit("changeuserinfo");
+									uni.setStorageSync("lastLogin",new Date().getTime())
 								} else {
 									uni.redirectTo({
 										url: '/pages/jiuzhai/bind_Customer'

pages/index/index.vue

@@ -424,6 +424,10 @@
 
 			that.u = uni.getStorageSync("mall_UserInfo");
 			that.b2bUser = uni.getStorageSync("b2b_user");
+			if(that.b2bUser && that.b2bUser.salesBaseInfo==''){
+				uni.removeStorageSync('b2b_user')
+				that.b2bUser=null
+			}
 			console.log("onLoad_setting", this.setting);
 			console.log("onLoad_b2bUser", this.b2bUser);
 			if (!that.u) {
@@ -477,7 +481,15 @@
 			}
 			uni.showNavigationBarLoading();
 		},
-		created() {},
+		created() {
+			if(uni.getStorageSync("lastLogin")){
+				const tempHour = (new Date().getTime() - uni.getStorageSync("lastLogin"))/1000/60/60
+				if(tempHour>70){
+					uni.removeStorageSync('b2b_user')
+					uni.removeStorageSync('mall_UserInfo')
+				}
+			}
+		},
 		// #ifdef MP-WEIXIN
 		onShareTimeline() {
 			setTimeout(() => {

pages/jiuzhai/jz_Line.vue

@@ -368,19 +368,19 @@
 							<view style="height: 50vh;display: flex;">
 								<view style="background-color: #f1f1f1;margin-right: 30rpx;height:100%">
 									<scroll-view scroll-y="true" style="height:100%">
-										<view style="text-align: center; padding: 15px 0;">
+										<view style="text-align: center; padding: 15px 0;" v-if='msg.teamType==0 || msg.teamType==1'>
 											<u-tag mode="plain" border-color="#DFBE6E" color="#DFBE6E" text="出境游" size="mini"></u-tag>
 										</view>
 										<template v-for="x in lineList">
 											<view :style="{'background':x.LineID==currentLineId.LineID?'#FFF':'unset'}" @click="changeLineTeamsHandler(x)"
-											style="font-size: 15px;color:#111;padding:30rpx;text-align: center;" v-if="x.LineDirection==2" :key="x.LineID">{{x.LineShortName}}</view>
+											style="font-size: 15px;color:#111;padding:30rpx;text-align: center;" v-if="x.LineDirection==2 && (msg.teamType==0 || msg.teamType==1)" :key="x.LineID">{{x.LineShortName}}</view>
 										</template>
-										<view style="text-align: center; padding: 15px 0;">
+										<view style="text-align: center; padding: 15px 0;"  v-if='msg.teamType==2'>
 											<u-tag mode="plain" border-color="#DFBE6E" color="#DFBE6E" text="当地游" size="mini"></u-tag>
 										</view>
 										<template v-for="x in lineList">
 											<view :style="{'background':x.LineID==currentLineId.LineID?'#FFF':'unset'}" @click="changeLineTeamsHandler(x)"
-											style="font-size: 15px;color:#111;padding:30rpx;text-align: center;" v-if="x.LineDirection==3" :key="x.LineID">{{x.LineShortName}}</view>
+											style="font-size: 15px;color:#111;padding:30rpx;text-align: center;" v-if="x.LineDirection==3&&msg.teamType==2" :key="x.LineID">{{x.LineShortName}}</view>
 										</template>
 									</scroll-view>
 								</view>
@@ -706,6 +706,7 @@
 				this.msg.lineId = item.LineID;
 				this.msg.PlaceIds = "";
 				this.msg.team = [];
+				this.allTeams = true
 			},
 			//获取查询条件
 			getLineQuery() {

plugin/api.js

@@ -121,7 +121,7 @@ export default {
 							uni.removeStorageSync('b2b_user')
 							uni.removeStorageSync('mall_UserInfo')
 							uni.redirectTo({
-								url: '/pages/jiuzhai/bind_Customer'
+								url: '/pages/index/index'
 							})
 							// uni.redirectTo({
 							// 	url: '/pages/index/index'