Merge branch 'master' of http://git.liuniu946.com/hrjy/ysg

pages/money/pay.vue

@@ -108,6 +108,7 @@
 			}
 			if(options.vipType){
 				this.vipType = options.vipType;
+				this.agent_award = options.agent_award
 			}
 			this.mer_id = options.mer_id
 			this.checkedAuto = options.checked || 0;
@@ -331,6 +332,7 @@
 					}else if(+obj.vipType==2){
 						data.is_agent=1
 					}
+					data.agent_award = obj.agent_award;
 				}
 				
 				// 判断是否拼团商品

pages/order/createOrder.vue

@@ -230,6 +230,7 @@
 				pinkid: '', //保存拼团商品id
 				isgift: 0,
 				vipType:'',//会员礼包类型1会员2代理
+				agent_award:''
 
 			};
 		},
@@ -249,7 +250,8 @@
 			}
 			// 判断是否礼包商品
 			if(option.vipType){
-				this.vipType = option.vipType
+				this.vipType = option.vipType;
+				this.agent_award = option.agent_award
 			}
 			this.userinfo();
 		},
@@ -402,7 +404,7 @@
 				let url = '/pages/money/pay?key=' + this.orderKey + '&isgift=' + this.isgift + '&mer_id=' + this.mer_id
 				// 礼包商品
 				if(this.vipType){
-					url+=`&vipType=${this.vipType}`
+					url+=`&vipType=${this.vipType}&agent_award=${this.agent_award}`;
 				}
 				if (this.pinkid) {
 					url += '&pinkid=' + this.pinkid

pages/product/product.vue

@@ -563,7 +563,7 @@
 							// 跳转到支付页
 							let url = '/pages/order/createOrder?id=' + da.cartId ;
 							if(obj.vipType){
-								url +=`&vipType=${obj.vipType}` ;
+								url +=`&vipType=${obj.vipType}&agent_award=${obj.goodsObjact.agent_award}` ;
 							}
 							uni.navigateTo({
 								url

store/index.js

@@ -7,8 +7,8 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
 	state: {
-		baseURL:'https://ysg.liuniu946.com',//请求地址配置 
-		// baseURL:'',//请求地址配置 
+		// baseURL:'https://ysg.liuniu946.com',//请求地址配置 
+		baseURL:'',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor:false,//是否打开强制登录