Merge branch 'master' of http://123.60.98.226:3000/chenkainan/changshu

manifest.json

@@ -43,7 +43,13 @@
             /* ios打包配置 */
             "ios" : {},
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "geolocation" : {
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                }
+            }
         }
     },
     /* 快应用特有相关 */

pages/index/index.vue

@@ -173,7 +173,7 @@
 					{
 						title: '电影购票',
 						img: 'https://static.ticket.sz-trip.com/changshu/images/index/dygp.png',
-						// url: 'https://m.cloud.sz-trip.com/MoviesChangShu',
+						url: 'https://m.cloud.sz-trip.com/MoviesChangShu',
 					},
 					{
 						title: '场馆预约',

subPackages/webPage/webPage.vue

@@ -58,13 +58,37 @@ export default {
 				  .map(([key, value]) => `${(key)}=${(value)}`)
 				  .join('&');
 				
-				const fullUrl = `${baseUrl}?${queryString}`;
+				let location = uni.getStorageSync('location')
+				if (location) {
+					queryString+=`&lon=${location.lon}&lat=${location.lat}`
+					let fullUrl = `${baseUrl}?${queryString}`;
 					console.log(fullUrl);
+					this.url = fullUrl
+				} else {
+					uni.getLocation({
+						success: data => {
+							uni.setStorageSync('location', {
+								lat: data.latitude,
+								lon: data.longitude
+							});
+							queryString+=`&lon=${data.longitude}&lat=${data.latitude}`
+							let fullUrl = `${baseUrl}?${queryString}`;
+							console.log(fullUrl);
+							this.url = fullUrl
 							
+						},
+						fail: res=> {
+							let fullUrl = `${baseUrl}?${queryString}`;
+							console.log(fullUrl, '获取定位失败', res);
 							this.url = fullUrl
 						}
 					})
 				}
+				
+				
+			}
+		})
+	}
   },
   methods: {
 	  handleJDSZ (url) {
@@ -80,9 +104,33 @@ export default {
 				  .map(([key, value]) => `${(key)}=${(value)}`)
 				  .join('&');
 				  
-				const fullUrl = `${baseUrl}?${queryString}`;
+				let location = uni.getStorageSync('location')
+				if (location) {
+					queryString+=`&lon=${location.lon}&lat=${location.lat}`
+					let fullUrl = `${baseUrl}?${queryString}`;
 					console.log(fullUrl);
 					this.url = fullUrl
+				} else {
+					uni.getLocation({
+						success: data => {
+							uni.setStorageSync('location', {
+								lat: data.latitude,
+								lon: data.longitude
+							});
+							queryString+=`&lon=${data.longitude}&lat=${data.latitude}`
+							let fullUrl = `${baseUrl}?${queryString}`;
+							console.log(fullUrl);
+							this.url = fullUrl
+							
+						},
+						fail: res=> {
+							let fullUrl = `${baseUrl}?${queryString}`;
+							console.log(fullUrl, '获取定位失败', res);
+							this.url = fullUrl
+						}
+					})
+				}
+				
 		  	}
 		  }).finally(()=>{
 			this.saveUrl = url