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

components/luo-navBar/components/luo-navBar/luo-navBar.vue

@@ -9,8 +9,8 @@
 			<text class="title" :style="{'color':color,'font-weight':isBlod?'bold':''}" v-if="midText.length && !isSearch">{{midText}}</text>
 			<view class="search-box" v-if="isSearch">
 				<uni-icons type="search" color="#666666"></uni-icons>
-				<input v-if='!isPlaceText' type="text" v-model="searchText" @confirm="confirmEvent" @focus="focusEvent" @blur="blurEvent" @input="inputEvent" placeholder="请输入搜索关键字" />
-				<input v-if='isPlaceText' type="text" v-model="searchText" @confirm="confirmEvent" @focus="focusEvent" @blur="blurEvent" @input="inputEvent" :placeholder="placeText" />
+				<input :maxlength="maxlen" v-if='!isPlaceText' type="text" v-model="searchText1" @confirm="confirmEvent" @focus="focusEvent" @blur="blurEvent" @input="inputEvent" placeholder="请输入搜索关键字" />
+				<input :maxlength="maxlen" v-if='isPlaceText' type="text" v-model="searchText1" @confirm="confirmEvent" @focus="focusEvent" @blur="blurEvent" @input="inputEvent" :placeholder="placeText" />
 			</view>
 			<slot name="mid"></slot>
 		</view>
@@ -30,8 +30,17 @@
 		},
 		data() {
 			return {
+				// searchText1:this.searchText
 			};
 		},
+		computed:{
+			searchText1:{
+				get(){
+				        return this.searchText;
+				      },
+				set(v) { }
+			}
+		},
 		props:{
 			// 盒子背景颜色
 			boxBackColor:{
@@ -40,6 +49,10 @@
 					return "#ffffff"
 				}
 			},
+			maxlen:{
+				type: String,
+				default: "30"
+			},
 			// 颜色
 			color: {
 				type: String,
@@ -97,7 +110,7 @@
 					return 24
 				}
 			},
-			// 左边文字
+			// 右边文字
 			rightText:{
 				type: String,
 				default(){
@@ -138,6 +151,9 @@
 				this.$emit('leftClick')
 			},
 			rightClick(){
+				if(this.rightText=='取消'){
+					this.searchText1=''
+				}
 				this.$emit('rightClick')
 			},
 			focusEvent(e){

pages/mine/cargoowner/addEnerprise.vue

@@ -12,7 +12,7 @@
 			<view style='padding:10px 0 10px;' class="flex flex-space-between items-center width100">
 				<view style='width:100px;font-size:14px;'>法定代表人姓名</view>
 				<view class="flex">
-					<u--input disabledColor='#fff' disabled placeholder="自动获取" inputAlign='left' border="none" v-model="dataDetails.legalPersonName">
+					<u--input disabledColor='#fff' disabled placeholder="自动获取" inputAlign='left' border="none" v-model="legalPersonName">
 					</u--input>
 				</view>
 			</view>
@@ -103,6 +103,7 @@
 				checked:false,
 				validityPeriod:[],
 				isShowimgType:false,
+				legalPersonName:'',
 				uploadType:'',
 				index:0,
 				fileList1: []
@@ -122,7 +123,14 @@
 			if(uni.getStorageSync('currectcompany')){
 				this.dataDetails.company=uni.getStorageSync('currectcompany').companyName
 				this.dataDetails.advanceFreightService=uni.getStorageSync('currectcompany').advanceFreightService
+				var name='',legalPersonNamelength=uni.getStorageSync('currectcompany').legalPersonName.length
+				for (let i = 0; i < legalPersonNamelength; i++) {
+					name+='*'
+				}
+				this.legalPersonName=name.substr(0, name.length - 1) + uni.getStorageSync('currectcompany').legalPersonName[legalPersonNamelength-1]
 				this.dataDetails.legalPersonName=uni.getStorageSync('currectcompany').legalPersonName
+			}else{
+				
 			}
 		},
 		methods: {
@@ -135,7 +143,7 @@
 					result => {
 						// 上传成功回调函数
 						console.log('图片地址', result)
-						this.dataDetails.certificateAddressUrl += result
+						this.dataDetails.certificateAddressUrl=this.dataDetails.certificateAddressUrl +',' +result
 			
 					}
 				)
@@ -230,6 +238,7 @@
 			// 		})
 			// 	});
 			// },
+			
 			submit(){
 				uni.showLoading({
 					title: '加载中',

pages/mine/cargoowner/cargoowner.vue

@@ -62,7 +62,7 @@
 					<view class="row3">
 						<view class="right">
 							<!-- v-if='item.status!="平台审核中"&&item.status!="企业审核中"&&item.status!="企业暂不可用"&&item.status!="企业不存在"&&item.status!="授权已撤销"' -->
-							<image  @click='edit(item)'
+							<image @click='edit(item)'
 								style='width:17px;height:17px;margin:0 10px;' src="@/static/mine/company/edit.png">
 							</image>
 							<image @click='del(item)' style='width:17px;height:17px;margin:0 10px;'
@@ -209,7 +209,7 @@
 
 <style lang="scss" scoped>
 	.content {
-		padding-bottom: 200rpx;
+		padding-bottom: 320rpx;
 	}
 
 	.identity {

pages/mine/cargoowner/editEnerprise.vue

@@ -3,7 +3,7 @@
 		<view class="wrap">
 			<view style='border-bottom:1px solid #eee;padding:10px 0 10px;' class="flex flex-space-between row">
 				<view class="left-text">企业</view>
-				<view style='font-size:16px;width:50%;' class='flex flex-space-between'  @click="selectshow">
+				<view style='font-size:16px;width:50%;' class='flex flex-space-between'>
 					<view :style="{'color':dataDetails.company ? '#000':'#C6CBD5'}">{{dataDetails.company?dataDetails.company:'选择所属企业'}}</view>
 					<view><u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon></view>
 				</view>
@@ -128,8 +128,8 @@
 					result => {
 						// 上传成功回调函数
 						console.log('图片地址', result)
-						this.dataDetails.addressUrl += result
-			
+						this.dataDetails.certificateAddressUrl=this.dataDetails.certificateAddressUrl +',' +result
+
 					}
 				)
 			},
@@ -139,6 +139,7 @@
 			},
 			// 新增图片
 			async afterRead(event) {
+				// console.log(this[`fileList${event.name}`])
 				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
 				let fileListLen = this[`fileList${event.name}`].length
@@ -151,6 +152,7 @@
 				})
 				for (let i = 0; i < lists.length; i++) {
 					const result = await this.uploadFilePromise(lists[i],lists[i].url)
+					// console.log(result)
 					let item = this[`fileList${event.name}`][fileListLen]
 					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
 						status: 'success',
@@ -229,6 +231,7 @@
 					mask:true
 				})
 				var _this=this
+				console.log(this.dataDetails)
 				this.dataDetails.commonId=this.userInfo.id
 				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/editCargoOwnerComp', _this.dataDetails).then(res => {
 					uni.hideLoading()

pages/mine/cargoowner/editpersonalinformation.vue

@@ -4,7 +4,7 @@
 			<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 placeholder="输入姓名" inputAlign='left' border="none" v-model="dataDetails.name">
+					<u--input @input='nameinput' placeholder="输入姓名" inputAlign='left' border="none" v-model="dataDetails.name">
 					</u--input>
 				</view>
 			</view>
@@ -66,7 +66,7 @@
 
 			<view class="flex row">
 				<view class="left-text">身份证号</view>
-				<u--input placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.cardNumber">
+				<u--input :disabled='dataDetails.id' placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.cardNumber">
 				</u--input>
 			</view>
 
@@ -167,6 +167,9 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			nameinput(){
+				this.dataDetails.call=this.dataDetails.name[0]
+			},
 			// 性别切换
 			radioChange(n) {
 				console.log('radioChange', n);
@@ -249,7 +252,45 @@
 				this.isShowimgType = true
 				this.index = index
 			},
+			validate() {
+				if (uni.$u.test.isEmpty(this.dataDetails.name)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "姓名不能为空！",
+					})
+					return true
+				}
+				if (this.dataDetails.name.length<2||this.dataDetails.name.length<10) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "姓名输入错误！",
+					})
+					return true
+				}
+				if (this.dataDetails.call.length<4) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "称呼输入错误！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.cardNumber)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "身份证号不能为空！",
+					})
+					return true
+				}
+				if (this.dataDetails.call.length<18) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "身份证号输入错误！",
+					})
+					return true
+				}
+			},
 			submit() {
+				if (this.validate()) return
 				uni.showLoading({
 					title: '加载中',
 					mask: true
@@ -382,11 +423,17 @@
 </script>
 
 <style lang="scss" scoped>
+	/deep/.content{
+		margin-bottom:160px;
+	}
 	// .preview-card-img {
 	// 	/deep/uni-image>div, uni-image>img {
 	// 	    transform: scale(1.5) rotate(-90deg);
 	// 	}
 	// }
+	/deep/.uni-input-input:disabled{
+		background:#fff;
+	}
 	.picture {
 		margin-top: 20rpx;
 		background: #F5F6FA;

pages/mine/cargoowner/selectcompany.vue

@@ -8,7 +8,7 @@
 				<rich-text :nodes="item.colorcompanyName"></rich-text>
 				<view class='flex items-center align-center'>
 					<view class='legal_person'>法人</view>
-					<view>{{item.legalPersonName}}</view>
+					<view>{{item.legalPersonName1}}</view>
 				</view>
 			</view>
 		</view>
@@ -77,8 +77,58 @@
 				// this.s
 			},
 			checkcompany(item) {
-				uni.setStorageSync('currectcompany', item)
-				this.goDetailPage('pages/mine/cargoowner/addEnerprise')
+				var that=this
+				// console.log(item,this.userInfo)
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.$request.baseRequest('get', '/cargoOwnerInfo/selectCargoOwner', {
+						commonId: this.userInfo.id
+					}).then(res => {
+						uni.hideLoading()
+						if (res.data) {
+							console.log(res.data)
+							if(res.data.name==item.legalPersonName){
+								uni.showToast({
+									title: '您已经具备该公司货主身份',
+									icon: 'none',
+									duration: 2000
+								})
+							}else if(res.data.cargoOwnerCompInfoList){
+								if(!res.data.cargoOwnerCompInfoList.every(item=>{
+									return item.company==item.companyName
+								})){
+									for (var i = 0; i < res.data.cargoOwnerCompInfoList.length; i++) {
+										if(res.data.cargoOwnerCompInfoList[i].company==item.companyName){
+											uni.showToast({
+												title: '该企业已认证过,删除后才可以再次选中该企业',
+												icon: 'none',
+												duration: 2000
+											})
+										}
+									}
+								}else{
+									uni.setStorageSync('currectcompany', item)
+									that.goDetailPage('pages/mine/cargoowner/addEnerprise')
+								}
+								
+							}
+						}
+					})
+					.catch(res => {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+				// if(){
+					
+				// }
+				console.log(12331)
+				
 			},
 			goDetailPage(src) {
 				uni.$u.route(src);
@@ -87,7 +137,8 @@
 				var _this = this
 				var arr = [],
 					filterArr = []
-				this.$request.baseRequest('post', '/searchRecordsInfo/api/addInfo', {
+					if(value){
+						this.$request.baseRequest('post', '/searchRecordsInfo/api/addInfo', {
 						functionType: 1,
 						commonId: this.userInfo.id,
 						searchContent: value
@@ -99,6 +150,8 @@
 							duration: 2000
 						})
 					});
+					}
+				
 				this.$request.baseRequest('get', '/companyInfo/selectAllCompany', {
 						searchKeyWord: value
 					}).then(res => {
@@ -113,6 +166,12 @@
 							_this.more = false
 						}
 						for (var i = 0; i < len; i++) {
+							var len2=res.data.records[i].legalPersonName.length
+							var name=''
+							for (var q = 0; q < len2; q++) {
+								name+='*'
+							}
+							res.data.records[i].legalPersonName1=name.substr(0, name.length - 1) + res.data.records[i].legalPersonName[len2-1]
 							// console.log(res.data.records[i])
 							res.data.records[i].colorcompanyName = res.data.records[i].companyName
 							res.data.records[i].colorcompanyName = _this.join(res.data.records[i].colorcompanyName,
@@ -138,16 +197,26 @@
 					title: '加载中',
 					mask: true
 				})
-				if (this.lastTime == 0) {
-					this.lastTime = setTimeout(() => {
-						_this.currectsearch(value)
-					}, 2000)
-				} else {
-					clearTimeout(this.lastTime)
-					this.lastTime = setTimeout(() => {
-						_this.currectsearch(value)
-					}, 2000)
-				}
+					if (this.lastTime == 0) {
+						this.lastTime = setTimeout(() => {
+							if(e){
+								_this.currectsearch(e.detail.value)
+							}else{
+								_this.currectsearch(value)
+							}
+							
+						}, 2000)
+					} else {
+						clearTimeout(this.lastTime)
+						this.lastTime = setTimeout(() => {
+							if(e){
+								_this.currectsearch(e.detail.value)
+							}else{
+								_this.currectsearch(value)
+							}
+						}, 2000)
+					}
+				
 			}
 		}
 	}

pages/mine/company/editcompany.vue

@@ -1,40 +1,44 @@
 <template>
-	<view>
-		<u-navbar leftText="返回" title="企业认证" :safeAreaInsetTop="false">
+	<view class="content">
+		<web-view :src="srcHandler()" v-if="isSshowPlayVideo"></web-view>
+		<!-- 		<u-navbar leftText="返回" title="企业认证" :safeAreaInsetTop="true">
 			<view class="u-nav-slot" slot="left">
-		        <u-icon @clcik='navback' name="arrow-left" size="19"></u-icon>
-		    </view>
+				<u-icon @click='navback' name="arrow-left" size="19"></u-icon>
+			</view>
 			<view class="u-nav-slot" slot="right">
-				<view @click="goDetailPage('/pages/mine/company/addcompanytwo')" class='next'>下一步</view>
+				<view @click="goDetailPage('/pages/mine/company/addcompanythree')" class='next'>下一步</view>
 			</view>
-		</u-navbar>
-		<view style='margin:50px 0 0 19px;font-size:12px;color:#EF4034;'>注：企业认证仅限该企业法定代表人本人完成。</view>
+		</u-navbar> -->
+		<view style='margin:10px 0 0 19px;font-size:12px;color:#EF4034;'>注：企业认证仅限该企业法定代表人本人完成。</view>
 		<view class='wrap'>
 			<view class="flex border-bottom mt20 align-center">
 				<view class="left">企业名称</view>
 				<view class="flex right">
-					<u--input placeholder="输入企业名称" inputAlign='left' border="none" v-model="dataDetails.companyName">
+					<u--input placeholder="输入企业名称" inputAlign='left' border="none" v-model="dataDetails.companyName" @blur='companyNameBlur'>
 					</u--input>
 				</view>
 			</view>
-			<view  class="flex border-bottom mt20 align-center">
+			<view class="flex border-bottom mt20 align-center">
 				<view class="left">法定代表人姓名</view>
 				<view class="flex right">
-					<u--input placeholder="输入法定代表人姓名" inputAlign='left' border="none" v-model="dataDetails.legalPersonName">
+					<u--input placeholder="输入法定代表人姓名" inputAlign='left' border="none"
+						v-model="dataDetails.legalPersonName">
 					</u--input>
 				</view>
 			</view>
-			<view  class="flex border-bottom mt20 align-center">
+			<view class="flex border-bottom mt20 align-center">
 				<view class="left">联系电话</view>
 				<view class="flex right">
-					<u--input disabledColor='#fff' disabled placeholder="输入联系电话" inputAlign='left' border="none" v-model="dataDetails.phone">
+					<u--input disabledColor='#fff' disabled placeholder="输入联系电话" inputAlign='left' border="none"
+						v-model="dataDetails.phone">
 					</u--input>
 				</view>
 			</view>
-			<view  class="flex mt20 align-center">
+			<view class="flex mt20 align-center">
 				<view class="left">注册实缴金额</view>
 				<view class="flex right align-center">
-					<u--input placeholder="输入企业注册实缴金额" inputAlign='left' border="none" v-model="dataDetails.registeredPaidAmount">
+					<u--input placeholder="输入企业注册实缴金额" inputAlign='left' border="none"
+						v-model="dataDetails.registeredPaidAmount">
 					</u--input>
 					<view>万元</view>
 				</view>
@@ -42,46 +46,126 @@
 		</view>
 		<view class='content1'>
 			<view class="title">上传营业执照</view>
-			<view style='position:relative;'>
-				<view v-if='!dataDetails.businessLicenseAddressUrl' @click="uploadImg(1)" class="picture picture7">
+			<view style='position:relative;' @click="uploadImg(1)">
+				<view v-if='!dataDetails.businessLicenseAddressUrl' class="picture picture7">
 					<image class="xj-image" src="@/static/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传营业执照</view>
 				</view>
 				<view v-if='dataDetails.businessLicenseAddressUrl' @click.stop="uploadImg(1)"
-				class="preview-card-img picture ">
-				<view @click.stop="delCard(1)">
-					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
-					</image>
+					class="preview-card-img picture ">
+					<view @click.stop="delCard(1)">
+						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
+						</image>
+					</view>
+					<image class="" :src="dataDetails.businessLicenseAddressUrl" mode="aspectFit"></image>
 				</view>
-				<image class="" :src="dataDetails.businessLicenseAddressUrl" mode="aspectFit"></image>
-			</view>
 			</view>
 			<view class="flex row">
 				<view class="left-text">营业期限截止日期</view>
-				<view style='font-size:16px;width:50%;' class='flex flex-space-between'  @click="selectValidityPeriod">
-					<view :style="{'color':dataDetails.businessTermDate ? '#000':'#C6CBD5'}">{{dataDetails.businessTermDate?dataDetails.businessTermDate:'选择期限截止日期'}}</view>
-					<view><u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon></view>
+				<view style='font-size:16px;width:50%;' class='flex flex-space-between'
+					@click="selectValidityPeriod(0)">
+					<view :style="{'color':dataDetails.businessTermDate ? '#000':'#C6CBD5'}">
+						{{dataDetails.businessTermDate?dataDetails.businessTermDate:'选择期限截止日期'}}
+					</view>
+					<view>
+						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+					</view>
 				</view>
 			</view>
 			<view class="flex row noborder">
 				<view class="left-text">统一社会信用代码</view>
-				<u--input placeholder="请输入统一社会信用代码" inputAlign='left' border="none" v-model="dataDetails.unifiedSocialCreditCode">
+				<u--input disabled placeholder="请输入统一社会信用代码" inputAlign='left' border="none"
+					v-model="dataDetails.unifiedSocialCreditCode">
 				</u--input>
 			</view>
-						
-			
-			<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
-				@confirm="confirmValidityPeriod" @change="changeHandler"  @cancel="clickcancel">
-			</u-picker>
-			
+			<view class="flex row noborder">
+				<view class="left-text">企业用地是否自有</view>
+				<u-radio-group placement="row" class="select-type" v-model="dataDetails.landOwnership">
+					<u-radio :customStyle="radioCustomStyle" v-for="(item, index) in radiolist1" :key="index"
+						:label="item.name" :name="item.name" @change="radioChange($event,item)" labelSize='12px'
+						:iconSize='4'>
+					</u-radio>
+				</u-radio-group>
+			</view>
+		</view>
+		<view class='content2'>
+			<view class="title">{{dataDetails.landOwnership=='自有'?'上传房产证':'上传租赁合同（扫描件或图片）'}}</view>
+			<view style='position:relative;'>
+				<view v-if='!dataDetails.propertyAddressUrl' @click="uploadImg(2)" class="picture">
+					<image class="xj-image" src="@/static/mine/company/tianjiazhaopian@3x.png"></image>
+				</view>
+				<view v-if='dataDetails.propertyAddressUrl' @click.stop="uploadImg(2)" class="preview-card-img picture">
+					<view @click.stop="delCard(2)">
+						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
+						</image>
+					</view>
+					<image class="uploadimage" :src="dataDetails.propertyAddressUrl" mode="aspectFit"></image>
+				</view>
+			</view>
+		</view>
+		<view class='content3' v-if="dataDetails.landOwnership=='租赁'">
+			<view class="flex row flex-space-between">
+				<view class="left-text">场地租赁截止日期</view>
+				<view class='flex flex-space-between' @click="selectValidityPeriod(1)">
+					<view :style="{'color':dataDetails.siteLeaseDate ? '#000':'#C6CBD5'}">
+						{{dataDetails.siteLeaseDate?dataDetails.siteLeaseDate:'选择日期'}}
+					</view>
+					<view>
+						<u-icon name="arrow-right" color="#7E7E7E" size="12"></u-icon>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4 -->
+		<!-- dataDetails.videoAddressUrl -->
+		<view class='content3' v-if="!dataDetails.videoAddressUrl"
+			@click="goDetailPage('/pages/mine/company/companyvideo')">
+			<view class="left-text">视频验证（打开摄像头并阅读提示文字）</view>
+			<view class="video-icon">
+				<u-icon size="40" name="camera-fill"></u-icon>
+			</view>
+		</view>
+		<view class='content3' v-if="dataDetails.videoAddressUrl">
+			<view class="left-text">视频验证（点击按钮播放视频）</view>
+			<video class="myVideo" :src="dataDetails.videoAddressUrl" controls></video>
+		<!-- 	<view>
+				<view class="video-icon">
+					<u-icon size="40" name="play-circle-fill" @click="isSshowPlayVideo=true"></u-icon>
+				</view>
+			</view> -->
+		</view>
+
+		<view class="content4">
+			<view class="flex row noborder mt20 flex-space-between">
+				<view class="left-text">申请开通平台垫付运费业务</view>
+				<view>
+					<u-switch @change="change" v-model="value" inactiveColor='#ABB0BB' size="20"></u-switch>
+				</view>
+			</view>
+			<view class="flex service align-center">
+				<u--image @click='consent'
+					:src="consentStatus==true?'../../../static/images/mine/duihao@2x.png':'../../../static/images/mine/wxz.png'"
+					width="12px" height="12px"></u--image>
+				我已阅读并同意
+				<navigator
+					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
+					class="path" hover-class="navigator-hover">《服务协议》</navigator>和<navigator
+					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html"
+					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
+			</view>
 		</view>
+
 		<view class='footer'>
-			<view @click="goDetailPage('/pages/mine/company/addcompanytwo')" class='newlyIncreased'>下一步</view>
+			<!-- <view @click="goDetailPage('/pages/mine/company/addcompanythree')" class='newlyIncreased'>下一步</view> -->
+			<view @click="submit" class='newlyIncreased'>提交</view>
 		</view>
-		
-		<u-action-sheet  :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
-			@select="imgTypeSelect" :closeOnClickOverlay="false" :closeOnClickAction="true"  @close="isShowimgType=false">
+		<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod" @confirm="confirmValidityPeriod"
+			@change="changeHandler" @cancel="isShowcardValidity=false">
+		</u-picker>
+		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
+			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -92,41 +176,66 @@
 	import upload from '@/components/upload.vue';
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
-		components:{
-		},
+		components: {},
 		data() {
 			return {
-				isShowcardValidity:false,
-				uploadType:'',
-				index:'',
-				isShowimgType:false,
-				validityPeriod:[],
-				dataDetails:{
-					phone:'',
-					businessLicenseAddressUrl:'',
-					propertyAddressUrl:'',
-					advanceFreightService:1
+				isSshowPlayVideo: false,
+				srcHandler() {
+					return `/hybrid/html/play.html?src=${this.dataDetails.videoAddressUrl}`
+				},
+				consentStatus: false,
+				ValidityPeriodType: '',
+				value: true,
+				radioCustomStyle: {
+					margin: '0 0 0 20rpx'
+				},
+				radiolist1: [{
+						name: '自有',
+						disabled: false
+					},
+					{
+						name: '租赁',
+						disabled: false
+					},
+
+				],
+				isShowcardValidity: false,
+				uploadType: '',
+				index: '',
+				isShowimgType: false,
+				validityPeriod: [],
+				checked: false,
+				checked1: false,
+				dataDetails: {
+					phone: '',
+					businessLicenseAddressUrl: '',
+					propertyAddressUrl: '',
+					advanceFreightService: 1,
+					landOwnership: '自有',
+					videoAddressUrl: null,
+					legalPersonName:''
+
 				}
 			}
 		},
-		onLoad(options){
+		onLoad(options) {
 			this.dataDetails.id=options.id
-			this.validityPeriod = this.$helper.makeValidityPeriod(0,30)
-			this.dataDetails.commonId=this.userInfo.id
-			this.dataDetails.phone=this.userInfo.phone
+			this.validityPeriod = this.$helper.makeValidityPeriod(0, '长期')
+			console.log(this)
+			this.dataDetails.commonId = this.userInfo.id
+			this.dataDetails.phone = this.userInfo.phone
+			console.log('```````````````')
+			console.log(options)
+			if(uni.getStorageSync('companydata')){
+				this.dataDetails = uni.getStorageSync('companydata')
+			}
+			this.dataDetails.videoAddressUrl = options.videoSrc
 			this.getList()
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			delCard() {
-				this.dataDetails.businessLicenseAddressUrl = ''
-				this.$forceUpdate()
-			},
-			navBack() {
-				uni.navigateBack();
-			},
 			getList(){
 				uni.showLoading({
 					title: '加载中',
@@ -146,11 +255,194 @@
 					})
 				});
 			},
-			clickcancel(){
-				this.isShowcardValidity=false
+			companyNameBlur(){
+				this.$request.baseRequest('get', '/companyInfo/repeatCompanyInfo', {
+						commonId: this.userInfo.id,
+						companyName:this.dataDetails.companyName
+					}).then(res => {
+						if (res.code==200) {
+							// that.dataDetails.legalPersonName = res.data.name
+						}else{
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			loadedmetadata(event) {
+				console.log(event)
+			},
+			loadeddata(event) {
+				console.log(event)
+			},
+			videoErrorCallback: function(e) {
+				uni.showModal({
+					content: e.target.errMsg,
+					showCancel: false
+				})
+			},
+			validate() {
+				if (uni.$u.test.isEmpty(this.dataDetails.companyName)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "企业名称不能为空！",
+					})
+					return true
+				}
+				if (this.dataDetails.companyName.length<4||this.dataDetails.companyName.length<25) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "企业名称字数在4-25个字！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.legalPersonName)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "法定代表人姓名不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.phone)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "联系电话不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.registeredPaidAmount)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "注册实缴金额不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.businessLicenseAddressUrl)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "营业执照不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.businessTermDate)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "营业期限截止日期不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.unifiedSocialCreditCode)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "统一社会信用代码不能为空！",
+					})
+					return true
+				}
+
+				if (uni.$u.test.isEmpty(this.dataDetails.propertyAddressUrl)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "房产证或租赁合同不能为空！",
+					})
+					return true
+				}
+
+				if (this.dataDetails.landOwnership == '租赁') {
+					if (uni.$u.test.isEmpty(this.dataDetails.siteLeaseDate)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "场地租赁截止日期不能为空！",
+						})
+						return true
+					}
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "视频认证不能为空！",
+					})
+					return true
+				}
+			},
+			submit() {
+				if (this.validate()) return
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				var _this = this
+				this.$request.baseRequest('post', '/companyInfo/api/editCompanyInfo', _this.dataDetails).then(res => {
+						uni.hideLoading()
+						uni.$u.toast('提交成功')
+						this.goDetailPage('/pages/mine/company/index')
+					})
+					.catch(res => {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			consent() {
+				this.consentStatus = !this.consentStatus
+			},
+			change(e) {
+				if (this.value) {
+					this.$set(this.dataDetails, 'advanceFreightService', 1)
+				} else {
+					this.$set(this.dataDetails, 'advanceFreightService', 0)
+				}
+			},
+			radioChange(n) {
+				console.log('radioChange', n);
+				this.dataDetails.landOwnership = n
+				console.log('this.dataDetails.landOwnership', this.dataDetails.landOwnership);
+			},
+			delCard(type) {
+				if (type == 1) {} else {
+
+				}
+				this.dataDetails.businessLicenseAddressUrl = ''
+				this.$forceUpdate()
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+			checkedchange() {
+				this.checked = !this.checked
+				if (this.checked) {
+					this.dataDetails.landOwnership = 0
+					this.checked1 = false
+				} else {
+
+				}
+			},
+			checkedchange1() {
+				this.checked1 = !this.checked1
+				if (this.checked1) {
+					this.dataDetails.landOwnership = 1
+					this.checked = false
+				} else {
+
+				}
+			},
+			clickcancel() {
+				this.isShowcardValidity = false
 			},
 			imgTypeSelect(val) {
-				var _this=this
+				var _this = this
 				if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
@@ -161,8 +453,21 @@
 								result => {
 									// 上传成功回调函数
 									console.log('图片地址', result)
-									_this.dataDetails.businessLicenseAddressUrl=result
-									console.log(_this.dataDetails.businessLicenseAddressUrl)
+
+									switch (_this.uploadType) {
+										// 身份正面
+										case 1:
+											_this.dataDetails.businessLicenseAddressUrl = result
+											console.log(_this.dataDetails.businessLicenseAddressUrl)
+											break
+											// 身份反面
+										case 2:
+											_this.dataDetails.propertyAddressUrl = result
+											console.log(_this.dataDetails.propertyAddressUrl)
+											break
+										case 3:
+											break;
+									}
 								}
 							)
 						}
@@ -177,33 +482,46 @@
 								result => {
 									// 上传成功回调函数
 									console.log('图片地址', result)
-									_this.dataDetails.businessLicenseAddressUrl=result
+									_this.dataDetails.businessLicenseAddressUrl = result
 								}
 							)
 						}
 					});
 				}
 			},
-			uploadImg(type, index) {
+			uploadImg(type) {
 				this.uploadType = type
 				this.isShowimgType = true
-				this.index = index
+				// this.index = index
 			},
 			goDetailPage(src) {
-				uni.setStorage({key: 'companydata',data: JSON.stringify(this.dataDetails)});
+				uni.setStorageSync('companydata', this.dataDetails);
 				uni.$u.route(src);
 			},
-			selectValidityPeriod() {
+			selectValidityPeriod(type) {
+				this.ValidityPeriodType = type
 				this.isShowcardValidity = true
 			},
 			confirmValidityPeriod(e) {
-				console.log('confirm', e)
-				if (e.value[0] == '长期') {
-					this.dataDetails.businessTermDate = e.value[0]
-				} else {
-					this.dataDetails.businessTermDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
+				switch (this.ValidityPeriodType) {
+					case 0:
+						if (e.value[0] == '长期') {
+							this.dataDetails.businessTermDate = e.value[0]
+						} else {
+							this.dataDetails.businessTermDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
+						}
+						break
+					case 1:
+						if (e.value[0] == '长期') {
+							this.dataDetails.siteLeaseDate = e.value[0]
+						} else {
+							this.dataDetails.siteLeaseDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
+						}
+						break
 				}
-			
+				console.log('confirm', e)
+
+
 				this.isShowcardValidity = false
 			},
 			changeHandler(e) {
@@ -214,13 +532,13 @@
 					index,
 					picker = this.$refs.uPicker
 				} = e
-			
+
 				// if (columnIndex === 0) {
 				// 	
 				// 	if (e.index != 0) {
 				// 		picker.setColumnValues(1, this.validityPeriod[1].shift())
 				// 	}
-			
+
 				// } else if (columnIndex === 1) {
 				// 	if (e.index != 0) {
 				// 		picker.setColumnValues(2, this.validityPeriod[2].shift())
@@ -231,34 +549,45 @@
 	}
 </script>
 
-<style  lang="scss" scoped>
-	page{
-		background:#F5F6FA;
+<style lang="scss" scoped>
+	.content {
+		padding: 0 0 200rpx 0;
 	}
-	.next{
-		color:#2772FB;
-		font-size:13px;
-	}
-	.wrap{
+	/deep/.uni-input-input:disabled{
 		background:#fff;
-		padding:20rpx 30rpx;
-		border-radius:5px;
-		margin:20rpx;
-		.left{
+	}
+	page {
+		background: #F5F6FA;
+	}
+
+	.next {
+		color: #2772FB;
+		font-size: 13px;
+	}
+
+	.wrap {
+		background: #fff;
+		padding: 20rpx 30rpx;
+		border-radius: 5px;
+		margin: 20rpx;
+
+		.left {
 			width: 240rpx;
 			font-size: 28rpx;
 		}
-		.right{
+
+		.right {
 			font-size: 28rpx;
 			width: calc(100% - 240rpx);
 		}
 	}
-	
+
 	.preview-card-img {
 		// /deep/uni-image>div, uni-image>img {
 		//     transform: scale(1.5) rotate(-90deg);
 		// }
 	}
+
 	.picture {
 		margin-top: 20rpx;
 		background: #F5F6FA;
@@ -271,26 +600,29 @@
 		align-items: center;
 		color: #6A7282;
 	}
+
 	.content1 {
-		background:#fff;
-		padding:40rpx 20rpx 20rpx;
-		margin:20rpx 20rpx 200rpx;
+		background: #fff;
+		padding: 20rpx;
+		margin: 20rpx;
 		border-radius: 10rpx;
+
 		.row {
 			border-bottom: 1px solid #EEEEEE;
 			padding-bottom: 28rpx;
 			margin-top: 26rpx;
-	
+
 		}
-	
+
 		.left-text {
+			// background: red;
 			width: 320rpx;
 			color: #333333;
 			display: flex;
 			align-items: center;
-			font-size:14px;
+			font-size: 14px;
 		}
-	
+
 		.picture {
 			position: relative;
 			width: 100%;
@@ -299,56 +631,44 @@
 			justify-content: center;
 			flex-direction: column;
 			align-items: center;
-			overflow: hidden;
+
 			.text {
 				margin-top: 20rpx;
 			}
 		}
+
 		.picture7 {
 			background: url(../../../static/mine/cy.png);
 			background-size: 100% 100%;
 		}
-	
-	
+
+
 		.xj-image {
 			width: 100rpx;
 			height: 100rpx;
 		}
-	
+
 		.title {
 			color: #999999;
 			margin: 20rpx 0;
 		}
 	}
-	.u-input{
-		font-size:16px;
-	}
+
+	.content2,
+	.content3,
 	.content4 {
-		position:fixed;
-		bottom:0;
-		background: white;
-		width:100%;
-		text-align:center;
-		left:0;
-		box-sizing: border-box;;
-		padding:10px 15px;
-		.line{
-			position:absolute;
-			left:0;
-			margin-top:-9px;
-			border-top:1px solid #eee;
-			width:100%;
-		}
-		.next-btn {
-			background: #F1F3F6;
-			width: 85%;
-			padding: 20rpx 20rpx;
-			text-align: center;
-			color: #C5CAD4;
-			border-radius: 50rpx;margin:0 auto;
-			margin-top:10px;
-		}
+		background: #fff;
+		padding: 20rpx;
+		margin: 20rpx;
+		border-radius: 10rpx;
 	}
+
+	.u-input {
+		font-size: 16px;
+	}
+
+	.content4 {}
+
 	.del-card {
 		position: absolute;
 		top: -10rpx;
@@ -357,23 +677,58 @@
 		height: 80rpx;
 		z-index: 9;
 	}
-	.footer{
-		position:fixed;
-		background:#fff;
-		width:100%;
-		bottom:0;
-		left:0;
-		padding:15px 15px 30px;
+
+	.footer {
+		position: fixed;
+		background: #fff;
+		width: 100%;
+		bottom: 0;
+		left: 0;
+		padding: 40rpx 60rpx;
 		box-sizing: border-box;
 	}
-	.newlyIncreased{
-		width:100%;
-		margin:0 auto;
-		text-align:center;
-		height:46px;
-		line-height: 46px;
-		color:#fff;
-		background:url(../../../static/mine/huozhurenzheng/Mask@3x.png) no-repeat;
-		background-size:100%;
+
+	.newlyIncreased {
+		width: 100%;
+		height: 80rpx;
+		margin: 0 auto;
+		text-align: center;
+		color: #fff;
+		background: #2772FB;
+		background-size: 100%;
+		border-radius: 50rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.u-checkbox-label--left {
+		margin: 0 10px;
+	}
+
+	.service {
+		font-size: 24rpx;
+		margin: 20rpx;
+		justify-content: center;
+
+		/deep/.u-image {
+			margin: 0 20rpx;
+		}
+	}
+
+	.video-icon {
+		margin-top: 20rpx;
+		background: #F5F6FA;
+		width: 212rpx;
+		height: 211rpx;
+		border-radius: 20rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		color: #6A7282;
+	}
+	.myVideo{
+		
 	}
 </style>

pages/mine/index.vue

@@ -83,7 +83,7 @@
 						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 					</view>
 				</view>
-				<view class="flex flex-space-between content1-item" @click="goDetailPage('/pages/mine/set')">
+				<!-- <view class="flex flex-space-between content1-item" @click="goDetailPage('/pages/mine/set')">
 					<view class='flex items-center'>
 						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
 							width="20px" height="20px"></u--image>设置
@@ -91,7 +91,7 @@
 					<view>
 						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 					</view>
-				</view>
+				</view> -->
 
 			</view>
 		</view>

pages/mine/set.vue

@@ -14,9 +14,9 @@
 				<view>
 					<text>姓名</text>
 				</view>
-				<view style='align-items: center;' class="flex">
+				<view @click='editname' style='align-items: center;' class="flex">
 					<view class="username">
-						{{username}}
+						{{name}}
 					</view>
 					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
@@ -72,6 +72,7 @@
 				// content:'uView的目标是成为uni-app生态最优秀的UI框架',
 				headUrl: "@/static/mine/avatar1.png",
 				username: "",
+				name:'',
 				gridList: [{
 					num: 0,
 					name: '退出登录',
@@ -84,13 +85,38 @@
 			}
 		},
 		computed: {
-			// ...mapState(['hasLogin', 'userInfo'])
+			...mapState(['hasLogin', 'userInfo'])
 		},
 		onShow() {
 			this.getList()
 		},
-		onLoad() {},
+		onLoad() {
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			})
+			this.$request.baseRequest('get', '/cargoOwnerInfo/selectCargoOwner', {
+					commonId: this.userInfo.id
+				}).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.name=res.data.call+'**'
+			
+					}
+				})
+				.catch(res => {
+					uni.hideLoading()
+					uni.showToast({
+						title: res.message,
+						icon: 'none',
+						duration: 2000
+					})
+				});
+		},
 		methods: {
+			editname(){
+				uni.$u.toast('可在 货主认证-身份信息 中修改')
+			},
 			UpdataPassword() {
 				console.log(1111)
 				uni.navigateTo({

pages/mine/settings/editPassword.vue

@@ -14,7 +14,7 @@
 					</u-button>
 				</u-form-item>
 				<u-form-item label="新密码" prop="password" borderBottom>
-					<u--input v-model="registerData.password" border="none" placeholder="请输新入密码，6-16位字符"></u--input>
+					<u--input v-model="registerData.password" border="none" placeholder="请输入新密码，6-16位字符"></u--input>
 				</u-form-item>
 			
 				<u-code ref="uCode" @change="codeChange" seconds="20" @start="disabled1 = true" @end="disabled1 = false">

pages/order/index.vue

@@ -16,7 +16,7 @@
 			</view> -->
 		<view class="top-content">
 			<u-search placeholder="搜索订单" v-model="searchKeyWord" bgColor='white' :actionStyle='searchStyle'
-				@search="getSearch" :clearabled="true"></u-search>
+				@custom="getSearch" @search="getSearch" :clearabled="true"></u-search>
 			<view class="tab-content">
 				<u-tabs :list="tabList" @click="clickTab" lineColor='transparent' :current='tabIndex'
 					:inactiveStyle="{color:'white'}" :activeStyle="{

pages/public/login.vue

@@ -20,8 +20,17 @@
 				<!-- <u--input class='password' border="none" v-model='password'
 					placeholder="请输入密码，6-16位字符" :type="type" value="">
 					</u--input> -->
-				<u-input class='password' border="none" v-model='password' placeholder="请输入密码，6-16位字符"
-					:type="isShowPassword" :clearable='true'>
+				<u-input 	v-if="isShowPassword=='password'" class='password' border="none" v-model='password' placeholder="请输入密码，6-16位字符"
+					type="password" :clearable='true'>
+					<template slot="suffix">
+						<u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
+							v-if="isShowPassword=='password'"></u-icon>
+						<u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
+						</u-icon>
+					</template>
+				</u-input>
+				<u-input v-else class='password' border="none" v-model='password' placeholder="请输入密码，6-16位字符"
+					type="text" :clearable='true'>
 					<template slot="suffix">
 						<u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
 							v-if="isShowPassword=='password'"></u-icon>

pages/release/release.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="fixed1"></view>
-		<view class='title flex'>
+		<view class='title top-title flex'>
 			<u-icon class="back" name="arrow-left" color="" size="20" @click="back"></u-icon>
 			<view class="nav-title">发布</view>
 			<view class="search" @click="goToRecord">
@@ -893,7 +893,7 @@
 
 	.content1 {
 		background: white;
-		margin: var(--status-bar-height) 20rpx 0 20rpx;
+		margin: 100rpx 20rpx 0 20rpx;
 		border-radius: 20rpx;
 		padding: 40rpx;
 
@@ -935,7 +935,15 @@
 		display: flex;
 		justify-content: flex-end;
 	}
-
+	.top-title{
+		background:#fff;
+		padding:20rpx;
+		position: fixed;
+		z-index:100;
+		top:0;
+		box-sizing: border-box;
+		width:100%;
+	}
 	.content2 {
 		padding: 40rpx;