前端

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/fk.vue

@@ -23,6 +23,7 @@
 	import {
 		mapState
 	} from 'vuex';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
 		data() {
@@ -34,6 +35,7 @@
 			};
 		},
 		onLoad(options) {
+			this.get_camera_permission()
 			this.dataDetails = JSON.parse(options.val)
 			this.imgList = []
 		},
@@ -41,6 +43,23 @@
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			submit() {
 				uni.showLoading({
 					title: '加载中'

pages/goodSource/jb.vue

@@ -23,6 +23,7 @@
 	import {
 		mapState
 	} from 'vuex';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
 		data() {
@@ -37,11 +38,29 @@
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		onLoad(options) {
+			this.get_camera_permission()
 			this.dataDetails = JSON.parse(options.val)
 			console.log(this.dataDetails)
 			this.imgList = []
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			submit() {
 				uni.showLoading({
 					title: '加载中'

pages/mine/driverCertification.vue

@@ -270,6 +270,7 @@
 
 <script>
 	import keyboard from "@/components/master-keyboard/master-keyboard.vue";
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import upload from '@/components/upload.vue';
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	var _this
@@ -389,6 +390,7 @@
 		},
 		onLoad() {
 			_this = this;
+			this.get_camera_permission()
 			console.log(this.userInfo)
 			//获取截止日期List数据
 			this.validityPeriod = this.$helper.makeValidityPeriod(0)
@@ -401,6 +403,23 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			delCard(type) {
 				switch (type) {
 					// 人车合影

pages/mine/driverCertificationNext.vue

@@ -253,6 +253,7 @@
 
 <script>
 	import uploadImage from '@/components/ossutil/uploadFile.js';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	var _this;
 	export default {
 		components: {},
@@ -284,11 +285,29 @@
 		onLoad(options) {
 			_this = this;
 			console.log(options)
+			this.get_camera_permission()
 			this.dataDetails = JSON.parse(options.data)
 			this.dataDetails.driverType = 1
 			this.validityPeriod = this.$helper.makeValidityPeriod()
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			delCard(type) {
 			switch (type) {
 				case 1:

pages/mine/editDriverCertification.vue

@@ -92,6 +92,7 @@
 
 <script>
 	import upload from '@/components/upload.vue';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	var _this
 	import {
@@ -162,6 +163,7 @@
 		onLoad() {
 			_this = this;
 			console.log(this.userInfo)
+			this.get_camera_permission()
 			//获取截止日期List数据
 			this.validityPeriod = this.$helper.makeValidityPeriod(0)
 			// this.dataDetails.driverPhone = this.userInfo.phone
@@ -173,6 +175,23 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			changeHandler(e) {
 				const {
 					columnIndex,

pages/mine/editDriverCertificationNext.vue

@@ -256,6 +256,7 @@
 
 <script>
 	import uploadImage from '@/components/ossutil/uploadFile.js';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	var _this;
 	export default {
 		components: {},
@@ -287,6 +288,7 @@
 		},
 		onLoad(options) {
 			_this = this;
+			this.get_camera_permission()
 			this.dataDetails = JSON.parse(options.data)
 			if (this.dataDetails.driverType == 1) {
 				this.radiovalue = '挂车司机'
@@ -296,6 +298,23 @@
 			this.validityPeriod = this.$helper.makeValidityPeriod()
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			delCard(type) {
 				switch (type) {
 					case 1:

pages/mine/manageBankCards/addBankCard.vue

@@ -70,6 +70,7 @@
 <script>
 	import upload from '@/components/upload.vue';
 	import uploadImage from '@/components/ossutil/uploadFile.js';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	var _this;
 	import {
 		mapState
@@ -102,9 +103,27 @@
 		},
 		onLoad() {
 			_this = this;
+			this.get_camera_permission()
 			this.dataDetails.driverId = this.userInfo.driverId?this.userInfo.driverId:uni.getStorageSync("firstAuthentication").id
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			delCard() {
 				_this.dataDetails.payeeAddressUrl = ''
 				_this.$forceUpdate()

pages/mine/manageBankCards/editBankCard.vue

@@ -60,6 +60,7 @@
 <script>
 	import upload from '@/components/upload.vue';
 	import uploadImage from '@/components/ossutil/uploadFile.js';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	var _this;
 	export default {
 		components: {},
@@ -76,8 +77,26 @@
 		},
 		onLoad() {
 			_this = this;
+			this.get_camera_permission()
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			manualInput() {
 				if (this.isShowManualInput) {
 					if (uni.$u.test.isEmpty(this.bankType[this.index])) {

pages/mine/manageVehicles/addVehicle.vue

@@ -366,6 +366,7 @@
 
 <script>
 	import uploadImage from '@/components/ossutil/uploadFile.js';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import keyboard from "@/components/master-keyboard/master-keyboard.vue";
 	var _this;
 	import {
@@ -428,9 +429,27 @@
 		onLoad(options) {
 			_this = this;
 			this.dataDetails.commonId = this.userInfo.id
+			this.get_camera_permission()
 			this.validityPeriod = this.$helper.makeValidityPeriod()
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			driveType(){
 				this.isShowCarType = true
 			},

pages/mine/manageVehicles/editVehicle.vue

@@ -366,6 +366,7 @@
 </template>
 
 <script>
+	import permision from "@/js_sdk/wa-permission/permission.js";
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	import keyboard from "@/components/master-keyboard/master-keyboard.vue";
 	var _this;
@@ -441,9 +442,27 @@
 			this.fileList2 = [{
 				url: options.guaAddressUrl
 			}]
+			this.get_camera_permission()
 			this.validityPeriod = this.$helper.makeValidityPeriod()
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			driveType() {
 				this.isShowCarType = true
 			},

pages/mine/often/addRoute.vue

@@ -100,7 +100,13 @@
 					this.routeData.sendCity = ""
 					this.routeData.sendArea = ""
 				}else if(address.area == '全市'){
-					this.title1 = address.province  + address.city
+					if(address.province=='北京'||address.province=='天津'||address.province=='上海'||address.province=='重庆'||address.province=='台湾'){
+						this.title1 = address.province
+						this.routeData.sendCity =  ''
+					}else{
+						this.title1 = address.province  + address.city
+					}
+					// this.title1 = address.province  + address.city
 					this.routeData.sendArea = ""
 				}else{
 					this.title1 = address.province  + address.city + address.area;
@@ -117,7 +123,12 @@
 					this.routeData.unloadCity = ""
 					this.routeData.unloadArea = ""
 				}else if(address.area == '全市'){
-					this.title2 = address.province  + address.city
+					if(address.province=='北京'||address.province=='天津'||address.province=='上海'||address.province=='重庆'||address.province=='台湾'){
+						this.title2 = address.province
+						this.routeData.unloadCity =''
+					}else{
+						this.title2 = address.province  + address.city
+					}
 					this.routeData.unloadArea = ""
 				}else{
 					if(address.province == '全国'){
@@ -184,10 +195,16 @@
 					}).then(res => {
 						if (res.code == 200) {
 							this.routeData = res.data
-							this.title1 = this.routeData.sendProvince + this.routeData.sendCity + this.routeData
+							if(this.routeData.sendProvince=='北京'||this.routeData.sendProvince=='天津'||this.routeData.sendProvince=='上海'||this.routeData.sendProvince=='重庆'||this.routeData.sendProvince=='台湾'){
+								this.title1 = this.routeData.sendProvince 
+								this.title2 = this.routeData.unloadProvince
+							}else{
+								this.title1 = this.routeData.sendProvince + this.routeData.sendCity + this.routeData
 								.sendArea
-							this.title2 = this.routeData.unloadProvince + this.routeData.unloadCity + this.routeData
+								this.title2 = this.routeData.unloadProvince + this.routeData.unloadCity + this.routeData
 								.unloadArea
+							}
+							
 						}
 					})
 					.catch(res => {

pages/order/addEvaluation.vue

@@ -55,6 +55,7 @@
 		mapState
 	} from 'vuex';
 	import start from '../../common/components/uni-rate.vue'
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
 		components: {
@@ -116,10 +117,28 @@
 		},
 		onLoad(options) {
 			that = this
+			this.get_camera_permission()
 			this.objData = JSON.parse(options.val)
 			console.log(this.objData)
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			submit(){
 				let _data = {
 					evaluatoredId: this.objData.cargoCommonId,

pages/riders/addFleet.vue

@@ -55,6 +55,7 @@
 <script>
 	// import Linkage from '@/components/gaojianghua-linkage/linkage.vue'
 	import uploadImage from '@/components/ossutil/uploadFile.js';
+	import permision from "@/js_sdk/wa-permission/permission.js";
 	import itmisterAddressPicker from '@/components/itmister-address-picker/itmister-address-picker.nvue'
 	export default {
 		components: {
@@ -79,6 +80,7 @@
 		},
 		onLoad(options) {
 			this.id = options.id
+			this.get_camera_permission()
 			if (this.id) { //修改
 				uni.setNavigationBarTitle({
 					title: '设置'
@@ -90,6 +92,23 @@
 			this.submit()
 		},
 		methods: {
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			selectAddress() {
 				this.$refs.addressElone.show();
 			},

pages/riders/report.vue

@@ -25,6 +25,7 @@
 
 <script>
 	import uploadImage from '@/components/ossutil/uploadFile.js';
+	import permision from "@/js_sdk/wa-permission/permission.js";
 	export default{
 		data(){
 			return{
@@ -41,9 +42,27 @@
 		onShow(){},
 		onLoad(options){
 			this.fleetId = options.id
+			this.get_camera_permission()
 			this.getList()
 		},
 		methods:{
+			async get_camera_permission() {
+				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
+				if(photol == false){
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相册权限,去设置',
+						success: function (res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+									            // plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});	
+				}
+			},
 			submit(){
 				if (!this.reportInfo.content) {
 					this.$refs.uToast.show({