Merge branch 'master' of http://114.215.101.231:8099/jiashaokang/xidejiuApp into xide_duxiaotian

@@ -94,5 +94,5 @@
             "https" : true
             "https" : true
         }
         }
     },
     },
-    "appid" : "__UNI__E30DA7B"
+    "appid" : "__UNI__B8180DC"
 }
 }

@@ -5,6 +5,7 @@
 				<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" inactive-color="#969799" active-color="#3E554E"
 				<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" inactive-color="#969799" active-color="#3E554E"
 					bar-width="90" bar-height="3" gutter="163" :current="Tabcurrent" @change="change"></u-tabs-swiper>
 					bar-width="90" bar-height="3" gutter="163" :current="Tabcurrent" @change="change"></u-tabs-swiper>
 			</view>
 			</view>
+			
 			<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
 			<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
 				<swiper-item class="swiper-item">
 				<swiper-item class="swiper-item">
 					<!-- 第一部分 -->
 					<!-- 第一部分 -->
@@ -183,7 +184,6 @@
 
 
 <script>
 <script>
 	export default {
 	export default {
-
 		data() {
 		data() {
 			return {
 			return {
 				isMyYouHui:false,
 				isMyYouHui:false,
@@ -232,36 +232,6 @@
 					url: "../../home/home"
 					url: "../../home/home"
 				})
 				})
 			},
 			},
-			//请求我的优惠卷接口
-			// First_rqs_MyYouhuiData() {
-			// 	let data = {
-			// 		status: this.status,
-			// 		page: this.page,
-			// 	}
-			// 	this.$rqs("/api/coupon/getUserCoupon2", data).then(res => {
-			// 		console.log(res, "+++++++");
-			// 		//整理后台返回数据
-			// 		this.houtaiYouhuiArry = res.data.data; //houtaiYouhuiArry是后台数据
-			// 		let current_page = res.data.data.current_page //当前页 page1 可以
-			// 		let last_page = res.data.data.last_page //最后页 值是2
-			// 		let houtaiYouhuiData = res.data.data.data //渲染的数据
-			// 		houtaiYouhuiData.forEach(item => {
-			// 			item.price = parseInt(item.price);
-			// 			item.bottom_price = parseInt(item.bottom_price)
-			// 			let d = new Date(item.end_time * 1000);
-			// 			item.end_time = (d.getFullYear()) + "." + (d.getMonth() + 1) + "." + (d
-			// 				.getDate()) + '到期'
-			// 		})
-			// 		// price = parseInt(price)
-			// 		console.log(houtaiYouhuiData);
-			// 		console.log(houtaiYouhuiData);
-			// 		console.log(houtaiYouhuiData);
-			// 		this.houtaiYouhuiData = houtaiYouhuiData; //赋值操作
-			// 	})
-			// },
-			shouQuan() {
-
-			},
 			//后台接口调用
 			//后台接口调用
 			youHujuanDataOne(s, p) {
 			youHujuanDataOne(s, p) {
 				console.log(p);
 				console.log(p);

@@ -144,7 +144,7 @@
 						let that = this;
 						let that = this;
 						console.log("点击了入会");
 						console.log("点击了入会");
 						that.show = !that.show;
 						that.show = !that.show;
-					}else{
+					}else if(name == 2 && e == 1){
 						uni.showToast({
 						uni.showToast({
 							title: "已经入会，请在我的优惠卷中查看",
 							title: "已经入会，请在我的优惠卷中查看",
 							icon: 'none'
 							icon: 'none'
@@ -178,7 +178,12 @@
 									icon: "none"
 									icon: "none"
 								})
 								})
 							}else{
 							}else{
-								
+								if(res.data.code == 0){
+									uni.showToast({
+										title:res.data.msg,
+										icon:"error"
+									})
+								}
 							}
 							}
 						})
 						})
 					}else if(name == 1 && e == 1){
 					}else if(name == 1 && e == 1){

@@ -26,7 +26,7 @@ import Login from '../login.js'
 //  onShow中调用 this.$loginCustom(0)  (0 可省略) 
 //  onShow中调用 this.$loginCustom(0)  (0 可省略) 
 // 点击事件 this.$loginCustom(1).then(res ={登录成功后所需执行操作})
 // 点击事件 this.$loginCustom(1).then(res ={登录成功后所需执行操作})
 export const loginCustom = (e) => {
 export const loginCustom = (e) => {
-	let point = e || 0;
+	let point = e || 0;//声明变量获取是否点击 e=1=>点击
 	let code = Login.getUrlCode('code'); // 截取code
 	let code = Login.getUrlCode('code'); // 截取code
 	if (code && !uni.getStorageSync('token')) {
 	if (code && !uni.getStorageSync('token')) {
 		let data = {
 		let data = {