bug修改

index.html

@@ -21,7 +21,8 @@
       window._AMapSecurityConfig = {
         //securityJsCode: "js秘钥",
         // serviceHost: 'https://wx.sjajk.com/_AMapService',
-		serviceHost: 'http://120.46.52.165/_AMapService',
+		// serviceHost: 'http://120.46.52.165/_AMapService',
+		serviceHost: 'http://192.168.2.222:8187/_AMapService',
       };
     </script>
     <!-- 高德 -->

manifest.json

@@ -184,11 +184,12 @@
                     "key" : "2acf1b8c3d1aaf0070472dec19018d96",
                     "securityJsCode" : "2b07c8496878c327a8ae7a19de33e2a7",
                     // "serviceHost" : "http://wx.sjajk.com/_AMapService"//生产需替换
-                    // "serviceHost" : "http://120.46.52.165/_AMapService"
+                    // "serviceHost" : "http://120.46.52.165/_AMapService",
-                    "serviceHost" : "http://192.168.2.222:8187/_AMapService"
+					"serviceHost" : "http://192.168.2.222:8187/_AMapService"
                 }
             }
         },
+        // "serviceHost" : "http://192.168.2.222:8187/_AMapService"
         // "serviceHost" : "http://47.75.182.93:8090/_AMapService"
         "template" : "index.html"
     }

pages/index/index.vue

@@ -448,6 +448,10 @@
 				this.getHomeArtificerList();
 				this.latitude = uni.getStorageSync('latitude')
 				this.longitude = uni.getStorageSync('longitude')
+			}else{
+				uni.navigateTo({
+					url: '/pages/public/login'
+				})
 			}
 			that.token = uni.getStorageSync('token');
 			// that.getKTCityList();

pages/my/index.vue

@@ -32,11 +32,11 @@
 						<span class="my-head-mian-bottom-list-text">优惠券</span>
 					</view>
 					<view class="my-head-mian-bottom-list">
-						<image src="../../static/my-juanma.png" mode=""></image>
+						<image src="../../static/my-juanma.png" mode="" @click="youhui()"></image>
 						<span class="my-head-mian-bottom-list-text">券码兑换</span>
 					</view>
 					<view class="my-head-mian-bottom-list">
-						<image src="../../static/my-jifen.png" mode=""></image>
+						<image src="../../static/my-jifen.png" mode="" @click="youhui()"></image>
 						<span class="my-head-mian-bottom-list-text">积分兑换</span>
 					</view>
 				</view>
@@ -130,10 +130,12 @@
 					{urlImg:'../../static/my-gong-7.png',text:'设置中心',link:'/my/setting/index'},
 					{urlImg:'../../static/my-gong-8.png',text:'浏览历史',link:'/pages/my/historyMy'},
 					{urlImg:'../../static/my-gong-9.png',text:'我的团队',link:'/pages/my/myteam'},
-				]
+				],
+				token:''
 			}
 		},
 		onLoad(e) {
+			this.token = uni.getStorageSync('token');
 			this.XCXIsSelect = this.$queue.getData("XCXIsSelect");
 			if (e.money && e.couponnum) {
 				this.money = e.money;
@@ -323,7 +325,6 @@
 				}
 			},
 			goNav(e, name) {
-				console.log(e)
 				if (this.userId) {
 					uni.navigateTo({
 						url: e
@@ -435,40 +436,110 @@
 				});
 			},
 			chonghi(link){//我的钱包
-				if(link=='充值'){
+				if (this.userId) {
-					uni.navigateTo({
+					if(link=='充值'){
-						url:'/my/wallet/index?text='+'my'
+						uni.navigateTo({
-					})
+							url:'/my/wallet/index?text='+'my'
-				}else{
+						})
-					uni.navigateTo({
+					}else{
-						url:'/my/wallet/mymoneydetail'
+						uni.navigateTo({
+							url:'/my/wallet/mymoneydetail'
+						})
+					}
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '您还未登录,请先登录',
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
 					})
 				}
 			
+				
+				
 			},
 			youhui(link){//优惠劵，券码兑换，积分兑换 跳页
+				if (this.userId) {
 					uni.navigateTo({
 						url:link
 					})
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '您还未登录,请先登录',
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					})
+				}
 			},
 			useToUrl(item){//常用功能跳转页面
 				var link=item.link
+				if (this.userId) {
 					uni.navigateTo({
 						url:link
 					})
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '您还未登录,请先登录',
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					})
+				}
 			},
 			meServe(item){
-				if(item=="服务套餐"){
+				if (this.userId) {
-					uni.navigateTo({
+					if(item=="服务套餐"){
-						url:'/pages/my/servicePackage'
+						uni.navigateTo({
-					})
+							url:'/pages/my/servicePackage'
-				}else if(item=="项目次卡"){
+						})
-					uni.navigateTo({
+					}else if(item=="项目次卡"){
-						url:'/pages/my/cika'
+						uni.navigateTo({
-					})
+							url:'/pages/my/cika'
-				}else if(item=="服务疗程"){
+						})
-					uni.navigateTo({
+					}else if(item=="服务疗程"){
-						url:'/pages/my/fuwuliaocheng'
+						uni.navigateTo({
+							url:'/pages/my/fuwuliaocheng'
+						})
+					}
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '您还未登录,请先登录',
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
 					})
 				}
 			},

pages/therapist/therapist.vue

@@ -342,7 +342,8 @@ import permision from "@/components/permission.js";
 				massageTypeId: null,
 				currentMarkerIndex: -1,
 				showPopup: false,
-				dataIndex:''
+				dataIndex:'',
+				userId:''
 			}
 		},
 
@@ -410,7 +411,12 @@ import permision from "@/components/permission.js";
 			that.city = uni.getStorageSync('city') ? uni.getStorageSync('city') : '请选择城市'
 			that.getTpCount();
 			that.getTpMy();
-			
+			that.userId = uni.getStorageSync('userId')
+			if (!this.userId) {
+				uni.navigateTo({
+					url: '/pages/public/login'
+				})
+			}
 			that.token = uni.getStorageSync('token')
 			if (uni.getStorageSync('token')) {
 				if (that.latitude && that.longitude) {