tianhui 3 роки тому
батько
коміт
45ac2990d7

+ 7 - 3
common/http.interceptor.js

@@ -49,9 +49,13 @@ const install = (Vue, vm) => {
 			return res;  
 		} else if(res.msg == "令牌不能为空"||res.code == 401){
 			console.log('location',location)
-			alert('还未登录,即将跳转登录');			
-			setTimeout(()=>{location.href = location.href+'pages/center/phoneLogin/phoneLogin';});
-		}else return false;
+			console.log('location',location.href);
+			let storage = window.sessionStorage; 
+			storage.setItem('backUrl',location.href);
+			alert('还未登录,即将跳转登录');		
+			setTimeout(()=>{location.href = 'http://localhost:8080/#/pages/center/phoneLogin/phoneLogin';});
+			
+		}else return res;
 	}
 }
 

+ 16 - 5
pages/center/order/orderDetails/orderDetails.vue

@@ -63,12 +63,23 @@
 				
 			},
 			goPay(orderId){
-				this.$u.route({
-					url: 'pages/payPage/payPage',
-					params: {
-						orderId: orderId
-					}
+				let orderList=[];
+				orderList.push(orderId);
+				this.$u.api.payGzbank({orderList: orderList}).then(res=>{
+					let payUrl = res.data.url;
+					window.open(payUrl);
+				}).catch(err=>{
+					this.$refs.uToast.show({
+						title: err.msg,
+						type: 'error',
+					});
 				});
+				// this.$u.route({
+				// 	url: 'pages/payPage/payPage',
+				// 	params: {
+				// 		orderId: orderId
+				// 	}
+				// });
 			},	
 			
 			

+ 14 - 5
pages/center/phoneLogin/phoneLogin.vue

@@ -130,11 +130,20 @@ export default {
 					// console.log('finish res',res);
 					this.$u.vuex('vuex_user', res.data);
 					this.$u.vuex('vuex_hasLogin', true);
-					this.$refs.uToast.show({
-						title: '操作成功',
-						url: '/pages/index/index',
-						isTab:true
-					});
+					let storage = window.sessionStorage;  
+					let backUrl = storage.getItem('backUrl');
+					let switchTabList = ['/pages/use/use'];
+					if(switchTabList.includes(res.data)){}
+					console.log('backUrl',backUrl);
+					location.href = backUrl;
+					// this.$refs.uToast.show({
+					// 	title: '操作成功',
+					// 	url: backUrl,
+					// 	// isTab:true,
+					// 	callback :function(err){
+					// 		console.log('err',err)
+					// 	}
+					// });
 					
 					// this.$u.api.getuseinfo().then(res => {
 					// 	console.log('getuseinfo',res.retBody);

+ 12 - 7
pages/payLists/payLists.vue

@@ -4,7 +4,7 @@
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" >
 			<scroll-view scroll-y style="height: 100%; width: 100%;" >
 				<view class="page-box">
-					<view class="pay" @click="goDetails(payItem.id)" v-for="(payItem, index) in  payList" :key="payItem.id">
+					<view class="pay" @click="goDetails(payItem.orderId)" v-for="(payItem, index) in  payList" :key="payItem.id">
 						<view class="pay-top u-flex">
 							<view class="pay-top-left u-flex-1">
 								<view class="car">{{payItem.vehicleNo}}</view>
@@ -110,12 +110,17 @@
 				});
 				
 			},
-			goDetails(id){
-				this.$u.route({
-					url: 'pages/center/order/orderDetails/orderDetails',
-					params: {
-						orderId: id
-					}
+			goDetails(orderId){
+				let orderList=[];
+				orderList.push(orderId);
+				this.$u.api.payGzbank({orderList: orderList}).then(res=>{
+					let payUrl = res.data.url;
+					window.open(payUrl);
+				}).catch(err=>{
+					this.$refs.uToast.show({
+						title: err.msg,
+						type: 'error',
+					});
 				});
 			},
 			all(){