准备测试

src/api/coupon.js

@@ -8,5 +8,11 @@ export default {
     getCouponInfo: {
         method: 'GET',
         url: '/mall/web/coupon/:batchNo',
-    },             
+    },        
+    //推荐用户
+    sourceUser: {
+    	method: 'POST',
+        url: '/mall/web/recommend/:sourceUserId',
+    }
+    
 }

src/models/coupon-model.js

@@ -26,5 +26,10 @@ export default {
             	'encodeToken': token
             }
         }),
-
+	//推荐用户
+	sourceUser : (sourceUserId) =>
+		utilsModel
+        .config(couponApi.sourceUser , {sourceUserId: sourceUserId})
+        .request({
+        }),
 }

src/view/home.vue

@@ -1,7 +1,7 @@
 
 <template>
 	<div class="home">
-		<input type="hidden" id="openedDistrict" th:value="${openedDistrict}"/>
+		<!--<input type="hidden" id="openedDistrict" th:value="${openedDistrict}"/>-->
 		<input type="hidden" id="merchantNo" th:value="${merchantNo}"/> <!--商户标号-->                              
 		<input type="hidden" id="districtId" th:value="${districtId}"/> <!--选定区县id-->
 		<div class="page-top">		
@@ -20,8 +20,8 @@
 					<div class="swiper-pagination"></div>
 				</div>          
 			</div>
-			<div class="coupon">
-				<a v-if="promotionImgList" :href="promotionImgList.linkUrl"><img :src="promotionImgList.imgUrl"/></a>
+			<div class="coupon" >
+				<a v-if="promotionImgList != {}" :href="promotionImgList.linkUrl || ''"><img :src="promotionImgList.imgUrl"/></a>
 			</div>
 			<div class="new-card" v-for="item in goodsList">
 				<div class="new-card-top">
@@ -88,25 +88,31 @@
 		methods: {
 			getName (){
 				let arr = this.addressValue[2].split('&')
-				$("#districtId").val(arr[0]) 
+				console.log(arr)
+				$("#districtId").val(arr[0]) 		
+				$("#merchantNo").val(arr[2])
 				this.getGoodsList()
 				this.defaultCity = arr[1]
 				this.show = false
 				localStorage.setItem('cityName',this.addressValue)
+				
 			},
 			change (name) {
 		      	this.addressValue = name
 		   	},
 		   	getGoodsList (){
+		   		
 		   		var params = {
 		   			"merchantNo": $("#merchantNo").val(),
 		   			"selectedDistrictId": $("#districtId").val()
 		   		}
+		   		console.log(params)
 		   		homeApi.getGoods(params).then(res => {
-		   			console.log(res)
+		   			//console.log(res)
 					if ( res.code == 0 ){
 						this.bannerImgList = res.response.bannerImgList
-						this.promotionImgList =  res.response.promotionImgList[0];
+						this.promotionImgList =  res.response.promotionImgList[0] || {};
+					//	console.log('11',this.promotionImgList)
 						let goodsList = res.response.goodsList
 						let arr = [];
 						for(let i=0;i<goodsList.length;i++){
@@ -154,7 +160,7 @@
 		   	getdefaultAddress (){
 		   		console.log(123)
 		   		homeApi.getdefaultAddress().then(res => {
-		   			console.log('默认地址信息',res)
+		   			//console.log('默认地址信息',res)
 		   			if ( res.code == 0 ){
 		   				if ( !res.data ){
 		   					this.show = true

src/view/month-card.vue

@@ -75,7 +75,8 @@
 <script>
     import couponModel from '../models/coupon-model';
     import configs from '../configs';
-
+	import { Alert, Toast,Popup,Picker } from "vux";
+	
 	var strCookie =document.cookie; 
 	var cookieName = "1hjz_mall_login_access_token=";
 	var token = strCookie.slice(cookieName.length); 
@@ -97,6 +98,11 @@
             batchNo: this.$route.query.batchNo,
         };
     },
+    components: {
+		Toast,
+		Popup,
+		Picker
+	},
     methods: {
 
         // 初始化
@@ -145,20 +151,8 @@
               
                 that.loading = false;              
 				console.log(result)
-//              if (result.code == 0) {
-//
-//                  console.log('领取成功')
-//
-//              } else {
-//
-//                  console.log('领取失败')
-//
-//              }
 				if (result.code === 0 || result.code === 3) {
-					// alert("领取成功!");
-					// setTimeout(function () {
-				 //        window.location.href = locationUrl + '/mall/web/vgoods/detail/' + that.getData.goodsNo;
-				 //    }, 1000);
+					
 				    window.history.go(0);
 //				    hide_layer(1);
 				} else if (result.code === 666) {
@@ -172,12 +166,20 @@
 				        result.msg = '操作失败，请刷新重试';
 				    }
 				    alert(result.msg);
-//				    $('.get-btn').attr('disabled', true).text("已使用");
-//				    hide_layer(1);
 				}
             });
 
-        },
+      },
+        sourceUser (){
+        	var sourceUserId = this.$route.query.sourceUserId
+        	console.log("22",sourceUserId)
+        	if ( sourceUserId ){
+        		couponModel.sourceUser(sourceUserId).then(res => {
+        			
+        		})
+        	}
+        }
+        
     },    
     filters: {
         numFilter(value) {            
@@ -192,7 +194,7 @@
 
         // 初始化
         this.handleInit();
-
+		this.sourceUser()
     }
   }
 </script>

src/view/poster.vue

@@ -1,7 +1,8 @@
 
 <template>
 	<div class="poster">
-		<input type="hidden" id="merchantNo" th:value="${merchantNo}" value="2"/>
+		<!--<img class="weixin" src="../assets/images/poster/weixin.png" v-show="ImgFix" @click="ImgFix = false" />-->
+		<input type="hidden" id="merchantNo" th:value="${merchantNo}"/>
 		<div class="page-top">		
 			<a @click="goBack()"><img src="../assets/images/my-money/left.png" /></a>
 			<i class="name">分销海报</i>
@@ -34,6 +35,7 @@
 			return {
 				show: false,
 				imgSrc: "",
+			//	ImgFix: false,
 				defaultCity: '天河区',
 				addressData: [],
 				addressValue: [],
@@ -56,26 +58,38 @@
 				let cityNameArr = arr[2].split('&')
 				let cityName = cityNameArr[1]
 				this.defaultCity = cityName
+				
 			},
 			getPoster (){
 				var merchantNo = $("#merchantNo").val()
 				console.log(merchantNo)
+				//判断是否在微信环境下操作
+//				var ua = window.navigator.userAgent.toLowerCase();
+//			 	//通过正则表达式匹配ua中是否含有MicroMessenger字符串
+//			 	if(ua.match(/MicroMessenger/i) != 'micromessenger'){
+//			 		this.ImgFix = true
+//			 		return;
+//				}
 				posterApi.getPoster(merchantNo).then(res => {
-					console.log("海报",res)
 					if ( res.code == 0 ){
-						if ( res.data.hasOAuth == 0 ){
-							location.href = res.data.oauthUrl
-							return
-						}
+						
 		   				if ( res.data.imageUrl ){
 		   					this.imgSrc = res.data.imageUrl
 		   				} else {
-		   					createPoster()
+		   					if ( res.data.hasOAuth == 0 ){
+								location.href = res.data.oauthUrl
+								return
+							} else {
+								createPoster()
+							}
+		   					
 		   				}
 		   			} else {
 						this.$vux.toast.text(res.msg,"middle");
 						if ( res.code == 667 ){
-							location.href = '/mall/web/user/login'
+							setTimeout(function(){
+								location.href = '/mall/web/user/login'
+							})
 						}
 					}
 				})
@@ -91,7 +105,9 @@
 		   			} else {
 						this.$vux.toast.text(res.msg,"middle");
 						if ( res.code == 666 ){
-							location.href = '/mall/web/user/login'
+							setTimeout(function(){
+								location.href = '/mall/web/user/login'
+							})
 						}
 					}
 				})
@@ -100,6 +116,7 @@
 				let arr = this.addressValue[2].split('&')
 				this.defaultCity = arr[1]
 				this.show = false
+				$("#merchantNo").val(arr[2])
 			},
 			change (name) {
 		      	this.addressValue = name
@@ -122,6 +139,7 @@
 		mounted() {
 	    	this.getAddress()
 	      	this.getCityName()
+	     	this.getPoster()
 		}
 	};
 </script>
@@ -195,5 +213,10 @@
     display: block;
     margin-top: 0.5rem;
 }
+/*.weixin {
+	width: 100%;
+	position: fixed;
+	z-index: 100;
+}*/
 
 </style>

src/view/put-money.vue

@@ -128,7 +128,7 @@
 					
 					//判断是否在微信环境下操作
 					var ua = window.navigator.userAgent.toLowerCase();
-				 	 //通过正则表达式匹配ua中是否含有MicroMessenger字符串
+				 	//通过正则表达式匹配ua中是否含有MicroMessenger字符串
 				 	if(ua.match(/MicroMessenger/i) != 'micromessenger'){
 				 		this.isWenxin = true
 				 		return;