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

# Conflicts:
#	pages/mine/cargoowner/editEnerprise.vue

App.vue

@@ -2,6 +2,12 @@
 	/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
 	@import "@/uni_modules/uview-ui/index.scss";
 	@import 'static/css/common.scss';
+	uni-modal {
+	     .uni-modal {
+			 border-radius:30px;
+			 font-size:20rpx;
+		 }  
+	}  
 </style>
 <script>
 	import {
@@ -20,7 +26,11 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
+		
 		onLaunch: function() {
+	
+				
+			
 			// plus.android.requestPermissions(['android.permission.CAMERA'], function(e){  
 			//                 if(e.deniedAlways.length>0){    //权限被永久拒绝  
 			//                     // 弹出提示框解释为何需要权限，引导用户打开设置页面开启  
@@ -55,6 +65,71 @@
 			// 		})
 			// 	}
 			// })
+			// #ifdef APP-PLUS
+			console.log(uni.getStorageSync('userInfo'))
+			if(uni.getStorageSync('userInfo')){
+				that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+					phone: uni.getStorageSync('userInfo').phone,
+				}).then(res => {
+					if (res.data.authenticationStatus == '已禁用') {
+						
+					// this.isShowAlert = true
+					// this.alertTitle = '账号审核中'
+					// this.confirmText = '退出APP'
+					// this.showCancelButton = false
+					let options = {
+					    title: '提示', 
+						info:'账号审核中',
+					    okText: '退出程序', 
+						infoAlignment:'center',
+						radius:10,
+					    // cancelText: '否',
+						showCancel:false,
+						okButtonColor:'#2772FB'
+					};
+					const native = uni.requireNativePlugin('AJ-Alert');
+					native.showAction(options, result => {
+						// #ifdef APP-PLUS
+						            	if (uni.getSystemInfoSync().platform == 'ios') {
+						            		plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+						            	} else if (uni.getSystemInfoSync().platform == 'android') {
+						            		plus.runtime.quit();
+						            	}
+						            // #endif
+					    // 点击是的回调, result暂时没有返回内容
+					}, cancel => {
+					    // 点击否的回调
+					});
+					// uni.showModal({
+					//     title: '提示',
+					//     content: '这是一个模态弹窗',
+					// 	showCancel:false,
+					// 	confirmText:'退出app',
+					// 	// confirmColor:'#317AFE',
+					// 	confirmColor:'#F54E40',
+					//     success: function (res) {
+					//         if (res.confirm) {
+					//             // #ifdef APP-PLUS
+					//             	if (uni.getSystemInfoSync().platform == 'ios') {
+					//             		plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+					//             	} else if (uni.getSystemInfoSync().platform == 'android') {
+					//             		plus.runtime.quit();
+					//             	}
+					//             // #endif
+					//         } else if (res.cancel) {
+					//             console.log('用户点击取消');
+					//         }
+					//     }
+					// });
+
+					} else {
+						console.log(1231233212332312312213)
+					}
+				})
+			}
+			
+			
+			// #endif
 			uni.getSystemInfo({
 				success: function(e) {
 					Vue.prototype.statusBar = e.statusBarHeight
@@ -187,5 +262,8 @@
 </script>
 
 <style>
+	/* #ifndef APP-PLUS */  
+	
+	/* #endif */
 	/*每个页面公共css */
 </style>

components/bert-suggest/suggest.vue

@@ -6,7 +6,7 @@
 				<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="手机 QQ或e-mail,方便我们联系您" />
+				<input v-model="data.contact" placeholder="请输入您的手机号,方便我们联系您" />
 			</uni-card>
 		</view>
 		
@@ -97,7 +97,7 @@
 		}
 	}
 	.submit-btn {
-		background-color: #22C572;
+		background-color: #2772FB;
 		color:#fff;
 		border-radius:30px;
 		margin: 20rpx;

config/index.js

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

manifest.json

@@ -125,6 +125,20 @@
                     "pid" : "3404",
                     "parameters" : {}
                 }
+            },
+            "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" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 0,
+                    "pid" : "1664",
+                    "parameters" : {}
+                }
             }
         }
     },

pages.json

@@ -588,7 +588,16 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/mine/settings/fankui",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "意见反馈",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

pages/carSource/driverSee.vue

@@ -161,6 +161,7 @@
 				list3:[],
 				list4:[],
 				ping:[],
+				commonId:'',
 				hyDriverCarInfoList:[],
 				driverList:{},
 				total:0
@@ -171,6 +172,8 @@
 			this.show = true
 		},
 		onLoad(options) {
+			this.commonId=options.commonId
+			console.log(options )
 			// this.dataObj =JSON.parse(options.driver) 
 			// console.log(this.dataObj)
 			that = this
@@ -229,7 +232,7 @@
 			upCallback(page) {
 				var that =this
 				that.$request.baseRequest('get', '/driverInfo/getDriver', {
-						commonId:'2939c4c23ca14e4ab6f16d7a6b3f8d5e'
+						commonId:this.commonId
 					}).then(res => {
 						console.log(res.data)
 						that.driverList=res.data

pages/mine/cargoowner/addEnerprise.vue

@@ -24,7 +24,11 @@
 			</view>
 		</view>
 		<view class='content1'>
-			<view class="title">上传企业授权书</view>
+			<view class="flex">
+				<view class="title">上传企业授权书</view>
+				<view class="title title_css" @click="formWork">授权书模板</view>
+			</view>
+
 			<!-- {{show}} -->
 			<!-- 			<button type="default" @click="()=>{show = true}" style="width: 80%;background-color: #007AFF;color: #fff;margin-top: 60rpx;">选择文件</button>
 				<view class="textStyle" v-for="(item,index) in pathArr" :key="index">
@@ -39,8 +43,8 @@
 					</view>
 				</view>
 				<nk-select-file v-model="show" @confirm="getPath"></nk-select-file> -->
-			<u-upload class="uview-upload" :fileList="fileList1" @beforeRead='beforeRead($event)' @afterRead="afterRead($event)" @delete="deletePic"
-				name="1" multiple :maxCount="9"></u-upload>
+			<u-upload class="uview-upload" :fileList="fileList1" @beforeRead='beforeRead($event)'
+				@afterRead="afterRead($event)" @delete="deletePic" name="1" multiple :maxCount="9"></u-upload>
 			<!-- 		<view style='position:relative;'>
 				<view v-if='!dataDetails.certificateAddressUrl' @click="uploadImg(1)" class="picture picture7">
 					<image class="xj-image" src="@/static/mine/ic_shanchuan@2x.png"></image>
@@ -89,6 +93,8 @@
 				提交
 			</view>
 		</view>
+		<u-picker :show="formWorkShow" @cancel="formWorkShow = false" @close="formWorkShow = false"
+			:columns="formWorkColumns" @confirm="formWorkSubmit"></u-picker>
 	</view>
 </template>
 
@@ -120,7 +126,12 @@
 				uploadType: '',
 				index: 0,
 				fileList1: [],
-				urlList:[]
+				urlList: [],
+				formWorkShow: false,
+				formWorkColumns: [
+					["复制下载链接", "预览模板"]
+				]
+
 			}
 		},
 		computed: {
@@ -151,21 +162,59 @@
 			}
 		},
 		methods: {
+			formWork() {
+				this.formWorkShow = true
+			},
+			formWorkSubmit(e) {
+				let that = this
+				console.log(e.value[0])
+				if (e.value[0] == "复制下载链接") {
+					uni.setClipboardData({
+						data: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/contractPdf/1069f84fcbbe4c2d9ce048bf98ea7a63.pdf',
+						success: function() {
+							uni.showToast({
+								title: '复制成功',
+							});
+							that.formWorkShow = false
+						},
+						fail: function() {
+							uni.showToast({
+								title: '复制失败',
+							});
+						}
+					});
+				} else {
+					uni.downloadFile({
+						url: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/contractPdf/1069f84fcbbe4c2d9ce048bf98ea7a63.pdf',
+						success: function(res) {
+							var filePath = res.tempFilePath;
+							uni.openDocument({
+								filePath: filePath,
+								showMenu: true,
+								success: function(res) {
+									console.log('打开文档成功');
+									that.formWorkShow = false
+								}
+							});
+						}
+					});
+				}
+			},
 			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('用户点击取消');
 							}
 						}
-					});	
+					});
 				}
 			},
 			getPath(event) {
@@ -173,7 +222,7 @@
 				this.pathArr = event;
 			},
 			uploadFilePromise(file, url) {
-				uploadImage('image',url, 'appData/',
+				uploadImage('image', url, 'appData/',
 					result => {
 						// 上传成功回调函数
 						this.urlList.push(result)
@@ -182,7 +231,7 @@
 			},
 			// 删除图片
 			deletePic(event) {
-				this.urlList=this.urlList.splice(event.index,1)
+				this.urlList = this.urlList.splice(event.index, 1)
 				this[`fileList${event.name}`].splice(event.index, 1)
 			},
 			// 新增图片
@@ -210,21 +259,21 @@
 				}
 			},
 			async beforeRead(event) {
-				console.log(1221212,event)
-				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
-								if(photol == false){
-									uni.showModal({
-									    title: '提示',
-									    content: '您已经关闭相机权限,去设置',
-									    success: function (res) {
-									        if (res.confirm) {
-									            plus.runtime.openURL("app-settings:");
-									        } else if (res.cancel) {
-									            console.log('用户点击取消');
-									        }
-									    }
-									});	
-								}
+				console.log(1221212, event)
+				var photol = await permision.requestAndroidPermission("android.permission.CAMERA")
+				if (photol == false) {
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭相机权限,去设置',
+						success: function(res) {
+							if (res.confirm) {
+								plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				}
 			},
 			consent() {
 				this.checked = !this.checked
@@ -308,7 +357,7 @@
 				// 	})
 				// 	return true
 				// }
-				if(this.urlList.length == 0){
+				if (this.urlList.length == 0) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "企业授权书不能为空！",
@@ -332,7 +381,7 @@
 				}
 			},
 			submit() {
-				if(this.validate()){
+				if (this.validate()) {
 					return
 				}
 				uni.showLoading({
@@ -350,7 +399,9 @@
 							uni.removeStorageSync('cargoOwnerId')
 							uni.removeStorageSync('currectcompany')
 							uni.$u.toast('提交成功')
-							_this.goDetailPage('/pages/mine/cargoowner/cargoowner')
+							uni.navigateBack({
+								delta: 1
+							})
 						})
 					.catch(res => {
 						uni.hideLoading()
@@ -446,9 +497,17 @@
 		}
 
 		.title {
+			width: 50%;
 			color: #999999;
 			margin: 20rpx 0;
 		}
+
+		.title_css {
+			text-align: right;
+			color: #2772FB;
+			margin: 20rpx 0;
+			font-size: 30rpx;
+		}
 	}
 
 	.u-input {
@@ -484,6 +543,6 @@
 			margin-top: 10px;
 		}
 
-	
+
 	}
 </style>

pages/mine/cargoowner/cargoowner.vue

@@ -260,7 +260,7 @@
 		width: 100%;
 		bottom: 0;
 		left: 0;
-		padding: 15px 15px 30px;
+		padding: 15px 15px 40px;
 		box-sizing: border-box;
 	}
 

pages/mine/cargoowner/editEnerprise.vue

@@ -301,22 +301,23 @@
 				var _this = this
 				this.dataDetails.commonId = this.userInfo.id
 				this.dataDetails.certificateAddressUrl = this.urlList.toString()
-				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/editCargoOwnerComp', _this.dataDetails).then(
-						res => {
-							uni.hideLoading()
-							uni.removeStorage('cargoOwnerId')
-							uni.removeStorage('currectcompany')
-							uni.$u.toast('提交成功')
-							_this.goDetailPage('/pages/mine/cargoowner/cargoowner')
-						})
-					.catch(res => {
-						uni.hideLoading()
-						uni.showToast({
-							title: res.message,
-							icon: 'none',
-							duration: 2000
-						})
-					});
+				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/editCargoOwnerComp', _this.dataDetails).then(res => {
+					uni.hideLoading()
+					uni.removeStorage('cargoOwnerId')
+					uni.removeStorage('currectcompany')
+					uni.$u.toast('提交成功')
+					uni.navigateBack({
+						delta: 1
+					})
+				})
+				.catch(res => {
+					uni.hideLoading()
+					uni.showToast({
+						title: res.message,
+						icon: 'none',
+						duration: 2000
+					})
+				});
 			},
 		}
 	}

pages/mine/cargoowner/editpersonalinformation.vue

@@ -30,51 +30,55 @@
 
 				<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit"></image>
 			</view>
-			<view style='padding:5px 0 10px;border-bottom:1px solid #eee;' class="flex width100">
-				<view style='width:100px;font-size:14px;'>姓名</view>
-				<view class="flex">
-					<u--input @input='nameinput' placeholder="输入姓名" inputAlign='left' border="none"
+			<view style='padding:5px 0 10px;border-bottom:1px solid #eee;' class="flex flex-space-between width100">
+				<view class="left-text" style='font-size:14px;'>姓名</view>
+				<view style='padding-right:10px;' class="flex">
+					<u--input @input='nameinput' placeholder="输入姓名" inputAlign='right' border="none"
 						v-model="dataDetails.name">
 					</u--input>
 				</view>
 			</view>
-			<view class="flex row" style='padding:10px 0 5px;border-bottom:1px solid #eee;'>
-				<view style='width:100px;font-size:14px;'>性别</view>
-				<u-radio-group v-model="dataDetails.sex" placement="row">
-					<u-radio :customStyle="radioCustomStyle" v-for="(item, index) in radiolist1" :key="index"
-						:label="item.name" :name="item.name" @change="radioChange">
-					</u-radio>
-				</u-radio-group>
+			<view class="flex row flex-space-between" style='padding:10px 0 5px;border-bottom:1px solid #eee;'>
+				<view class="left-text" style='font-size:14px;'>性别</view>
+				<view>
+					<u-radio-group v-model="dataDetails.sex" placement="row">
+						<u-radio :customStyle="radioCustomStyle" v-for="(item, index) in radiolist1" :key="index"
+							:label="item.name" :name="item.name" @change="radioChange">
+						</u-radio>
+					</u-radio-group>
+				</view>
 			</view>
-			<view class="flex row row-ch" style='padding:10px 0 5px;'>
-				<view style='width:100px;font-size:14px;'>称呼</view>
-				<view style="width: 60rpx;">
-					<u--input placeholder="输入姓氏" class="ch-style" inputAlign='left' border="none"
-						v-model="dataDetails.call">
-					</u--input>
+			<view class="flex row row-ch flex-space-between" style='padding:10px 0 5px;'>
+				<view class="left-text" style='font-size:14px;'>称呼</view>
+				<view style='padding-right:10px;' class='flex'>
+					<view style="width: 60rpx;">
+						<u--input placeholder="输入姓氏" class="ch-style" inputAlign='right' border="none"
+							v-model="dataDetails.call">
+						</u--input>
+					</view>
+					<view class="flex align-center" v-if="dataDetails.sex=='男'">先生</view>
+					<view class="flex align-center" v-else>女士</view>
 				</view>
-				<view class="flex align-center" v-if="dataDetails.sex=='男'">先生</view>
-				<view class="flex align-center" v-else>女士</view>
 			</view>
 
-			<view style='padding:10px 0 5px;border-bottom:1px solid #eee;' class="flex width100">
-				<view style='width:100px;font-size:14px;'>联系电话</view>
-				<view class="flex">
-					<u--input disabledColor='#fff' disabled placeholder="输入联系电话" inputAlign='left' border="none"
+			<view style='padding:10px 0 5px;border-bottom:1px solid #eee;' class="flex 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"
 						v-model="dataDetails.phone">
 					</u--input>
 				</view>
 			</view>
-			<view class="flex row">
+			<view style='padding-right:10px;' class="flex row">
 				<view class="left-text">身份证号</view>
-				<u--input :disabled='dataDetails.id' placeholder="请输入身份证号" inputAlign='left' border="none"
+				<u--input :disabled='dataDetails.id' placeholder="请输入身份证号" inputAlign='right' border="none"
 					v-model="dataDetails.cardNumber">
 				</u--input>
 			</view>
 
-			<view class="flex row noborder">
+			<view style='padding-right:10px;' class="flex flex-space-between row noborder">
 				<view class="left-text">身份证截止日期</view>
-				<view style='font-size:16px;width:50%;' class='flex flex-space-between' @click="selectValidityPeriod">
+				<view style='font-size:16px;align-items: center;' class='flex' @click="selectValidityPeriod">
 					<view :style="{'color':dataDetails.cardValidityDate ? '#000':'#C6CBD5'}">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证截止日期'}}
 					</view>
@@ -145,6 +149,7 @@
 				dataDetails: {
 					name: '',
 					phone: '',
+					sex:'男',
 					commonId: '',
 					cardNumber: '',
 					cardAddressUrl: '',
@@ -164,7 +169,10 @@
 		onLoad(options) {
 			this.get_camera_permission()
 			var _this = this;
-			this.dataDetails = options
+			console.log(options)
+			if(JSON.stringify(options) != "{}"){
+				this.dataDetails = options
+			}
 			this.validityPeriod = this.$helper.makeValidityPeriod(0, '长期')
 			this.dataDetails.phone = this.userInfo.phone
 			this.dataDetails.commonId = this.userInfo.id
@@ -196,7 +204,10 @@
 			// 性别切换
 			radioChange(n) {
 				console.log('radioChange', n);
+				
 				this.dataDetails.sex = n
+				this.$forceUpdate()
+				console.log(this.dataDetails.sex)
 			},
 			consent() {
 				this.checked = !this.checked
@@ -274,6 +285,25 @@
 				if (e.value[0] == '长期') {
 					this.dataDetails.cardValidityDate = e.value[0]
 				} else {
+					if(e.value[0]==''){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "年份不能为空！",
+						})
+						return
+					}else if(e.value[1]==''){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "月份不能为空！",
+						})
+						return
+					}else if(e.value[2]==''){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "日期不能为空！",
+						})
+						return
+					}
 					this.dataDetails.cardValidityDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
 				}
 
@@ -301,6 +331,13 @@
 					})
 					return true
 				}
+				if (this.dataDetails.call.length==0) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "称呼不能为空！",
+					})
+					return true
+				}
 				if (this.dataDetails.call.length > 4) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -308,6 +345,7 @@
 					})
 					return true
 				}
+				
 				if (uni.$u.test.isEmpty(this.dataDetails.cardNumber)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -392,10 +430,17 @@
 												}).then(res => {
 												if (res.data.recPersonNo) {
 													that.dataDetails.cardNumber = res.data.recPersonNo
+													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 => {

pages/mine/cargoowner/selectcompany.vue

@@ -90,13 +90,14 @@
 						
 						uni.hideLoading()
 						if (res.data) {
-							if(res.data.name==item.legalPersonName){
-								uni.showToast({
-									title: '您已经具备该公司货主身份',
-									icon: 'none',
-									duration: 2000
-								})
-							}else if(res.data.hyCargoOwnerCompInfoList){
+							// if(res.data.name==item.legalPersonName){
+							// 	uni.showToast({
+							// 		title: '您已经具备该公司货主身份',
+							// 		icon: 'none',
+							// 		duration: 2000
+							// 	})
+							// }else 
+							if(res.data.hyCargoOwnerCompInfoList){
 								res.data.hyCargoOwnerCompInfoList.every(items=>{
 									 console.log(items.company,item.companyName)
 								})
@@ -105,7 +106,10 @@
 								})){
 
 									uni.setStorageSync('currectcompany', item)
-									that.goDetailPage('pages/mine/cargoowner/addEnerprise')
+									uni.navigateBack({
+										delta: 1
+									})
+									// that.goDetailPage('pages/mine/cargoowner/addEnerprise')
 								}else{
 									for (var i = 0; i < res.data.hyCargoOwnerCompInfoList.length; i++) {
 										if(res.data.hyCargoOwnerCompInfoList[i].company==item.companyName){
@@ -162,11 +166,11 @@
 						})
 					});
 					}
-				
-				this.$request.baseRequest('get', '/companyInfo/selectAllCompany', {
+				if(value){
+					this.$request.baseRequest('get', '/companyInfo/selectAllCompany', {
 						searchKeyWord: value
 					}).then(res => {
-						uni.hideLoading()
+						// uni.hideLoading()
 						var len = 0
 						console.log(res)
 						if (res.data.records.length > 10) {
@@ -193,21 +197,25 @@
 						console.log(arr)
 					})
 					.catch(res => {
-						uni.hideLoading()
+						// uni.hideLoading()
 						uni.showToast({
 							title: res.message,
 							icon: 'none',
 							duration: 2000
 						})
 					});
+				}else{
+					this.companyList=[]
+				}
+				
 			},
 			companyInput(e, value) {
 				var _this = this
 				this.searching = true
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				})
+				// uni.showLoading({
+				// 	title: '加载中',
+				// 	mask: true
+				// })
 					if (this.lastTime == 0) {
 						this.lastTime = setTimeout(() => {
 							if(e){
@@ -227,6 +235,7 @@
 							}
 						}, 2000)
 					}
+					
 				
 			}
 		}

pages/mine/company/addcompany.vue

@@ -182,7 +182,7 @@
 			<view class="flex row noborder mt20 flex-space-between">
 				<view class="left-text">视频验证（点击按钮播放视频）</view>
 				<view>
-					<u-button type="primary" @click="goDetailPage('/pages/mine/company/companyvideo')" size="mini">重新上传
+					<u-button color='#2772FB' type="primary" @click="goDetailPage('/pages/mine/company/companyvideo')" size="mini">重新上传
 					</u-button>
 				</view>
 			</view>
@@ -395,6 +395,30 @@
 			
 				this.isShowBank = true
 			},
+			manualInput() {
+				if (this.isShowManualInput) {
+					if (uni.$u.test.isEmpty(this.dataDetails.payeeAddressUrl)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请填写卡号！",
+						})
+						return true
+					}
+					if (this.columns.length==0) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请选择手动输入！",
+						})
+						return true
+					}
+					
+					this.isShowBank = true
+			
+				} else {
+					this.isShowBank = false
+				}
+				this.isShowManualInput = !this.isShowManualInput
+			},
 			confirmBank(e) {
 				console.log(e)
 				this.dataDetails.bankDepositBranch = e.value[0]
@@ -802,7 +826,9 @@
 											  			_this.columns.push(res.data
 											  				.bankNameZhihang)
 											  
-											  		}
+											  		}else{
+														_this.columns=[]
+													}
 											  		_this.$forceUpdate()
 											  	})
 											  	.catch(res => {
@@ -991,6 +1017,7 @@
 		justify-content: center;
 		align-items: center;
 		height: 68rpx;
+		min-width: 124rpx;
 	}
 
 	.content1 {

pages/mine/company/editcompany.vue

@@ -174,7 +174,7 @@
 			<view class="flex row noborder mt20 flex-space-between">
 				<view class="left-text">视频验证（点击按钮播放视频）</view>
 				<view>
-					<u-button type="primary" @click="goDetailPage('/pages/mine/company/companyvideo')" size="mini">重新上传
+					<u-button color='#2772FB' type="primary" @click="goDetailPage('/pages/mine/company/companyvideo')" size="mini">重新上传
 					</u-button>
 				</view>
 			</view>
@@ -301,6 +301,7 @@
 					},
 
 				],
+				isShowManualInput:false,
 				isShowcardValidity: false,
 				uploadType: '',
 				index: '',
@@ -362,6 +363,22 @@
 					});
 				}
 			},
+			manualInput() {
+				if (this.isShowManualInput) {
+					if (uni.$u.test.isEmpty(this.dataDetails.payeeAddressUrl)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请填写卡号！",
+						})
+						return true
+					}
+					this.isShowBank = true
+			
+				} else {
+					this.isShowBank = false
+				}
+				this.isShowManualInput = !this.isShowManualInput
+			},
 			selectData(num) {
 				this.dataType = num
 				this.isShowcardValidity = true
@@ -923,6 +940,7 @@
 		justify-content: center;
 		align-items: center;
 		height: 68rpx;
+		min-width: 124rpx;
 	}
 
 	.picture {

pages/mine/index.vue

@@ -34,12 +34,12 @@
 			</view>
 
 			<view class='flex operate flex-space-around'>
-				<view class='flex items-center' @click="toMyRelease">
-					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/wodefabu.png"
+				<view style='font-size:14px;' class='flex items-center' @click="toMyRelease">
+					<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true" src="../../static/mine/wodefabu.png"
 						width="42px" height="42px"></u--image>我的发布
 				</view>
-				<view class='flex items-center' @click="goDetailPage('/pages/mine/evaluate')">
-					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/pingjia.png"
+				<view style='font-size:14px;' class='flex items-center' @click="goDetailPage('/pages/mine/evaluate')">
+					<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true" src="../../static/mine/pingjia.png"
 						width="42px" height="42px"></u--image>
 					司机评价
 				</view>

pages/mine/manageBankCards/addBankCard.vue

@@ -50,7 +50,7 @@
 			<view class="flex row noborder">
 				<view class="left-text">持卡人姓名</view>
 				<view class="flex">
-					<u--input placeholder="输入持卡人姓名" inputAlign='left' border="none"
+					<u--input :disabled='disabled' placeholder="输入持卡人姓名" inputAlign='left' border="none"
 						v-model="dataDetails.cardholderName">
 					</u--input>
 				</view>
@@ -58,7 +58,7 @@
 			<view class="flex row noborder">
 				<view class="left-text">持卡人身份证号</view>
 				<view class="flex">
-					<u--input placeholder="输入持卡人身份证号" inputAlign='left' border="none"
+					<u--input :disabled='disabled' placeholder="输入持卡人身份证号" inputAlign='left' border="none"
 						v-model="dataDetails.cardholderIdNumber" maxlength="18">
 					</u--input>
 				</view>
@@ -98,6 +98,7 @@
 					bankDeposit: '',
 					bankDepositBranch: '',
 				},
+				disabled:false,
 				imagesrc: '',
 				columns: [
 
@@ -119,8 +120,13 @@
 			_this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', { //查身份证号
 				phone: uni.getStorageSync("userInfo").phone
 			}).then(res => {
-				this.id = res.data.cardNumber
-				this.name = res.data.name
+				if(res.data.authenticationStatus=='已认证'){
+					this.id = res.data.cardNumber
+					this.name = res.data.name
+					this.dataDetails.cardholderIdNumber= res.data.cardNumber
+					this.dataDetails.cardholderName=res.data.name
+					this.disabled=true
+				}
 			})
 		},
 		methods: {
@@ -158,7 +164,7 @@
 				if (uni.$u.test.isEmpty(this.columns)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "请先上传银行卡！",
+						message: "请选择手动收入",
 					})
 					return true
 				}
@@ -334,8 +340,9 @@
 				// 	.catch(res => {
 				// 		uni.$u.toast(res.message);
 				// 	});
+				console.log(this.name)
 				if (that.validate()) return //校验  511303198809243079
-				if (that.dataDetails.cardholderName != this.name) {
+				if (that.dataDetails.cardholderName != this.name&&this.name!='') {
 					that.$refs.uToast.show({
 						type: 'error',
 						message: "收款人须为货主本人！",
@@ -346,6 +353,7 @@
 						title: '加载中',
 						mask: true
 					})
+					
 					that.$request.baseRequest('get', '/driverPayeeInfo/bankCradShibie', { //三要素验证
 						name: that.dataDetails.cardholderName, //持卡人姓名
 						idCard: this.id, //货主身份证号

pages/mine/manageBankCards/index.vue

@@ -5,12 +5,12 @@
 				<view class="text1">我的卡</view>
 				<!-- <view class="text2">（共{{bankList?bankList.length:0}}张）</view> -->
 			</view>
-
 			<view v-if='bankList.length==0' @click="addBankCard" class="add-bankcard flex">
+				
 				<view class="car-text">添加银行卡</view>
 				<u-icon class="icon" name="plus-circle-fill" color="#2979ff" size="24"></u-icon>
 			</view>
-			<view v-else><u-icon name="trash" size="24" @click="del()"></u-icon></view>
+			<view v-else><image style='width:17px;height:17px;' @click="del()" src="../../../static/mine/sanchu.png" mode=""></image></view>
 		</view>
 		<!-- <image src="../../../static/images/mine/bank/nongyelogo.png" mode=""></image> -->
 		<view class="card-list" v-for="(item,index) in bankList" :key='index'>
@@ -66,6 +66,9 @@
 			}
 			this.init();
 		},
+		onShow() {
+			this.init();
+		},
 		methods: {
 			confirmClick(){
 				this.isShowAlert = false
@@ -218,7 +221,21 @@
 					});
 			},
 			addBankCard() {
-				uni.$u.route('/pages/mine/manageBankCards/addBankCard');
+				var _this = this;
+				// this.dataDetails.driverId = this.userInfo.driverId
+				_this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', { //查身份证号
+					phone: uni.getStorageSync("userInfo").phone
+				}).then(res => {
+					if(res.data.authenticationStatus=='已认证'){
+						uni.$u.route('/pages/mine/manageBankCards/addBankCard');
+					}else{
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请先进行身份认证！",
+						})
+					}
+				})
+				
 			},
 			edit() {
 				uni.$u.route('/pages/mine/manageBankCards/editBankCard');

pages/mine/myAccount/bankList.vue

@@ -6,11 +6,11 @@
 				<view class="text2">（共{{bankList?bankList.length:0}}张）</view>
 			</view> -->
 
-			<view @click="addBankCard" class="add-bankcard flex">
+			<view v-if='bankList.length==0' @click="addBankCard" class="add-bankcard flex">
 				<view class="car-text">添加银行卡</view>
 				<u-icon class="icon" name="plus-circle-fill" color="#2979ff" size="24"></u-icon>
 			</view>
-
+			<view v-else><image style='width:17px;height:17px;' @click="del()" src="../../../static/mine/sanchu.png" mode=""></image></view>
 		</view>
 		<!-- <image src="../../../static/images/mine/bank/nongyelogo.png" mode=""></image> -->
 		<view class="card-list" v-for="(item,index) in bankList" :key='index' @click="bankCheng(item)">
@@ -26,16 +26,6 @@
 					</view>
 				</view>
 			</view>
-
-			<view class="flex flex-space-between row2 align-center">
-				<view class="flex align-center">
-					<radio :checked="item.defaultFlag==1" @click='radioChange(item)' />
-					<view class="default-card">设为默认收款账户</view>
-				</view>
-				<view>
-					<u-icon name="trash" size="24" @click="del(item,index)"></u-icon>
-				</view>
-			</view>
 		</view>
 		<!-- <view @click="addBankCard">添加银行卡</view> -->
 		 <u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#2772FB'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
@@ -66,6 +56,9 @@
 			}
 			this.init();
 		},
+		onShow() {
+			this.init();
+		},
 		methods: {
 			bankCheng(item){
 				uni.setStorageSync("bankInfo",item)
@@ -211,7 +204,20 @@
 					});
 			},
 			addBankCard() {
-				uni.$u.route('/pages/mine/manageBankCards/addBankCard');
+				var _this = this;
+				// this.dataDetails.driverId = this.userInfo.driverId
+				_this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', { //查身份证号
+					phone: uni.getStorageSync("userInfo").phone
+				}).then(res => {
+					if(res.data.authenticationStatus=='已认证'){
+						uni.$u.route('/pages/mine/manageBankCards/addBankCard');
+					}else{
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请先进行身份认证！",
+						})
+					}
+				})
 			},
 			edit() {
 				uni.$u.route('/pages/mine/manageBankCards/editBankCard');
@@ -224,9 +230,9 @@
 					...params
 				})
 			},
-			del(val, index) {
-				this.obj = val
-				this.index = index
+			del() {
+				this.obj = this.bankList[0]
+				this.index =0
 				this.isShowAlert = true
 		
 			}

pages/mine/myAccount/bill.vue

@@ -105,7 +105,8 @@
 	.center {
 		// padding:0 20rpx;
 		background: #F5F6FA;
-		height: calc(100vh - 9.9vh);
+		height: calc(100vh - 1vh);
+		overflow: scroll;
 		.data_top{
 			padding: 20rpx 30rpx 0;
 			background: #ffffff;

pages/mine/myAccount/withdrawal.vue

@@ -67,7 +67,8 @@
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
 			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
-		<u-button type="primary" text="提交" @click="submit" class="btn_css"></u-button>
+			<view @click="submit" class='newlyIncreased'>提交</view>
+		<!-- <u-button type="primary" text="提交" @click="submit" class="btn_css"></u-button> -->
 	</view>
 </template>
 
@@ -280,4 +281,17 @@
 		}
 
 	}
+	.newlyIncreased {
+		width: 100%;
+		height: 80rpx;
+		margin: 20px auto;
+		text-align: center;
+		color: #fff;
+		background: #2772FB;
+		background-size: 100%;
+		border-radius: 50rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 </style>

pages/mine/set.vue

@@ -27,6 +27,8 @@
 				</view>
 				<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 			</view> -->
+		</view>
+		<view class='wrap'>
 			<view class='flex flex-space-between wrap-item' @click='UpdataPassword'>
 				<view>
 					<text>修改密码</text>
@@ -53,7 +55,7 @@
 			<button @click='logoutAlert()' class='exitlogin'>退出登录</button>
 		</view>
 		<u-modal :show="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' :title='title'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#2772FB' confirm-text='确定' :title='title'
 			:showCancelButton='false' :content="content" @confirm="logout" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -172,7 +174,7 @@
 			},
 			fankui() {
 				uni.navigateTo({
-					url: `/pages/user/fankui`
+					url: `/pages/mine/settings/fankui`
 				})
 			},
 			logoutAlert() {

pages/news/index.vue

@@ -77,24 +77,27 @@
 				mescroll: null
 			}
 		},
-		async onLoad() {
-			that = this
-			// #ifdef APP-PLUS
-			let _status = await that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
-				phone: this.userInfo.phone,
-			}).then(res => {
-				return res.data.authenticationStatus
-			})
-			if (_status == '已禁用') {
-				this.isShowAlert = true
-				this.alertTitle = '账号审核中'
-				this.confirmText = '退出APP'
-				this.showCancelButton = false
-			} else {
-				console.log(1231233212332312312213)
-			}
-			// #endif
+		// async onLoad() {
+		// 	that = this
+		// 	// #ifdef APP-PLUS
+		// 	let _status = await that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+		// 		phone: this.userInfo.phone,
+		// 	}).then(res => {
+		// 		return res.data.authenticationStatus
+		// 	})
+		// 	if (_status == '已禁用') {
+		// 		this.isShowAlert = true
+		// 		this.alertTitle = '账号审核中'
+		// 		this.confirmText = '退出APP'
+		// 		this.showCancelButton = false
+		// 	} else {
+		// 		console.log(1231233212332312312213)
+		// 	}
+		// 	// #endif
 
+		// },
+		onLoad() {
+		
 		},
 		onShow() {
 			var that=this
@@ -173,7 +176,9 @@
 			read(val) {
 				if(val.newsType == "投诉结果" || val.newsType == "举报结果"){
 					uni.$u.route("/pages/news/feedbackResults?id=" + val.bussId + "&type=" + val.newsType)
-				}
+				}else{
+					uni.$u.route("/pages/news/newsSee?_obj=" + JSON.stringify(val))
+					}
 				uni.showLoading({
 					title: '加载中',
 					mask: true

pages/order/addEvaluation.vue

@@ -7,7 +7,7 @@
 					<view>{{objData.goodName}}</view>
 				</view>
 				<view class="flex align-center">
-					<image :src="objData.driverPortrait" mode="widthFix" class="tx-img"></image>
+					<image :src="objData.driverPortrait"  class="tx-img"></image>
 					<view>{{objData.driverName}}</view>
 				</view>
 			</view>
@@ -308,6 +308,8 @@
 
 	.tx-img {
 		width: 40rpx;
+		height:40rpx;
+		border-radius: 50%;
 		margin-right: 20rpx;
 	}
 </style>

pages/order/index.vue

@@ -107,7 +107,8 @@
 						</view>
 						<view class="flex align-center">
 							<view style="margin-right: 20rpx;">运距 {{good.distance}}km</view>
-							<view class="car">{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}</view>
+							<view v-if="good.cargoOwnerStatus!='已完结'" class="car">{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}</view>
+							<view v-else class="car">{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}</view>
 						</view>
 						<!-- 		<view class="right">
 							<view class="flex fontsize-26 row">
@@ -322,28 +323,28 @@
 			// this.getLngLat();
 			//#endif
 		},
-		async onLoad() {
-			that = this
-			// #ifdef APP-PLUS
-			let _status = await that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
-				phone: this.userInfo.phone,
-			}).then(res => {
-				if(res.data){
-					return res.data.authenticationStatus
-				}
+		// async onLoad() {
+		// 	that = this
+		// 	// #ifdef APP-PLUS
+		// 	let _status = await that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+		// 		phone: this.userInfo.phone,
+		// 	}).then(res => {
+		// 		if(res.data){
+		// 			return res.data.authenticationStatus
+		// 		}
 				
-			})
-			if (_status == '已禁用') {
-				this.isShowAlert = true
-				this.alertTitle = '账号审核中'
-				this.confirmText = '退出APP'
-				this.showCancelButton = false
-			} else {
-				console.log(1231233212332312312213)
-			}
-			// #endif
+		// 	})
+		// 	if (_status == '已禁用') {
+		// 		this.isShowAlert = true
+		// 		this.alertTitle = '账号审核中'
+		// 		this.confirmText = '退出APP'
+		// 		this.showCancelButton = false
+		// 	} else {
+		// 		console.log(1231233212332312312213)
+		// 	}
+		// 	// #endif
 
-		},
+		// },
 		onShow() {
 			this.upCallback({
 				size: 10,

pages/public/login.vue

@@ -56,7 +56,9 @@
 				<view @click='gocode' style='flex:1;text-align:center;' class="Regular">验证码登录</view>
 			</view>
 		</view>
+		<u-toast ref="uToast"></u-toast>
 	</view>
+	
 	</view>
 </template>
 
@@ -151,66 +153,80 @@
 			},
 			passlogin(e) {
 				var that = this
-				uni.showLoading({
-					title: '登录中',
-					mask: true
-				})
-				console.log("clinetId", this.clientId)
-				that.$request.baseRequest('get', '/commonUser/login', {
-						phone: this.phone,
-						password: this.password,
-						loginFlag: 1,
-						identification:2
-					}).then(res => {
-						if (res.code == 200) {
-							uni.setStorageSync('userInfo', res.data)
-							that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
-								reCommonId: this.userInfo.id,
-							}).then(res3 => {
-								if (res3.data||res3.data==0) {
-									let name = 'myTip';
-									let value = res3.data
-									if (value == 0) {
-										uni.removeTabBarBadge({
-											index: 2
-										})
-									}
+				
+				that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+					phone: this.phone,
+				}).then(res => {
+					if (res.data.authenticationStatus == '已禁用') {
+						that.$refs.uToast.show({
+							type: 'error',
+							message: "账号审核中！"
+						})
+						
+					} else {
+						uni.showLoading({
+							title: '登录中',
+							mask: true
+						})
+						
+						that.$request.baseRequest('get', '/commonUser/login', {
+								phone: that.phone,
+								password: that.password,
+								loginFlag: 1,
+								identification:2
+							}).then(res => {
+								if (res.code == 200) {
+									uni.setStorageSync('userInfo', res.data)
+									that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
+										reCommonId: that.userInfo.id,
+									}).then(res3 => {
+										if (res3.data||res3.data==0) {
+											let name = 'myTip';
+											let value = res3.data
+											if (value == 0) {
+												uni.removeTabBarBadge({
+													index: 2
+												})
+											}
+											that.$store.commit('$uStore', {
+												name,
+												value
+											});
+											if (value != 0 && value) {
+												uni.setTabBarBadge({
+													index: 2,
+													text: value + ""
+												})
+											}
+										}
+									})
+									
+									that.$store.commit('login', res.data)
+									var name = 'userInfo';
+									var value = res.data;
 									that.$store.commit('$uStore', {
 										name,
 										value
 									});
-									if (value != 0 && value) {
-										uni.setTabBarBadge({
-											index: 2,
-											text: value + ""
-										})
-									}
+									uni.switchTab({
+										url: '/pages/order/index'
+									});
+									uni.hideLoading()
+								} else {
+									uni.hideLoading()
+									uni.showToast({
+										title: res.message,
+										icon: 'none',
+										duration: 2000
+									})
 								}
 							})
-							
-							that.$store.commit('login', res.data)
-							var name = 'userInfo';
-							var value = res.data;
-							that.$store.commit('$uStore', {
-								name,
-								value
+							.catch(res => {
+								uni.$u.toast(res.message);
 							});
-							uni.switchTab({
-								url: '/pages/order/index'
-							});
-							uni.hideLoading()
-						} else {
-							uni.hideLoading()
-							uni.showToast({
-								title: res.message,
-								icon: 'none',
-								duration: 2000
-							})
-						}
-					})
-					.catch(res => {
-						uni.$u.toast(res.message);
-					});
+					}
+				})
+				
 			},
 			gocode() {
 				uni.navigateTo({

pages/public/loginOther.vue

@@ -18,7 +18,6 @@
 			<button @click='gocode' :class='codestatus?"active":""' class='verificationCode'>获取验证码</button>
 			<view @click='gonumber' class="Regular use-password" style='text-align:center;color:#6A6A6A;'>使用账号密码登录
 			</view>
-
 			<button v-if='tabbar' @click='goregister' class='Regular register active'>手机号一键注册</button>
 		</view>
 		<view v-if="loginType === 'phone'" class="register-section">
@@ -113,9 +112,21 @@
 			},
 			gocode() {
 				if (this.phone.length == 11 && /^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.phone)) {
-					uni.navigateTo({
-						url: '/pages/public/code?phone=' + this.phone
-					})
+					that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+						phone: this.phone,
+					}).then(res => {
+						if (res.data.authenticationStatus == '已禁用') {
+							that.$refs.uToast.show({
+								type: 'error',
+								message: "账号审核中！"
+							})
+							
+						} else {
+							uni.navigateTo({
+								url: '/pages/public/code?phone=' + this.phone
+							})
+						}
+					})	
 				} else if (this.phone.length == 0) {
 					uni.showToast({
 					 title: '手机号不能为空',

pages/public/register.vue

@@ -37,7 +37,7 @@
 				class='verificationCode'>注册</button>
 			<view
 				style='color:#6A6A6A;margin-top:10px;font-size:30rpx;display:flex;justify-content:center;align-items: center;'>
-				<u--image @click='consent'
+				<u--image style='margin-right:3px;position:relative;top:1rpx;' @click='consent'
 					:src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
 					width="17px" height="17px"></u--image>
 				已阅读并同意

pages/release/release.vue

@@ -44,7 +44,8 @@
 					</view>
 				</view>
 				<view class="right" @click="selectAddress(0)" v-if="!dataObj.sendArea">
-					<view class="right">{{dataObj.sendArea?'':'>'}}</view>
+					<view v-if='dataObj.sendArea' class="right"></view>
+					<view class="right" v-else><image src="../../static/images/myimg/gengduo1.png" style="width: 20rpx;height: 26rpx;margin-top:14rpx;"></image></view>
 				</view>
 			</view>
 			<view class="row2">
@@ -60,7 +61,8 @@
 					</view>
 				</view>
 				<view class="right" @click="selectAddress(1)" v-if="!dataObj.unloadArea">
-					<view class="right">{{dataObj.unloadArea?(dataObj.unloadCity+dataObj.unloadArea):'>'}}</view>
+					<view v-if='dataObj.unloadArea' class="right">{{(dataObj.unloadCity+dataObj.unloadArea)}}</view>
+					<view class="right" v-else><image src="../../static/images/myimg/gengduo1.png" style="width: 20rpx;height: 26rpx;margin-top:14rpx;"></image></view>
 				</view>
 			</view>
 		</view>
@@ -761,11 +763,10 @@
 									unsendLatitude: '',
 								}
 								_this.checkboxValue1 = ['不限']
+								uni.$u.route("/pages/release/record")
 							}
 						})
-						uni.switchTab({
-							url: '/pages/order/index'
-						})
+						
 					})
 					.catch(res => {
 						uni.showToast({
@@ -997,7 +998,9 @@
 	.input {
 		text-align: right;
 	}
-
+	.content{
+		height:100vh;
+	}
 	.title {
 		padding: 0 20rpx;
 		display: flex;

pages/release/selectAddress.vue

@@ -322,6 +322,9 @@
 		background: white;
 		padding: 20rpx;
 	}
+	.content {
+		height:100vh;
+	}
 	.content2-wrap{
 		margin-bottom:200rpx;
 	}

uni_modules/uview-ui/components/u-upload/u-upload.vue

@@ -200,8 +200,6 @@
 			},
 			
 			chooseFile() {
-				this.beforeRead1()
-				console.log(1212)
 				const {
 					maxCount,
 					multiple,