Merge remote-tracking branch 'origin/v1.0.0' into v1.0.0

common/api/api.js

@@ -64,7 +64,7 @@ const httpTokenRequest = (opts, data) => {
                 // console.log(33333333333,res[1])
 				if(res[1].data.code == 401){
 					uni.removeStorageSync('userToken')
-					uni.navigateTo({
+					uni.redirectTo({
 						url:"/pages/login/index/index?failure=401"
 					})
 					return;

pages/main.vue

@@ -85,6 +85,7 @@
 		},
 		methods: {
 			tabChange(index) {
+				uni.setStorageSync('tabbar', index)
 				let that = this
 				switch (index) {
 					case 0:
@@ -333,6 +334,7 @@
 										duration: 2000
 									});
 									
+									
 									// 判断是否扫码进入
 									that.scene = uni.getStorageSync('scene')
 									// console.log(that.scene,"微信扫码进入")
@@ -358,8 +360,19 @@
 													icon: 'none',
 													duration: 2000
 												});
-											}
+											} 
 										})
+									}else{
+										let routerLogin = uni.getStorageSync('routerLogin')
+										let tabbar = uni.getStorageSync('tabbar')
+										if(tabbar){
+											this.tabChange(tabbar)
+										}
+										if(routerLogin){
+											uni.redirectTo({
+												url:routerLogin
+											})
+										}
 									}
 									
 								}else{

pages/moveCar.vue

@@ -56,6 +56,8 @@
 		methods: {
 			goUrl(vo) {
 				let token = uni.getStorageSync('userToken');
+				uni.removeStorageSync('routerLogin')
+				uni.setStorageSync('routerLogin',vo.url)
 				if (!token) {
 					// uni.navigateTo({
 					//     url: '/pages/binding/index?url=/pages/main&index=1'

pages/shop.vue

@@ -166,6 +166,8 @@ export default {
         },
         goDetail(id,link) {
 			let token = uni.getStorageSync('userToken');
+			uni.removeStorageSync('routerLogin')
+			uni.setStorageSync('routerLogin',false)
 			if(!token){
 				let returnPage= '/pages/main';
 				let pageType = "reLaunch"