achao 2 years ago
parent
commit
6bfb7b6ae0

+ 50 - 33
common/helper.js

@@ -15,18 +15,18 @@ const imgTypeList = [{
 	}
 ]
 // 当前日期是否超过今天(校验有效期)
-const periodOfValidity=function(year1,month1,day1){
+const periodOfValidity = function(year1, month1, day1) {
 	let nowDate = new Date();
 	let year = nowDate.getFullYear()
 	let month = nowDate.getMonth() + 1
 	let day = nowDate.getDate()
-	if(year1<year){
+	if (year1 < year) {
 		return false
 	}
-	if(year1==year&&month1<month){
+	if (year1 == year && month1 < month) {
 		return false
 	}
-	if(year1==year&&month1==month&&day1<=day){
+	if (year1 == year && month1 == month && day1 <= day) {
 		return false
 	}
 	return true
@@ -117,39 +117,39 @@ const contactCustomerService = (phone) => {
 	}
 	const res = uni.getSystemInfoSync();
 	// ios系统默认有个模态框
-	if(res.platform=='ios'){
+	if (res.platform == 'ios') {
 		uni.makePhoneCall({
-		phoneNumber:phone,
-		success(){
-			console.log('拨打成功了');
-		},
-		fail() {
-			console.log('拨打失败了');
-		}
-	})
-	}else{
-	//安卓手机手动设置一个showActionSheet
+			phoneNumber: phone,
+			success() {
+				console.log('拨打成功了');
+			},
+			fail() {
+				console.log('拨打失败了');
+			}
+		})
+	} else {
+		//安卓手机手动设置一个showActionSheet
 		uni.showActionSheet({
-			itemList: [phone,'呼叫'],
-			success:function(res){
+			itemList: [phone, '呼叫'],
+			success: function(res) {
 				console.log(res);
-			   if(res.tapIndex==1){
-				uni.makePhoneCall({
-				  phoneNumber: phone,
-				success: (res) => {
-					console.log('调用成功!')
-					
-				},
-			  
-				// 失败回调
-				fail: (res) => {
-					console.log('调用失败!')
-					// contactCustomerService(item)
+				if (res.tapIndex == 1) {
+					uni.makePhoneCall({
+						phoneNumber: phone,
+						success: (res) => {
+							console.log('调用成功!')
+
+						},
+
+						// 失败回调
+						fail: (res) => {
+							console.log('调用失败!')
+							// contactCustomerService(item)
+						}
+					})
 				}
-				})
-			  }
 			}
-		  })
+		})
 	}
 	// console.log("联系客服")
 	// uni.makePhoneCall({
@@ -183,6 +183,7 @@ const filterArea = (q) => {
 // 	return item.match(regex).groups
 // }
 
+// 辽宁省沈阳市新民市公主屯镇委公主屯派出所
 const formatLocation = (str) => {
 	// console.log('``````')
 	// console.log(str)
@@ -214,7 +215,23 @@ const formatLocation = (str) => {
 	let index3 = str.indexOf("区")
 	if (index3 == -1) {
 		index3 = str.indexOf("县")
-		area.Country = str.substring(index2 + 1, index3 + 1)
+		if (index3 == -1) {
+			index3 = str.lastIndexOf("市")
+			if (index3 == -1) {
+				index3 = str.indexOf("镇")
+				if (index3 == -1) {
+
+				} else {
+					area.Country = str.substring(index2 + 1, index3 + 1)
+
+				}
+			} else {
+				area.Country = str.substring(index2 + 1, index3 + 1)
+			}
+		} else {
+			area.Country = str.substring(index2 + 1, index3 + 1)
+		}
+
 	} else {
 		area.Country = str.substring(index2 + 1, index3 + 1)
 	}

+ 31 - 20
components/bert-suggest/suggest.vue

@@ -1,12 +1,13 @@
 <template>
 	<view>
 		<view style='background:#fff;margin:20px 10px 10px;border-radius:10px;'>
-			<uni-card class="box" :isFull="true" title="反馈意见" >
+			<uni-card class="box" :isFull="true" title="反馈意见">
 				<textarea v-model="data.content" placeholder="您的反馈对我们非常重要,请在此输入。"></textarea>
-				<view style='position:absolute;right:22px;bottom:16px;font-size:13px;'>{{data.content.length}}/150个字</view>
+				<view style='position:absolute;right:22px;bottom:16px;font-size:13px;'>{{data.content.length}}/150个字
+				</view>
 			</uni-card>
-			<uni-card class="box contact" :isFull="true" title="联系方式" >
-				<input v-model="data.contact" placeholder="请输入您的手机号,方便我们联系您" maxlength="11" type="number"/>
+			<uni-card class="box contact" :isFull="true" title="联系方式">
+				<input v-model="data.contact" placeholder="请输入您的手机号,方便我们联系您" maxlength="11" type="number" />
 			</uni-card>
 		</view>
 		<button class="submit-btn" @click="submit">提交</button>
@@ -16,7 +17,7 @@
 <script>
 	import uniCard from '@/components/uni-card/uni-card.vue';
 	export default {
-		components:{
+		components: {
 			uniCard
 		},
 		data() {
@@ -35,7 +36,7 @@
 			chooseImage() {
 				let _self = this;
 				uni.chooseImage({
-					sizeType: ['compressed', 'original'],
+					sizeType: ['compressed'],
 					sourceType: ['album', 'camera'],
 					success: function(res) {
 						_self.data.imgList = _self.data.imgList.concat(res.tempFiles)
@@ -66,6 +67,7 @@
 		margin-bottom: 10rpx;
 		position: relative;
 	}
+
 	.imgs {
 		position: relative;
 		display: inline-flex;
@@ -73,48 +75,57 @@
 		margin: 10rpx;
 		width: 150rpx;
 		height: 150rpx;
+
 		.img {
 			width: 100%;
 			height: 100%;
 			border-radius: 10rpx;
 			border: 1rpx solid #ebebeb;
 		}
+
 		.remove {
 			line-height: 30rpx;
 			text-align: center;
 			border-radius: 10rpx;
 			position: absolute;
-			right: 0rpx;	
+			right: 0rpx;
 			top: 0rpx;
 			width: 30rpx;
 			height: 30rpx;
 			font-weight: bold;
 			background-color: #e53c25;
 		}
+
 		.add-img {
 			background-color: #f0f0f0;
 		}
 	}
+
 	.submit-btn {
 		background-color: #2772FB;
-		color:#fff;
-		border-radius:30px;
+		color: #fff;
+		border-radius: 30px;
 		margin: 20rpx;
-		margin-top:30px;
+		margin-top: 30px;
 	}
-	textarea,input{
-		background:#F9F9FA;
+
+	textarea,
+	input {
+		background: #F9F9FA;
 		border: 1px solid #eee;
 	}
-	textarea{
-		margin:0 auto;
-		padding:10px;
-		font-size:14px;
+
+	textarea {
+		margin: 0 auto;
+		padding: 10px;
+		font-size: 14px;
 	}
-	input{
-		padding:20px;
+
+	input {
+		padding: 20px;
 	}
-	.contact{
-		padding-bottom:20px;
+
+	.contact {
+		padding-bottom: 20px;
 	}
 </style>

+ 171 - 173
manifest.json

@@ -1,175 +1,173 @@
 {
-    "name" : "畅运通-货主端",
-    "appid" : "__UNI__DCD13AC",
-    "description" : "畅运通",
-    "versionName" : "1.1.0",
-    "versionCode" : 110,
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "compatible" : {
-            "ignoreVersion" : true
-        },
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {
-            "Maps" : {},
-            "Geolocation" : {},
-            "Push" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "maps" : {
-                    "amap" : {
-                        "appkey_ios" : "b1ce5ff5cafa861ce00623ac4788a721",
-                        "appkey_android" : "77d75fbe6f68fc8e415b990bfc70daaa"
-                    }
-                },
-                "push" : {
-                    "unipush" : {}
-                },
-                "oauth" : {},
-                "ad" : {},
-                "geolocation" : {
-                    "amap" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "b1ce5ff5cafa861ce00623ac4788a721",
-                        "appkey_android" : "77d75fbe6f68fc8e415b990bfc70daaa"
-                    },
-                    "system" : {
-                        "__platform__" : [ "ios", "android" ]
-                    }
-                }
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png"
-                    },
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png"
-                    }
-                }
-            }
-        },
-        "nativePlugins" : {
-            "AJ-Alert" : {
-                "__plugin_info__" : {
-                    "name" : "原生 弹窗 Alert 提示框  dialog 支持苹果安卓",
-                    "description" : "uni的showModel样式单一,直接写vue弹窗又遮盖不了原生的组件,这是一个优化原生弹窗api",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=1664",
-                    "android_package_name" : "uni.UNIDCD13AC",
-                    "ios_bundle_id" : "uni.UNIDCD13AC",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "1664",
-                    "parameters" : {}
-                }
-            },
-            "KJ-Camera" : {
-                "__plugin_info__" : {
-                    "name" : "相机自定义拍照录像,可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏",
-                    "description" : "相机自定义拍照录像,可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏、相机切换前后摄像头 QQ群:863776189 可接单 离线包:单价*10  源码:单价*15",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=3404",
-                    "android_package_name" : "uni.UNIDCD13AC",
-                    "ios_bundle_id" : "uni.UNIDCD13AC",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "3404",
-                    "parameters" : {}
-                }
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "2"
+	"name": "畅运通-货主端",
+	"appid": "__UNI__DCD13AC",
+	"description": "畅运通",
+	"versionName": "1.1.0",
+	"versionCode": 110,
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"compatible": {
+			"ignoreVersion": true
+		},
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"Maps": {},
+			"Push": {},
+			"Geolocation": {},
+			"Camera": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
+				],
+				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
+			},
+			/* ios打包配置 */
+			"ios": {
+				"dSYMs": false
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"maps": {
+					"amap": {
+						"appkey_ios": "b1ce5ff5cafa861ce00623ac4788a721",
+						"appkey_android": "77d75fbe6f68fc8e415b990bfc70daaa"
+					}
+				},
+				"push": {
+					"unipush": {}
+				},
+				"oauth": {},
+				"ad": {},
+				"geolocation": {
+					"amap": {
+						"__platform__": ["ios", "android"],
+						"appkey_ios": "b1ce5ff5cafa861ce00623ac4788a721",
+						"appkey_android": "77d75fbe6f68fc8e415b990bfc70daaa"
+					}
+				}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png"
+					},
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png"
+					}
+				}
+			}
+		},
+		"nativePlugins": {
+			"AJ-Alert": {
+				"__plugin_info__": {
+					"name": "原生 弹窗 Alert 提示框  dialog 支持苹果安卓",
+					"description": "uni的showModel样式单一,直接写vue弹窗又遮盖不了原生的组件,这是一个优化原生弹窗api",
+					"platforms": "Android,iOS",
+					"url": "https://ext.dcloud.net.cn/plugin?id=1664",
+					"android_package_name": "uni.UNIDCD13AC",
+					"ios_bundle_id": "uni.UNIDCD13AC",
+					"isCloud": true,
+					"bought": 1,
+					"pid": "1664",
+					"parameters": {}
+				}
+			},
+			"KJ-Camera": {
+				"__plugin_info__": {
+					"name": "相机自定义拍照录像,可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏",
+					"description": "相机自定义拍照录像,可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏、相机切换前后摄像头 QQ群:863776189 可接单 离线包:单价*10  源码:单价*15",
+					"platforms": "Android,iOS",
+					"url": "https://ext.dcloud.net.cn/plugin?id=3404",
+					"android_package_name": "uni.UNIDCD13AC",
+					"ios_bundle_id": "uni.UNIDCD13AC",
+					"isCloud": true,
+					"bought": 1,
+					"pid": "3404",
+					"parameters": {}
+				}
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "2"
 }

+ 85 - 77
pages/mine/cargoowner/editpersonalinformation.vue

@@ -48,20 +48,22 @@
 					</u-radio-group>
 				</view>
 			</view>
-			<view style='margin-top:10px;padding-bottom:11px;' class="flex row flex-space-between" >
+			<view style='margin-top:10px;padding-bottom:11px;' class="flex row flex-space-between">
 				<view class="left-text" style='font-size:14px;'>称呼</view>
 				<view style='padding-right:10px;' class='flex flex-space-between'>
 					<view style="width: 160rpx;">
-						<u--input style='padding-right:4px;' placeholder="输入姓氏" class="ch-style" inputAlign='right' border="none"
-							v-model="dataDetails.call">
+						<u--input style='padding-right:4px;' placeholder="输入姓氏" class="ch-style" inputAlign='right'
+							border="none" v-model="dataDetails.call">
 						</u--input>
 					</view>
-					<view style='position:relative;top:0px;font-size:15px;' class="flex align-center" v-if="dataDetails.sex=='男'">先生</view>
+					<view style='position:relative;top:0px;font-size:15px;' class="flex align-center"
+						v-if="dataDetails.sex=='男'">先生</view>
 					<view style='position:relative;top:0px;font-size:15px;' class="flex align-center" v-else>女士</view>
 				</view>
 			</view>
 
-			<view style='border-bottom:1px solid #eee;margin-top:10px;padding-bottom:11px;' class="flex row width100 flex-space-between">
+			<view style='border-bottom:1px solid #eee;margin-top:10px;padding-bottom:11px;'
+				class="flex row width100 flex-space-between">
 				<view class="left-text" style='font-size:14px;'>联系电话</view>
 				<view style='padding-right:10px;' class="flex">
 					<u--input disabledColor='#fff' disabled placeholder="输入联系电话" inputAlign='right' border="none"
@@ -71,8 +73,8 @@
 			</view>
 			<view style='padding-right:10px;margin-top:10px;padding-bottom:11px;' class="flex row">
 				<view class="left-text">身份证号</view>
-				<u--input :disabled='dataDetails.id&&firstAuthentication.passOnce?true:false' placeholder="请输入身份证号" inputAlign='right' border="none"
-					v-model="dataDetails.cardNumber" maxlength="18">
+				<u--input :disabled='dataDetails.id&&firstAuthentication.passOnce?true:false' placeholder="请输入身份证号"
+					inputAlign='right' border="none" v-model="dataDetails.cardNumber" maxlength="18">
 				</u--input>
 			</view>
 
@@ -87,14 +89,16 @@
 				</view>
 			</view>
 			<view class="bz">注:个人信息审核通过后自动认证成为个人货主。</view>
-			<itmister-date-picker :overdueContent="'身份证已过期'" :dateStatus="1" :periodOfValidity="true" :futureYear="30" :checkYear="year" :checkMonth="month" :checkDay="day" ref="dateValidityPeriod"  @dateConfirm="confirmValidityPeriod"></itmister-date-picker>
+			<itmister-date-picker :overdueContent="'身份证已过期'" :dateStatus="1" :periodOfValidity="true" :futureYear="30"
+				:checkYear="year" :checkMonth="month" :checkDay="day" ref="dateValidityPeriod"
+				@dateConfirm="confirmValidityPeriod"></itmister-date-picker>
 		</view>
 
 		<view class="content4">
 			<view style='margin:0 0 18px;font-size:12px;color:#999;' class='flex items-center'>
 				<u--image style='margin-right:5px;margin-top: 4rpx;' @click='consent'
 					:src="checked?'../../../static/mine/duihao@2x.png':'../../../static/mine/wxz.png'" width="12px"
-					height="12px" ></u--image>
+					height="12px"></u--image>
 				我已阅读并同意全部细则
 			</view>
 			<view class='line'></view>
@@ -132,7 +136,7 @@
 				radioCustomStyle: {
 					margin: '0 20rpx 0 0'
 				},
-				submitstatus:false,
+				submitstatus: false,
 				radiolist1: [{
 						name: '男',
 						disabled: false
@@ -142,15 +146,15 @@
 						disabled: false
 					},
 				],
-				year:'',
-				month:'',
-				day:'',
+				year: '',
+				month: '',
+				day: '',
 				uploadType: '',
 				isShowimgType: false,
 				dataDetails: {
 					name: '',
 					phone: '',
-					sex:'男',
+					sex: '男',
 					commonId: '',
 					cardNumber: '',
 					cardAddressUrl: '',
@@ -165,23 +169,23 @@
 				validityPeriod: [],
 				isShowimgType: false,
 				index: '',
-				firstAuthentication:{}
+				firstAuthentication: {}
 			};
 		},
 		onLoad(options) {
 			// this.get_camera_permission()
 			var _this = this;
 			// console.log(options)
-			if(JSON.stringify(options) != "{}"){
+			if (JSON.stringify(options) != "{}") {
 				this.dataDetails = options
-				if(this.dataDetails.cardValidityDate&&this.dataDetails.cardValidityDate!='长期'){
-					const arr=this.dataDetails.cardValidityDate.split('-')
-					this.year=arr[0]
-					this.month=arr[1]
-					this.day=arr[2]
+				if (this.dataDetails.cardValidityDate && this.dataDetails.cardValidityDate != '长期') {
+					const arr = this.dataDetails.cardValidityDate.split('-')
+					this.year = arr[0]
+					this.month = arr[1]
+					this.day = arr[2]
 				}
-				if(this.dataDetails.cardValidityDate=='长期'){
-					this.year='长期'
+				if (this.dataDetails.cardValidityDate == '长期') {
+					this.year = '长期'
 				}
 			}
 			this.dataDetails.phone = this.userInfo.phone
@@ -192,7 +196,7 @@
 				phone: this.userInfo.phone
 			}).then(res => {
 				uni.setStorageSync("firstAuthentication", res.data)
-				this.firstAuthentication=res.data
+				this.firstAuthentication = res.data
 			})
 		},
 		computed: {
@@ -200,20 +204,20 @@
 		},
 		methods: {
 			async get_camera_permission() {
-				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
-				if(photol == false){
+				var photol = await permision.requestAndroidPermission("android.permission.CAMERA")
+				if (photol == false) {
 					uni.showModal({
 						title: '提示',
 						content: '您已经关闭相机权限,去设置',
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
 								permision.gotoAppPermissionSetting()
-									            // plus.runtime.openURL("app-settings:");
+								// plus.runtime.openURL("app-settings:");
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
 						}
-					});	
+					});
 				}
 			},
 			nameinput() {
@@ -222,7 +226,7 @@
 			// 性别切换
 			radioChange(n) {
 				console.log('radioChange', n);
-				
+
 				this.dataDetails.sex = n
 				this.$forceUpdate()
 				console.log(this.dataDetails.sex)
@@ -300,7 +304,7 @@
 				// }
 			},
 			confirmValidityPeriod(date) {
-				this.dataDetails.cardValidityDate=date.date
+				this.dataDetails.cardValidityDate = date.date
 			},
 			uploadImg(type, index) {
 				this.get_camera_permission()
@@ -325,7 +329,7 @@
 					})
 					return true
 				}
-				if (this.dataDetails.call.length==0) {
+				if (this.dataDetails.call.length == 0) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "称呼不能为空!",
@@ -339,7 +343,7 @@
 					})
 					return true
 				}
-				
+
 				if (uni.$u.test.isEmpty(this.dataDetails.cardValidityDate)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -347,10 +351,10 @@
 					})
 					return true
 				}
-				
-				if(this.dataDetails.cardValidityDate!='长期'){
-					var arr=this.dataDetails.cardValidityDate.split('-')
-					if(!this.$helper.periodOfValidity(arr[0],arr[1],arr[2])){
+
+				if (this.dataDetails.cardValidityDate != '长期') {
+					var arr = this.dataDetails.cardValidityDate.split('-')
+					if (!this.$helper.periodOfValidity(arr[0], arr[1], arr[2])) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "身份证已过期!",
@@ -396,36 +400,37 @@
 			},
 			submit() {
 				if (this.validate()) return
-					uni.showLoading({
-						title: '加载中',
-						mask: true
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				var _this = this
+				delete _this.dataDetails.hyCargoOwnerCompInfoList
+				_this.dataDetails.accountNumber = uni.getStorageSync("userInfo").phone
+				_this.$request.baseRequest('post', '/cargoOwnerInfo/api/editCargoOwner', _this.dataDetails).then(res => {
+						// console.log(res)
+						// uni.$u.route('/pages/mine/cargoowner/cargoowner')
+						uni.hideLoading()
+						uni.$u.toast('提交成功')
+						uni.navigateBack({
+							delta: 1
+						})
 					})
-					var _this = this
-					delete _this.dataDetails.hyCargoOwnerCompInfoList
-					_this.dataDetails.accountNumber = uni.getStorageSync("userInfo").phone
-					_this.$request.baseRequest('post', '/cargoOwnerInfo/api/editCargoOwner', _this.dataDetails).then(res => {
-							// console.log(res)
-							// uni.$u.route('/pages/mine/cargoowner/cargoowner')
-							uni.hideLoading()
-							uni.$u.toast('提交成功')
-							uni.navigateBack({
-								delta: 1
-							})
+					.catch(res => {
+						console.log(res)
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
 						})
-						.catch(res => {
-							console.log(res)
-							uni.hideLoading()
-							uni.showToast({
-								title: res.message,
-								icon: 'none',
-								duration: 2000
-							})
-						});
+					});
 			},
 			photograph() {
 				console.log('拍照')
 				let that = this;
 				uni.chooseImage({
+					sizeType: ['compressed'],
 					count: 1,
 					success: function(res) {
 						console.log(JSON.stringify(res.tempFilePaths));
@@ -462,21 +467,22 @@
 													flag: 1
 												}).then(res => {
 												// if(!that.dataDetails.id){
-													if (res.data.recPersonNo) {
-														that.dataDetails.cardNumber = res.data.recPersonNo.replace(/\s*/g,"")
-														if(that.dataDetails.cardNumber[16]%2==0){
-															that.dataDetails.sex='女'
-														}else{
-															that.dataDetails.sex='男'
-														}
-													}
-													if (res.data.recPerson) {
-														that.dataDetails.name = res.data.recPerson
-														that.dataDetails.call=that.dataDetails.name[0]
+												if (res.data.recPersonNo) {
+													that.dataDetails.cardNumber = res.data.recPersonNo
+														.replace(/\s*/g, "")
+													if (that.dataDetails.cardNumber[16] % 2 == 0) {
+														that.dataDetails.sex = '女'
+													} else {
+														that.dataDetails.sex = '男'
 													}
+												}
+												if (res.data.recPerson) {
+													that.dataDetails.name = res.data.recPerson
+													that.dataDetails.call = that.dataDetails.name[0]
+												}
 												// }
-												
-												
+
+
 												that.$forceUpdate()
 											})
 											.catch(res => {
@@ -713,9 +719,11 @@
 	.bz {
 		font-size: 28rpx;
 	}
-	.right{
-		width:16px;height:16px;
-		position:relative;
-		top:1px;
+
+	.right {
+		width: 16px;
+		height: 16px;
+		position: relative;
+		top: 1px;
 	}
 </style>

+ 50 - 47
pages/mine/company/addcompany.vue

@@ -126,7 +126,8 @@
 			<view class="flex row border-bottom mt20 flex-space-between">
 				<view class="left-text">卡号</view>
 				<view class="flex right">
-					<u--input maxlength='19' placeholder="输入银行卡号码" inputAlign='right' border="none" v-model="dataDetails.bankCard">
+					<u--input maxlength='19' placeholder="输入银行卡号码" inputAlign='right' border="none"
+						v-model="dataDetails.bankCard">
 					</u--input>
 					<view class="" @click="uploadImg(5)" style="display: flex;align-items: center;margin-left: 20rpx;">
 						<image src="../../../static/images/xiangji-2.png" mode="" style="width: 40rpx ;height: 40rpx;">
@@ -252,7 +253,8 @@
 			<!-- <view @click="goDetailPage('/pages/mine/company/addcompanythree')" class='newlyIncreased'>下一步</view> -->
 			<view @click="$u.throttle(submit(), 1000)" class='newlyIncreased'>提交</view>
 		</view>
-		<itmister-date-picker :overdueContent="overdueContent" :dateStatus="1" :periodOfValidity="true" :futureYear="30"  ref="dateValidityPeriod"  @dateConfirm="confirmValidityPeriod"></itmister-date-picker>
+		<itmister-date-picker :overdueContent="overdueContent" :dateStatus="1" :periodOfValidity="true" :futureYear="30"
+			ref="dateValidityPeriod" @dateConfirm="confirmValidityPeriod"></itmister-date-picker>
 		<u-picker :show="isShowBank" :columns="columns" :closeOnClickOverlay='true' @close='zhBankClose'
 			@cancel='zhBankClose' @confirm='confirmBank'></u-picker>
 		</u-picker>
@@ -285,7 +287,7 @@
 				value: false,
 				isShowBank: false,
 				columns: [],
-				overdueContent:'',
+				overdueContent: '',
 				radioCustomStyle: {
 					margin: '0 0 0 20rpx'
 				},
@@ -359,10 +361,10 @@
 			},
 			selectData(num) {
 				this.dataType = num
-				if(num==0){
-					this.overdueContent='营业执照已过期'
-				}else if(num==1){
-					this.overdueContent='身份证已过期'
+				if (num == 0) {
+					this.overdueContent = '营业执照已过期'
+				} else if (num == 1) {
+					this.overdueContent = '身份证已过期'
 				}
 				this.$refs.dateValidityPeriod.show()
 			},
@@ -415,14 +417,14 @@
 			// 	// this.isShowimgType = true
 			// },
 			confirmValidityPeriod(date) {
-				console.log(date,this.dataType)
+				console.log(date, this.dataType)
 				switch (this.dataType) {
 					case 0:
-							this.dataDetails.businessTermDate = date.date
+						this.dataDetails.businessTermDate = date.date
 
 						break
 					case 1:
-							this.dataDetails.cardValidityDate = date.date
+						this.dataDetails.cardValidityDate = date.date
 						break
 				}
 				this.$forceUpdate()
@@ -529,7 +531,7 @@
 						commonId: this.userInfo.id
 					}).then(res => {
 						if (res.code == 200) {
-							console.log(this,res.data)
+							console.log(this, res.data)
 							if (uni.getStorageSync('companydata')) {
 								this.dataDetails = uni.getStorageSync('companydata')
 								if (!this.dataDetails.businessLicenseAddressUrl) {
@@ -543,7 +545,7 @@
 							that.dataDetails.cardBackAddressUrl = res.data.cardBackAddressUrl
 							that.dataDetails.cardNumber = res.data.cardNumber
 							that.dataDetails.cardValidityDate = res.data.cardValidityDate
-							
+
 						}
 					})
 					.catch(res => {
@@ -638,43 +640,43 @@
 					})
 					return true
 				}
-				if (this.dataDetails.unifiedSocialCreditCode.length!=18) {
+				if (this.dataDetails.unifiedSocialCreditCode.length != 18) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "统一社会信用代码输出错误!",
 					})
 					return true
 				}
-				if(uni.$u.test.isEmpty(this.dataDetails.bankCard)){
+				if (uni.$u.test.isEmpty(this.dataDetails.bankCard)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "卡号不能为空!",
 					})
 					return true
 				}
-				if(this.dataDetails.bankCard.length<16||this.dataDetails.bankCard.length>19){
+				if (this.dataDetails.bankCard.length < 16 || this.dataDetails.bankCard.length > 19) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "卡号输出错误!",
 					})
 					return true
 				}
-				
-				if(uni.$u.test.isEmpty(this.dataDetails.bankDeposit)){
+
+				if (uni.$u.test.isEmpty(this.dataDetails.bankDeposit)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "开户行不能为空!",
 					})
 					return true
 				}
-				if(uni.$u.test.isEmpty(this.dataDetails.bankDepositBranch)){
+				if (uni.$u.test.isEmpty(this.dataDetails.bankDepositBranch)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "开户支行不能为空!",
 					})
 					return true
 				}
-				
+
 				//先注释掉
 				// if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
 				// 		.propertyAddressUrl)) {
@@ -704,38 +706,38 @@
 			},
 			submit() {
 				if (this.validate()) return
-					if (!this.consentStatus) {
+				if (!this.consentStatus) {
+					uni.showToast({
+						title: '请勾选协议',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				var _this = this
+				this.$request.baseRequest('post', '/companyInfo/api/addCompanyInfo', _this.dataDetails).then(res => {
+						uni.hideLoading()
+						uni.$u.toast('提交成功')
+						this.submitstatus = false
+						uni.removeStorageSync("videoSrc")
+						uni.navigateBack({
+							delta: 1
+						})
+
+					})
+					.catch(res => {
+						uni.hideLoading()
+						this.submitstatus = false
 						uni.showToast({
-							title: '请勾选协议',
+							title: res.message,
 							icon: 'none',
 							duration: 2000
 						})
-						return
-					}
-					uni.showLoading({
-						title: '加载中',
-						mask: true
-					})
-					var _this = this
-					this.$request.baseRequest('post', '/companyInfo/api/addCompanyInfo', _this.dataDetails).then(res => {
-							uni.hideLoading()
-							uni.$u.toast('提交成功')
-							this.submitstatus = false
-							uni.removeStorageSync("videoSrc")
-							uni.navigateBack({
-								delta: 1
-							})
-
-						})
-						.catch(res => {
-							uni.hideLoading()
-							this.submitstatus = false
-							uni.showToast({
-								title: res.message,
-								icon: 'none',
-								duration: 2000
-							})
-						});
+					});
 
 			},
 			consent() {
@@ -786,6 +788,7 @@
 				// if (val.name == '相册') {
 				uni.chooseImage({
 					count: 1,
+					sizeType: ['compressed'],
 					// sourceType: ,
 					success: function(res) {
 						console.log(_this.uploadType);

+ 54 - 50
pages/mine/company/editcompany.vue

@@ -117,14 +117,15 @@
 			<view style='padding-top:10rpx;' class="flex row border-bottom mt20 align-center flex-space-between">
 				<view class="left">卡号</view>
 				<view class="flex">
-					<u--input maxlength='19' placeholder="输入银行卡号码" inputAlign='left' border="none" v-model="dataDetails.bankCard">
+					<u--input maxlength='19' placeholder="输入银行卡号码" inputAlign='left' border="none"
+						v-model="dataDetails.bankCard">
 					</u--input>
 					<view class="" @click="uploadImg(5)">
 						<image src="../../../static/images/xiangji-2.png" mode=""
 							style="width: 40rpx ;height: 40rpx;margin-top: 10rpx;"></image>
 					</view>
 				</view>
-				
+
 			</view>
 			<view style='padding-top:10rpx;' class="flex row border-bottom mt20 align-center">
 				<view class="left">开户行</view>
@@ -177,8 +178,8 @@
 					</u-button>
 				</view>
 			</view> -->
-			<!-- <video class="myVideo" :src="dataDetails.videoAddressUrl" controls></video> -->
-			<!-- <view>
+		<!-- <video class="myVideo" :src="dataDetails.videoAddressUrl" controls></video> -->
+		<!-- <view>
 				<view class="video-icon">
 					<u-icon size="40" name="play-circle-fill" @click="videoShow()"></u-icon>
 				</view>
@@ -259,7 +260,9 @@
 		<!-- <u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod" @confirm="confirmValidityPeriod"
 			@change="changeHandler" @cancel="isShowcardValidity=false">
 		</u-picker> -->
-		<itmister-date-picker :overdueContent="'身份证已过期'" :dateStatus="1" :periodOfValidity="true" :futureYear="30" :checkYear="year" :checkMonth="month" :checkDay="day" ref="dateValidityPeriod"  @dateConfirm="confirmValidityPeriod"></itmister-date-picker>
+		<itmister-date-picker :overdueContent="'身份证已过期'" :dateStatus="1" :periodOfValidity="true" :futureYear="30"
+			:checkYear="year" :checkMonth="month" :checkDay="day" ref="dateValidityPeriod"
+			@dateConfirm="confirmValidityPeriod"></itmister-date-picker>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>
@@ -301,14 +304,14 @@
 					},
 
 				],
-				year:'',
-				month:'',
-				day:'',
+				year: '',
+				month: '',
+				day: '',
 				isShowManualInput: false,
 				isShowcardValidity: false,
 				uploadType: '',
 				index: '',
-				submitstatus:false,
+				submitstatus: false,
 				isShowimgType: false,
 				checked: false,
 				checked1: false,
@@ -385,30 +388,30 @@
 				this.dataType = num
 				switch (this.dataType) {
 					case 0:
-						if(this.dataDetails.businessTermDate=='长期'){
-							this.year=this.dataDetails.businessTermDate
-						}else{
-							var arr=this.dataDetails.businessTermDate.split('-')
-							this.year=arr[0]
-							this.month=arr[1]
-							this.day=arr[2]
+						if (this.dataDetails.businessTermDate == '长期') {
+							this.year = this.dataDetails.businessTermDate
+						} else {
+							var arr = this.dataDetails.businessTermDate.split('-')
+							this.year = arr[0]
+							this.month = arr[1]
+							this.day = arr[2]
 						}
 						break
 					case 1:
-						if(this.dataDetails.cardValidityDate=='长期'){
-							this.year=this.dataDetails.cardValidityDate
-						}else{
-							var arr=this.dataDetails.cardValidityDate.split('-')
-							this.year=arr[0]
-							this.month=arr[1]
-							this.day=arr[2]
+						if (this.dataDetails.cardValidityDate == '长期') {
+							this.year = this.dataDetails.cardValidityDate
+						} else {
+							var arr = this.dataDetails.cardValidityDate.split('-')
+							this.year = arr[0]
+							this.month = arr[1]
+							this.day = arr[2]
 						}
 						break
 				}
-				if(num==0){
-					this.overdueContent='营业执照已过期'
-				}else if(num==1){
-					this.overdueContent='身份证已过期'
+				if (num == 0) {
+					this.overdueContent = '营业执照已过期'
+				} else if (num == 1) {
+					this.overdueContent = '身份证已过期'
 				}
 				this.$refs.dateValidityPeriod.show()
 			},
@@ -435,11 +438,11 @@
 			confirmValidityPeriod(date) {
 				switch (this.dataType) {
 					case 0:
-							this.dataDetails.businessTermDate = date.date
-				
+						this.dataDetails.businessTermDate = date.date
+
 						break
 					case 1:
-							this.dataDetails.cardValidityDate = date.date
+						this.dataDetails.cardValidityDate = date.date
 						break
 				}
 				this.$forceUpdate()
@@ -471,13 +474,13 @@
 						id: this.dataDetails.id
 					}).then(res => {
 						uni.hideLoading()
-						if(res.data){
+						if (res.data) {
 							_this.dataDetails = res.data
-							if(_this.dataDetails.advanceFreightService==1){
-								this.value=true
-							}else{
-								this.value=false
-							}	
+							if (_this.dataDetails.advanceFreightService == 1) {
+								this.value = true
+							} else {
+								this.value = false
+							}
 						}
 					})
 					.catch(res => {
@@ -589,36 +592,36 @@
 					})
 					return true
 				}
-				if (this.dataDetails.unifiedSocialCreditCode.length!=18) {
+				if (this.dataDetails.unifiedSocialCreditCode.length != 18) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "统一社会信用代码输出错误!",
 					})
 					return true
 				}
-				if(uni.$u.test.isEmpty(this.dataDetails.bankCard)){
+				if (uni.$u.test.isEmpty(this.dataDetails.bankCard)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "卡号不能为空!",
 					})
 					return true
 				}
-				if(this.dataDetails.bankCard.length<16||this.dataDetails.bankCard.length>19){
+				if (this.dataDetails.bankCard.length < 16 || this.dataDetails.bankCard.length > 19) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "卡号输出错误!",
 					})
 					return true
 				}
-				
-				if(uni.$u.test.isEmpty(this.dataDetails.bankDeposit)){
+
+				if (uni.$u.test.isEmpty(this.dataDetails.bankDeposit)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "开户行不能为空!",
 					})
 					return true
 				}
-				if(uni.$u.test.isEmpty(this.dataDetails.bankDepositBranch)){
+				if (uni.$u.test.isEmpty(this.dataDetails.bankDepositBranch)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "开户支行不能为空!",
@@ -658,8 +661,8 @@
 			},
 			submit() {
 				if (this.validate()) return
-				if(!this.submitstatus){
-					this.submitstatus=true
+				if (!this.submitstatus) {
+					this.submitstatus = true
 					if (!this.consentStatus) {
 						uni.showToast({
 							title: '请勾选协议',
@@ -676,7 +679,7 @@
 					this.$request.baseRequest('post', '/companyInfo/api/editCompanyInfo', _this.dataDetails).then(res => {
 							uni.hideLoading()
 							uni.$u.toast('提交成功')
-							this.submitstatus=false
+							this.submitstatus = false
 							uni.navigateBack({
 								delta: 1
 							})
@@ -684,7 +687,7 @@
 						})
 						.catch(res => {
 							uni.hideLoading()
-							this.submitstatus=false
+							this.submitstatus = false
 							uni.showToast({
 								title: res.message,
 								icon: 'none',
@@ -692,7 +695,7 @@
 							})
 						});
 				}
-				
+
 			},
 			consent() {
 				this.consentStatus = !this.consentStatus
@@ -745,6 +748,7 @@
 				// if (val.name == '相册') {
 				uni.chooseImage({
 					count: 1,
+					sizeType: ['compressed'],
 					// sourceType: ,
 					success: function(res) {
 						console.log(JSON.stringify(res.tempFilePaths));
@@ -838,7 +842,7 @@
 												}
 
 												// 开户支行LIst
-												_this.columns=[]
+												_this.columns = []
 												if (res.data.bankNameZhihang) {
 													_this.columns.push(res.data
 														.bankNameZhihang)
@@ -967,7 +971,7 @@
 
 	.wrap {
 		background: #fff;
-		padding:10rpx 30rpx 20rpx;
+		padding: 10rpx 30rpx 20rpx;
 		border-radius: 5px;
 		margin: 20rpx;
 
@@ -1037,7 +1041,7 @@
 
 	.content1 {
 		background: #fff;
-		padding:20rpx 20rpx 0;
+		padding: 20rpx 20rpx 0;
 		margin: 20rpx;
 		border-radius: 10rpx;
 

+ 1 - 0
pages/mine/manageBankCards/addBankCard.vue

@@ -348,6 +348,7 @@
 				console.log(val)
 				// if (val.name == '相册') {
 				uni.chooseImage({
+					sizeType: ['compressed'],
 					count: 1,
 					// sourceType: this.$helper.chooseImage.sourceType,
 					success: function(res) {

+ 8 - 6
pages/mine/manageBankCards/editBankCard.vue

@@ -70,7 +70,7 @@
 				dataDetails: {},
 				imagesrc: '',
 				bankType: [],
-				submitstatus:false,
+				submitstatus: false,
 				isShowBank: false,
 				isShowManualInput: false,
 				index: ''
@@ -82,20 +82,20 @@
 		},
 		methods: {
 			async get_camera_permission() {
-				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
-				if(photol == false){
+				var photol = await permision.requestAndroidPermission("android.permission.CAMERA")
+				if (photol == false) {
 					uni.showModal({
 						title: '提示',
 						content: '您已经关闭相机权限,去设置',
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
 								permision.gotoAppPermissionSetting()
-									            // plus.runtime.openURL("app-settings:");
+								// plus.runtime.openURL("app-settings:");
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
 						}
-					});	
+					});
 				}
 			},
 			manualInput() {
@@ -156,6 +156,7 @@
 				let that = this;
 				uni.chooseImage({
 					count: 1,
+					sizeType: ['compressed'],
 					success: function(res) {
 						console.log(JSON.stringify(res.tempFilePaths));
 						uploadImage(res.tempFilePaths[0], 'appData/',
@@ -173,6 +174,7 @@
 				if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
+						sizeType: ['compressed'],
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));

+ 10 - 7
pages/mine/manageVehicles/addVehicle.vue

@@ -29,9 +29,10 @@
 			unloadGroupPhoto() {
 				uni.chooseImage({
 					count: 1,
+					sizeType: ['compressed'],
 					success: function(res) {
 						console.log(JSON.stringify(res.tempFilePaths));
-						uploadImage('image',res.tempFilePaths[0], 'appData/',
+						uploadImage('image', res.tempFilePaths[0], 'appData/',
 							result => {
 								// 上传成功
 								console.log('图片地址', result)
@@ -40,13 +41,15 @@
 					}
 				});
 			},
-			submit(){
+			submit() {
 				let params = {
-						type: 'success',
-						message: "提交成功",
-						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
-					}
-				this.$refs.uToast.show({...params})
+					type: 'success',
+					message: "提交成功",
+					iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
+				}
+				this.$refs.uToast.show({
+					...params
+				})
 			},
 		},
 	}

+ 10 - 7
pages/mine/manageVehicles/editVehicle.vue

@@ -29,9 +29,10 @@
 			unloadGroupPhoto() {
 				uni.chooseImage({
 					count: 1,
+					sizeType: ['compressed'],
 					success: function(res) {
 						console.log(JSON.stringify(res.tempFilePaths));
-						uploadImage('image',res.tempFilePaths[0], 'appData/',
+						uploadImage('image', res.tempFilePaths[0], 'appData/',
 							result => {
 								// 上传成功
 								console.log('图片地址', result)
@@ -40,13 +41,15 @@
 					}
 				});
 			},
-			submit(){
+			submit() {
 				let params = {
-						type: 'success',
-						message: "修改成功",
-						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
-					}
-				this.$refs.uToast.show({...params})
+					type: 'success',
+					message: "修改成功",
+					iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
+				}
+				this.$refs.uToast.show({
+					...params
+				})
 			},
 		},
 	}

+ 73 - 68
pages/mine/settings/editAvatar.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="content">
 		<view @click="upload" class="picture">
-			<image class="xj-image"  v-if="!deptListurl.avatarUrl" src="@/static/images/common/tianjiazhaopian@2x.png"></image>
+			<image class="xj-image" v-if="!deptListurl.avatarUrl" src="@/static/images/common/tianjiazhaopian@2x.png">
+			</image>
 			<image class="xj-image" :src="deptListurl.avatarUrl" v-if="deptListurl.avatarUrl"></image>
-			
+
 		</view>
-			<view @click="$u.throttle(submit, 1000)" class="submit">提交</view>
+		<view @click="$u.throttle(submit, 1000)" class="submit">提交</view>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
-			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true"
-			@close="isShowimgType=false">
+			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>
 	</view>
 </template>
@@ -23,12 +23,12 @@
 	export default {
 		data() {
 			return {
-					isShowimgType:false,
-					imgSrc:'',
-					deptListurl:{
-						avatarUrl:'',
-						id:''
-					}
+				isShowimgType: false,
+				imgSrc: '',
+				deptListurl: {
+					avatarUrl: '',
+					id: ''
+				}
 			}
 		},
 		onLoad() {
@@ -40,33 +40,34 @@
 		methods: {
 			upload() {
 				// this.isShowimgType = true
-			this.imgTypeSelect()
+				this.imgTypeSelect()
 			},
 			imgTypeSelect(val) {
 				console.log(val)
 				// if (val.name == '相册') {
-					uni.chooseImage({
-						count: 1,
-						// sourceType: this.$helper.chooseImage.sourceType,
-						success: function(res) {
-							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image',res.tempFilePaths[0], 'appData/',
-								result => {
-									// 上传成功
-									console.log('图片地址', result)
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['compressed'],
+					// sourceType: this.$helper.chooseImage.sourceType,
+					success: function(res) {
+						console.log(JSON.stringify(res.tempFilePaths));
+						uploadImage('image', res.tempFilePaths[0], 'appData/',
+							result => {
+								// 上传成功
+								console.log('图片地址', result)
 								that.deptListurl.avatarUrl = result
-			
-								}
-							)
-						}
-					});
-			
-			// 	} else {
-			
-			// 	}
-			
+
+							}
+						)
+					}
+				});
+
+				// 	} else {
+
+				// 	}
+
 			},
-			submit(){
+			submit() {
 				this.deptListurl.id = this.userInfo.id
 				this.$request.baseRequest('post', '/commonUser/editUserInfo', this.deptListurl).then(res => {
 						uni.showToast({
@@ -74,7 +75,7 @@
 							icon: 'success',
 							duration: 2000,
 							success() {
-								setTimeout(()=>{
+								setTimeout(() => {
 									that.userInfo.avatarUrl = that.deptListurl.avatarUrl
 									var _student = uni.getStorageSync('userInfo');
 									_student.avatarUrl = that.deptListurl.avatarUrl;
@@ -87,15 +88,15 @@
 									});
 									// this.$api.msg('修改成功2!')
 									uni.navigateBack({
-										delta:1
+										delta: 1
 									})
-								},2000)
+								}, 2000)
 							}
 						})
-				
+
 					})
 					.catch(res => {
-					uni.$u.toast( res.message);
+						uni.$u.toast(res.message);
 					});
 			}
 		}
@@ -103,38 +104,42 @@
 </script>
 
 <style>
-	.content{
+	.content {
 		background: white;
 		padding: 20rpx;
 	}
-.left-text {
-			width: 290rpx;
-			color: #333333;
-			display: flex;
-			align-items: center;
-		}
-		.picture {
-			margin-top: 20rpx;
-			background: #F5F6FA;
-			width: 212rpx;
-			height: 212rpx;
-			border-radius: 10rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			color: #6A7282;
-		}
-		.xj-image {
-			width: 100%;
-			height: 100%;
-		}
-		.submit{
-			margin-top: 20rpx;
-			background: #2772FB;
-			border-radius: 50rpx;
-			padding: 20rpx 0;
-			color: white;
-			text-align: center;
-		}
+
+	.left-text {
+		width: 290rpx;
+		color: #333333;
+		display: flex;
+		align-items: center;
+	}
+
+	.picture {
+		margin-top: 20rpx;
+		background: #F5F6FA;
+		width: 212rpx;
+		height: 212rpx;
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		color: #6A7282;
+	}
+
+	.xj-image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.submit {
+		margin-top: 20rpx;
+		background: #2772FB;
+		border-radius: 50rpx;
+		padding: 20rpx 0;
+		color: white;
+		text-align: center;
+	}
 </style>

+ 48 - 46
pages/release/addAddress.vue

@@ -68,7 +68,7 @@
 					contactPhone: "",
 					longitude: "",
 					latitude: "",
-					adCode:"",
+					adCode: "",
 				},
 				// rules: {
 				// 	// 'addressInfo.name': {
@@ -122,56 +122,58 @@
 			},
 			toMap() {
 				let that = this
-				// this.isShowMap = true
-				uni.getLocation({
-					type: 'gcj02',
-					geocode: true,
-					altitude: true,
-					isHighAccuracy: true,
+				uni.chooseLocation({
 					success: function(res) {
-						console.log('当前位置的经度:' + res.longitude);
-						console.log('当前位置的纬度:' + res.latitude);
-						uni.chooseLocation({
-							latitude: res.latitude,
-							longitude: res.longitude,
-							success: function(res) {
-								console.log(res);
-								console.log('位置名称:' + res.name);
-								console.log('详细地址:' + res.address);
-								console.log('纬度:' + res.latitude);
-								console.log('经度:' + res.longitude);
-								let _address = that.$helper.formatLocation(res.address)
-								that.addressInfo.latitude = res.latitude
-								that.addressInfo.longitude = res.longitude
-								that.addressInfo.detailedAddress = _address.Village
-								that.addressInfo.province = _address.Province
-								that.addressInfo.city = _address.City
-								that.addressInfo.area = _address.Country
-								that.addressInfo.commonId = that.userInfo.id
-								uni.request({
-									url: 'https://restapi.amap.com/v3/config/district?key=d29a9d10160efaca0dd616bbec936d7f&subdistrict=1&keywords=' +
-										_address.City,
-									success: (res) => {
-									  for(let i = 0 ; i < res.data.districts[0].districts.length ; i++){
-										  if(res.data.districts[0].districts[i].name == _address.Country){
-											  that.addressInfo.adCode = res.data.districts[0].districts[i].adcode
-											  console.log("行政区划代码"+that.addressInfo.adCode)
-											  break
-										  } 
-									  }
+						console.log(res);
+						console.log('位置名称:' + res.name);
+						console.log('详细地址:' + res.address);
+						console.log('纬度:' + res.latitude);
+						console.log('经度:' + res.longitude);
+						let _address = that.$helper.formatLocation(res.address)
+						that.addressInfo.latitude = res.latitude
+						that.addressInfo.longitude = res.longitude
+						that.addressInfo.detailedAddress = _address.Village ? _address.Village : res.name
+						that.addressInfo.province = _address.Province
+						that.addressInfo.city = _address.City
+						that.addressInfo.area = _address.Country
+						that.addressInfo.commonId = that.userInfo.id
+						uni.request({
+							url: 'https://restapi.amap.com/v3/config/district?key=d29a9d10160efaca0dd616bbec936d7f&subdistrict=1&keywords=' +
+								_address.City,
+							success: (res) => {
+								for (let i = 0; i < res.data.districts[0].districts.length; i++) {
+									if (res.data.districts[0].districts[i].name == _address
+										.Country) {
+										that.addressInfo.adCode = res.data.districts[0].districts[
+											i].adcode
+										console.log("行政区划代码" + that.addressInfo.adCode)
+										break
 									}
-								});
-								that.$forceUpdate()
-							},
-							fail(err) {
-								console.log(err)
-							},
-							complete(res1) {
-								console.log(res1)
+								}
 							}
 						});
+						that.$forceUpdate()
+					},
+					fail(err) {
+						console.log(err)
+					},
+					complete(res1) {
+						console.log(res1)
 					}
-				})
+				});
+
+				// this.isShowMap = true
+				// uni.getLocation({
+				// 	type: 'gcj02',
+				// 	geocode: true,
+				// 	altitude: true,
+				// 	isHighAccuracy: true,
+				// 	success: function(res) {
+				// 		console.log('当前位置的经度:' + res.longitude);
+				// 		console.log('当前位置的纬度:' + res.latitude);
+
+				// 	}
+				// })
 
 				// console.log(123)
 				// uni.$u.route('/pages/release/map', {

+ 51 - 62
pages/release/selectAddress.vue

@@ -19,9 +19,8 @@
 				</view>
 				<view class="row flex row3">
 					<u-radio-group placement="row" class="select-type" v-model="item.radiovalue">
-						<u-radio :customStyle="radioCustomStyle" v-for="item1 in radiolist1"
-							:label="item1.name" :name="item1.name" @change="radioChange($event,item)" labelSize='12px'
-							:iconSize='10'>
+						<u-radio :customStyle="radioCustomStyle" v-for="item1 in radiolist1" :label="item1.name"
+							:name="item1.name" @change="radioChange($event,item)" labelSize='12px' :iconSize='10'>
 						</u-radio>
 					</u-radio-group>
 					<view class="flex">
@@ -53,8 +52,8 @@
 			<view class="btn-right" @click="selectAddress(1)">新增常用地址</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 1000)" @close="cancelClick"
-			@cancel="cancelClick"></u-modal>
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 1000)"
+			@close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -99,7 +98,7 @@
 				isShowAlert: false,
 				alertTitle: "",
 				alertContent: "",
-				showCancelButton:false
+				showCancelButton: false
 			}
 		},
 		computed: {
@@ -182,7 +181,7 @@
 								}
 							}
 
-							
+
 						}
 
 					})
@@ -272,64 +271,54 @@
 				if (type == 0) {
 					console.log(111111111)
 					let that = this
-					uni.getLocation({
-						type: 'gcj02',
-						geocode:true,
-						altitude:true,
-						isHighAccuracy:true,
+					uni.chooseLocation({
 						success: function(res) {
-							console.log('当前位置的经度:' + res.longitude);
-							console.log('当前位置的纬度:' + res.latitude);
-							uni.chooseLocation({
-								success: function(res) {
-									// var locationObj = that.$helper.formatLocation(res);
-									// console.log(locationObj)
-									console.log(res);
-									console.log('位置名称:' + res.name);
-									console.log('详细地址:' + res.address);
-									console.log('纬度:' + res.latitude);
-									console.log('经度:' + res.longitude);
-									let _address = that.$helper.formatLocation(res.address)
-									console.log('----------------------------')
-									console.log(_address, that.type)
-									var data = {}
-									data.latitude = res.latitude
-									data.longitude = res.longitude
-									data.detailedAddress = _address.Village
-									data.province = _address.Province
-									data.city = _address.City
-									data.area = _address.Country
-									data.commonId = that.userInfo.id
-									if (that.type == 0) {
-										uni.setStorageSync('storage_faddress', data)
-									} else {
-										uni.setStorageSync('storage_saddress', data)
-									}
+							// var locationObj = that.$helper.formatLocation(res);
+							// console.log(locationObj)
+							console.log(res);
+							console.log('位置名称:' + res.name);
+							console.log('详细地址:' + res.address);
+							console.log('纬度:' + res.latitude);
+							console.log('经度:' + res.longitude);
+							let _address = that.$helper.formatLocation(res.address)
+							console.log('----------------------------')
+							console.log(_address, that.type)
+							var data = {}
+							data.latitude = res.latitude
+							data.longitude = res.longitude
+							data.detailedAddress = _address.Village ? _address.Village : res.name
+							data.province = _address.Province
+							data.city = _address.City
+							data.area = _address.Country
+							data.commonId = that.userInfo.id
+							if (that.type == 0) {
+								uni.setStorageSync('storage_faddress', data)
+							} else {
+								uni.setStorageSync('storage_saddress', data)
+							}
 
-									uni.navigateBack({
-										delta: 1
-									})
-									// uni.$u.route('/pages/release/release');
-									// that.temporaryAddress.latitude = res.latitude
-									// that.temporaryAddress.longitude = res.longitude
-									// that.temporaryAddress.detailedAddress = locationObj.ADDRESS
-									// that.temporaryAddress.province = locationObj.REGION_PROVINCE
-									// that.temporaryAddress.city = locationObj.REGION_CITY
-									// that.temporaryAddress.area = locationObj.REGION_COUNTRY
-									// that.temporaryAddress.commonId = that.userInfo.id
-									// that.configAddress(that.temporaryAddress)
-									// that.$forceUpdate()
-								},
+							uni.navigateBack({
+								delta: 1
+							})
+						},
 
-								fail(err) {
-									console.log(err)
-								},
-								complete(res1) {
-									console.log(res1)
-								}
-							});
+						fail(err) {
+							console.log(err)
+						},
+						complete(res1) {
+							console.log(res1)
 						}
-					})
+					});
+					// uni.getLocation({
+					// 	type: 'gcj02',
+					// 	geocode: true,
+					// 	isHighAccuracy: true,
+					// 	success: function(res) {
+					// 		console.log('当前位置的经度:' + res.longitude);
+					// 		console.log('当前位置的纬度:' + res.latitude);
+
+					// 	}
+					// })
 				} else {
 					uni.$u.route('/pages/release/addAddress', {
 						type: type,
@@ -349,7 +338,7 @@
 
 	.content {
 		height: 100vh;
-		overflow:scroll;
+		overflow: scroll;
 	}
 
 	.content2-wrap {