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

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

@@ -279,12 +279,21 @@ export default {
 		},
 		//领劵
 		getCoupon() {
+			console.log(uni.getStorageSync('is_focus'),'-*-*-*-*-');
 			if (!uni.getStorageSync('token')) {
 				this.$loginCustom(1);
 			} else {
-				uni.navigateTo({
-					url: 'coupon/coupon'
-				});
+				if (!uni.getStorageSync('is_focus')) {
+					uni.navigateTo({
+						url: '/pages/home/coupon/coupon'
+					});
+				} else {
+					console.log(0);
+					uni.showToast({
+						title: '已关注,请到我的优惠券查看优惠券',
+						icon: 'none'
+					});
+				}
 			}
 		}
 	}