为登录产品页跳转

config/config.js

@@ -6,13 +6,14 @@ const config = {
 	// apiBaseurl:'http://172.16.90.3:9098/forest-portal',//邱波
 	apiBaseurl:'http://wx.hw.hongweisoft.com/zddtest/forest-portal',//东东
 	// apiBaseurl:'http://wx.hw.hongweisoft.com/zddapi/forest-portal',//东东
+		
 	//本地图片
 	// imgUrl:'http://'+window.location.host,
 	// 图片占位
 	placeImg:'http://placekitten.com',
 	
 	// loginUrl:'http://tanhui.hongweisoft.com/forest-portal/wechat/h5/authorize?returnUrl=/',//登录后跳转到测试链接
-	// loginUrl:'http://forest.hw.hongweisoft.com/data/forest-portal/wechat/h5/authorize?returnUrl=/',//登录后跳转到测试链接
+	// loginUrl:'http://forest.hw.hongweisoft.com/data/forest-portal/wechat/h5/authorize?returnUrl=http://forest.hw.hongweisoft.com/#/',//登录后跳转链接
 	// loginUrl:'http://wx.hw.hongweisoft.com/zddapi/forest-portal/wechat/h5/authorize?returnUrl=http://172.16.90.25:8081/#/',//登录后跳转到测试链接 东东
 	loginUrl:'http://wx.hw.hongweisoft.com/zddtest/forest-portal/wechat/h5/authorize?returnUrl=http://foresth5test.hw.hongweisoft.com/#/',//登录后跳转到测试链接 东东
 	// loginUrl:'http://wx.hw.hongweisoft.com/zddtest/forest-portal/wechat/h5/authorize?returnUrl=http://wx.hw.hongweisoft.com/gcz/#/',//登录后跳转到测试链接 东东
@@ -23,6 +24,8 @@ const config = {
 	
 	
 	//online 线上配置
+	// loginUrl:'http://wxh5.gzqlyx.com/api/forest-portal/wechat/h5/authorize?returnUrl=http://wxh5.gzqlyx.com/#/',//登录后跳转链接
+	// apiBaseurl:'http://wxh5.gzqlyx.com/api/forest-portal',
 
 	
 	

main.js

@@ -14,7 +14,19 @@ http.interceptors.response.use((response) => { /* 对响应成功做点什么
 	   });
 	 };
 	 if(response.data.code == 401){
-		 // console.log('response',response);
+		// console.log('response',response);
+		// 是否产品 是的话登录后跳转产品页
+		// console.log('location.href',location.href.split('#')[1]);
+		// console.log('是否产品',location.href.split('#')[1].indexOf("/pages/product/product") != -1);
+		if(location.href.split('#')[1].indexOf("/pages/product/product") != -1){
+			let productID = location.href.split('#')[1].split('=')[1];
+			// console.log('productID',productID)
+			uni.setStorage({
+				key: 'productID',
+				data:productID
+			});
+		};
+		// 是否产品 是的话登录后跳转产品页
 		uni.showToast({
 		 	title:response.data.message + "    即将跳转到登录页",
 		 	icon:"none",

pages/index/index.vue

@@ -199,6 +199,16 @@
 					userInfo.accessToken = this.params.token;
 					userInfo.tokenhead = this.params.tokenhead;
 					this.setLogin(userInfo);
+				}).then(res =>{
+					//产品跳转
+					uni.getStorage({
+						key:'productID',
+						success: res => {
+							console.log('productID',res.data);
+							this.jumpDetails(res.data)
+						}
+					});
+					//产品跳转
 				}).catch(err => {
 					if(err.data.message =='暂未登录或token已经过期'){
 						let loginurl = `${this.config.apiBaseurl}/wechat/h5/authorize?returnUrl=${this.thispage}`

pages/login/login.vue

@@ -20,16 +20,16 @@
 		},
 		data(){
 			return{
-				
+				hPage:'',
 			}
 		},
-		onLoad(options){
+		onLoad(options){			
 			this.backpage = options.backpage
 			
 		},
 		methods:{
 			wxclick(){
-				window.location.replace(this.config.loginUrl);
+				window.location.replace(this.config.loginUrl+this.hPage);
 			}
 			
 		}

pages/product/product.vue

@@ -86,7 +86,7 @@
 		<view class="bottom-flex-btn-wrap">
 			<view class="bottom-flex-btn-content">
 				<button type="default" :disabled="isPred==0?false:true"  class="bottom-flex-btn" @click="focuse(params.productid)">有意向</button>
-				<!-- <button type="default" class="bottom-flex-btn" @click="buy(params.productid)">立即购买</button> -->
+				<button type="default" class="bottom-flex-btn" @click="buy(params.productid)">立即购买</button>
 				<button type="default" class="bottom-flex-btn primary" @click="callnumber(phoneNumber)">打电话</button>
 			</view>			
 		</view>

pages/usercenter/addrs/addrs.vue

@@ -64,7 +64,7 @@
 				</view>
 			</view>
 			<view class="form-item">
-				<view class="form-item-til">设为收货地址</view>
+				<view class="form-item-til">设为默认收货地址</view>
 				<view class="form-item-con" style="min-width: auto;">
 					<switch :checked="params.defaultStatus==1?true:false" @change="switchDefaultStatus" />
 				</view>

pages/usercenter/myorder/myorder.vue

@@ -154,7 +154,7 @@
 					};
 					// console.log(data);
 					// 接口返回的当前页数据列表 (数组)
-					let curPageData = data.data.data.list; 
+					let curPageData = data.data.data.list||new Array(); 
 					// console.log('curPageData',curPageData);
 					// 接口返回的当前页数据长度 (如列表有26个数据,当前页返回8个,则curPageLen=8)
 					let curPageLen = curPageData.length; 

pages/usercenter/usercenter.vue

@@ -45,7 +45,7 @@
 					<view class="select-bar-arrow"></view>
 				</view>
 			</navigator>
-			<!-- <navigator url="/pages/usercenter/myorder/myorder">
+			<navigator url="/pages/usercenter/myorder/myorder">
 				<view class="select-bar">
 					<svg class="icon select-bar-icon" aria-hidden="true">
 						<use xlink:href="#icondizhi"></use>
@@ -53,8 +53,8 @@
 					<view class="select-bar-text">我的订单</view>
 					<view class="select-bar-arrow"></view>
 				</view>
-			</navigator> -->
-			<!-- <navigator url="/pages/usercenter/addrs/addrs">
+			</navigator>
+			<navigator url="/pages/usercenter/addrs/addrs">
 				<view class="select-bar">
 					<svg class="icon select-bar-icon" aria-hidden="true">
 						<use xlink:href="#icondizhi1"></use>
@@ -62,7 +62,7 @@
 					<view class="select-bar-text">收货地址</view>
 					<view class="select-bar-arrow"></view>
 				</view>
-			</navigator> -->
+			</navigator>
 			<navigator url="/pages/usercenter/feedback/feedback">
 				<view class="select-bar">
 					<svg class="icon select-bar-icon" aria-hidden="true">

pay.js

@@ -23,7 +23,7 @@ export default {
 					Authorization: 'Bearer '+ token, //注意Bearer后面有一空格
 				},
 			}).then(res=>{
-				// console.log('res',res);
+				console.log('res',res);
 					//#ifdef H5
 					$wxApi.JSAPI(res.data.data).then(r);
 					//#endif

wxapi.js

@@ -148,6 +148,7 @@ export default {
 	//拉起微信浏览器端支付
 	JSAPI(res) {
 		return new Promise(r => {
+			console.log('JSAPI res',res);
 			wx.chooseWXPay({
 				"appId": res.appId,
 				"timestamp": res.timeStamp, //时间戳，自1970年以来的秒数