From c9f20a6ab4ed105b2772015923d2a8dab47dd4dc Mon Sep 17 00:00:00 2001
From: fengchengzhi <fengchengzhi@3ncto.com>
Date: Fri, 14 Sep 2018 20:14:19 +0800
Subject: [PATCH] =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=20=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/poster.js                   |   2 +-
 src/assets/images/icon/home-s.png   | Bin 0 -> 2269 bytes
 src/assets/images/icon/home.png     | Bin 0 -> 1996 bytes
 src/assets/images/icon/my-s.png     | Bin 0 -> 2690 bytes
 src/assets/images/icon/my.png       | Bin 0 -> 2334 bytes
 src/assets/images/icon/server-s.png | Bin 0 -> 2677 bytes
 src/assets/images/icon/server.png   | Bin 0 -> 2343 bytes
 src/components/nav-bottom.vue       |  57 +++++++++++++++++++++++
 src/router/index.js                 |   3 ++
 src/view/home.vue                   |  68 ++++++++++++++++------------
 src/view/month-card.vue             |  39 +++++++---------
 src/view/poster.vue                 |  45 +++++++++++-------
 src/view/service-evaluation.vue     |   1 +
 13 files changed, 146 insertions(+), 69 deletions(-)
 create mode 100644 src/assets/images/icon/home-s.png
 create mode 100644 src/assets/images/icon/home.png
 create mode 100644 src/assets/images/icon/my-s.png
 create mode 100644 src/assets/images/icon/my.png
 create mode 100644 src/assets/images/icon/server-s.png
 create mode 100644 src/assets/images/icon/server.png
 create mode 100644 src/components/nav-bottom.vue

diff --git a/src/api/poster.js b/src/api/poster.js
index f76ad61..b370fb6 100644
--- a/src/api/poster.js
+++ b/src/api/poster.js
@@ -3,7 +3,7 @@ export default {
 	//获取海报信息
     getPoster: {
         method: 'GET',
-        url: '/mall/web/consumer_add/:merchantNo',
+        url: '/mall/web/recommend/:merchantNo/coupon',
     },
     //生成海报
     createPoster:{
diff --git a/src/assets/images/icon/home-s.png b/src/assets/images/icon/home-s.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c61afe925119d9870c6fe9b780e501716d7a8ae
GIT binary patch
literal 2269
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon/home.png b/src/assets/images/icon/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1d4bb3c964809ba4264122658a2d0ed83cf49a8
GIT binary patch
literal 1996
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon/my-s.png b/src/assets/images/icon/my-s.png
new file mode 100644
index 0000000000000000000000000000000000000000..b465b3f865deb773dcc3ac32682ee56c8b91b5c2
GIT binary patch
literal 2690
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon/my.png b/src/assets/images/icon/my.png
new file mode 100644
index 0000000000000000000000000000000000000000..59d4080f0c39bde711ea505d5c1138c91a5d932e
GIT binary patch
literal 2334
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
Ef@l3;{{R30

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon/server-s.png b/src/assets/images/icon/server-s.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f5f207dfb9babef4c8cab0da06dbbe123687783
GIT binary patch
literal 2677
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon/server.png b/src/assets/images/icon/server.png
new file mode 100644
index 0000000000000000000000000000000000000000..95e7d040d10431cf679292583c0aeb46a56de9b5
GIT binary patch
literal 2343
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
N002ovPDHLkV1kaWajgIV

literal 0
HcmV?d00001

diff --git a/src/components/nav-bottom.vue b/src/components/nav-bottom.vue
new file mode 100644
index 0000000..76ad889
--- /dev/null
+++ b/src/components/nav-bottom.vue
@@ -0,0 +1,57 @@
+<template>
+	<div class="router-bottom">
+		<router-link :class="{active:$route.name=='首页'}" to="/home">
+			<img v-if="$route.name!='首页'" src="../assets/images/icon/home.png" />
+			<img v-else src="../assets/images/icon/home-s.png">
+			<span>首页</span>
+		</router-link>
+		<a href="http://test.1hjz.cn/mall/web/appoint_index">
+			<img src="../assets/images/icon/server.png" />
+			<span>服务</span>
+		</a>
+		<a href="http://test.1hjz.cn/mall/web/owner" >
+			<img src="../assets/images/icon/my.png" />
+			<span>我的</span>
+		</a>
+	</div>
+</template>
+
+<script>
+	export default {
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+.router-bottom {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 1rem;
+	box-sizing: border-box;
+	border-top: 1px solid #ddd;
+}
+.router-bottom a {
+	list-style: none;
+	color: #999999;
+}
+.router-bottom a img {
+	width: 0.4rem;
+	height: 0.4rem;
+	display: block;
+	margin-bottom: 0.1rem;
+}
+.router-bottom a span {
+	height:0.2rem;
+	font-size:0.2rem;
+	font-weight:400;
+	display: block;
+}
+a.active {
+	color: #29B079;
+}
+</style>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 73bbf10..76787b7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -55,6 +55,9 @@ let router = new Router({
             path: '/demo',
             name: 'demo',
             component: demo
+        },{
+        	path:"/",
+        	redirect:"/home"
         }
     ]
 })
diff --git a/src/view/home.vue b/src/view/home.vue
index e017d6c..e167c2c 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -1,19 +1,15 @@
 
 <template>
 	<div class="home">
-		<!--<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">		
+		<div ref="test" class="page-top">		
 			<i class="position" @click="show = true"><img src="../assets/images/icon/position.png"/>{{defaultCity}}</i>
 			<i class="logo"><img src="../assets/images/icon/logo.png" /></i>
 			<i class="text"><a href="tel:400-6080100">联系客服</a></i>
 		</div>
 		<div class="page-content">
-			<div class="banner">
-				
+			<div class="banner" v-if="bannerImgList.length > 0">
 				<swiper :options="swiperOption">
-					<swiper-slide v-for="(item,index) in bannerImgList" v-if="bannerImgList.length > 0" :key="index">
+					<swiper-slide v-for="(item,index) in bannerImgList"  :key="index">
 						<div class="swiper-img" :style="{backgroundImage:'url('+item.imgUrl+')'}"></div>
 						<!--<img src="../../dist/static/img/slider-img.21dc32f.png"/>-->
 					</swiper-slide>
@@ -24,8 +20,8 @@
 				</swiper>
 				
 			</div>
-			<div class="coupon" >
-				<a v-if="promotionImgList != {}" :href="promotionImgList.linkUrl || ''"><img :src="promotionImgList.imgUrl"/></a>
+			<div class="coupon" v-if="promotionImgList == {}">
+				<a :href="promotionImgList.linkUrl || ''"><img :src="promotionImgList.imgUrl"/></a>
 			</div>
 			<div class="new-card" v-for="item in goodsList">
 				<div class="new-card-top">
@@ -52,6 +48,10 @@
 			</div>
 		</div>
 		
+		<div class="page-bottom">
+			<routerFooter></routerFooter>
+		</div>
+		
 		<popup v-model="show">
 	        <div class="picke-address">
 	        	<div class="status-btn">
@@ -68,11 +68,14 @@
 	import homeApi from "../models/home-model.js";
 	import Swiper from '@/common/swiper';
 	import { Alert, Toast,Popup,Picker } from "vux";
+	import routerFooter from "../components/nav-bottom";
 	export default {
 		data() {
 			return {
 				show: false,
 				defaultCity: '天河区',
+				merchantNo: '', //商户编号
+				districtId: '', //区id
 				addressData: [],
 				addressValue: [],
 				bannerImgList:[], //轮播图
@@ -88,17 +91,17 @@
 		components: {
 			Toast,
 			Popup,
-			Picker
+			Picker,
+			routerFooter
 		},
 		watch: {
 			
 		},
 		methods: {
 			getName (){
-				let arr = this.addressValue[2].split('&')
-				console.log(arr)
-				$("#districtId").val(arr[0]) 		
-				$("#merchantNo").val(arr[2])
+				let arr = this.addressValue[2].split('&') || ''
+				this.districtId = arr[0]	
+				this.merchantNo = arr[2]
 				this.getGoodsList()
 				this.defaultCity = arr[1]
 				this.show = false
@@ -111,16 +114,14 @@
 		   	getGoodsList (){
 		   		
 		   		var params = {
-		   			"merchantNo": $("#merchantNo").val(),
-		   			"selectedDistrictId": $("#districtId").val()
+		   			"merchantNo": this.merchantNo,
+		   			"selectedDistrictId": this.districtId
 		   		}
-		   		console.log(params)
+		   	//	console.log(params)
 		   		homeApi.getGoods(params).then(res => {
-		   			//console.log(res)
 					if ( res.code == 0 ){
 						this.bannerImgList = res.response.bannerImgList
 						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++){
@@ -166,14 +167,15 @@
 		   	},
 		   	//获取默认地址信息
 		   	getdefaultAddress (){
-		   		console.log(123)
 		   		homeApi.getdefaultAddress().then(res => {
-		   			//console.log('默认地址信息',res)
+		   		//	console.log('默认地址信息',res)
 		   			if ( res.code == 0 ){
 		   				if ( !res.data ){
 		   					this.show = true
 		   				} else {
-		   					this.defaultCity = res.data.districtName
+		   					this.defaultCity = res.data.districtName || ''
+		   					this.districtId = res.data.districtId || ''
+		   					this.merchantNo = res.data.merchantNo || ''
 		   					this.addressValue = []
 		   					this.addressValue.push(res.data.provinceId)
 		   					this.addressValue.push(res.data.cityId)
@@ -191,7 +193,6 @@
 	      	this.getdefaultAddress()
 	      	this.getGoodsList()
 	      	this.getAddress()
-	      	
 		}
 	};
 </script>
@@ -237,12 +238,14 @@
 }
 .home .page-content {
 	background:rgba(255,255,255,1);
+	padding-bottom: 1rem;
 }
 .home .page-content .banner {
-	height: 2.56rem;
+	max-height: 2.56rem;
+	margin-bottom: 0.3rem;
 }
 .home .page-content .banner > div {
-	height: 2.56rem;
+	max-height: 2.56rem;
 }
 .home .page-content .banner a {
 	display: block;
@@ -255,11 +258,11 @@
 .swiper-img {
 	width: 100%;
 	height: 2.56rem;
-	background-size: cover;
-	background-position: center center;
+	background-size: 100% 100%;
 }
 .home .page-content .coupon {
 	margin-top: 0.3rem;
+	margin-bottom: 0.4rem;
 }
 .home .page-content .coupon img {
 	width:6.8rem;
@@ -267,10 +270,10 @@
 	margin: auto;
 }
 .home .page-content .new-card {
-	padding-bottom: 0.5rem;
+	/*padding-bottom: 0.5rem;*/
 }
 .home .page-content .new-card .new-card-top {
-	padding: 0.4rem 0 0.3rem;
+	padding: 0rem 0 0.3rem;
 }
 .home .page-content .new-card .new-card-top img {
 	width:7.1rem;
@@ -359,6 +362,13 @@
 	align-items: center;
 	justify-content: center;
 }
+.home .page-bottom {
+	width: 100%;
+	height: 1rem;
+	position: fixed;
+	bottom: 0;
+	background:rgba(255,255,255,1);
+}
 .picke-address .status-btn {
 	display: flex;
 	height: 0.8rem;
diff --git a/src/view/month-card.vue b/src/view/month-card.vue
index 7af7b71..84e51ce 100644
--- a/src/view/month-card.vue
+++ b/src/view/month-card.vue
@@ -95,7 +95,7 @@
                 '2': '满减券',
                 '3': '折扣券',
             },
-            batchNo: this.$route.query.batchNo,
+            batchNo: this.$route.query.batchNo || "CB180914060305419101",
         };
     },
     components: {
@@ -112,20 +112,17 @@
 
             // 回去优惠券信息
             couponModel.getCouponInfo(that.batchNo, token).then(function (result) {
-
-                console.log(result.response);
-              
-              that.loading = false;             
-
-              if (result.code == 0) {
-
-                that.getData = result.response
-
-              } else {
-
-                console.log(result.msg);
-
-              }
+            //    console.log("xx",result.response);
+              	that.loading = false;             
+              	if ( result.code == 0 ) {
+					if ( result.response.isLogin ){
+						that.sourceUser()
+					}
+                	that.getData = result.response
+
+              	} else {
+                	console.log(result.msg);
+              	}
             });
 
         },
@@ -150,14 +147,11 @@
             couponModel.giveCoupon(params,token).then(function (result) {
               
                 that.loading = false;              
-				console.log(result)
+				console.log("信息",result)
 				if (result.code === 0 || result.code === 3) {
-					
 				    window.history.go(0);
-//				    hide_layer(1);
 				} else if (result.code === 666) {
-				    alert("您还没登录，请先登录!");                    
-
+				    that.$vux.toast.text("您还没登录，请先登录!","middle");         
 				    setTimeout(function () {
 				        window.location.href = locationUrl + '/mall/web/user/login?callback=' + encodeURIComponent(window.location.href);
 				    }, 1000);
@@ -169,10 +163,9 @@
 				}
             });
 
-      },
+      	},
         sourceUser (){
         	var sourceUserId = this.$route.query.sourceUserId
-        	console.log("22",sourceUserId)
         	if ( sourceUserId ){
         		couponModel.sourceUser(sourceUserId).then(res => {
         			
@@ -194,7 +187,7 @@
 
         // 初始化
         this.handleInit();
-		this.sourceUser()
+		
     }
   }
 </script>
diff --git a/src/view/poster.vue b/src/view/poster.vue
index a79ce8c..2f0f891 100644
--- a/src/view/poster.vue
+++ b/src/view/poster.vue
@@ -1,15 +1,15 @@
 
 <template>
 	<div class="poster">
-		<!--<img class="weixin" src="../assets/images/poster/weixin.png" v-show="ImgFix" @click="ImgFix = false" />-->
-		<input type="hidden" id="merchantNo" th:value="${merchantNo}"/>
+		<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>
 			<i class="text" @click="show = true">{{defaultCity}}</i>
 		</div>
 		<div class="page-content">
-			<img class="poster-img" :src="imghost + imgSrc">
+			<img class="poster-img" v-if="imgSrc != ''" :src="imghost + imgSrc">
 			<button class="create-poster" @click="createPoster(1)">重新生成海报</button>	
 		</div>
 		
@@ -35,7 +35,10 @@
 			return {
 				show: false,
 				imgSrc: "",
-			//	ImgFix: false,
+				merchantNo: "", //商户编号
+				isAuthorize: false,
+				authorizeSrc : '',
+				ImgFix: true,
 				defaultCity: '天河区',
 				addressData: [],
 				addressValue: [],
@@ -53,6 +56,7 @@
 		methods: {
 			getCityName (){
 				let name = localStorage.getItem("cityName")||''
+				console.log(name)
 				if(!name){
 					return
 				}
@@ -61,12 +65,19 @@
 				let cityNameArr = arr[2].split('&')
 				let cityName = cityNameArr[1]
 				this.defaultCity = cityName
+				this.merchantNo = cityNameArr[2]
 				
 			},
 			getPoster (){
-				var merchantNo = $("#merchantNo").val()
+				var merchantNo = this.merchantNo
+				//console.log(merchantNo)
 				posterApi.getPoster(merchantNo).then(res => {
+					console.log("res",res)
 					if ( res.code == 0 ){
+						this.authorizeSrc = res.data.oauthUrl || ''
+						if ( res.data.hasOAuth == 1 ){
+							this.isAuthorize = true
+						}
 						
 		   				if ( res.data.imageUrl ){
 		   					this.imgSrc = res.data.imageUrl
@@ -74,7 +85,7 @@
 		   					if ( res.data.hasOAuth == 0 ){
 								location.href = res.data.oauthUrl
 								return
-							} else {
+							} else {							
 								createPoster()
 							}
 		   					
@@ -90,7 +101,12 @@
 				})
 			},
 			createPoster (status){
-				var merchantNo = $("#merchantNo").val()
+				console.log(111,this.authorizeSrc)
+				if ( !this.isAuthorize ){
+					location.href = this.authorizeSrc
+					return;
+				}
+				var merchantNo = this.merchantNo
 				posterApi.createPoster({"merchantNo":merchantNo}).then(res => {
 					if ( res.code == 0 ){
 						if ( status ){
@@ -111,11 +127,10 @@
 				let arr = this.addressValue[2].split('&')
 				this.defaultCity = arr[1]
 				this.show = false
-				$("#merchantNo").val(arr[2])
+				this.merchantNo = arr[2]
 			},
 			change (name) {
 		      	this.addressValue = name
-		      	
 		   	},
 			getAddress (){
 		   		homeApi.getAddress().then(res => {
@@ -132,11 +147,9 @@
 			}
 		},
 		mounted() {
-	      	window.onload=()=>{
-	      		this.getPoster();
-	      		this.getAddress()
-	      		this.getCityName()
-	      	}
+			this.getCityName()
+	      	this.getPoster();
+      		this.getAddress()		
 		}
 	};
 </script>
@@ -210,10 +223,10 @@
     display: block;
     margin-top: 0.5rem;
 }
-/*.weixin {
+.weixin {
 	width: 100%;
 	position: fixed;
 	z-index: 100;
-}*/
+}
 
 </style>
\ No newline at end of file
diff --git a/src/view/service-evaluation.vue b/src/view/service-evaluation.vue
index 41ecd09..f04bd51 100644
--- a/src/view/service-evaluation.vue
+++ b/src/view/service-evaluation.vue
@@ -44,6 +44,7 @@
             <textarea v-model="content" name="" id="" class="message" placeholder="您的宝贵意见，将帮助我们提升服务"></textarea>
             <button @click="submit" class="submitBtn">提交</button>
         </div>
+        
 
         <!--问题弹出框-->
         <!-- <div id="popup-question" class="popup-box" style="display:block">