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

# Conflicts:
#	config/index.js
#	manifest.json

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)
 	}

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>

config/index.js

@@ -1,7 +1,11 @@
 const dev = {
 	baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.changyuntong56.com',
+<<<<<<< HEAD
 	// baseUrlNew: 'http://192.168.110.9:8099',
+=======
+	baseUrlNew: 'http://192.168.110.82:8099',
+>>>>>>> 53bebc615c9da4da7d1f8ddddad2142792cd2137
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
 	// baseUrlNew: 'http://192.168.110.67:8999/',
 	h5Appid: 'wxb66b599f7f61b46f',
@@ -10,4 +14,4 @@ const dev = {
 
 export function def() {
 	return dev
-}
+}

manifest.json

@@ -1,172 +1,173 @@
 {
-    "name" : "畅运通-货主端",
-    "appid" : "__UNI__DCD13AC",
-    "description" : "畅运通",
-    "versionName" : "1.1.2",
-    "versionCode" : 112,
-    "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"
-                    }
-                }
-            },
-            "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"
 }

pages.json

@@ -79,7 +79,7 @@
 				"navigationBarTitleText": "反馈处理结果",
 				"enablePullDownRefresh": false
 			}
-		},{
+		}, {
 			"path": "pages/news/newsSee",
 			"style": {
 				"navigationBarTitleText": "系统消息",
@@ -147,9 +147,9 @@
 						}]
 					},
 					"pullToRefresh": {
-					    "support": true,
-					    "color": "#2772FB", //小圈圈的颜色
-					    "style": "circle" //小圈圈的样式
+						"support": true,
+						"color": "#2772FB", //小圈圈的颜色
+						"style": "circle" //小圈圈的样式
 					}
 				}
 			}
@@ -176,7 +176,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/mine/helpDescription",
 			"style": {
 				"navigationBarTitleText": "操作说明",
@@ -248,22 +248,6 @@
 				"enablePullDownRefresh": false
 			}
 
-		},
-		{
-			"path": "pages/mine/camera/idcard/idcard",
-			"style": {
-				"navigationStyle": "custom",
-				"backgroundColor": "#000000"
-			}
-
-		},
-		{
-			"path": "pages/mine/camera/video/video",
-			"style": {
-				"navigationStyle": "custom",
-				"backgroundColor": "#000000"
-			}
-
 		},
 		{
 			"path": "pages/mine/agency/agency",
@@ -294,7 +278,7 @@
 				"navigationBarTitleText": "提现详情",
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
 		{
 			"path": "pages/mine/myAccount/withdrawal",
@@ -372,7 +356,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/mine/company/companyvideo",
 			"style": {
 				"navigationBarTitleText": "视频认证",
@@ -514,9 +498,9 @@
 						}]
 					},
 					"pullToRefresh": {
-					    "support": true,
-					    "color": "#2772FB", //小圈圈的颜色
-					    "style": "circle" //小圈圈的样式
+						"support": true,
+						"color": "#2772FB", //小圈圈的颜色
+						"style": "circle" //小圈圈的样式
 					}
 				}
 			}
@@ -574,35 +558,29 @@
 				"navigationStyle": "custom"
 			}
 
+		}, {
+			"path": "pages/mine/settings/fankui",
+			"style": {
+				"navigationBarTitleText": "意见反馈",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/public/serviceAgreement/serviceAgreement",
+			"style": {
+				"navigationBarTitleText": "服务协议",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/public/cytScrectAgreement/cytScrectAgreement",
+			"style": {
+				"navigationBarTitleText": "隐私声明",
+				"enablePullDownRefresh": false
+			}
+
 		}
-	    ,{
-            "path" : "pages/mine/settings/fankui",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "意见反馈",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/public/serviceAgreement/serviceAgreement",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "服务协议",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/public/cytScrectAgreement/cytScrectAgreement",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "隐私声明",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

pages/mine/camera/camera.nvue

@@ -1,213 +0,0 @@
-<template>
-	<view class="live-camera" :style="{ width: windowWidth, height: windowHeight }">
-		<live-pusher
-			id="livePusher"
-			ref="livePusher"
-			class="livePusher"
-			mode="FHD"
-			beauty="0"
-			whiteness="0"
-			:aspect="aspect"
-			min-bitrate="1000"
-			audio-quality="16KHz"
-			device-position="back"
-			:auto-focus="true"
-			:muted="true"
-			:enable-camera="true"
-			:enable-mic="false"
-			:zoom="false"
-			@statechange="statechange"
-			:style="{ width: windowWidth, height: windowHeight }"
-		></live-pusher>
-
-		<view class="menu">
-			<!--底部菜单区域背景-->
-			<cover-image class="menu-mask" src="/static/live-camera/bar.png"></cover-image>
-
-			<!--返回键-->
-			<cover-image class="menu-back" @tap="back" src="/static/live-camera/back.png"></cover-image>
-
-			<!--快门键-->
-			<cover-image class="menu-snapshot" @tap="snapshot" src="/static/live-camera/shutter.png"></cover-image>
-
-			<!--反转键-->
-			<cover-image class="menu-flip" @tap="flip" src="/static/live-camera/flip.png"></cover-image>
-		</view>
-	</view>
-</template>
-
-<script>
-let _this = null;
-export default {
-	data() {
-		return {
-			poenCarmeInterval:null,//打开相机的轮询
-			aspect: '2:3', //比例
-			windowWidth: '', //屏幕可用宽度
-			windowHeight: '', //屏幕可用高度
-			camerastate: false, //相机准备好了
-			livePusher: null, //流视频对象
-			snapshotsrc: null //快照
-		};
-	},
-	onLoad(e) {
-		_this = this;
-		this.initCamera();
-	},
-	onReady() {
-		this.livePusher = uni.createLivePusherContext('livePusher', this);
-		this.startPreview(); //开启预览并设置摄像头
-		this.poenCarme();
-	},
-	methods: {
-		
-		//轮询打开
-		poenCarme(){
-			//#ifdef APP-PLUS
-			if (plus.os.name == 'Android') {
-				this.poenCarmeInterval = setInterval(function() {
-					console.log(_this.camerastate);
-					if (!_this.camerastate) _this.startPreview();
-				}, 2500);
-			}
-			//#endif
-		},
-		//初始化相机
-		initCamera() {
-			uni.getSystemInfo({
-				success: function(res) {
-					_this.windowWidth = res.windowWidth;
-					_this.windowHeight = res.windowHeight;
-					let zcs = _this.aliquot(_this.windowWidth,_this.windowHeight);
-					_this.aspect = (_this.windowWidth/zcs)+':'+(_this.windowHeight/zcs);
-					console.log('画面比例：'+_this.aspect);
-				}
-			});
-		},
-		
-		//整除数计算
-		aliquot(x, y) {
-			if (x % y == 0) return y;
-			return this.aliquot(y, x % y);
-		},
-
-		//开始预览
-		startPreview() {
-			this.livePusher.startPreview({
-				success: a => {
-					console.log(a)
-				}
-			});
-		},
-		
-		//停止预览
-		stopPreview() {
-			this.livePusher.stopPreview({
-				success: a => {
-					_this.camerastate = false; //标记相机未启动
-				}
-			});
-		},
-		
-		//状态
-		statechange(e) {
-			//状态改变
-			console.log(e);
-			if (e.detail.code == 1007) {
-				_this.camerastate = true;
-			} else if (e.detail.code == -1301) {
-				_this.camerastate = false;
-			}
-		},
-		
-
-		//返回
-		back() {
-			uni.navigateBack();
-		},
-
-		//抓拍
-		snapshot() {
-			//震动
-			uni.vibrateShort({
-			    success: function () {
-			        console.log('success');
-			    }
-			});
-			//拍照
-			this.livePusher.snapshot({
-				success: e => {
-					_this.snapshotsrc = e.message.tempImagePath;
-					_this.stopPreview();
-					_this.setImage();
-					uni.navigateBack();
-				}
-			});
-		},
-
-		//反转
-		flip() {
-			this.livePusher.switchCamera();
-		},
-
-		//设置
-		setImage() {
-			let pages = getCurrentPages();
-			let prevPage = pages[pages.length - 2]; //上一个页面
-
-			//直接调用上一个页面的setImage()方法，把数据存到上一个页面中去
-			prevPage.$vm.setImage({ path: _this.snapshotsrc });
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.live-camera {
-	justify-content: center;
-	align-items: center;
-	.menu {
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 750rpx;
-		height: 180rpx;
-		z-index: 98;
-		align-items: center;
-		justify-content: center;
-		.menu-mask {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 750rpx;
-			height: 180rpx;
-			z-index: 98;
-		}
-		.menu-back {
-			position: absolute;
-			left: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-		.menu-snapshot {
-			width: 130rpx;
-			height: 130rpx;
-			z-index: 99;
-		}
-		.menu-flip {
-			position: absolute;
-			right: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-	}
-}
-</style>

pages/mine/camera/idcard/idcard.nvue

@@ -1,246 +0,0 @@
-<template>
-	<view class="live-camera" :style="{ width: windowWidth, height: windowHeight }">
-		<view class="preview" :style="{ width: windowWidth, height: windowHeight - 80 }">
-			<live-pusher
-				id="livePusher"
-				ref="livePusher"
-				class="livePusher"
-				mode="FHD"
-				beauty="0"
-				whiteness="0"
-				:aspect="aspect"
-				min-bitrate="1000"
-				audio-quality="16KHz"
-				device-position="back"
-				:auto-focus="true"
-				:muted="true"
-				:enable-camera="true"
-				:enable-mic="false"
-				:zoom="false"
-				@statechange="statechange"
-				:style="{ width: cameraWidth, height: cameraHeight }"
-			></live-pusher>
-
-			<!--提示语-->
-			<cover-view class="remind">
-				<text class="remind-text" style="">{{ message }}</text>
-			</cover-view>
-
-			<!--辅助线-->
-			<cover-view class="outline-box" :style="{ width: windowWidth, height: windowHeight - 80 }">
-				<cover-image
-					class="outline-img"
-					:src="dotype == 'idcardface' ? '/static/live-camera/outline/idcardface.png' : '/static/live-camera/outline/idcardbadge.png'"
-					style=""
-				></cover-image>
-			</cover-view>
-		</view>
-
-		<view class="menu">
-			<!--底部菜单区域背景-->
-			<cover-image class="menu-mask" src="/static/live-camera/bar.png"></cover-image>
-
-			<!--返回键-->
-			<cover-image class="menu-back" @tap="back" src="/static/live-camera/back.png"></cover-image>
-
-			<!--快门键-->
-			<cover-image class="menu-snapshot" @tap="snapshot" src="/static/live-camera/shutter.png"></cover-image>
-
-			<!--反转键-->
-			<cover-image class="menu-flip" @tap="flip" src="/static/live-camera/flip.png"></cover-image>
-		</view>
-	</view>
-</template>
-
-<script>
-let _this = null;
-export default {
-	data() {
-		return {
-			poenCarmeInterval: null, //打开相机的轮询
-			dotype: 'face', //操作类型
-			message: '', //提示
-			aspect: '2:3', //比例
-			cameraWidth: '', //相机画面宽度
-			cameraHeight: '', //相机画面宽度
-			windowWidth: '', //屏幕可用宽度
-			windowHeight: '', //屏幕可用高度
-			camerastate: false, //相机准备好了
-			livePusher: null, //流视频对象
-			snapshotsrc: null //快照
-		};
-	},
-	onLoad(e) {
-		_this = this;
-		this.dotype = e.dotype;
-		this.initCamera();
-	},
-	onReady() {
-		this.livePusher = uni.createLivePusherContext('livePusher', this);
-		this.startPreview(); //开启预览并设置摄像头
-		this.poenCarme();
-	},
-	methods: {
-		//轮询打开
-		poenCarme() {
-			//#ifdef APP-PLUS
-			if (plus.os.name == 'Android') {
-				this.poenCarmeInterval = setInterval(function() {
-					console.log(_this.camerastate);
-					if (!_this.camerastate) _this.startPreview();
-				}, 2500);
-			}
-			//#endif
-		},
-		//初始化相机
-		initCamera() {
-			//处理安卓手机异步授权问题
-			uni.getSystemInfo({
-				success: function(res) {
-					_this.windowWidth = res.windowWidth;
-					_this.windowHeight = res.windowHeight;
-					_this.cameraWidth = res.windowWidth;
-					_this.cameraHeight = res.windowWidth * 1.5;
-				}
-			});
-		},
-
-		//开始预览
-		startPreview() {
-			this.livePusher.startPreview({
-				success: a => {
-					console.log(a);
-				}
-			});
-		},
-
-		//停止预览
-		stopPreview() {
-			this.livePusher.stopPreview({
-				success: a => {
-					_this.camerastate = false; //标记相机未启动
-				}
-			});
-		},
-
-		//状态
-		statechange(e) {
-			//状态改变
-			console.log(e);
-			if (e.detail.code == 1007) {
-				_this.camerastate = true;
-			} else if (e.detail.code == -1301) {
-				_this.camerastate = false;
-			}
-		},
-
-		//返回
-		back() {
-			uni.navigateBack();
-		},
-
-		//抓拍
-		snapshot() {
-			this.livePusher.snapshot({
-				success: e => {
-					_this.snapshotsrc = e.message.tempImagePath;
-					_this.stopPreview();
-					_this.setImage();
-					uni.navigateBack();
-				}
-			});
-		},
-
-		//反转
-		flip() {
-			this.livePusher.switchCamera();
-		},
-
-		//设置
-		setImage() {
-			let pages = getCurrentPages();
-			let prevPage = pages[pages.length - 2]; //上一个页面
-
-			//直接调用上一个页面的setImage()方法，把数据存到上一个页面中去
-			prevPage.$vm.setImage({ path: _this.snapshotsrc, dotype: this.dotype });
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.live-camera {
-	.preview {
-		justify-content: center;
-		align-items: center;
-		.outline-box {
-			position: absolute;
-			top: 0;
-			left: 0;
-			bottom: 0;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-			.outline-img {
-				width: 750rpx;
-				height: 1125rpx;
-			}
-		}
-		.remind {
-			position: absolute;
-			top: 880rpx;
-			width: 750rpx;
-			z-index: 100;
-			align-items: center;
-			justify-content: center;
-			.remind-text {
-				color: #dddddd;
-				font-weight: bold;
-			}
-		}
-	}
-	.menu {
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 750rpx;
-		height: 180rpx;
-		z-index: 98;
-		align-items: center;
-		justify-content: center;
-		.menu-mask {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 750rpx;
-			height: 180rpx;
-			z-index: 98;
-		}
-		.menu-back {
-			position: absolute;
-			left: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-		.menu-snapshot {
-			width: 130rpx;
-			height: 130rpx;
-			z-index: 99;
-		}
-		.menu-flip {
-			position: absolute;
-			right: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-	}
-}
-</style>

pages/mine/camera/idphoto/idphoto.nvue

@@ -1,240 +0,0 @@
-<template>
-	<view class="live-camera" :style="{ width: windowWidth, height: windowHeight }">
-		<view class="preview" :style="{ width: windowWidth, height: windowHeight - 80 }">
-			<live-pusher
-				id="livePusher"
-				ref="livePusher"
-				class="livePusher"
-				mode="FHD"
-				beauty="1"
-				whiteness="0"
-				:aspect="aspect"
-				min-bitrate="1000"
-				audio-quality="16KHz"
-				device-position="back"
-				:auto-focus="true"
-				:muted="true"
-				:enable-camera="true"
-				:enable-mic="false"
-				:zoom="false"
-				@statechange="statechange"
-				:style="{ width: cameraWidth, height: cameraHeight }"
-			></live-pusher>
-
-			<!--提示语-->
-			<cover-view class="remind">
-				<text class="remind-text" style="">{{ message }}</text>
-			</cover-view>
-
-			<!--辅助线-->
-			<cover-view class="outline-box" :style="{ width: windowWidth, height: windowHeight - 80 }">
-				<cover-image class="outline-img" src="/static/live-camera/outline/idphotoskin.png" style=""></cover-image>
-			</cover-view>
-		</view>
-
-		<view class="menu">
-			<!--底部菜单区域背景-->
-			<cover-image class="menu-mask" src="/static/live-camera/bar.png"></cover-image>
-
-			<!--返回键-->
-			<cover-image class="menu-back" @tap="back" src="/static/live-camera/back.png"></cover-image>
-
-			<!--快门键-->
-			<cover-image class="menu-snapshot" @tap="snapshot" src="/static/live-camera/shutter.png"></cover-image>
-
-			<!--反转键-->
-			<cover-image class="menu-flip" @tap="flip" src="/static/live-camera/flip.png"></cover-image>
-		</view>
-	</view>
-</template>
-
-<script>
-let _this = null;
-export default {
-	data() {
-		return {
-			dotype: 'idphoto', //操作类型
-			message: '', //提示
-			aspect: '2:3', //比例
-			cameraWidth: '', //相机画面宽度
-			cameraHeight: '', //相机画面宽度
-			windowWidth: '', //屏幕可用宽度
-			windowHeight: '', //屏幕可用高度
-			camerastate: false, //相机准备好了
-			livePusher: null, //流视频对象
-			snapshotsrc: null //快照
-		};
-	},
-	onLoad(e) {
-		_this = this;
-		if (e.dotype != undefined) this.dotype = e.dotype;
-		this.initCamera();
-	},
-	onReady() {
-		this.livePusher = uni.createLivePusherContext('livePusher', this);
-		this.startPreview(); //开启预览并设置摄像头
-		this.poenCarme();
-	},
-	methods: {
-		//轮询打开
-		poenCarme() {
-			//#ifdef APP-PLUS
-			if (plus.os.name == 'Android') {
-				this.poenCarmeInterval = setInterval(function() {
-					console.log(_this.camerastate);
-					if (!_this.camerastate) _this.startPreview();
-				}, 2500);
-			}
-			//#endif
-		},
-
-		//初始化相机
-		initCamera() {
-			uni.getSystemInfo({
-				success: function(res) {
-					_this.windowWidth = res.windowWidth;
-					_this.windowHeight = res.windowHeight;
-					_this.cameraWidth = res.windowWidth;
-					_this.cameraHeight = res.windowWidth * 1.5;
-				}
-			});
-		},
-
-		//开始预览
-		startPreview() {
-			this.livePusher.startPreview({
-				success: a => {
-					console.log(a);
-				}
-			});
-		},
-		//停止预览
-		stopPreview() {
-			this.livePusher.stopPreview({
-				success: a => {
-					_this.camerastate = false; //标记相机未启动
-				}
-			});
-		},
-
-		//状态
-		statechange(e) {
-			//状态改变
-			console.log(e);
-			if (e.detail.code == 1007) {
-				_this.camerastate = true;
-			} else if (e.detail.code == -1301) {
-				_this.camerastate = false;
-			}
-		},
-
-		//返回
-		back() {
-			uni.navigateBack();
-		},
-
-		//抓拍
-		snapshot() {
-			this.livePusher.snapshot({
-				success: e => {
-					_this.snapshotsrc = e.message.tempImagePath;
-					_this.stopPreview();
-					_this.setImage();
-					uni.navigateBack();
-				}
-			});
-		},
-
-		//反转
-		flip() {
-			this.livePusher.switchCamera();
-		},
-
-		//设置
-		setImage() {
-			let pages = getCurrentPages();
-			let prevPage = pages[pages.length - 2]; //上一个页面
-
-			//直接调用上一个页面的setImage()方法，把数据存到上一个页面中去
-			prevPage.$vm.setImage({ path: _this.snapshotsrc, dotype: this.dotype });
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.live-camera {
-	.preview {
-		justify-content: center;
-		align-items: center;
-		.outline-box {
-			position: absolute;
-			top: 0;
-			left: 0;
-			bottom: 0;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-			.outline-img {
-				width: 750rpx;
-				height: 1125rpx;
-			}
-		}
-		.remind {
-			position: absolute;
-			top: 880rpx;
-			width: 750rpx;
-			z-index: 100;
-			align-items: center;
-			justify-content: center;
-			.remind-text {
-				color: #dddddd;
-				font-weight: bold;
-			}
-		}
-	}
-	.menu {
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 750rpx;
-		height: 180rpx;
-		z-index: 98;
-		align-items: center;
-		justify-content: center;
-		.menu-mask {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 750rpx;
-			height: 180rpx;
-			z-index: 98;
-		}
-		.menu-back {
-			position: absolute;
-			left: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-		.menu-snapshot {
-			width: 130rpx;
-			height: 130rpx;
-			z-index: 99;
-		}
-		.menu-flip {
-			position: absolute;
-			right: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-	}
-}
-</style>

pages/mine/camera/portrait/portrait.nvue

@@ -1,214 +0,0 @@
-<template>
-	<view class="live-camera" :style="{ width: windowWidth, height: windowHeight }">
-		<live-pusher
-			id="livePusher"
-			ref="livePusher"
-			class="livePusher"
-			mode="FHD"
-			beauty="0"
-			whiteness="0"
-			:aspect="aspect"
-			min-bitrate="1000"
-			audio-quality="16KHz"
-			device-position="back"
-			:auto-focus="true"
-			:muted="true"
-			:enable-camera="true"
-			:enable-mic="false"
-			:zoom="false"
-			:style="{ width: windowWidth, height: windowHeight }"
-		></live-pusher>
-
-		<!--提示语-->
-		<cover-view class="remind">
-			<text class="remind-text" style="">{{ message }}</text>
-		</cover-view>
-
-		<!--辅助线-->
-		<cover-view class="outline">
-			<cover-image class="outline" src="/static/live-camera/outline/portrait.png" style=""></cover-image>
-		</cover-view>
-		
-
-		<view class="menu">
-			<!--底部菜单区域背景-->
-			<cover-image class="menu-mask" src="/static/live-camera/bar.png"></cover-image>
-
-			<!--返回键-->
-			<cover-image class="menu-back" @tap="back" src="/static/live-camera/back.png"></cover-image>
-
-			<!--快门键-->
-			<cover-image class="menu-snapshot" @tap="snapshot" src="/static/live-camera/shutter.png"></cover-image>
-
-			<!--反转键-->
-			<cover-image class="menu-flip" @tap="flip" src="/static/live-camera/flip.png"></cover-image>
-		</view>
-	</view>
-</template>
-
-<script>
-let _this = null;
-export default {
-	data() {
-		return {
-			message:'请拍摄苛学加',//提示
-			aspect: '2:3', //比例
-			windowWidth: '', //屏幕可用宽度
-			windowHeight: '', //屏幕可用高度
-			camerastate: false, //相机准备好了
-			livePusher: null, //流视频对象
-			snapshotsrc: null //快照
-		};
-	},
-	onLoad(e) {
-		_this = this;
-		this.initCamera();
-	},
-	onReady() {
-		this.livePusher = uni.createLivePusherContext('livePusher', this);
-		this.startPreview(); //开启预览并设置摄像头
-	},
-	methods: {
-		//初始化相机
-		initCamera() {
-			uni.getSystemInfo({
-				success: function(res) {
-					_this.windowWidth = res.windowWidth;
-					_this.windowHeight = res.windowHeight;
-					let zcs = _this.aliquot(_this.windowWidth, _this.windowHeight);
-					_this.aspect = _this.windowWidth / zcs + ':' + _this.windowHeight / zcs;
-				}
-			});
-		},
-
-		//整除数计算
-		aliquot(x, y) {
-			if (x % y == 0) return y;
-			return this.aliquot(y, x % y);
-		},
-
-		//开始预览
-		startPreview() {
-			this.livePusher.startPreview({
-				success: a => {
-					if (a.errMsg == 'startPreview:ok' || a.errMsg == 'operateLivePusher:ok') {
-						_this.camerastate = true; //标记相机启动成功
-					}
-				}
-			});
-		},
-		//停止预览
-		stopPreview() {
-			this.livePusher.stopPreview({
-				success: a => {
-					_this.camerastate = false; //标记相机未启动
-				}
-			});
-		},
-
-		//返回
-		back() {
-			uni.navigateBack();
-		},
-
-		//抓拍
-		snapshot() {
-			this.livePusher.snapshot({
-				success: e => {
-					_this.snapshotsrc = e.message.tempImagePath;
-					_this.stopPreview();
-					_this.setImage();
-					uni.navigateBack();
-				}
-			});
-		},
-
-		//反转
-		flip() {
-			this.livePusher.switchCamera();
-		},
-
-		//设置
-		setImage() {
-			let pages = getCurrentPages();
-			let prevPage = pages[pages.length - 2]; //上一个页面
-
-			//直接调用上一个页面的setImage()方法，把数据存到上一个页面中去
-			prevPage.$vm.setImage({ path: _this.snapshotsrc });
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.live-camera {
-	justify-content: center;
-	align-items: center;
-	.outline {
-		position: absolute;
-		top: 0;
-		left: 0;
-		bottom: 0;
-		width: 750rpx;
-		height: 1125rpx;
-		z-index: 99;
-		align-items: center;
-		justify-content: center;
-	}
-	.remind {
-		position: absolute;
-		top: 880rpx;
-		width: 750rpx;
-		z-index: 100;
-		align-items: center;
-		justify-content: center;
-		.remind-text {
-			color: #dddddd;
-			font-weight: bold;
-		}
-	}
-	.menu {
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 750rpx;
-		height: 180rpx;
-		z-index: 98;
-		align-items: center;
-		justify-content: center;
-		.menu-mask {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 750rpx;
-			height: 180rpx;
-			z-index: 98;
-		}
-		.menu-back {
-			position: absolute;
-			left: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-		.menu-snapshot {
-			width: 130rpx;
-			height: 130rpx;
-			z-index: 99;
-		}
-		.menu-flip {
-			position: absolute;
-			right: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-	}
-}
-</style>

pages/mine/camera/video/video.nvue

@@ -1,259 +0,0 @@
-<template>
-	<view class="live-camera" :style="{ width: windowWidth, height: windowHeight }">
-		<view class="preview" :style="{ width: windowWidth, height: windowHeight - 80 }">
-			<live-pusher id="livePusher" ref="livePusher" class="livePusher" mode="FHD" beauty="0" whiteness="0"
-				:aspect="aspect" min-bitrate="1000" audio-quality="16KHz" device-position="back" :auto-focus="true"
-				:muted="true" :enable-camera="true" :enable-mic="false" :zoom="false" @statechange="statechange"
-				:style="{ width: cameraWidth, height: cameraHeight }"></live-pusher>
-
-			<!--提示语-->
-			<cover-view class="remind">
-				<text class="remind-text" style="">{{ message }}</text>
-			</cover-view>
-
-			<!--辅助线-->
-			<cover-view class="outline-box" :style="{ width: windowWidth, height: windowHeight - 80 }">
-				<cover-image class="outline-img"
-					:src="dotype == 'idcardface' ? '/static/live-camera/outline/idcardface.png' : '/static/live-camera/outline/idcardbadge.png'"
-					style=""></cover-image>
-			</cover-view>
-		</view>
-
-		<view class="menu">
-			<!--底部菜单区域背景-->
-			<cover-image class="menu-mask" src="/static/live-camera/bar.png"></cover-image>
-
-			<!--返回键-->
-			<cover-image class="menu-back" @tap="back" src="/static/live-camera/back.png"></cover-image>
-
-			<!--快门键-->
-			<cover-image class="menu-snapshot" @tap="start" src="/static/live-camera/shutter.png"></cover-image>
-			<cover-image class="menu-snapshot" @tap="stop" src="/static/live-camera/shutter.png"></cover-image>
-
-			<!--反转键-->
-			<cover-image class="menu-flip" @tap="flip" src="/static/live-camera/flip.png"></cover-image>
-		</view>
-	</view>
-</template>
-
-<script>
-	let _this = null;
-	export default {
-		data() {
-			return {
-				poenCarmeInterval: null, //打开相机的轮询
-				dotype: 'face', //操作类型
-				message: '', //提示
-				aspect: '2:3', //比例
-				cameraWidth: '', //相机画面宽度
-				cameraHeight: '', //相机画面宽度
-				windowWidth: '', //屏幕可用宽度
-				windowHeight: '', //屏幕可用高度
-				camerastate: false, //相机准备好了
-				livePusher: null, //流视频对象
-				snapshotsrc: null //快照
-			};
-		},
-		onLoad(e) {
-			_this = this;
-			this.dotype = e.dotype;
-			this.initCamera();
-		},
-		onReady() {
-			this.livePusher = uni.createLivePusherContext('livePusher', this);
-			this.startPreview(); //开启预览并设置摄像头
-			this.poenCarme();
-		},
-		methods: {
-			//轮询打开
-			poenCarme() {
-				//#ifdef APP-PLUS
-				if (plus.os.name == 'Android') {
-					this.poenCarmeInterval = setInterval(function() {
-						console.log(_this.camerastate);
-						if (!_this.camerastate) _this.startPreview();
-					}, 2500);
-				}
-				//#endif
-			},
-			//初始化相机
-			initCamera() {
-				//处理安卓手机异步授权问题
-				uni.getSystemInfo({
-					success: function(res) {
-						_this.windowWidth = res.windowWidth;
-						_this.windowHeight = res.windowHeight;
-						_this.cameraWidth = res.windowWidth;
-						_this.cameraHeight = res.windowWidth * 1.5;
-					}
-				});
-			},
-
-			//开始预览
-			startPreview() {
-				this.livePusher.startPreview({
-					success: a => {
-						console.log(a);
-					}
-				});
-			},
-
-			//停止预览
-			stopPreview() {
-				this.livePusher.stopPreview({
-					success: a => {
-						_this.camerastate = false; //标记相机未启动
-					}
-				});
-			},
-
-			//状态
-			statechange(e) {
-				console.log('````````````````````````````````````')
-				//状态改变
-				console.log(e);
-				if (e.detail.code == 1007) {
-					_this.camerastate = true;
-				} else if (e.detail.code == -1301) {
-					_this.camerastate = false;
-				}
-			},
-
-			//返回
-			back() {
-				uni.navigateBack();
-			},
-			start: function() {
-				console.log('开启直播流')
-				this.livePusher.start({
-					success: (a) => {
-						console.log("livePusher.start:" + JSON.stringify(a));
-					}
-				});
-			},
-			stop: function() {
-				console.log('结束直播流')
-				this.livePusher.stop({
-					success: (a) => {
-						console.log("livePusher.end:" + JSON.stringify(a));
-					}
-				});
-			},
-			//抓拍
-			snapshot() {
-
-				// this.livePusher.snapshot({
-				// 	success: e => {
-				// 		_this.snapshotsrc = e.message.tempImagePath;
-				// 		_this.stopPreview();
-				// 		_this.setImage();
-				// 		uni.navigateBack();
-				// 	}
-				// });
-			},
-
-			//反转
-			flip() {
-				this.livePusher.switchCamera();
-			},
-
-			//设置
-			setImage() {
-				let pages = getCurrentPages();
-				let prevPage = pages[pages.length - 2]; //上一个页面
-
-				//直接调用上一个页面的setImage()方法，把数据存到上一个页面中去
-				prevPage.$vm.setImage({
-					path: _this.snapshotsrc,
-					dotype: this.dotype
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.live-camera {
-		.preview {
-			justify-content: center;
-			align-items: center;
-
-			.outline-box {
-				position: absolute;
-				top: 0;
-				left: 0;
-				bottom: 0;
-				z-index: 99;
-				align-items: center;
-				justify-content: center;
-
-				.outline-img {
-					width: 750rpx;
-					height: 1125rpx;
-				}
-			}
-
-			.remind {
-				position: absolute;
-				top: 880rpx;
-				width: 750rpx;
-				z-index: 100;
-				align-items: center;
-				justify-content: center;
-
-				.remind-text {
-					color: #dddddd;
-					font-weight: bold;
-				}
-			}
-		}
-
-		.menu {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 750rpx;
-			height: 180rpx;
-			z-index: 98;
-			align-items: center;
-			justify-content: center;
-
-			.menu-mask {
-				position: absolute;
-				left: 0;
-				bottom: 0;
-				width: 750rpx;
-				height: 180rpx;
-				z-index: 98;
-			}
-
-			.menu-back {
-				position: absolute;
-				left: 30rpx;
-				bottom: 50rpx;
-				width: 80rpx;
-				height: 80rpx;
-				z-index: 99;
-				align-items: center;
-				justify-content: center;
-			}
-
-			.menu-snapshot {
-				width: 130rpx;
-				height: 130rpx;
-				z-index: 99;
-			}
-
-			.menu-flip {
-				position: absolute;
-				right: 30rpx;
-				bottom: 50rpx;
-				width: 80rpx;
-				height: 80rpx;
-				z-index: 99;
-				align-items: center;
-				justify-content: center;
-			}
-		}
-	}
-</style>

pages/mine/camera/watermark/watermark.nvue

@@ -1,228 +0,0 @@
-<template>
-	<view class="live-camera" :style="{ width: windowWidth, height: windowHeight }">
-		<view class="preview" :style="{ width: windowWidth, height: windowHeight}">
-			<live-pusher
-				id="livePusher"
-				ref="livePusher"
-				class="livePusher"
-				mode="FHD"
-				beauty="0"
-				whiteness="0"
-				:aspect="aspect"
-				min-bitrate="1000"
-				audio-quality="16KHz"
-				device-position="back"
-				:auto-focus="true"
-				:muted="true"
-				:enable-camera="true"
-				:enable-mic="false"
-				:zoom="false"
-				@statechange="statechange"
-				:style="{ width: windowWidth, height: windowHeight }"
-			></live-pusher>
-			<!--提示语-->
-			<cover-view class="remind">
-				<text class="remind-text" style="">{{ message }}</text>
-			</cover-view>
-		</view>
-		<view class="menu">
-			<!--底部菜单区域背景-->
-			<cover-image class="menu-mask" src="/static/live-camera/bar.png"></cover-image>
-
-			<!--返回键-->
-			<cover-image class="menu-back" @tap="back" src="/static/live-camera/back.png"></cover-image>
-
-			<!--快门键-->
-			<cover-image class="menu-snapshot" @tap="snapshot" src="/static/live-camera/shutter.png"></cover-image>
-
-			<!--反转键-->
-			<cover-image class="menu-flip" @tap="flip" src="/static/live-camera/flip.png"></cover-image>
-		</view>
-	</view>
-</template>
-
-<script>
-let _this = null;
-export default {
-	data() {
-		return {
-			dotype:'watermark',
-			message:'live-camer',//水印内容
-			poenCarmeInterval: null, //打开相机的轮询
-			aspect: '2:3', //比例
-			windowWidth: '', //屏幕可用宽度
-			windowHeight: '', //屏幕可用高度
-			camerastate: false, //相机准备好了
-			livePusher: null, //流视频对象
-			snapshotsrc: null //快照
-		};
-	},
-	onLoad(e) {
-		_this = this;
-		if (e.dotype != undefined) this.dotype = e.dotype;
-		this.initCamera();
-	},
-	onReady() {
-		this.livePusher = uni.createLivePusherContext('livePusher', this);
-		this.startPreview(); //开启预览并设置摄像头
-		this.poenCarme();
-	},
-	methods: {
-		//轮询打开
-		poenCarme() {
-			//#ifdef APP-PLUS
-			if (plus.os.name == 'Android') {
-				this.poenCarmeInterval = setInterval(function() {
-					console.log(_this.camerastate);
-					if (!_this.camerastate) _this.startPreview();
-				}, 2500);
-			}
-			//#endif
-		},
-		//初始化相机
-		initCamera() {
-			uni.getSystemInfo({
-				success: function(res) {
-					_this.windowWidth = res.windowWidth;
-					_this.windowHeight = res.windowHeight;
-					let zcs = _this.aliquot(_this.windowWidth, _this.windowHeight);
-					_this.aspect = _this.windowWidth / zcs + ':' + _this.windowHeight / zcs;
-					console.log('画面比例：'+_this.aspect);
-				}
-			});
-		},
-
-		//整除数计算
-		aliquot(x, y) {
-			if (x % y == 0) return y;
-			return this.aliquot(y, x % y);
-		},
-
-		//开始预览
-		startPreview() {
-			this.livePusher.startPreview({
-				success: a => {
-					console.log(a);
-				}
-			});
-		},
-
-		//停止预览
-		stopPreview() {
-			this.livePusher.stopPreview({
-				success: a => {
-					_this.camerastate = false; //标记相机未启动
-				}
-			});
-		},
-
-		//状态
-		statechange(e) {
-			//状态改变
-			console.log(e);
-			if (e.detail.code == 1007) {
-				_this.camerastate = true;
-			} else if (e.detail.code == -1301) {
-				_this.camerastate = false;
-			}
-		},
-
-		//返回
-		back() {
-			uni.navigateBack();
-		},
-
-		//抓拍
-		snapshot() {
-			this.livePusher.snapshot({
-				success: e => {
-					_this.snapshotsrc = e.message.tempImagePath;
-					_this.stopPreview();
-					_this.setImage();
-					uni.navigateBack();
-				}
-			});
-		},
-
-		//反转
-		flip() {
-			this.livePusher.switchCamera();
-		},
-
-		//设置
-		setImage() {
-			let pages = getCurrentPages();
-			let prevPage = pages[pages.length - 2]; //上一个页面
-
-			//直接调用上一个页面的setImage()方法，把数据存到上一个页面中去
-			prevPage.$vm.setImage({ path: _this.snapshotsrc , dotype: this.dotype });
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.live-camera {
-	justify-content: center;
-	align-items: center;
-	.preview {
-		justify-content: center;
-		align-items: center;
-		.remind {
-			position: absolute;
-			top: 60rpx;
-			left: 20rpx;
-			width: 130px;
-			z-index: 100;
-			.remind-text {
-				color: #dddddd;
-				font-size: 40rpx;
-				text-shadow: #fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0, #fff 0 -1px 0;
-			}
-		}
-	}
-	.menu {
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 750rpx;
-		height: 180rpx;
-		z-index: 98;
-		align-items: center;
-		justify-content: center;
-		.menu-mask {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 750rpx;
-			height: 180rpx;
-			z-index: 98;
-		}
-		.menu-back {
-			position: absolute;
-			left: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-		.menu-snapshot {
-			width: 130rpx;
-			height: 130rpx;
-			z-index: 99;
-		}
-		.menu-flip {
-			position: absolute;
-			right: 30rpx;
-			bottom: 50rpx;
-			width: 80rpx;
-			height: 80rpx;
-			z-index: 99;
-			align-items: center;
-			justify-content: center;
-		}
-	}
-}
-</style>

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>

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);

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,6 +842,7 @@
 												}
 
 												// 开户支行LIst
+												_this.columns = []
 												if (res.data.bankNameZhihang) {
 													_this.columns.push(res.data
 														.bankNameZhihang)
@@ -966,7 +971,7 @@
 
 	.wrap {
 		background: #fff;
-		padding:10rpx 30rpx 20rpx;
+		padding: 10rpx 30rpx 20rpx;
 		border-radius: 5px;
 		margin: 20rpx;
 
@@ -1036,7 +1041,7 @@
 
 	.content1 {
 		background: #fff;
-		padding:20rpx 20rpx 0;
+		padding: 20rpx 20rpx 0;
 		margin: 20rpx;
 		border-radius: 10rpx;
 

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) {

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));

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
+				})
 			},
 		},
 	}

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
+				})
 			},
 		},
 	}

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>

pages/order/orderDetails.vue

@@ -4,10 +4,12 @@
 		<view class="fixed1"></view>
 		<view class="fixed">
 			<view class='title flex flex-center'>
-				<image class="back"  src="../../static/images/return.png" @click="back" mode="" style="width: 40rpx; height: 40rpx;"></image>
+				<image class="back" src="../../static/images/return.png" @click="back" mode=""
+					style="width: 40rpx; height: 40rpx;"></image>
 				<!-- <u-icon class="back" name="arrow-left" color="" size="20" @click="back"></u-icon> -->
 				<view class="nav-title">订单详情</view>
-				<image class="search" style='width:18px;height:18px;' src="../../static/images/kefu.png" @click="$helper.contactCustomerService()" mode=""></image>
+				<image class="search" style='width:18px;height:18px;' src="../../static/images/kefu.png"
+					@click="$helper.contactCustomerService()" mode=""></image>
 				<!-- <u-icon class="search" name="server-fill" color="" size="28" @click="$helper.contactCustomerService()"> -->
 				</u-icon>
 			</view>
@@ -41,7 +43,8 @@
 				</u-button>
 				<u-button class="btn" text="确认卸车" @click="confirmUnLoading(4)" v-if="dataObj.cargoOwnerStatus=='待收货'">
 				</u-button>
-				<u-button class="btn" text="确认运费" @click="freightOk()" v-if="dataObj.cargoOwnerStatus=='司机驳回运费信息'"></u-button>
+				<u-button class="btn" text="确认运费" @click="freightOk()" v-if="dataObj.cargoOwnerStatus=='司机驳回运费信息'">
+				</u-button>
 				<!-- <u-button class="btn" text="确认卸车" @click="confirmLoading(4)" v-if="dataObj.cargoOwnerStatus=='待收货'">
 				</u-button> -->
 				<u-button class="btn" text="付款" @click="closed"
@@ -64,7 +67,8 @@
 				</view>
 				<view class="right flex s-row align-center phone">
 					<view class="bgc">
-						<image class="phone" style='width:24px;height:24px;' src="../../static/images/dianhua.png" @click="toPhone" mode=""></image>
+						<image class="phone" style='width:24px;height:24px;' src="../../static/images/dianhua.png"
+							@click="toPhone" mode=""></image>
 						<!-- <u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="toPhone"></u-icon> -->
 					</view>
 
@@ -154,7 +158,9 @@
 			<view class="level2-title">承运信息</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">合同编号</view>
-				<view class="row-right-text">{{dataObj.publishTaskInfo.wtContractNo?dataObj.publishTaskInfo.wtContractNo:'未签订'}}</view>
+				<view class="row-right-text">
+					{{dataObj.publishTaskInfo.wtContractNo?dataObj.publishTaskInfo.wtContractNo:'未签订'}}
+				</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">车牌号</view>
@@ -164,7 +170,7 @@
 				<view class="row-left-text gray">预计运费</view>
 				<view class="row-right-text">{{dataObj.hyCarrierInfo.estimatedFreight}}元</view>
 			</view>
-			<view class='row-between' >
+			<view class='row-between'>
 				<view class="row-left-text gray">预付款</view>
 				<view class="row-right-text">{{dataObj.advanceCharge}}元</view>
 			</view>
@@ -199,12 +205,17 @@
 						v-for="(item,index) in zcImgList" @click='ylImg(zcImgList)'></u--image>
 				</view>
 			</view>
-			<view v-if='dataObj.orderStatus=="待货主确认卸车"||dataObj.orderStatus=="待平台确认卸车"||dataObj.orderStatus=="货主驳回装车信息"||dataObj.orderStatus=="平台驳回装车信息"||dataObj.orderStatus=="待确认运费"||dataObj.cargoOwnerStatus=="已完结"'>
+			<view
+				v-if='dataObj.orderStatus=="待货主确认卸车"||dataObj.orderStatus=="待平台确认卸车"||dataObj.orderStatus=="货主驳回装车信息"||dataObj.orderStatus=="平台驳回装车信息"||dataObj.orderStatus=="待确认运费"||dataObj.cargoOwnerStatus=="已完结"'>
 				<view class='row-between'>
 					<view class="row-left-text gray">合计应付运费</view>
 					<view class="row-right-text">
-						<u--input v-if='dataObj.orderStatus=="待货主确认卸车"' placeholder="请输入合计应付运费" border="none" inputAlign="right" clearable v-model="totalFreight"></u--input>
-						<view v-if='dataObj.orderStatus=="待平台确认卸车"||dataObj.orderStatus=="货主驳回装车信息"||dataObj.orderStatus=="平台驳回装车信息"||dataObj.orderStatus=="待确认运费"||dataObj.cargoOwnerStatus=="已完结"'>{{totalFreight}}</view>
+						<u--input v-if='dataObj.orderStatus=="待货主确认卸车"' placeholder="请输入合计应付运费" border="none"
+							inputAlign="right" clearable v-model="totalFreight"></u--input>
+						<view
+							v-if='dataObj.orderStatus=="待平台确认卸车"||dataObj.orderStatus=="货主驳回装车信息"||dataObj.orderStatus=="平台驳回装车信息"||dataObj.orderStatus=="待确认运费"||dataObj.cargoOwnerStatus=="已完结"'>
+							{{totalFreight}}
+						</view>
 					</view>
 				</view>
 				<view class='row-between'>
@@ -221,7 +232,8 @@
 				<view class='row-between'>
 					<view class="row-left-text gray">回单照片</view>
 					<view class="flex">
-						<u--image @click='ylImg(hdImgList)' :showLoading="true" :src='item' width="40px" height="40px" v-for="(item,index) in hdImgList"></u--image>
+						<u--image @click='ylImg(hdImgList)' :showLoading="true" :src='item' width="40px" height="40px"
+							v-for="(item,index) in hdImgList"></u--image>
 					</view>
 				</view>
 			</view>
@@ -247,8 +259,10 @@
 			</view>
 			<view style='flex-wrap: wrap;' class='flex mx row-left-text'>
 				<!-- 明细：预付{{dataObj.advanceCharge}}元，服务费{{dataObj.freightInfo.driverServiceCharge}}元，尾款{{dataObj.freightInfo.ownerFreightBalance}}元，合计{{dataObj.freightInfo.totalPayment}}元。 -->
-				明细：预付{{dataObj.advanceCharge}}元，工本费{{dataObj.freightInfo.ownerServiceCharge}}元，<text v-if="dataObj.freightInfo.ownerFreightBalance">尾款{{dataObj.freightInfo.ownerFreightBalance}}元，</text>合计{{dataObj.freightInfo.totalPayment}}元。</view>
+				明细：预付{{dataObj.advanceCharge}}元，工本费{{dataObj.freightInfo.ownerServiceCharge}}元，<text
+					v-if="dataObj.freightInfo.ownerFreightBalance">尾款{{dataObj.freightInfo.ownerFreightBalance}}元，</text>合计{{dataObj.freightInfo.totalPayment}}元。
 			</view>
+		</view>
 		<!-- v-if="status3" -->
 		<view class="content4" v-if="status3">
 			<view class="level2-title gray">还款信息</view>
@@ -277,8 +291,8 @@
 			</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
-			:closeOnClickOverlay='true' :showCancelButton='true' @confirm="$u.throttle(confirmClick(), 1000)" @close="cancelClick"
-			@cancel="cancelClick" class="modal">
+			:closeOnClickOverlay='true' :showCancelButton='true' @confirm="$u.throttle(confirmClick(), 1000)"
+			@close="cancelClick" @cancel="cancelClick" class="modal">
 			<u-radio-group v-model="radiovalue1" placement="" v-if='isShowTerminationReason' class='row'>
 				<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
 					:label="item.name" :name="item.name" @change="radioChange">
@@ -290,24 +304,26 @@
 		</u-modal>
 		<u-popup :show="show" mode="bottom" @close="close" @open="open">
 			<view class="u-popup-wrap">
-				<view >
-					<image style='width:12px;height:12px;' @click='closepopup' class='close'  src="../../static/images/order/guanbi@3x.png" mode=""></image>
+				<view>
+					<image style='width:12px;height:12px;' @click='closepopup' class='close'
+						src="../../static/images/order/guanbi@3x.png" mode=""></image>
 					<!-- <u-icon @click="closepopup" class='close' name="close" size="20"></u-icon> -->
 				</view>
-				
+
 				<view style='fon-size:34rpx;margin-bottom:20px;text-align:center;font-weight: 600;'>确认终止订单</view>
 				<view style="margin: 0 auto;">
-		           	<u-radio-group iconPlacement="right" v-model="radiovalue1" placement="" >
-		           	<u-radio  :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
-		           		:label="item.name" :name="item.name" @change="radioChange" >
-		           	</u-radio>
-		           </u-radio-group>
-		           </view>
-				   <view style='border-top:10px solid #F2F4F7;position:absolute;left:0;height:0;width:100%;'></view>
-		           <view style='padding:40rpx 0 30rpx;'>终止原因描述</view>
-		           <u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'>
-		           </u--textarea>
-				   <view class='termination' :class="{'active':value2.length>0}" @click='$u.throttle(termination(), 1000)'>终止</view>
+					<u-radio-group iconPlacement="right" v-model="radiovalue1" placement="">
+						<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
+							:label="item.name" :name="item.name" @change="radioChange">
+						</u-radio>
+					</u-radio-group>
+				</view>
+				<view style='border-top:10px solid #F2F4F7;position:absolute;left:0;height:0;width:100%;'></view>
+				<view style='padding:40rpx 0 30rpx;'>终止原因描述</view>
+				<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'>
+				</u--textarea>
+				<view class='termination' :class="{'active':value2.length>0}" @click='$u.throttle(termination(), 1000)'>
+					终止</view>
 			</view>
 		</u-popup>
 		<u-toast ref="uToast"></u-toast>
@@ -324,11 +340,11 @@
 			</view>
 			
 		</u-popup> -->
-		<u-modal :show="moneyShow"  title="合计运费" showCancelButton @confirm="moneyClick" @close="moneyclose"
+		<u-modal :show="moneyShow" title="合计运费" showCancelButton @confirm="moneyClick" @close="moneyclose"
 			@cancel="moneyclose">
-					<view class="slot-content">
-						<u--input v-model="totalFreight" type="number" placeholder="合计应付运费(含预付款)"></u--input>
-					</view>
+			<view class="slot-content">
+				<u--input v-model="totalFreight" type="number" placeholder="合计应付运费(含预付款)"></u--input>
+			</view>
 		</u-modal>
 		<!-- 		<view v-if="lookAlert" class="look-contract" @click="lookAlert==false">
 			<u-button class="btn" text="查看合同" @click="lookContract"></u-button>
@@ -364,7 +380,7 @@
 	import uniPopup from '@/components/uni-popup/uni-popup.vue'
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
-		components:{
+		components: {
 			uniPopup
 		},
 		data() {
@@ -381,7 +397,7 @@
 				status2: false,
 				status3: false,
 				id: '',
-				show:false,
+				show: false,
 				value2: '',
 				radiolist1: [{
 						name: '已与司机协商',
@@ -406,7 +422,7 @@
 				isShowAlert: false,
 				zcImgList: [],
 				xcImgList: [],
-				hdImgList:[],
+				hdImgList: [],
 				contractSrc: '',
 				canvasName: 'handWriting',
 				ctx: '',
@@ -417,8 +433,8 @@
 				selectColor: 'black',
 				lineColor: '#1A1A1A', // 颜色
 				lineSize: 5, // 笔记倍数
-				moneyShow:false,
-				totalFreight:""
+				moneyShow: false,
+				totalFreight: ""
 			}
 
 		},
@@ -458,45 +474,59 @@
 					});
 				}
 			},
-			moneyClick(){
+			moneyClick() {
 				this.moneyShow = false
-				if(this.dataObj.cargoOwnerStatus == "司机驳回运费信息"){
+				if (this.dataObj.cargoOwnerStatus == "司机驳回运费信息") {
 					this.$request.baseRequest('post', '/orderInfo/api/confirmFreight', {
-							 id: this.dataObj.id,
-							 typeFlag:1,
-							 totalFreight:this.totalFreight
-						}).then(res => {
-							if (res.code == 200) {
-								this.$refs.uToast.show({
-									type: 'success',
-									message: "确认成功",
-								})
-								// this.getList()
-							}
-						})
-				}else{
+						id: this.dataObj.id,
+						typeFlag: 1,
+						totalFreight: this.totalFreight
+					}).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "确认成功",
+							})
+							// this.getList()
+						}
+					})
+				} else {
 					this.confirmUnLoading(4)
 				}
 			},
-			moneyclose(){
+			moneyclose() {
 				this.moneyShow = false
 				this.totalFreight = ""
 			},
-			freightOk(){
-					this.moneyShow = true
+			freightOk() {
+				// billingMethod 0:元/吨 1:元/车
+				if (this.dataObj.billingMethod == 1) { //元/车
+					this.totalFreight = this.dataObj.freight
+				} else { //元/吨
+				//装车净重和卸车净重最小值  *  运输单价
+					if (Number(this.dataObj.hyCarrierInfo.loadingWeight) > Number(this.dataObj.hyCarrierInfo
+							.unloadingWeight)) {
+						this.totalFreight = Number(this.dataObj.hyCarrierInfo.unloadingWeight) * Number(this.dataObj.freight)
+						this.totalFreight = this.totalFreight.toFixed(2)
+					} else {
+						this.totalFreight = Number(this.dataObj.hyCarrierInfo.loadingWeight) * Number(this.dataObj.freight)
+						this.totalFreight = this.totalFreight.toFixed(2)
+					}
+				}
+				this.moneyShow = true
 			},
 			radioChange(n) {
 				console.log('radioChange', n);
 			},
-			closepopup(){
-				this.show=false
+			closepopup() {
+				this.show = false
 			},
 			open() {
-			          // console.log('open');
+				// console.log('open');
 			},
 			close() {
 				this.show = false
-			          // console.log('close');
+				// console.log('close');
 			},
 			ylImg(src) {
 				uni.previewImage({
@@ -537,7 +567,6 @@
 				uni.$u.route('/pages/order/signContract', {
 					obj: JSON.stringify(this.dataObj)
 				});
-
 			},
 			// 完结
 			closed() {
@@ -557,7 +586,6 @@
 									})
 								}
 							})
-
 						}
 					})
 					.catch(res => {
@@ -603,31 +631,44 @@
 					this.confirmText = '确定'
 					this.isShowAlert = true
 				}
-				
+
 				// uni.$u.route('/pages/order/confirmLoading', item);
 			},
 			confirmUnLoading(type) {
-				this.type=type
-				if(type == 4){
-					console.log(this.totalFreight)
-					if(this.totalFreight){
+				this.type = type
+				if (type == 4) {
+					if (this.totalFreight) {
 						this.alertTitle = '确认卸车？'
 						this.confirmText = '确定'
 						this.isShowAlert = true
-					}else{
+					} else {
+						// billingMethod 0:元/吨 1:元/车 
+						if (this.dataObj.billingMethod == 1) { //元/车
+							this.totalFreight = this.dataObj.freight
+						} else { //元/吨
+						//装车净重和卸车净重最小值  *  运输单价
+							if (Number(this.dataObj.hyCarrierInfo.loadingWeight) > Number(this.dataObj.hyCarrierInfo
+									.unloadingWeight)) {
+								this.totalFreight = Number(this.dataObj.hyCarrierInfo.unloadingWeight) * Number(this.dataObj.freight)
+								this.totalFreight = this.totalFreight.toFixed(2)
+							} else {
+								this.totalFreight = Number(this.dataObj.hyCarrierInfo.loadingWeight) * Number(this.dataObj.freight)
+								this.totalFreight = this.totalFreight.toFixed(2)
+							}
+						}
 						this.moneyShow = true
 					}
-				}else if(type == 6){
+				} else if (type == 6) {
 					this.alertTitle = '确定驳回卸车信息？'
 					this.confirmText = '确定'
 					this.isShowAlert = true
 				}
-				
+
 				// let item = this.dataObj
 				// uni.$u.route('/pages/order/confirmUnloading', item);
 			},
 			confirmClick() {
-				var that=this
+				var that = this
 				that.isShowAlert = false
 				if (this.type == 1 || this.type == 2) {
 					let _title = ''
@@ -658,7 +699,7 @@
 									type: 'success',
 									message: _title,
 									complete() {
-										
+
 									}
 								})
 							}
@@ -670,13 +711,13 @@
 					let _flag = ''
 					if (this.type == 3) _flag = 1
 					if (this.type == 4) _flag = 2
-					
+
 					this.$request.baseRequest('post', '/carrierInfo/cargoOwnerLoadingAdd', {
 							orderId: this.dataObj.id,
 							id: this.dataObj.hyCarrierInfo.id,
 							loadingFlag: _flag,
 							flag: 1,
-							totalFreight:this.totalFreight,
+							totalFreight: this.totalFreight,
 						}).then(res => {
 							if (res.code == 200) {
 								this.$refs.uToast.show({
@@ -696,7 +737,7 @@
 						.catch(res => {
 							uni.$u.toast(res.message);
 						});
-				}else if(this.type==5){
+				} else if (this.type == 5) {
 					this.$request.baseRequest('post', '/carrierInfo/cargoOwnerLoadingAdd', {
 							orderId: this.dataObj.id,
 							loadingFlag: 1,
@@ -719,7 +760,7 @@
 						.catch(res => {
 							uni.$u.toast(res.message);
 						});
-				}else if(this.type == 6){
+				} else if (this.type == 6) {
 					this.$request.baseRequest('post', '/carrierInfo/cargoOwnerLoadingAdd', {
 							orderId: this.dataObj.id,
 							loadingFlag: 2,
@@ -737,59 +778,14 @@
 										// })
 									}
 								})
-					
+
 							}
 						})
 						.catch(res => {
 							uni.$u.toast(res.message);
 						});
-				} else{
-					var that=this
-										if (this.radiovalue1 == '其他' && !this.value2) {
-											this.$refs.uToast.show({
-												type: 'error',
-												message: "请填写终止原因描述!",
-											})
-											return
-										}
-										let _terminationReason = ''
-										if (this.radiovalue1 == '已与司机协商') {
-											_terminationReason = 1
-										} else if (this.radiovalue1 == '司机原因终止') {
-											_terminationReason = 2
-										} else if (this.radiovalue1 == '货主个人原因终止') {
-											_terminationReason = 3
-										} else if (this.radiovalue1 == '其他') {
-											_terminationReason = 4
-										}
-										this.$request.baseRequest('post', '/orderInfo/api/end', {
-												id: this.id,
-												terminator: 2,
-												terminationReason: _terminationReason,
-												terminationReasonDescription: this.value2
-											}).then(res => {
-												if (res.code == 200) {
-													that.show=false
-													that.value2=''
-													this.$refs.uToast.show({
-														type: 'success',
-														message: '终止订单成功',
-													})
-													that.getList()
-												} else {
-													this.$refs.uToast.show({
-														type: 'success',
-														message: '终止订单失败',
-													})
-												}
-											})
-											.catch(res => {
-												uni.$u.toast(res.message);
-											});
-				}
-			},
-			termination(){
-				var that=this
+				} else {
+					var that = this
 					if (this.radiovalue1 == '其他' && !this.value2) {
 						this.$refs.uToast.show({
 							type: 'error',
@@ -814,8 +810,8 @@
 							terminationReasonDescription: this.value2
 						}).then(res => {
 							if (res.code == 200) {
-								that.show=false
-								that.value2=''
+								that.show = false
+								that.value2 = ''
 								this.$refs.uToast.show({
 									type: 'success',
 									message: '终止订单成功',
@@ -831,6 +827,51 @@
 						.catch(res => {
 							uni.$u.toast(res.message);
 						});
+				}
+			},
+			termination() {
+				var that = this
+				if (this.radiovalue1 == '其他' && !this.value2) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请填写终止原因描述!",
+					})
+					return
+				}
+				let _terminationReason = ''
+				if (this.radiovalue1 == '已与司机协商') {
+					_terminationReason = 1
+				} else if (this.radiovalue1 == '司机原因终止') {
+					_terminationReason = 2
+				} else if (this.radiovalue1 == '货主个人原因终止') {
+					_terminationReason = 3
+				} else if (this.radiovalue1 == '其他') {
+					_terminationReason = 4
+				}
+				this.$request.baseRequest('post', '/orderInfo/api/end', {
+						id: this.id,
+						terminator: 2,
+						terminationReason: _terminationReason,
+						terminationReasonDescription: this.value2
+					}).then(res => {
+						if (res.code == 200) {
+							that.show = false
+							that.value2 = ''
+							this.$refs.uToast.show({
+								type: 'success',
+								message: '终止订单成功',
+							})
+							that.getList()
+						} else {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: '终止订单失败',
+							})
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
 			},
 			cancelClick() {
 				this.isShowAlert = false
@@ -846,7 +887,7 @@
 				this.id = item.id
 				this.isShowAlert = true
 			},
-			clickstop(){
+			clickstop() {
 				let item = this.dataObj
 				// 货主接单
 				if (item.cargoOwnerStatusKey == 1) {
@@ -858,7 +899,7 @@
 				this.show = true
 			},
 			toPhone() {
-				var that=this
+				var that = this
 				that.get_camera_permission()
 				uni.makePhoneCall({
 					phoneNumber: that.dataObj.driverPhone,
@@ -880,10 +921,10 @@
 				}).then(res => {
 					if (res.code == 200) {
 						this.dataObj = res.data
-						if(this.dataObj.hyCarrierInfo.totalFreight){//货主确定卸车输入的 合计运费
+						if (this.dataObj.hyCarrierInfo.totalFreight) { //货主确定卸车输入的 合计运费
 							this.totalFreight = this.dataObj.hyCarrierInfo.totalFreight
 						}
-						
+
 						// 承运信息显示
 						if (res.data.cargoOwnerStatus != "待接单" && res.data.cargoOwnerStatus != "未装车" && res.data
 							.cargoOwnerStatus != "已终止") {
@@ -899,7 +940,7 @@
 							this.status3 = true
 						}
 						if (res.data.hyCarrierInfo) {
-							this.zcImgList=[]
+							this.zcImgList = []
 							if (res.data.hyCarrierInfo.loadingImg) {
 								let _zcList = res.data.hyCarrierInfo.loadingImg.split(',')
 								for (let i = 0; i < _zcList.length; i++) {
@@ -907,14 +948,14 @@
 								}
 							}
 							if (res.data.hyCarrierInfo.unloadingImg) {
-								this.xcImgList=[]
+								this.xcImgList = []
 								let _xcList = res.data.hyCarrierInfo.unloadingImg.split(',')
 								for (let i = 0; i < _xcList.length; i++) {
 									if (_xcList[i]) this.xcImgList.push(_xcList[i])
 								}
 							}
 							if (res.data.hyCarrierInfo.receiptImg) {
-								this.hdImgList=[]
+								this.hdImgList = []
 								let _hdList = res.data.hyCarrierInfo.receiptImg.split(',')
 								console.log(_hdList)
 								for (let i = 0; i < _hdList.length; i++) {
@@ -1277,49 +1318,58 @@
 		top: 120rpx;
 		left: 10rpx;
 	}
-	/deep/.u-popup__content{
+
+	/deep/.u-popup__content {
 		border-radius: 10px;
 		// padding:20px;
 	}
-	/deep/.u-radio{
-		margin:40rpx 0;
+
+	/deep/.u-radio {
+		margin: 40rpx 0;
 	}
-	.close{
-		position:absolute;
-		right:20px;
+
+	.close {
+		position: absolute;
+		right: 20px;
 	}
-	.termination{
-		background:#F1F3F6;
-		color:#C5CAD4;
-		padding:10px;
-		border-radius:30px;
+
+	.termination {
+		background: #F1F3F6;
+		color: #C5CAD4;
+		padding: 10px;
+		border-radius: 30px;
 		text-align: center;
-		margin-top:30rpx;
+		margin-top: 30rpx;
 	}
-	.termination.active{
+
+	.termination.active {
 		background: #2772FB;
 		color: white;
 	}
-	.freight{
-		.freight_text{
+
+	.freight {
+		.freight_text {
 			font-size: 34rpx;
 			font-weight: 600;
 			margin-bottom: 20rpx;
 		}
-		.freight_up{
+
+		.freight_up {
 			display: flex;
 			border-top: 1px solid #EEEEEE;
 			height: 60rpx;
 			background: red;
 			margin-top: 10px;
 		}
-		.freight_item{
+
+		.freight_item {
 			width: 50%;
 			text-align: center;
 			line-height: 50rpx;
 		}
 	}
-	.u-popup-wrap{
-		padding:20px;
+
+	.u-popup-wrap {
+		padding: 20px;
 	}
 </style>

pages/order/signContract.vue

@@ -21,7 +21,7 @@
 			</view>
 			<view class='row-between'>
 				<view class="gray">发货单位</view>
-				<view class="">{{dataDetails.compName?dataDetails.compName:'个人货主'}}</view>
+				<view class="">{{dataDetails.cargoOwner?dataDetails.cargoOwner:'个人货主'}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="gray">发货地</view>

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

pages/release/release.vue

@@ -22,7 +22,8 @@
 			<view class="row" @click="selectCargoOwner">
 
 				<view class="left select-sf" :class='dataObj.cargoOwner?"":"select-sf1"'>
-					{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}</view>
+					{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}
+				</view>
 				<view class="right">
 					<image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image>
 				</view>
@@ -520,7 +521,7 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			lookContract(){
+			lookContract() {
 				uni.downloadFile({
 					url: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/hzContract.pdf",
 					success: function(res) {
@@ -573,6 +574,10 @@
 				this.isBusinessType = false
 			},
 			getSFList() {
+				uni.showLoading({
+					mask: true,
+					title: '加载中'
+				})
 				this.dataObj.commonId = this.userInfo.id
 				this.$request.baseRequest('get', '/cargoOwnerCompInfo/cargoOwnerList', {
 						commonId: this.userInfo.id
@@ -620,6 +625,7 @@
 								.companyName)
 						}
 						this.$forceUpdate()
+						uni.hideLoading()
 					})
 					.catch(res => {});
 
@@ -904,10 +910,10 @@
 				this.dataObj.commonId = this.userInfo.id
 				uni.$u.route('/pages/order/signContract', {
 					obj: JSON.stringify(this.dataObj),
-					type:1
+					type: 1
 				});
 				// this.$request.baseRequest('post', '/publishTaskInfo/api/addTask', this.dataObj).then(res => {
-					
+
 				// 	if(res.code == 200){
 				// 		uni.removeStorage({
 				// 			key: 'storage_saddress'
@@ -925,7 +931,7 @@
 				// 		// 		url: "/pages/release/release"
 				// 		// })
 				// 		this.dataObj.id = res.data 
-						
+
 				// 	}
 				// 	})
 				// 	.catch(res => {
@@ -1370,6 +1376,7 @@
 		box-sizing: border-box;
 		border-radius: 10rpx;
 	}
+
 	uni-navigator {
 		display: inline-block;
 		color: #2772FB;

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 {