Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

App.vue

@@ -295,7 +295,6 @@
 			// #ifdef APP-PLUS
 			var that = this
 			//判断该用户是否需要开启持续定位
-			console.log("onlaunch11111111",uni.getStorageSync('userInfo'))
 			if (uni.getStorageSync('userInfo')) {
 				this.$request.baseRequest('get', '/orderInfo/getData', {
 					commonId: uni.getStorageSync('userInfo').id,

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',

pages.json

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

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()
 					}
@@ -501,7 +520,6 @@
 			confirmClick() {
 				let item = this.ObjSelect
 				var that = this
-
 				let _obj = {
 					driverCommonId: that.driverCommonId,
 					commonId: item.commonId,
@@ -528,6 +546,7 @@
 					goodsType: item.goodsType,
 					goodsTypeKey: item.goodsTypeKey
 				}
+				console.log("查看抢单",_obj)
 				that.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
 						if (res.code == 200) {
 							that.$refs.uToast.show({

pages/goodSource/shippingDetails.vue

@@ -319,7 +319,7 @@
 						commonId: item.commonId,
 						id: item.id,
 						compId: item.compId,
-						cargoOwnerName: item.cargoOwnerReallyName,
+						cargoOwnerName: item.cargoOwnerName,
 						cargoOwner: item.cargoOwner,
 						sendPrivate: item.sendPrivate,
 						sendCity: item.sendCity,
@@ -330,6 +330,7 @@
 						unloadArea: item.unloadArea,
 						unloadDetailedAddress: item.unloadDetailedAddress,
 						goodsName: item.goodsName,
+						goodsType:item.goodsType,
 						distance: item.distance,
 						freightPrice: item.freightPrice,
 						driverName: res2.data.driverName,

pages/mine/index1.vue

@@ -91,6 +91,12 @@
 					clearable></u--input>
 			</view>
 		</view>
+		<view class='row-between'>
+			<view class="">备注</view>
+			<view class="flex align-center">
+				<u--input placeholder="备注" border="none"  v-model="remark" inputAlign='right'></u--input>
+			</view>
+		</view>
 		
 		<button type="primary" @click="auth()">授权</button>
 		<button type="primary" @click="start()">开启定位</button>		
@@ -132,7 +138,8 @@
 					driverName:"孙亚洲",
 					interval:"5000" 
 				}],//运单信息列表,一辆车运单数最大支持数为 10
-				timer:""
+				timer:"",
+				// columns[["[00]车辆损坏","[01货主临时改变收货位置]",""]]
 			}
 		},
 		onLoad() {

pages/order/confirmLoading.vue

@@ -235,7 +235,6 @@
 				sdkwx.auth(this.appId, this.appSecurity, this.enterpriseSenderCode, this.environment, function(res) {
 					if (res.type == "onSuccess") {
 						//成功
-						
 						console.log("授权成功")
 						console.log(res)
 					} else if (res.type == "onFailure") {
@@ -303,11 +302,18 @@
 							console.log(res)
 							var errorCode = res.data.errorCode; //错误码
 							var errorMsg = res.data.errorMsg; //错误描述
+							that.$refs.uToast.show({
+								type: 'error',
+								message: errorMsg
+							})
 							that.timer = setTimeout(() => {
 								console.log("定时")
 								that.send()
 							}, 915204);
 						}
+						// uni.showModal({
+						// 	content:JSON.stringify(res)
+						// });
 					});
 			},
 			send() { //发送定位
@@ -778,7 +784,7 @@
 						if (res.code == 200) {
 							uni.hideLoading()
 							let _title = ''
-							if (this.detailData.statusFlag == 1) {
+							if (that.detailData.statusFlag == 1) {
 								_title = '暂存成功！'
 							} else {
 								that.start() //开始授权并开始定位

pages/order/confirmUnloading.vue

@@ -210,6 +210,8 @@
 					this.shippingNoteInfos[0].driverName = this.detailData.driverName, //司机姓名，SDK 回调返回， 调用 start/stop/pause/restart/ 必填，send 时非必填
 					this.shippingNoteInfos[0].interval = "5000" //请求时间间隔，SDK 回调返 回(单位 ms)
 				// var shippingNoteInfos = this.shippingNoteInfos;//运单信息列表
+				console.log("查看结束参数",this.shippingNoteInfos)
+				
 				let remark = ""
 				sdkwx.stop(this.detailData.carNumber, this.detailData.driverName, remark, this.shippingNoteInfos, function(res) {
 					if (res.type == "onSuccess") {
@@ -220,6 +222,11 @@
 						//失败
 						var errorCode = res.data.errorCode;//错误码
 						var errorMsg = res.data.errorMsg;//错误描述
+						this.$refs.uToast.show({
+							type: 'error',
+							message: errorMsg,
+						})
+						return
 					}	
 				});			
 			},

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>

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>