diff --git a/App.vue b/App.vue
index 0fbe8c1..81c60bd 100644
--- a/App.vue
+++ b/App.vue
@@ -55,7 +55,16 @@
 			});
 		},
 
-		onShow: function() {
+		onShow: function(e) {
+			console.log(e.query.code)
+			if(e && e.query.code){   //h5微信公众号登录返回的code
+				let code = e.query.code
+				this.$queue.setData('wxCode', code);
+			}
+			if(e && e.query.latng){   //h5公众号地图选点返回的经纬度
+				this.$queue.setData('latH', e.query.latng.split(',')[0]);
+				this.$queue.setData('lngH', e.query.latng.split(',')[1]);
+			}
 		},
 		onHide: function() {}
 	};
diff --git a/common/config.js b/common/config.js
index abd7d86..11d164b 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,6 +1,6 @@
 // const ROOTPATH1 = "http://10.11.32.109:8891/sqx_fast";
-const ROOTPATH1 = "http://10.11.32.107:8891/sqx_fast";
-// const ROOTPATH1 = "http://waimai.n.gznl.top/sqx_fast";
+// const ROOTPATH1 = "http://10.11.32.107:8891/sqx_fast";
+const ROOTPATH1 = "http://waimai.admin.service.yiqihuiju.com/sqx_fast";
 const ROOTPATH = "https://bwc.xianmxkj.com/sqx_fast";
 module.exports = {
     APIHOST: ROOTPATH,
diff --git a/main.js b/main.js
index a232aa8..b0461d8 100644
--- a/main.js
+++ b/main.js
@@ -27,6 +27,8 @@ Vue.config.productionTip = false
 Vue.prototype.$Request = HttpRequest;
 Vue.prototype.$queue = queue;
 
+Vue.prototype.$WechatUrl = 'http://waimai.admin.service.yiqihuiju.com';
+
 Vue.prototype.$Sysconf = HttpRequest.config;
 Vue.prototype.$SysCache = HttpCache;
 Vue.mixin(share)
diff --git a/manifest.json b/manifest.json
index 589de20..38a65bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -166,7 +166,7 @@
     },
     "h5" : {
         "title" : "惠聚",
-        "domain" : "https://bwc.xianmxkj.com",
+        "domain" : "http://waimai.admin.service.yiqihuiju.com",
         "router" : {
             "mode" : "history"
         },
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2df0d39..39e4bb7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -4,7 +4,7 @@
 			<view class="header">
 				<view class="nav">
 					<view class="navLeft" @tap="goSelectCity">
-						<view class="localName">{{ city }}</view>
+						<view class="localName">{{ localCampus }}</view>
 						<image src="../../static/img/home/xia.png" style="width: 20rpx;height: 14rpx;"></image>
 						<!-- <text class="cuIcon-unfold"></text> -->
 					</view>
@@ -134,9 +134,6 @@
 		},
 		onLoad(e) {
 			let that = this;
-			// #ifdef H5
-			that.initMyPosition();
-			// #endif
 			if (e.userByinvitationId) {
 				this.$queue.setData('userByinvitationId', e.userByinvitationId);
 			}
@@ -215,6 +212,7 @@
 			let that = this;
 			var city = this.$queue.getData('city');
 			var localCampus = this.$queue.getData('localCampus');
+			console.log(localCampus)
 			if (city && localCampus) {
 				console.log(city)
 				this.latitude = this.$queue.getData('latitude');
@@ -225,6 +223,10 @@
 				this.page = 1;
 				this.getHaoDianTuiJian1();
 				this.getHaoDianTuiJian();
+			} else{
+				// #ifdef H5
+				that.initMyPosition();
+				// #endif
 			}
 			
 			let userId = this.$queue.getData('userId');
@@ -506,12 +508,14 @@
 			},
 			//微信公众号获取地理位置
 			wxGetLocation(){
+				var that = this;
 				var pageUrl = encodeURIComponent(window.location.href);
 				jweixin.wxGetLocation(pageUrl).then((result)=>{
 					let str = `output=jsonp&location=${result.latitude},${result.longitude}&key=LH3BZ-NYN62-2SIUW-CGKY5-K5MXT-FWFOI`
 					this.$jsonp('https://apis.map.qq.com/ws/geocoder/v1/?'+str).then(res=>{
 					  uni.hideLoading();
 					  if(res.status == 0){
+							console.log(res)
 						  that.setLocation(result.latitude, result.longitude, res)
 					  }
 					})
@@ -699,7 +703,7 @@
 				});
 				//#endif
 				//#ifdef H5
-				window.location.href = 'http://waimai.n.gznl.top/sqx_fast/appLogin/wechatLogin';
+				window.location.href = this.$WechatUrl + '/sqx_fast/appLogin/wechatLogin';
 				//#endif
 			},
 			navClick: function(res) {
diff --git a/pages/index/selectCampus.vue b/pages/index/selectCampus.vue
index ef3c368..465bf91 100644
--- a/pages/index/selectCampus.vue
+++ b/pages/index/selectCampus.vue
@@ -28,6 +28,7 @@
 
 <script>
 	import ZhToPinYin from '@/js_sdk/tui-zh-pinyin/tui-zh-pinyin.js';
+	import jweixin from '@/common/jweixin.js'
 	var QQMapWX = require('@/js_sdk/qqmap-wx-jssdk1.2/qqmap-wx-jssdk.js');
 	var qqmapsdk;
 	// #ifdef MP-WEIXIN
@@ -51,6 +52,11 @@
 		},
 		onLoad: function(options) {
 			const that = this;
+			var city = this.$queue.getData("city")
+			console.log(this.$queue.getData("city"))
+			if (city != '') {
+				this.city = city
+			}
 			// #ifdef MP-WEIXIN
 			// 实例化API核心类
 			qqmapsdk = new QQMapWX({
@@ -73,12 +79,29 @@
 				 this.$queue.setData('localCampus', item.name);
 			}
 			//#endif
-			
-			var city = this.$queue.getData("city")
-			console.log(this.$queue.getData("city"))
-			if (city != '') {
-				this.city = city
+			//#ifdef H5
+			let lat = this.$queue.getData("latH")
+			let lng = this.$queue.getData("lngH")
+			console.log(lat,'latlatlatlat')
+			if(lat){
+				let str = `output=jsonp&location=${lat},${lng}&key=LH3BZ-NYN62-2SIUW-CGKY5-K5MXT-FWFOI`
+				this.$jsonp('https://apis.map.qq.com/ws/geocoder/v1/?'+str).then(res=>{
+				  if(res.status == 0){
+					 console.log(res,'resresresresres')
+					 this.latitude = res.result.location.lat;
+					 this.longitude = res.result.location.lng;
+					 this.weizhi.names = res.result.formatted_addresses.recommend;
+					 this.weizhi.dizhi = res.result.address
+					 this.city = res.result.address_component.city
+					 this.$queue.setData('latitude', this.latitude);
+					 this.$queue.setData('longitude', this.longitude);
+					 this.$queue.setData('city', res.result.address_component.city);
+					 this.$queue.setData('localCampus', res.result.formatted_addresses.recommend);
+				  }
+				})
 			}
+			//#endif
+			
 		},
 		methods: {
 			gocity() {
@@ -95,11 +118,14 @@
 			},
 			saveAddress() {
 				console.log("this.city____:" + this.city)
+				console.log("this.this.weizhi.names:" + this.weizhi.names)
 				this.$queue.setData('latitude', this.latitude);
 				this.$queue.setData('longitude', this.longitude);
 				this.$queue.setData('city', this.city);
-				this.$queue.setData('localCampus', this.weizhi.names);
-				uni.navigateBack();
+				// this.$queue.setData('localCampus', this.weizhi.names);
+				uni.switchTab({
+					url: '/pages/index/index'
+				})
 			},
 			initLocation(latitude, longitude) {
 				var that = this;
@@ -127,6 +153,7 @@
 			},
 			dingwei() {
 				const that = this;
+				//#ifdef MP-WEIXIN
 				uni.chooseLocation({
 					success: function(res) {
 						console.log(res)
@@ -145,6 +172,12 @@
 						}
 					}
 				});
+				//#endif
+				//#ifdef H5
+				var pageUrl = window.location.href;
+				var url1 = `https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=${pageUrl}&key=LH3BZ-NYN62-2SIUW-CGKY5-K5MXT-FWFOI&referer=myapp`
+				location.href= url1;
+				//#endif
 			}
 		}
 	}
diff --git a/pages/index/taskDetail.vue b/pages/index/taskDetail.vue
index 1e047b9..ad75494 100644
--- a/pages/index/taskDetail.vue
+++ b/pages/index/taskDetail.vue
@@ -747,7 +747,7 @@
 				});
 				//#endif
 				//#ifdef H5
-				window.location.href = 'http://waimai.n.gznl.top/sqx_fast/appLogin/wechatLogin';
+				window.location.href = 'http://waimai.admin.service.yiqihuiju.com/sqx_fast/appLogin/wechatLogin';
 				//#endif
 			},
 		}
diff --git a/pages/index/tuijianList.vue b/pages/index/tuijianList.vue
index 0e96764..1ce8e57 100644
--- a/pages/index/tuijianList.vue
+++ b/pages/index/tuijianList.vue
@@ -134,7 +134,7 @@
 				});
 				//#endif
 				//#ifdef H5
-				window.location.href = 'http://waimai.n.gznl.top/sqx_fast/appLogin/wechatLogin';
+				window.location.href = 'http://waimai.admin.service.yiqihuiju.com/sqx_fast/appLogin/wechatLogin';
 				//#endif
 			},
 			goDetail(nav) {
diff --git a/pages/my/channelshop.vue b/pages/my/channelshop.vue
index 2536447..f7b2f61 100644
--- a/pages/my/channelshop.vue
+++ b/pages/my/channelshop.vue
@@ -44,7 +44,7 @@
 				});
 				//#endif
 				//#ifdef H5
-				window.location.href = 'http://waimai.n.gznl.top/sqx_fast/appLogin/wechatLogin';
+				window.location.href = 'http://waimai.admin.service.yiqihuiju.com/sqx_fast/appLogin/wechatLogin';
 				//#endif
 			},
 			clickItem: function(options) {
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 6a9457e..77d8e22 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -665,7 +665,7 @@
 				});
 				//#endif
 				//#ifdef H5
-				window.location.href = 'http://waimai.n.gznl.top/sqx_fast/appLogin/wechatLogin';
+				window.location.href = this.$WechatUrl + '/sqx_fast/appLogin/wechatLogin';
 				//#endif
 			},
 			//退出登录
diff --git a/pages/my/myVIP.vue b/pages/my/myVIP.vue
index 443a68d..5021284 100644
--- a/pages/my/myVIP.vue
+++ b/pages/my/myVIP.vue
@@ -173,7 +173,7 @@
 				});
 				//#endif
 				//#ifdef H5
-				window.location.href = 'http://waimai.n.gznl.top/sqx_fast/appLogin/wechatLogin';
+				window.location.href = 'http://waimai.admin.service.yiqihuiju.com/sqx_fast/appLogin/wechatLogin';
 				//#endif
 			},
 			btns() {
diff --git a/pages/my/mychannel.vue b/pages/my/mychannel.vue
index 4f7d7d1..e4bc2ae 100644
--- a/pages/my/mychannel.vue
+++ b/pages/my/mychannel.vue
@@ -48,7 +48,7 @@
 				});
 				//#endif
 				//#ifdef H5
-				window.location.href = 'http://waimai.n.gznl.top/sqx_fast/appLogin/wechatLogin';
+				window.location.href = 'http://waimai.admin.service.yiqihuiju.com/sqx_fast/appLogin/wechatLogin';
 				//#endif
 			}
 		}
diff --git a/pages/my/shareFriends.vue b/pages/my/shareFriends.vue
index 15d8272..dddb8fe 100644
--- a/pages/my/shareFriends.vue
+++ b/pages/my/shareFriends.vue
@@ -179,7 +179,7 @@
 				});
 				//#endif
 				//#ifdef H5
-				window.location.href = 'http://waimai.n.gznl.top/sqx_fast/appLogin/wechatLogin';
+				window.location.href = 'http://waimai.admin.service.yiqihuiju.com/sqx_fast/appLogin/wechatLogin';
 				//#endif
 			},
 			showModal() {
diff --git a/pages/my/teamList.vue b/pages/my/teamList.vue
index 77107c6..bd0a7c5 100644
--- a/pages/my/teamList.vue
+++ b/pages/my/teamList.vue
@@ -55,7 +55,7 @@
 				});
 				//#endif
 				//#ifdef H5
-				window.location.href = 'http://waimai.n.gznl.top/sqx_fast/appLogin/wechatLogin';
+				window.location.href = 'http://waimai.admin.service.yiqihuiju.com/sqx_fast/appLogin/wechatLogin';
 				//#endif
 			}
 		}
diff --git a/pages/order/index.vue b/pages/order/index.vue
index c9adadd..9b01014 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -209,7 +209,7 @@
 				});
 				//#endif
 				//#ifdef H5
-				window.location.href = 'http://waimai.n.gznl.top/sqx_fast/appLogin/wechatLogin';
+				window.location.href = 'http://waimai.admin.service.yiqihuiju.com/sqx_fast/appLogin/wechatLogin';
 				//#endif
 			},
 			goDetail(id) {
diff --git a/pages/task/search.vue b/pages/task/search.vue
index 338dbeb..ea4710c 100644
--- a/pages/task/search.vue
+++ b/pages/task/search.vue
@@ -67,7 +67,7 @@
 				});
 				//#endif
 				//#ifdef H5
-				window.location.href = 'http://waimai.n.gznl.top/sqx_fast/appLogin/wechatLogin';
+				window.location.href = 'http://waimai.admin.service.yiqihuiju.com/sqx_fast/appLogin/wechatLogin';
 				//#endif
 			},
 			rtBubble() {
diff --git a/pages/task/tasklist.vue b/pages/task/tasklist.vue
index dc42bdd..be155f4 100644
--- a/pages/task/tasklist.vue
+++ b/pages/task/tasklist.vue
@@ -122,7 +122,7 @@
 				});
 				//#endif
 				//#ifdef H5
-				window.location.href = 'http://waimai.n.gznl.top/sqx_fast/appLogin/wechatLogin';
+				window.location.href = 'http://waimai.admin.service.yiqihuiju.com/sqx_fast/appLogin/wechatLogin';
 				//#endif
 			},
 			// 切换
diff --git a/wsl.txt b/wsl.txt
new file mode 100644
index 0000000..d271e76
--- /dev/null
+++ b/wsl.txt
@@ -0,0 +1 @@
+rsync -r ./ root@39.105.46.0:/root/html/huiju_h5
\ No newline at end of file