up

pages/activity/book.vue

@@ -350,41 +350,43 @@
 			this.form.type = (options.type == 'user' ? 2 : 1);
 			this.form.activity_id = parseInt(options.activity_id);
 			this.form.activity_number_id = parseInt(options.activity_number_id);
-			var that = this;
+			
-			wx.getStorage({
+		},
-				key: 'activityinfo',
+		onShow(){
-				success(res) {
+			var that = this;
-					that.list = res.data;
+			that.numberlist={};
-					console.log(that.list)
+			wx.getStorage({
-					for (var m of that.list.numbers) {
+				key: 'activityinfo',
-						if (that.form.activity_number_id == m.id) {
+				success(res) {
-							that.numberlist = m
+					that.list = res.data;
-						}
+					for (var m of that.list.numbers) {
-					}
+						if (that.form.activity_number_id == m.id) {
-					console.log(that.numberlist)
+							that.numberlist = m
-					if (that.form.type == 2) {
+						}
-						that.form.total = 1
+					}
-					} else if (that.form.type == 1) {
+					if (that.form.type == 2) {
-						that.form.total = 1;//res.data.team_min_count;
+						that.form.total = 1
-					}
+					} else if (that.form.type == 1) {
-				}
+						that.form.total = 1;//res.data.team_min_count;
-			})
+					}
-
+				}
-			//先登录
+			})
-			that.util.getOpenidInfo(function(res) {
+			
-				//手机号
+			//先登录
-				that.util.getUserInfo(function(r) {
+			that.util.getOpenidInfo(function(res) {
-					//如果手机号为空 需要先授权手机号
+				//手机号
-					if (that.util.isNull(r.mobile)) {
+				that.util.getUserInfo(function(r) {
-						that.showAuthorization = true;
+					//如果手机号为空 需要先授权手机号
-					} else {
+					if (that.util.isNull(r.mobile)) {
-						that.showAuthorization = false;
+						that.showAuthorization = true;
-						that.form.mobile = r.mobile;
+					} else {
-					}
+						that.showAuthorization = false;
-				}, true);
+						that.form.mobile = r.mobile;
-				that.loadCommonUser()
+					}
-
+				}, true);
-			}, true);
+				that.loadCommonUser()
+			
+			}, true);
 		},
 		onHide() {
 			clearInterval(this.t)

pages/activity/info.vue

@@ -141,16 +141,21 @@
 		},
 		onLoad(options) {
 			var that = this;
-			that.id = options.id;
+			that.id = options.id;
-			wx.getLocation({
+			
-				success(res) {
+
-					console.log(res)
+		},
-					that.latitude = res.latitude;
+		onShow(){
-					that.longitude = res.longitude;
+			var that = this;
-					that.loadActiveInfo()
+			that.numbers=[];
-				}
+			wx.getLocation({
-			})
+				success(res) {
-
+					console.log(res)
+					that.latitude = res.latitude;
+					that.longitude = res.longitude;
+					that.loadActiveInfo()
+				}
+			})
 		},
 		onShareAppMessage() {
 			return {

utils/util.js

@@ -1,6 +1,6 @@
 import md5 from "./md5.min";
 const HOSTARR = {
-	'development':'https://leyitest.ali251.langye.net',
+	'development':'https://leyitest.ali251.langye.net',//'https://leyiyuyue.szgmbwg.org.cn',//
 	'production': 'https://leyiyuyue.szgmbwg.org.cn'
 }; // 审核状态