更新

pages.json

@@ -317,7 +317,7 @@
 		{
 			"path": "pages/mine/cargoowner/addEnerprise",
 			"style": {
-				"navigationBarTitleText": "企业认证",
+				"navigationBarTitleText": "认证信息",
 				"enablePullDownRefresh": false
 			}
 
@@ -487,7 +487,7 @@
 		}, {
 			"path": "pages/mine/cargoowner/editEnerprise",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "编辑",
 				"enablePullDownRefresh": false
 			}
 

pages/mine/cargoowner/addEnerprise.vue

@@ -56,7 +56,7 @@
 			</view>
 			</view> -->
 			<view class="flex row noborder">
-				<view class="left-text">营业期限截止日期</view>
+				<view class="left-text">授权截止日期</view>
 				<view style='font-size:16px;width:50%;' class='flex flex-space-between' @click="selectdate">
 					<view :style="{'color':dataDetails.authorizationDeadline ? '#000':'#C6CBD5'}">
 						{{dataDetails.authorizationDeadline?dataDetails.authorizationDeadline:'选择期限截止日期'}}
@@ -118,7 +118,8 @@
 				legalPersonName: '',
 				uploadType: '',
 				index: 0,
-				fileList1: []
+				fileList1: [],
+				urlList:[]
 			}
 		},
 		computed: {
@@ -152,22 +153,21 @@
 				console.log(event);
 				this.pathArr = event;
 			},
-			uploadFilePromise(file, url) {debugger
+			uploadFilePromise(file, url) {
 				uploadImage('image',url, 'appData/',
 					result => {
 						// 上传成功回调函数
-						console.log('图片地址', result)
-						this.dataDetails.certificateAddressUrl = this.dataDetails.certificateAddressUrl + ',' + result
-
+						this.urlList.push(result)
 					}
 				)
 			},
 			// 删除图片
 			deletePic(event) {
+				this.urlList=this.urlList.splice(event.index,1)
 				this[`fileList${event.name}`].splice(event.index, 1)
 			},
 			// 新增图片
-			async afterRead(event) {debugger
+			async afterRead(event) {
 				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
 				console.log(event)
@@ -265,7 +265,14 @@
 				// 	})
 				// 	return true
 				// }
-				if (uni.$u.test.isEmpty(this.dataDetails.certificateAddressUrl)) {
+				// if (uni.$u.test.isEmpty(this.dataDetails.certificateAddressUrl)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "企业授权书不能为空！",
+				// 	})
+				// 	return true
+				// }
+				if(this.urlList.length == 0){
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "企业授权书不能为空！",
@@ -298,6 +305,7 @@
 				})
 				var _this = this
 				this.dataDetails.commonId = this.userInfo.id
+				this.dataDetails.certificateAddressUrl = this.urlList.toString()
 				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/addCargoOwnerComp', _this.dataDetails).then(
 						res => {
 							uni.hideLoading()

pages/mine/cargoowner/cargoowner.vue

@@ -31,7 +31,7 @@
 							<view v-else style='font-size:21px;'>{{personage.name}}</view>
 							<view v-if="personage.authenticationStatus!='已认证'" class='flex flex-space-between'
 								style='width:100%;color:#999999;font-size:14px;'>您的身份信息{{personage.authenticationStatus?personage.authenticationStatus:'未认证'}}状态
-								<u-icon name="arrow-right" color="#7E7E7E" size="10" v-if="datastatus"></u-icon>
+								<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 							</view>
 							<view v-else class='flex flex-space-between' style='width:100%;color:#999999;font-size:14px;'>
 								{{starUserphone}}
@@ -41,7 +41,7 @@
 					</view>
 				</view>
 		<view>
-			<view class="content2-title">所属企业 <text style='color:#999;'>({{enterprise.length}})</text></view>
+			<view class="content2-title">所属企业 <text style='color:#999;'>（{{enterprise.length}})</text></view>
 			<view v-if='enterprise.length>0'>
 				<view v-for='item in enterprise' class='wrap'>
 					<view class='flex flex-space-between'>
@@ -61,8 +61,7 @@
 					</view>
 					<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)' 							v-if='item.status!="平台审核中"&&item.status!="企业审核中"&&item.status!="企业暂不可用"&&item.status!="企业不存在"&&item.status!="授权已撤销"'
 								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;'
@@ -82,6 +81,7 @@
 				<view @click='goDetailPage("/pages/mine/cargoowner/editpersonalinformation")' class='newlyIncreased' v-if="!datastatus">去认证</view>
 			</view>
 		</view>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -125,6 +125,12 @@
 			toEditPage(){
 				if(this.personage&&this.personage.authenticationStatus=='已认证'){
 					uni.$u.route("/pages/mine/cargoowner/editpersonalinformation",this.personage);
+				}else if(this.personage&&this.personage.authenticationStatus == "审核中"){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "身份审核中，请耐心等待！",
+					})
+					return 
 				}else{
 					uni.$u.route("/pages/mine/cargoowner/editpersonalinformation",this.personage);
 				}
@@ -224,7 +230,7 @@
 
 <style lang="scss" scoped>
 	.content {
-		padding-bottom: 320rpx;
+		padding-bottom: 460rpx;
 	}
 
 	.identity {

pages/mine/cargoowner/editEnerprise.vue

@@ -50,7 +50,7 @@
 			</view>
 			</view> -->
 			<view class="flex row noborder">
-				<view class="left-text">营业期限截止日期</view>
+				<view class="left-text">授权截止日期</view>
 				<view style='font-size:16px;width:50%;' class='flex flex-space-between'  @click="selectdate">
 					<view :style="{'color':dataDetails.authorizationDeadline ? '#000':'#C6CBD5'}">{{dataDetails.authorizationDeadline?dataDetails.authorizationDeadline:'选择期限截止日期'}}</view>
 					<view><u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon></view>
@@ -101,7 +101,8 @@
 				isShowimgType:false,
 				uploadType:'',
 				index:0,
-				fileList1: []
+				fileList1: [],
+				urlList:[]
 			}
 		},
 		computed: {
@@ -116,7 +117,8 @@
 			
 			this.dataDetails = options
 			if(options.certificateAddressUrl){
-				var arr=options.certificateAddressUrl.split(',')
+				var arr = options.certificateAddressUrl.split(',')
+				this.urlList = options.certificateAddressUrl.split(',')
 				this.fileList1=[]
 				for(var i=0;i<arr.length;i++){
 					if(arr[i]!=''){
@@ -136,13 +138,15 @@
 					result => {
 						// 上传成功回调函数
 						console.log('图片地址', result)
-						this.dataDetails.certificateAddressUrl=this.dataDetails.certificateAddressUrl +',' +result
+						this.urlList.push(result)
+						// this.dataDetails.certificateAddressUrl=this.dataDetails.certificateAddressUrl +',' +result
 
 					}
 				)
 			},
 			// 删除图片
 			deletePic(event) {
+				this.urlList=this.urlList.splice(event.index,1)
 				this[`fileList${event.name}`].splice(event.index, 1)
 			},
 			// 新增图片
@@ -234,13 +238,21 @@
 			// 	});
 			// },
 			submit(){
+				if (!this.checked) {
+					uni.showToast({
+						title: '请勾选协议',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
 				uni.showLoading({
 					title: '加载中',
 					mask:true
 				})
 				var _this=this
-				console.log(this.dataDetails)
 				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')

pages/mine/cargoowner/editpersonalinformation.vue

@@ -1,38 +1,5 @@
 <template>
 	<view class="content">
-		<view class='content1'>
-			<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" v-model="dataDetails.name">
-					</u--input>
-				</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"
-						v-model="dataDetails.phone">
-					</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>
-			<view class="flex row row-ch" style='padding:10px 0 5px;'>
-				<view style='width:100px;font-size:14px;'>称呼</view>
-				<u--input placeholder="输入姓氏" class="ch-style" inputAlign='left' border="none"
-					v-model="dataDetails.call">
-				</u--input>
-				<view class="flex align-center" v-if="dataDetails.sex=='男'">先生</view>
-				<view class="flex align-center" v-else>女士</view>
-			</view>
-		</view>
 		<view class="content2 content-other">
 			<view class="title">上传身份证人像面</view>
 			<view @click.stop="uploadImg(1,index)" class="picture picture1" v-if="!dataDetails.cardAddressUrl">
@@ -63,7 +30,40 @@
 
 				<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" 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>
+			<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>
+				<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"
+						v-model="dataDetails.phone">
+					</u--input>
+				</view>
+			</view>
 			<view class="flex row">
 				<view class="left-text">身份证号</view>
 				<u--input :disabled='dataDetails.id' placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.cardNumber">
@@ -126,7 +126,7 @@
 		data() {
 			return {
 				radioCustomStyle: {
-					margin: '0 0 0 20rpx'
+					margin: '0 20rpx 0 0'
 				},
 				radiolist1: [{
 						name: '男',
@@ -199,8 +199,10 @@
 			delCard(status){
 				if(status==1){
 					this.dataDetails.cardAddressUrl=''
+					this.$forceUpdate()
 				}else{
 					this.dataDetails.cardBackAddressUrl=''
+					this.$forceUpdate()
 				}
 			},
 			//保存图片到相册，方便核查

pages/mine/index.vue

@@ -194,7 +194,9 @@
 						}
 					}else{
 						this.userName = this.userInfo.userName
+						this.cargoCall=""
 					}
+					this.$forceUpdate()
 				})
 				// this.phone = this.userInfo.phone ? this.userInfo.phone.replace(this.userInfo.phone.substring(3, 7),"****") : ''
 				this.phone = this.userInfo.phone

pages/public/register.vue

@@ -33,7 +33,7 @@
 				style='color:#6A6A6A;margin-top:10px;font-size:30rpx;display:flex;justify-content:center;align-items: center;'>
 				<u--image @click='consent'
 					:src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
-					width="17px" height="17px"></u--image>
+					width="17px" height="17px" style="margin:0 10rpx"></u--image>
 				已阅读并同意
 				<navigator
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"

pages/release/release.vue

@@ -472,7 +472,10 @@
 						this.columns = [
 							[]
 						]
-						this.columns[0].push("个人货主")
+						let obj = uni.getStorageSync("firstAuthentication")
+						if(obj && obj.authenticationStatus == '已认证'){
+							this.columns[0].push("个人货主")
+						}
 						for (let i = 0; i < this.qyList.length; i++) {
 							this.columns[0].push(this.qyList[i].company ? this.qyList[i].company : this.qyList[i]
 								.companyName)