前端

App.vue

@@ -14,119 +14,7 @@
 	import permision from "@/js_sdk/wa-permission/permission.js"
 	export default {
 		methods: {
-			getLngLat(){
-				uni.getLocation({
-					type: 'gcj02',
-					geocode: true,
-					success: res => {
-						if (res.latitude) {
-							console.log(res)
-							if(res.address.city){
-								if(res.address.city.indexOf('市')!=-1){
-									res.address.city=res.address.city.substring(0,res.address.city.length-1)
-								}
-							}
-							if(res.address.province){
-								if(res.address.province.indexOf('省')!=-1){
-									res.address.province=res.address.province.substring(0,res.address.province.length-1)
-								}
-							}
-							uni.setStorageSync('fPlaceObj',{
-								fchoosearea:'全部',
-								fchoosecity:res.address.city,
-								fchooseprovince:res.address.province,
-								selected:res.address.city
-							})
-							uni.setStorageSync('sPlaceObj',{
-								schoosearea:'请选择区',
-								schoosecity:'请选择市',
-								schooseprovince:'全国',
-								selected:'全国'
-							})
-							uni.setStorageSync('longitudeAndLatitude',res.longitude+','+res.latitude)
-				}
-				}
-				})
-			},
-			checkOpenGPSServiceByAndroidIOS() {
-				console.log()
-			    let system = uni.getSystemInfoSync(); // 获取系统信息
-			    console.log(system);
-			    if (system.platform === 'android') { // 判断平台
-			        var context = plus.android.importClass("android.content.Context");
-			        var locationManager = plus.android.importClass("android.location.LocationManager");
-			        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){
-									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服务页面
-										this.getLngLat()
-									} else {
-										uni.setStorageSync('fPlaceObj',{
-											fchoosearea:'全部',
-											fchoosecity:'市辖区',
-											fchooseprovince:'北京',
-											selected:res.address.city
-										})
-										uni.setStorageSync('sPlaceObj',{
-											schoosearea:'请选择区',
-											schoosecity:'请选择市',
-											schooseprovince:'全国',
-											selected:'全国'
-										})
-										uni.setStorageSync('longitudeAndLatitude','116.3972,39.9096')
-									}
-								} 
-			                }
-			            });
-			        }else{
-						this.getLngLat()
-					}
-			    } else if (system.platform === 'ios') {
-			        console.log("苹果");
-			        var cllocationManger = plus.ios.import("CLLocationManager");
-			        var enable = cllocationManger.locationServicesEnabled();
-			        var status = cllocationManger.authorizationStatus();
-			        plus.ios.deleteObject(cllocationManger);
-			        if (enable && status != 2) {
-						this.getLngLat()
-			            console.log("手机系统的定位已经打开");
-			        } else {
-			            console.log("手机系统的定位没有打开");
-			            uni.showModal({
-			                title: '提示',
-			                content: '请前往设置-隐私-定位服务打开定位服务功能',
-			                // showCancel: false, // 不显示取消按钮
-			                success(res) {
-								if(res.confirm){
-									var UIApplication = plus.ios.import("UIApplication");
-									var application2 = UIApplication.sharedApplication();
-									var NSURL2 = plus.ios.import("NSURL");
-									// var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");
-									// var setting2 = NSURL2.URLWithString("App-Prefs:root=LOCATION_SERVICES");
-									// var setting2 = NSURL2.URLWithString("app-settings");
-									var setting2 = NSURL2.URLWithString("App-Prefs:root=Privacy&path=LOCATION");
-									// var setting2 = NSURL2.URLWithString("App-Prefs:root=Privacy&path=LOCATION_SERVICES");
-									application2.openURL(setting2);
-									plus.ios.deleteObject(setting2);
-									plus.ios.deleteObject(NSURL2);
-									plus.ios.deleteObject(application2);
-									this.getLngLat()
-								}
-			                }
-			            });
-			        }
-			    }
-			},
+			
 			...mapMutations(['login']),
 			// vue的method里编写如下代码
 			// async requestAndroidPermission(permisionID) {
@@ -149,7 +37,6 @@
 		onLaunch: function() {
 			var that = this
 			// #ifdef APP-PLUS
-			this.checkOpenGPSServiceByAndroidIOS()
 			// uni.getNetworkType({
 			// 	success: function (res) {
 			// 		if(res.networkType=='none'){

common/components/uni-rate.vue

@@ -5,16 +5,20 @@
 				:style="{ 'margin-right': marginNumber + 'px' }" v-for="(star, index) in stars" :key="index"
 				@touchstart.stop="touchstart" @touchmove.stop="touchmove" @mousedown.stop="mousedown"
 				@mousemove.stop="mousemove" @mouseleave="mouseleave">
-				<uni-icons :color="color" :size="size" :type="isFill ? 'star-filled' : 'star'" />
+				<image style='width:19px;height:19px;' src="./xingxing.png" mode=""></image>
+				<!-- <uni-icons :color="color" :size="size" :type="isFill ? 'star-filled' : 'star'" /> -->
 				<!-- #ifdef APP-NVUE -->
 				<view :style="{ width: star.activeWitch.replace('%','')*size/100+'px'}" class="uni-rate__icon-on">
-					<uni-icons style="text-align: left;" :color="disabled?'#ccc':activeColor" :size="size"
-						type="star-filled" />
+					<!-- <uni-icons style="text-align: left;" :color="disabled?'#ccc':activeColor" :size="size"
+						type="star-filled" /> -->
+						<image style='width:19px;height:19px;' src="./xingxing_check.png" mode=""></image>
 				</view>
 				<!-- #endif -->
 				<!-- #ifndef APP-NVUE -->
 				<view :style="{ width: star.activeWitch}" class="uni-rate__icon-on">
-					<uni-icons :color="disabled?disabledColor:activeColor" :size="size" type="star-filled" />
+					<!-- <uni-icons :color="disabled?disabledColor:activeColor" :size="size" type="star-filled" /> -->
+					<!-- <image style='width:19px;height:19px;' src="'../../static/images/xingxing.png'" mode=""></image> -->
+					<image style='width:19px;height:19px;' src="./xingxing_check.png" mode=""></image>
 				</view>
 				<!-- #endif -->
 			</view>

config/index.js

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

pages/goodSource/index.vue

@@ -122,6 +122,7 @@
 </template>
 <script>
 	var that
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 	import {
 		mapState
@@ -192,28 +193,27 @@
    //              this.upCallback({page});
    //          },
 		},
+		onLoad() {
+			this.checkOpenGPSServiceByAndroidIOS()
+		},
 		onShow() {
-			//获取上一次点击起装卸地
-			if (uni.getStorageSync('fPlaceObj')) {
-				this.startPlace = uni.getStorageSync('fPlaceObj');
-
-			} else {
-				// #ifdef APP-PLUS
-				var that=this
-				console.log('good',1111)
-				// this.$nextTick(function(){
-					// this.getLngLat();
-				// })		
-				// #endif
-			}
-			if (uni.getStorageSync('sPlaceObj')) {
-				this.endPlace = uni.getStorageSync('sPlaceObj');
-				
-			} else {
-				this.endPlace.selected = '全国'
-			}
-			this.upCallback({size:10,num:1})
+			
 			var that= this
+			setTimeout(()=>{
+				// var photol=await permision.checkSystemEnableLocation()
+				if(uni.getStorageSync('confirm_location')){
+					that.get_localtion_permission()
+				}
+				//获取上一次点击起装卸地
+				if (uni.getStorageSync('fPlaceObj')) {
+					that.startPlace = uni.getStorageSync('fPlaceObj');
+				}
+				if (uni.getStorageSync('sPlaceObj')) {
+					that.endPlace = uni.getStorageSync('sPlaceObj');
+				}
+				that.upCallback({size:10,num:1})
+			},1500)
+			
 			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 				reCommonId: this.userInfo.id,
 			}).then(res3 => {
@@ -280,9 +280,164 @@
 
 		},
 		methods: {
+			async get_localtion_permission() {
+				var photol=await permision.checkSystemEnableLocation()
+				if(photol == true){
+					uni.removeStorageSync('confirm_location')
+					uni.showToast({
+									title: '只有文字弹窗',
+									icon: 'none',    //如果要纯文本，不要icon，将值设为'none'
+									duration: 2000    //持续时间为 2秒
+								})  
+					this.getLngLat()
+				}else{
+					if(uni.getStorageSync('confirm_location')){
+						uni.removeStorageSync('confirm_location')
+				}
+					uni.setStorageSync('fPlaceObj',{
+						fchoosearea:'全部',
+						fchoosecity:'市辖区',
+						fchooseprovince:'北京',
+						selected:'东城'
+					})
+					uni.setStorageSync('sPlaceObj',{
+						schoosearea:'请选择区',
+						schoosecity:'请选择市',
+						schooseprovince:'全国',
+						selected:'全国'
+					})
+					uni.setStorageSync('longitudeAndLatitude','116.3972,39.9096')
+				}
+			},
+			async getLngLat(){
+				await uni.getLocation({
+					type: 'gcj02',
+					geocode: true,
+					success: res => {
+						if (res.latitude) {
+							if(res.address.city){
+								if(res.address.city.indexOf('市')!=-1){
+									res.address.city=res.address.city.substring(0,res.address.city.length-1)
+								}
+							}
+							if(res.address.province){
+								if(res.address.province.indexOf('省')!=-1){
+									res.address.province=res.address.province.substring(0,res.address.province.length-1)
+								}
+							}
+							uni.setStorageSync('fPlaceObj',{
+								fchoosearea:'全部',
+								fchoosecity:res.address.city,
+								fchooseprovince:res.address.province,
+								selected:res.address.city
+							})
+							uni.setStorageSync('sPlaceObj',{
+								schoosearea:'请选择区',
+								schoosecity:'请选择市',
+								schooseprovince:'全国',
+								selected:'全国'
+							})
+							uni.setStorageSync('longitudeAndLatitude',res.longitude+','+res.latitude)
+				}
+				}
+				})
+			},
+			checkOpenGPSServiceByAndroidIOS() {
+			    let system = uni.getSystemInfoSync(); // 获取系统信息
+			    // console.log(system);
+			    if (system.platform === 'android') { // 判断平台
+			        var context = plus.android.importClass("android.content.Context");
+			        var locationManager = plus.android.importClass("android.location.LocationManager");
+			        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')
+								}
+			                }
+			            });
+			        }else{
+						this.getLngLat()
+					}
+			    } else if (system.platform === 'ios') {
+			        // console.log("苹果");
+			        var cllocationManger = plus.ios.import("CLLocationManager");
+			        var enable = cllocationManger.locationServicesEnabled();
+			        var status = cllocationManger.authorizationStatus();
+			        plus.ios.deleteObject(cllocationManger);
+			        if (enable && status != 2) {
+						this.getLngLat()
+			            console.log("手机系统的定位已经打开");
+			        } else {
+			            console.log("手机系统的定位没有打开");
+			            uni.showModal({
+			                title: '提示',
+			                content: '请前往设置-隐私-定位服务打开定位服务功能',
+			                // showCancel: false, // 不显示取消按钮
+			                success(res) {
+								if(res.confirm){
+									var UIApplication = plus.ios.import("UIApplication");
+									var application2 = UIApplication.sharedApplication();
+									var NSURL2 = plus.ios.import("NSURL");
+									// var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");
+									// var setting2 = NSURL2.URLWithString("App-Prefs:root=LOCATION_SERVICES");
+									// var setting2 = NSURL2.URLWithString("app-settings");
+									var setting2 = NSURL2.URLWithString("App-Prefs:root=Privacy&path=LOCATION");
+									// var setting2 = NSURL2.URLWithString("App-Prefs:root=Privacy&path=LOCATION_SERVICES");
+									application2.openURL(setting2);
+									plus.ios.deleteObject(setting2);
+									plus.ios.deleteObject(NSURL2);
+									plus.ios.deleteObject(application2);
+									this.getLngLat()
+								}
+			                }
+			            });
+			        }
+			    }
+			},
 			cargoOwner(_obj){
 				// uni.$u.route('/pages/order/evaluateList');
-				console.log("查看---------------",_obj)
+				// console.log("查看---------------",_obj)
 				uni.$u.route('/pages/goodSource/cargoOwnerSee',_obj)
 			},
 			mescrollInit(mescroll) {
@@ -419,123 +574,123 @@
 			selectType() {
 				this.show = true
 			},
-			getLngLat() {
-				var that=this
-				// uni.showLoading({
-				// 	title: '获取定位信息'
-				// })
+			// getLngLat() {
+			// 	var that=this
+			// 	// uni.showLoading({
+			// 	// 	title: '获取定位信息'
+			// 	// })
 				
-				uni.getLocation({
-					type: 'gcj02',
-					geocode: true,
-					success: res => {
-						if (res.latitude) {
-							console.log(res)
-							if(res.address.city){
-								if(res.address.city.indexOf('市')!=-1){
-									res.address.city=res.address.city.substring(0,res.address.city.length-1)
-								}
-							}
-							if(res.address.province){
-								if(res.address.province.indexOf('省')!=-1){
-									res.address.province=res.address.province.substring(0,res.address.province.length-1)
-								}
-							}
-							uni.setStorageSync('fPlaceObj',{
-								fchoosearea:'全部',
-								fchoosecity:res.address.city,
-								fchooseprovince:res.address.province,
-								selected:res.address.city
-							})
-							uni.setStorageSync('sPlaceObj',{
-								schoosearea:'请选择区',
-								schoosecity:'请选择市',
-								schooseprovince:'全国',
-								selected:'全国'
-							})
-							let _pickerSelect;
-							if (that.pickerSelect == '运费先付') {
-								_pickerSelect = 1
-							} else {
-								_pickerSelect = 0
-							}
-							that.startPlace.selected=res.address.city
-							that.startPlace.fchoosecity=res.address.city
-							let _data = {
-								searchKeyWord: this.tabIndex + 1,
-								searchType: _pickerSelect,
-								pageSize: 10,
-								currentPage: 1,
-								loadingPlaceCity: that.startPlace.fchoosecity,
-								// unLoadingPlaceCity: this.endPlace.schoosecity
+			// 	uni.getLocation({
+			// 		type: 'gcj02',
+			// 		geocode: true,
+			// 		success: res => {
+			// 			if (res.latitude) {
+			// 				console.log(res)
+			// 				if(res.address.city){
+			// 					if(res.address.city.indexOf('市')!=-1){
+			// 						res.address.city=res.address.city.substring(0,res.address.city.length-1)
+			// 					}
+			// 				}
+			// 				if(res.address.province){
+			// 					if(res.address.province.indexOf('省')!=-1){
+			// 						res.address.province=res.address.province.substring(0,res.address.province.length-1)
+			// 					}
+			// 				}
+			// 				uni.setStorageSync('fPlaceObj',{
+			// 					fchoosearea:'全部',
+			// 					fchoosecity:res.address.city,
+			// 					fchooseprovince:res.address.province,
+			// 					selected:res.address.city
+			// 				})
+			// 				uni.setStorageSync('sPlaceObj',{
+			// 					schoosearea:'请选择区',
+			// 					schoosecity:'请选择市',
+			// 					schooseprovince:'全国',
+			// 					selected:'全国'
+			// 				})
+			// 				let _pickerSelect;
+			// 				if (that.pickerSelect == '运费先付') {
+			// 					_pickerSelect = 1
+			// 				} else {
+			// 					_pickerSelect = 0
+			// 				}
+			// 				that.startPlace.selected=res.address.city
+			// 				that.startPlace.fchoosecity=res.address.city
+			// 				let _data = {
+			// 					searchKeyWord: this.tabIndex + 1,
+			// 					searchType: _pickerSelect,
+			// 					pageSize: 10,
+			// 					currentPage: 1,
+			// 					loadingPlaceCity: that.startPlace.fchoosecity,
+			// 					// unLoadingPlaceCity: this.endPlace.schoosecity
 							
-							}
-							that.$forceUpdate()
-							// that.$set(that.startPlace,'selected',res.address.city)
-							// that.lng = res.longitude;
-							// that.lat = res.latitude;
-							that.$request.baseRequest('get', '/publishTaskInfo/selectGoodsSource', _data).then(res => {
-									if (res.code == 200) {
-										console.log(res.data.records)
-										uni.hideLoading()
-										that.mescroll.endBySize(res.data.records.length, res.data.total);
-										if(res.data.records){
-											that.goods = res.data.records
-											for (let i = 0; i < that.goods.length; i++) {
-												if (that.goods[i].peripheralInfo == 1) {
-													that.isFirstIndex = i
-													return
-												}
-											}
-										}else{
-											that.goods=[]
-										}
+			// 				}
+			// 				that.$forceUpdate()
+			// 				// that.$set(that.startPlace,'selected',res.address.city)
+			// 				// that.lng = res.longitude;
+			// 				// that.lat = res.latitude;
+			// 				that.$request.baseRequest('get', '/publishTaskInfo/selectGoodsSource', _data).then(res => {
+			// 						if (res.code == 200) {
+			// 							console.log(res.data.records)
+			// 							uni.hideLoading()
+			// 							that.mescroll.endBySize(res.data.records.length, res.data.total);
+			// 							if(res.data.records){
+			// 								that.goods = res.data.records
+			// 								for (let i = 0; i < that.goods.length; i++) {
+			// 									if (that.goods[i].peripheralInfo == 1) {
+			// 										that.isFirstIndex = i
+			// 										return
+			// 									}
+			// 								}
+			// 							}else{
+			// 								that.goods=[]
+			// 							}
 										
-									}
-									uni.hideLoading()
-								})
-								.catch(res => {
-									uni.$u.toast(res.message);
-									that.mescroll.endErr();
-								});
-						} else {
-							if (uni.getSystemInfoSync().platform == 'android') {
-								var context = plus.android.importClass("android.content.Context");
-								var locationManager = plus.android.importClass(
-									"android.location.LocationManager");
-								var main = plus.android.runtimeMainActivity();
-								var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
-								that.bool = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)
-							}
-							if (that.bool === false) {
-								uni.showModal({
-									title: '提示',
-									content: '请打开定位服务',
-									success: ({
-										confirm,
-										cancel
-									}) => {
-										if (confirm) {
-											if (uni.getSystemInfoSync().platform == 'android') {
-												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);
-												var main = plus.android.runtimeMainActivity();
-												main.startActivity(intent); // 打开系统设置GPS服务页面
-											}
-										}
-									}
-								});
-							}
-							uni.hideLoading()
+			// 						}
+			// 						uni.hideLoading()
+			// 					})
+			// 					.catch(res => {
+			// 						uni.$u.toast(res.message);
+			// 						that.mescroll.endErr();
+			// 					});
+			// 			} else {
+			// 				if (uni.getSystemInfoSync().platform == 'android') {
+			// 					var context = plus.android.importClass("android.content.Context");
+			// 					var locationManager = plus.android.importClass(
+			// 						"android.location.LocationManager");
+			// 					var main = plus.android.runtimeMainActivity();
+			// 					var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+			// 					that.bool = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)
+			// 				}
+			// 				if (that.bool === false) {
+			// 					uni.showModal({
+			// 						title: '提示',
+			// 						content: '请打开定位服务',
+			// 						success: ({
+			// 							confirm,
+			// 							cancel
+			// 						}) => {
+			// 							if (confirm) {
+			// 								if (uni.getSystemInfoSync().platform == 'android') {
+			// 									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);
+			// 									var main = plus.android.runtimeMainActivity();
+			// 									main.startActivity(intent); // 打开系统设置GPS服务页面
+			// 								}
+			// 							}
+			// 						}
+			// 					});
+			// 				}
+			// 				uni.hideLoading()
 							
-						}
-					}
-				});
-			},
+			// 			}
+			// 		}
+			// 	});
+			// },
 			toDetail(id) {
 				var that=this
 				that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
@@ -587,11 +742,10 @@
 				}
 				console.log(uni.getStorageSync('longitudeAndLatitude'))
 				// if (this.tabIndex == 2) {
-					if(!this.startPlace.selected){
-						console.log(1)
-						// this.getLngLat();
-					}else{
-						
+					if(uni.getStorageSync('longitudeAndLatitude')){
+						this.lng=uni.getStorageSync('longitudeAndLatitude').split(',')[0]
+						this.lat=uni.getStorageSync('longitudeAndLatitude').split(',')[1]
+					}
 						_data.driverLongitude = this.lng
 						_data.driverLatitude = this.lat
 						// }
@@ -649,7 +803,6 @@
 										this.goods = [];
 										// this.otherGoods = []
 									};
-									console.log(res.data.records,1111111)
 									if(res.data.records){
 										for(var i=0;i<res.data.records.length;i++){
 											if(res.data.records[i].cargoDistance){
@@ -692,8 +845,6 @@
 								uni.$u.toast(res.message);
 								this.mescroll.endErr();
 							});
-					}
-					
 			},
 			clickTab(val) {
 				this.tabIndex = val.index

pages/goodSource/selectCity.vue

@@ -426,6 +426,7 @@
 					this.fchooseprovince='选择'
 					this.fchoosecity='请选择市'
 					this.fchoosearea='请选择区'
+					uni.removeStorageSync('longitudeAndLatitude')
 					uni.switchTab({
 						url: '/pages/goodSource/index'
 					});

pages/mine/driverCertification.vue

@@ -725,17 +725,21 @@
 														personImg: result,
 														flag:1
 													}).then(res => {
-													_this.dataDetails.numberCard = res.data.recPersonNo
-													if (res.data.recPerson) {
-														_this.dataDetails.driverName = res.data.recPerson
-														_this.dataDetails.driverCall = res.data.recPerson.substring(0,1)
-														for (let i = 0; i < _this.dataDetails
-															.hyDriverPayeeInfoList.length; i++
-															) { //收款人需与司机本人一致
-															_this.dataDetails.hyDriverPayeeInfoList[i]
-																.payeeName = res.data.recPerson
+														if(res.data){
+															_this.dataDetails.numberCard = res.data.recPersonNo
+															if (res.data.recPerson) {
+																_this.dataDetails.driverName = res.data.recPerson
+																_this.dataDetails.driverCall = res.data.recPerson.substring(0,1)
+																for (let i = 0; i < _this.dataDetails
+																	.hyDriverPayeeInfoList.length; i++
+																	) { //收款人需与司机本人一致
+																	_this.dataDetails.hyDriverPayeeInfoList[i]
+																		.payeeName = res.data.recPerson
+																}
+															}
+															_this.dataDetails.driverBirthday=res.data.recPersonBrithday
 														}
-													}
+													
 
 												})
 												.catch(res => {

pages/mine/driverCertificationNext.vue

@@ -37,8 +37,16 @@
 				</view>
 				<view class="flex row flex-space-between">
 					<view class="left-text">驾驶证有效期</view>
-					<view class="" @click="selectValidityPeriod(0)">
+					<!-- <view class="" @click="selectValidityPeriod(0)">
 						{{dataDetails.driverLicenseValidityDate?dataDetails.driverLicenseValidityDate:'选择有效截止日期>'}}
+					</view> -->
+					<view style='font-size:12px;' class="" @click="selectValidityPeriod(0)">
+						{{dataDetails.driverLicenseValidityStartDate?dataDetails.driverLicenseValidityStartDate:'起始时间'}}
+					</view>
+					<view>~</view>
+					<view style='font-size:12px;' class="" @click="selectValidityPeriod(9)">
+						
+						{{dataDetails.driverLicenseValidityDate?dataDetails.driverLicenseValidityDate:'结束时间'}}
 					</view>
 				</view>
 				<view class="flex row noborder">
@@ -286,9 +294,12 @@
 			_this = this;
 			console.log(options)
 			this.get_camera_permission()
-			this.dataDetails = JSON.parse(options.data)
-			this.dataDetails.driverType = 1
+			if(options.data){
+				this.dataDetails = JSON.parse(options.data)
+				this.dataDetails.driverType = 1
+			}
 			this.validityPeriod = this.$helper.makeValidityPeriod()
+			console.log(this.validityPeriod)
 		},
 		methods: {
 			async get_camera_permission() {
@@ -351,7 +362,7 @@
 				console.log('confirm', e)
 				switch (this.ValidityPeriodType) {
 					case 0:
-						this.dataDetails.driverLicenseValidityDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
+						this.dataDetails.driverLicenseValidityStartDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
 						break
 					case 1:
 						this.dataDetails.drivingLicenseValidityDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
@@ -371,10 +382,15 @@
 						this.dataDetails.trailerOperationCertificateValidityDate = e.value[0] + '-' + e.value[1] + '-' + e
 							.value[2]
 						break
+					case 9:
+						this.dataDetails.driverLicenseValidityDate = e.value[0] + '-' + e.value[1] + '-' + e
+								.value[2]
+							break
 				}
 				this.isShowValidity = false
 			},
 			selectValidityPeriod(type) {
+				
 				this.ValidityPeriodType = type
 				this.isShowValidity = true
 			},

pages/mine/editDriverCertificationNext.vue

@@ -35,10 +35,18 @@
 					</view>
 					<image class="" :src="dataDetails.driverLicenseBackPage" mode="aspectFit"></image>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">驾驶证有效期</view>
-					<view class="" @click="selectValidityPeriod(0)">
+					<!-- <view class="" @click="selectValidityPeriod(0)">
 						{{dataDetails.driverLicenseValidityDate?dataDetails.driverLicenseValidityDate:'选择有效截止日期>'}}
+					</view> -->
+					<view style='font-size:14px;' class="" @click="selectValidityPeriod(0)">
+						{{dataDetails.driverLicenseValidityStartDate?dataDetails.driverLicenseValidityStartDate:'起始时间'}}
+					</view>
+					<view>~</view>
+					<view style='font-size:14px;' class="" @click="selectValidityPeriod(9)">
+						
+						{{dataDetails.driverLicenseValidityDate?dataDetails.driverLicenseValidityDate:'结束时间'}}
 					</view>
 				</view>
 				<view class="flex row noborder">
@@ -358,7 +366,7 @@
 				console.log('confirm', e)
 				switch (this.ValidityPeriodType) {
 					case 0:
-						this.dataDetails.driverLicenseValidityDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
+						this.dataDetails.driverLicenseValidityStartDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
 						break
 					case 1:
 						this.dataDetails.drivingLicenseValidityDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
@@ -378,6 +386,10 @@
 						this.dataDetails.trailerOperationCertificateValidityDate = e.value[0] + '-' + e.value[1] + '-' + e
 							.value[2]
 						break
+					case 9:
+						this.dataDetails.driverLicenseValidityDate = e.value[0] + '-' + e.value[1] + '-' + e
+								.value[2]
+						break
 				}
 				this.isShowValidity = false
 			},

pages/mine/index.vue

@@ -238,7 +238,9 @@
 								this.statusVal = '身份认证未通过'
 							} else if (this.firstAuthentication.authenticationStatus == '已过期') {
 								this.statusVal = '证件已过期'
-							} else {
+							}  else if (this.firstAuthentication.authenticationStatus == '未认证') {
+								this.statusVal = '未认证'
+							}else {
 								this.statusVal = '已认证'
 							}
 						} else {

pages/mine/manageVehicles/addVehicle.vue

@@ -551,6 +551,8 @@
 													if (res.data) {
 														_this.dataDetails.carNumber = res.data
 															.carNum //车牌号
+														_this.dataDetails.vehicleType = res.data.vehicleType
+														_this.dataDetails.carCode =res.data.carCode
 														_this.dataDetails.owner = res.data
 															.owner //车辆所有人
 														_this.$forceUpdate()

pages/order/confirmLoading.vue

@@ -521,6 +521,7 @@
 					loadingLatitude:this.detailData.loadingLatitude,
 					id:this.detailData.hyCarrierInfo.id
 				}
+				
 				console.log("查看id--------",this.detailData.hyCarrierInfo.id)
 				this.$request.baseRequest('post', '/carrierInfo/loadingAdd', data).then(res => {
 						if (res.code == 200) {

pages/order/confirmUnloading.vue

@@ -55,8 +55,12 @@
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">合计运费（元）</view>
-				<input class="totalFreight-input" placeholder="输入合计运费" v-model="detailData.totalFreight"
+				<view style='position:relative;'>
+					<input :style="{color:this.detailData.freight!=detailData.totalFreight?'red':'#000'}" class="totalFreight-input" placeholder="输入合计运费" v-model="detailData.totalFreight"
 					type="number" />
+					<image @click='eliminate' class='close' v-if='detailData.totalFreight.length>0' src="../../static/images/order/guanbi.png" mode=""></image>
+				</view>
+				
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">定位</view>
@@ -99,7 +103,8 @@
 				sourceType: ['camera'],
 				detailData: {
 					addressUrl: '',
-					hyCarrierInfo:{}
+					hyCarrierInfo:{},
+					totalFreight:''
 				},
 				action: this.$helper.ossUploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
@@ -123,7 +128,14 @@
 					}
 				}
 			}
-			this.detailData.totalFreight=this.detailData.hyCarrierInfo.totalFreight
+			if(this.detailData.hyCarrierInfo.totalFreight){
+				this.$set(this.detailData,'totalFreight',String(this.detailData.hyCarrierInfo.totalFreight))
+				// this.detailData.totalFreight=String(this.detailData.hyCarrierInfo.totalFreight)
+			}else{
+				this.$set(this.detailData,'totalFreight',String(this.detailData.freight))
+				// this.detailData.totalFreight=String(this.detailData.freight)
+			}
+			
 			this.detailData.carrierInfo = {
 				// unloadingDate: '',
 				// estimatedFreight: '',
@@ -158,6 +170,13 @@
 				this.detailData.carrierInfo.unloadingDate = defaultDate
 				// this.$forceUpdate()
 			},
+			eliminate(){
+				console.log(11111)
+				this.$set(this.detailData,'totalFreight','')
+				// t.totalFreight=''
+				console.log(this.detailData.totalFreight)
+				console.log(this.detailData.totalFreight.length)
+			},
 			selectUnloadingDate() {
 				this.isShowValidity = true
 			},
@@ -506,5 +525,13 @@
 
 	.totalFreight-input {
 		text-align: right;
+		padding-right:18px;
+	}
+	.close{
+		position:absolute;
+		right:0;
+		width:15px;height:15px;
+		top:50%;
+		transform: translateY(-50%);
 	}
 </style>

pages/order/orderDetails.vue

@@ -118,15 +118,16 @@
 			</view>
 			<view class='row-between'>
 				<view class=" gray">收货联系人</view>
-				
-				<view class="flex">{{dataObj.publishTaskInfo.sender?dataObj.publishTaskInfo.sender:''}}
-				<u-icon v-if='dataObj.publishTaskInfo.senderPhone' class="phone" name="phone-fill" color="#2772FB" size="20" @click="$helper.contactCustomerService(dataObj.publishTaskInfo.senderPhone)"></u-icon>
+				<view class="flex flex-center">{{dataObj.publishTaskInfo.sender?dataObj.publishTaskInfo.sender:''}}
+				<image style='width:12px;height:12px;margin-left:5px;' v-if='dataObj.publishTaskInfo.senderPhone' class="phone" @click="$helper.contactCustomerService(dataObj.publishTaskInfo.senderPhone)" src="../../static/images/order/dianhua.png" mode=""></image>
+				<!-- <u-icon name="phone-fill" color="#2772FB" size="20"></u-icon> -->
 				</view>
 			</view>
 			<view class='row-between'>
 				<view class=" gray">发货联系人</view>
-				<view class="flex">{{dataObj.publishTaskInfo.receiver?dataObj.publishTaskInfo.receiver:''}}
-				<u-icon v-if='dataObj.publishTaskInfo.receiverPhone' class="phone" name="phone-fill" color="#2772FB" size="20" @click="$helper.contactCustomerService(dataObj.publishTaskInfo.receiverPhone)"></u-icon>
+				<view class="flex flex-center">{{dataObj.publishTaskInfo.receiver?dataObj.publishTaskInfo.receiver:''}}
+				<image style='width:12px;height:12px;margin-left:5px;' v-if='dataObj.publishTaskInfo.receiverPhone' class="phone" @click="$helper.contactCustomerService(dataObj.publishTaskInfo.receiverPhone)" src="../../static/images/order/dianhua.png" mode=""></image>
+				<!-- <u-icon v-if='dataObj.publishTaskInfo.receiverPhone' class="phone" name="phone-fill" color="#2772FB" size="20" @click="$helper.contactCustomerService(dataObj.publishTaskInfo.receiverPhone)"></u-icon> -->
 				</view>
 			</view>
 		<!-- 	<view class='row-between'>

pages/riders/index.vue

@@ -453,14 +453,23 @@
 					return
 				}
 				this.sendInfo.sendProvince = address.province ? address.province : ''
-				this.sendInfo.sendCity = address.city ? address.city : ''
+				if(address.city=='天津'||address.city=='北京'||address.city=='上海'||address.city=='重庆'||address.city=='台湾'){
+					this.sendInfo.sendCity=''
+				}else{
+					this.sendInfo.sendCity = address.city ? address.city : ''
+				}
+				
 				this.sendInfo.sendArea = address.area ? address.area : ''
 				if (address.city == '全省') {
 					this.title1 = address.province
 					this.sendInfo.sendCity = ""
 					this.sendInfo.sendArea = ""
 				} else if (address.area == '全市') {
-					this.title1 = address.province + address.city
+					if(address.city=='天津'||address.city=='北京'||address.city=='上海'||address.city=='重庆'||address.city=='台湾'){
+						this.title1 = address.province
+					}else{
+						this.title1 = address.province + address.city
+					}
 					this.sendInfo.sendArea = ""
 				} else {
 					this.title1 = address.province + address.city + address.area;
@@ -470,7 +479,12 @@
 			},
 			confirmChangeTwo(address) {
 				this.unloadInfo.unloadProvince = address.province ? address.province : ''
-				this.unloadInfo.unloadCity = address.city ? address.city : ''
+				if(address.city=='天津'||address.city=='北京'||address.city=='上海'||address.city=='重庆'||address.city=='台湾'){
+					this.unloadInfo.unloadCity=''
+				}else{
+					this.unloadInfo.unloadCity = address.city ? address.city : ''
+				}
+				// this.unloadCity.unloadCity = address.city ? address.city : ''
 				this.unloadInfo.unloadArea = address.area ? address.area : ''
 
 				if (address.city == '全省') {
@@ -478,7 +492,11 @@
 					this.unloadInfo.unloadCity = ""
 					this.unloadInfo.unloadArea = ""
 				} else if (address.area == '全市') {
-					this.title2 = address.province + address.city
+					if(address.city=='天津'||address.city=='北京'||address.city=='上海'||address.city=='重庆'||address.city=='台湾'){
+						this.title2 = address.province
+					}else{
+						this.title2 = address.province + address.city
+					}
 					this.unloadInfo.unloadArea = ""
 				} else {
 					if (address.province == '全国') {