zhongtianhaoyuan há 2 anos atrás
pai
commit
335a616684
5 ficheiros alterados com 102 adições e 49 exclusões
  1. 2 2
      config/index.js
  2. 9 0
      pages.json
  3. 64 45
      pages/goodSource/index.vue
  4. 3 2
      pages/public/register.vue
  5. 24 0
      pages/sale/webview.vue

+ 2 - 2
config/index.js

@@ -1,8 +1,8 @@
 const dev = {
-	baseUrlNew: 'https://api.changyuntong56.com',
+	// baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.110.67:8999',
 	h5Appid: 'wxb66b599f7f61b46f',

+ 9 - 0
pages.json

@@ -195,6 +195,15 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/sale/webview",
+			"style": {
+				// #ifdef MP 
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": ""
+				// #endif 
+			}
+		},
 		{
 			"path": "pages/riders/notice",
 			"style": {

+ 64 - 45
pages/goodSource/index.vue

@@ -406,51 +406,70 @@
 					var main = plus.android.runtimeMainActivity();
 					var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
 					if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
-						uni.showModal({
-							title: '提示',
-							content: '请打开定位服务功能',
-							// showCancel: false, // 不显示取消按钮
-							success(res) {
-								if (res.confirm) {
-									uni.setStorageSync('confirm_location', 1)
-									if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
-
-										var Intent = plus.android.importClass('android.content.Intent');
-										var Settings = plus.android.importClass('android.provider.Settings');
-										var intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-										main.startActivity(intent); // 打开系统设置GPS服务页面
-									} else {
-										uni.setStorageSync('fPlaceObj', {
-											fchoosearea: '全部',
-											fchoosecity: '市辖区',
-											fchooseprovince: '北京',
-											selected: '东城'
-										})
-										uni.setStorageSync('sPlaceObj', {
-											schoosearea: '请选择区',
-											schoosecity: '请选择市',
-											schooseprovince: '全国',
-											selected: '全国'
-										})
-										uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
-									}
-								} else {
-									uni.setStorageSync('fPlaceObj', {
-										fchoosearea: '全部',
-										fchoosecity: '市辖区',
-										fchooseprovince: '北京',
-										selected: '东城'
-									})
-									uni.setStorageSync('sPlaceObj', {
-										schoosearea: '请选择区',
-										schoosecity: '请选择市',
-										schooseprovince: '全国',
-										selected: '全国'
-									})
-									uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
-								}
-							}
-						});
+						// uni.showModal({
+						// 	title: '提示',
+						// 	content: '请打开定位服务功能',
+						// 	// showCancel: false, // 不显示取消按钮
+						// 	success(res) {
+						// 		if (res.confirm) {
+						// 			uni.setStorageSync('confirm_location', 1)
+						// 			if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
+
+						// 				var Intent = plus.android.importClass('android.content.Intent');
+						// 				var Settings = plus.android.importClass('android.provider.Settings');
+						// 				var intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+						// 				main.startActivity(intent); // 打开系统设置GPS服务页面
+						// 			} else {
+						// 				uni.setStorageSync('fPlaceObj', {
+						// 					fchoosearea: '全部',
+						// 					fchoosecity: '市辖区',
+						// 					fchooseprovince: '北京',
+						// 					selected: '东城'
+						// 				})
+						// 				uni.setStorageSync('sPlaceObj', {
+						// 					schoosearea: '请选择区',
+						// 					schoosecity: '请选择市',
+						// 					schooseprovince: '全国',
+						// 					selected: '全国'
+						// 				})
+						// 				uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
+						// 			}
+						// 		} else {
+						// 			uni.setStorageSync('fPlaceObj', {
+						// 				fchoosearea: '全部',
+						// 				fchoosecity: '市辖区',
+						// 				fchooseprovince: '北京',
+						// 				selected: '东城'
+						// 			})
+						// 			uni.setStorageSync('sPlaceObj', {
+						// 				schoosearea: '请选择区',
+						// 				schoosecity: '请选择市',
+						// 				schooseprovince: '全国',
+						// 				selected: '全国'
+						// 			})
+						// 			uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
+						// 		}
+						// 	}
+						// });
+						uni.setStorageSync('fPlaceObj', {
+							fchoosearea: '全部',
+							fchoosecity: '市辖区',
+							fchooseprovince: '北京',
+							selected: '东城'
+						})
+						uni.setStorageSync('sPlaceObj', {
+							schoosearea: '请选择区',
+							schoosecity: '请选择市',
+							schooseprovince: '全国',
+							selected: '全国'
+						})
+						if (uni.getStorageSync('fPlaceObj')) {
+							that.startPlace = uni.getStorageSync('fPlaceObj');
+						}
+						if (uni.getStorageSync('sPlaceObj')) {
+							that.endPlace = uni.getStorageSync('sPlaceObj');
+						}
+						uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
 					} else {
 						this.getLngLat()
 					}

+ 3 - 2
pages/public/register.vue

@@ -54,11 +54,12 @@
 					width="17px" height="17px"></u--image>
 				已阅读并同意
 				<navigator
-					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
+					url="/pages/sale/webview?can_share=false&url=http://liangxin.zthymaoyi.com/cytUserAgreement.html"
 					class="path" hover-class="navigator-hover">《服务协议》</navigator>和<navigator
-					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html"
+					url="/pages/sale/webview?can_share=false&url=http://liangxin.zthymaoyi.com/cytScrectAgreement.html"
 					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
 			</view>
+			
 		</view>
 	</view>
 </template>

+ 24 - 0
pages/sale/webview.vue

@@ -0,0 +1,24 @@
+<template>
+    <web-view :src="url"></web-view>
+</template>
+
+<script>
+	export default {
+        data() {
+            return {
+                url:""
+            }
+        },
+        onLoad(option) {
+            this.url = option.url;
+        },
+        methods: {
+        }
+    }
+</script>
+    
+
+
+<style>
+
+</style>