Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-huozhuapp

# Conflicts:
#	config/index.js

components/ossutil/uploadFile.js

@@ -14,7 +14,7 @@ const Crypto = require('./crypto.js');
  */
 const uploadFile = function(type, filePath, dir, successc, failc) {
 	console.log('type', type)
-	if (!filePath || filePath.length < 9) {
+	if (!filePath) {
 		uni.showModal({
 			title: '图片错误',
 			content: '请重试',
@@ -48,16 +48,16 @@ const uploadFile = function(type, filePath, dir, successc, failc) {
 			'success_action_status': '200',
 		},
 		success: function(res) {
-			console.log(res);
 			if (res.statusCode != 200) {
-				failc(new Error('上传错误:' + JSON.stringify(res)))
+				// failc(new Error('上传错误:' + JSON.stringify(res)))
+				console.log('上传错误:' + JSON.stringify(res));
 				return;
 			}
 			successc(aliyunServerURL + "/" + aliyunFileKey);
 		},
 		fail: function(err) {
 			err.wxaddinfo = aliyunServerURL;
-			failc(err);
+			console.log('上传错误:' + JSON.stringify(err));
 		},
 	})
 }
@@ -69,7 +69,7 @@ const getPolicyBase64 = function() {
 	const policyText = {
 		"expiration": srcT, //设置该Policy的失效时间，超过这个失效时间之后，就没有办法通过这个policy上传文件了 
 		"conditions": [
-			["content-length-range", 0, 5 * 1024 * 1024] // 设置上传文件的大小限制,5mb
+			["content-length-range", 0, 500 * 1024 * 1024] // 设置上传文件的大小限制,5mb
 		]
 	};
 

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智运-货主端",
     "appid" : "__UNI__DCD13AC",
     "description" : "智运",
-    "versionName" : "1.0.3",
-    "versionCode" : 103,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -109,22 +109,7 @@
                 }
             }
         },
-        "nativePlugins" : {
-            "KJ-Camera" : {
-                "__plugin_info__" : {
-                    "name" : "相机自定义拍照录像，可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏 - [试用版，仅用于自定义调试基座]",
-                    "description" : "相机自定义拍照录像，可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏、相机切换前后摄像头 QQ群：863776189 可接单 离线包：单价*10  源码：单价*15",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=3404",
-                    "android_package_name" : "",
-                    "ios_bundle_id" : "",
-                    "isCloud" : true,
-                    "bought" : 0,
-                    "pid" : "3404",
-                    "parameters" : {}
-                }
-            }
-        }
+        "nativePlugins" : {}
     },
     /* 快应用特有相关 */
     "quickapp" : {},

pages.json

@@ -324,7 +324,8 @@
 		}, {
 			"path": "pages/mine/company/editcompany",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "企业认证",
+				"enablePullDownRefresh": false
 			}
 
 		}, {

pages/mine/cargoowner/addEnerprise.vue

@@ -1,18 +1,23 @@
 <template>
 	<view class='content'>
+		
 		<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="{'color':dataDetails.company ? '#000':'#C6CBD5'}">{{dataDetails.company?dataDetails.company:'选择所属企业'}}</view>
-					<view><u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon></view>
+				<view style='font-size:14px;width:50%;' class='flex flex-space-between' @click="selectshow">
+					<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>
-				
+
 			</view>
 			<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="legalPersonName">
+					<u--input disabledColor='#fff' disabled placeholder="自动获取" inputAlign='left' border="none"
+						v-model="legalPersonName">
 					</u--input>
 				</view>
 			</view>
@@ -20,7 +25,7 @@
 		<view class='content1'>
 			<view class="title">上传企业授权书</view>
 			<!-- {{show}} -->
-<!-- 			<button type="default" @click="()=>{show = true}" style="width: 80%;background-color: #007AFF;color: #fff;margin-top: 60rpx;">选择文件</button>
+			<!-- 			<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">
 					<view>
 						文件名：{{item.name}}
@@ -35,7 +40,7 @@
 				<nk-select-file v-model="show" @confirm="getPath"></nk-select-file> -->
 			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
 				name="1" multiple :maxCount="9"></u-upload>
-	<!-- 		<view style='position:relative;'>
+			<!-- 		<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>
 					<view class="text">上传企业授权书</view>
@@ -51,28 +56,34 @@
 			</view> -->
 			<view class="flex row noborder">
 				<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>
+				<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>
 				</view>
 			</view>
-			<u-picker :show="isdate" ref="uPicker" :columns="validityPeriod"
-				@confirm="confirmValidityPeriod" @change="changeHandler"  @cancel="isdate=false">
+			<u-picker :show="isdate" ref="uPicker" :columns="validityPeriod" @confirm="confirmValidityPeriod"
+				@change="changeHandler" @cancel="isdate=false">
 			</u-picker>
-			
+
 		</view>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
-			@select="imgTypeSelect" @cancel='isShowimgType=false' :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
+			@select="imgTypeSelect" @cancel='isShowimgType=false' :closeOnClickOverlay="true" :closeOnClickAction="true"
+			@close="isShowimgType=false">
 		</u-action-sheet>
 		<view class="content4">
 			<view style='margin:0 0 18px;font-size:12px;color:#999;' class='flex items-center'>
 				<u--image style='margin-right:5px;' @click='consent'
-					:src="checked?'../../../static/mine/duihao@2x.png':'../../../static/mine/wxz.png'"
-					width="12px" height="12px"></u--image>
-					我已阅读并同意全部细则
+					:src="checked?'../../../static/mine/duihao@2x.png':'../../../static/mine/wxz.png'" width="12px"
+					height="12px"></u--image>
+				我已阅读并同意全部细则
 			</view>
 			<view class='line'></view>
-			<view :class="{'active':dataDetails.certificateAddressUrl&&dataDetails.company&&dataDetails.legalPersonName&&dataDetails.authorizationDeadline}" class="next-btn" @click="submit()">
+			<view
+				:class="{'active':dataDetails.certificateAddressUrl&&dataDetails.company&&dataDetails.legalPersonName&&dataDetails.authorizationDeadline}"
+				class="next-btn" @click="submit()">
 				提交
 			</view>
 		</view>
@@ -86,65 +97,66 @@
 	import upload from '@/components/upload.vue';
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
-		components: {
-		},
+		components: {},
 		data() {
 			return {
-				show:false,
+				show: false,
 				pathArr: [],
-				dataDetails:{
-					authorizationDeadline:'',
-					certificateAddressUrl:'',
-					advanceFreightService:''
+				dataDetails: {
+					authorizationDeadline: '',
+					certificateAddressUrl: '',
+					advanceFreightService: ''
 				},
-				companuList:[],
-				isshow:false,
-				isdate:false,
-				checked:false,
-				validityPeriod:[],
-				isShowimgType:false,
-				legalPersonName:'',
-				uploadType:'',
-				index:0,
+				companuList: [],
+				isshow: false,
+				isdate: false,
+				checked: false,
+				validityPeriod: [],
+				isShowimgType: false,
+				legalPersonName: '',
+				uploadType: '',
+				index: 0,
 				fileList1: []
 			}
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
-		onLoad(){
-			if(uni.getStorageSync('cargoOwnerId')){
-				this.dataDetails.cargoOwnerId=uni.getStorageSync('cargoOwnerId')
+		onLoad() {
+			if (uni.getStorageSync('cargoOwnerId')) {
+				this.dataDetails.cargoOwnerId = uni.getStorageSync('cargoOwnerId')
 			}
-			this.validityPeriod = this.$helper.makeValidityPeriod(0,'长期')
+			this.validityPeriod = this.$helper.makeValidityPeriod(0, '长期')
 			// this.getList()
 		},
 		onShow() {
-			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
+			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+='*'
+					name += '*'
 				}
-				this.legalPersonName=name.substr(0, name.length - 1) + uni.getStorageSync('currectcompany').legalPersonName[legalPersonNamelength-1]
-				this.dataDetails.legalPersonName=uni.getStorageSync('currectcompany').legalPersonName
-			}else{
-				
+				this.legalPersonName = name.substr(0, name.length - 1) + uni.getStorageSync('currectcompany')
+					.legalPersonName[legalPersonNamelength - 1]
+				this.dataDetails.legalPersonName = uni.getStorageSync('currectcompany').legalPersonName
+			} else {
+
 			}
 		},
 		methods: {
-			getPath(event){
+			getPath(event) {
 				console.log(event);
 				this.pathArr = event;
 			},
-			uploadFilePromise(file,url) {
-				uploadImage('image',file,url, 'appData/',
+			uploadFilePromise(file, url) {
+				uploadImage('image', file, url, 'appData/',
 					result => {
 						// 上传成功回调函数
 						console.log('图片地址', result)
-						this.dataDetails.certificateAddressUrl=this.dataDetails.certificateAddressUrl +',' +result
-			
+						this.dataDetails.certificateAddressUrl = this.dataDetails.certificateAddressUrl + ',' + result
+
 					}
 				)
 			},
@@ -165,7 +177,7 @@
 					})
 				})
 				for (let i = 0; i < lists.length; i++) {
-					const result = await this.uploadFilePromise(lists[i],lists[i].url)
+					const result = await this.uploadFilePromise(lists[i], lists[i].url)
 					let item = this[`fileList${event.name}`][fileListLen]
 					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
 						status: 'success',
@@ -175,13 +187,13 @@
 					fileListLen++
 				}
 			},
-			consent(){
-				this.checked=!this.checked
+			consent() {
+				this.checked = !this.checked
 			},
-			selectdate(){
-				this.isdate=true
+			selectdate() {
+				this.isdate = true
 			},
-			selectshow(){
+			selectshow() {
 				this.goDetailPage('/pages/mine/cargoowner/selectcompany')
 			},
 			confirmValidityPeriod(e) {
@@ -191,11 +203,14 @@
 				} else {
 					this.dataDetails.authorizationDeadline = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
 				}
-			
+
 				this.isdate = false
 			},
 			goDetailPage(src) {
-				uni.setStorage({key: 'companydata',data: JSON.stringify(this.dataDetails)});
+				uni.setStorage({
+					key: 'companydata',
+					data: JSON.stringify(this.dataDetails)
+				});
 				uni.$u.route(src);
 			},
 			changeHandler(e) {
@@ -206,13 +221,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())
@@ -238,53 +253,60 @@
 			// 		})
 			// 	});
 			// },
-			
-			submit(){
+
+			submit() {
 				uni.showLoading({
 					title: '加载中',
-					mask:true
-				})
-				var _this=this
-				this.dataDetails.commonId=this.userInfo.id
-				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/addCargoOwnerComp', _this.dataDetails).then(res => {
-					uni.hideLoading()
-					uni.removeStorage('cargoOwnerId')
-					uni.removeStorage('currectcompany')
-					uni.$u.toast('提交成功')
-					_this.goDetailPage('/pages/mine/cargoowner/cargoowner')
+					mask: true
 				})
-				.catch(res => {
-					uni.hideLoading()
-					uni.showToast({
-						title: res.message,
-						icon: 'none',
-						duration: 2000
-					})
-				});
+				var _this = this
+				this.dataDetails.commonId = this.userInfo.id
+				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/addCargoOwnerComp', _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
+						})
+					});
 			},
 		}
 	}
 </script>
 
 <style lang='scss' scoped>
-	page{
+	page {
 		background: #F5F6FA;
 	}
-	.content{
+
+	.content {
 		/* background: white; */
 		/* padding:20rpx */
 	}
-	.wrap{
+
+	.wrap {
 		margin: 20rpx;
 		padding: 20rpx;
 		border-radius: 20rpx;
 		background: white;
 	}
+
 	.preview-card-img {
-		/deep/uni-image>div, uni-image>img {
-		    transform: scale(1.5) rotate(-90deg);
+
+		/deep/uni-image>div,
+		uni-image>img {
+			transform: scale(1.5) rotate(-90deg);
 		}
 	}
+
 	.picture {
 		margin-top: 20rpx;
 		background: #F5F6FA;
@@ -297,27 +319,29 @@
 		align-items: center;
 		color: #6A7282;
 	}
+
 	.content1 {
-		background:#fff;
-		padding:40rpx 20rpx 20rpx;
-		margin:20rpx 0rpx 200rpx;
+		background: #fff;
+		padding: 40rpx 20rpx 20rpx;
+		margin: 20rpx 0rpx 200rpx;
 		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%;
@@ -326,58 +350,66 @@
 			justify-content: center;
 			flex-direction: column;
 			align-items: center;
-	
+
 			.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;
+
+	.u-input {
+		font-size: 16px;
 	}
+
 	.content4 {
-		position:fixed;
-		bottom:0;
+		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%;
+		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;
+			border-radius: 50rpx;
+			margin: 0 auto;
+			margin-top: 10px;
 		}
-		.next-btn.active{
-			background:#2772FB;
-			color:#fff;
+
+		.next-btn.active {
+			background: #2772FB;
+			color: #fff;
 		}
 	}
 </style>

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" v-if="datastatus"></u-icon> -->
 							</view>
 							<view v-else class='flex flex-space-between' style='width:100%;color:#999999;font-size:14px;'>
 								{{phone}}
@@ -102,6 +102,9 @@
 			}
 		},
 		onLoad() {
+			
+		},
+		onShow() {
 			var _this = this;
 			if (!this.hasLogin) {
 				uni.$u.route('/pages/public/login');

pages/mine/cargoowner/editpersonalinformation.vue

@@ -29,8 +29,7 @@
 				<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 class="flex align-center" >{{sexText}}</view>
 			</view>
 		</view>
 		<view class="content2 content-other">
@@ -110,6 +109,7 @@
 			@select="imgTypeSelect" @cancel='isShowimgType=false' :closeOnClickOverlay="true" :closeOnClickAction="true"
 			@close="isShowimgType=false">
 		</u-action-sheet>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -136,6 +136,7 @@
 						disabled: false
 					},
 				],
+				sexText:"先生",
 				uploadType: '',
 				isShowimgType: false,
 				dataDetails: {
@@ -146,7 +147,8 @@
 					cardAddressUrl: '',
 					cardBackAddressUrl: '',
 					cardValidityDate: '',
-					driverSex: '男'
+					driverSex: '男',
+					sex:''
 				},
 				checked: false,
 				isShowcardValidity: false,
@@ -172,8 +174,14 @@
 			},
 			// 性别切换
 			radioChange(n) {
-				console.log('radioChange', n);
 				this.dataDetails.sex = n
+				console.log('radioChange', this.dataDetails.sex);
+				if(n == "男"){
+					this.sexText = "先生"
+				}
+				else{
+					this.sexText = "女士"
+				}
 			},
 			consent() {
 				this.checked = !this.checked
@@ -260,14 +268,14 @@
 					})
 					return true
 				}
-				if (this.dataDetails.name.length<2||this.dataDetails.name.length<10) {
+				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) {
+				if (this.dataDetails.call.length>4) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "称呼输入错误！",
@@ -281,7 +289,7 @@
 					})
 					return true
 				}
-				if (this.dataDetails.call.length<18) {
+				if (this.dataDetails.cardNumber.length<18) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "身份证号输入错误！",
@@ -299,7 +307,10 @@
 				this.$request.baseRequest('post', '/cargoOwnerInfo/api/editCargoOwner', _this.dataDetails).then(res => {
 						uni.hideLoading()
 						uni.$u.toast('提交成功')
-						uni.$u.route('/pages/mine/cargoowner/cargoowner')
+						// uni.$u.route('/pages/mine/cargoowner/cargoowner')
+						uni.navigateBack({
+							delta:1
+						})
 					})
 					.catch(res => {
 						uni.hideLoading()

pages/mine/cargoowner/selectcompany.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<view class="fixed1"></view>
 		<luo-nav-bar @leftClick='navback' :searchText='searchText' @rightClick='cancel' @input='companyInput'
 			:isSearch="true" :isPlaceText='true' placeText='输入企业名称' rightText='取消' leftIcon='back'></luo-nav-bar>
 		<view v-if='searching' style='padding:10px;'>
@@ -249,4 +250,8 @@
 		margin: 15rpx 20rpx;
 		border-radius: 10rpx;
 	}
+	.fixed1 {
+		top: 0;
+		height: var(--status-bar-height);
+	}
 </style>

pages/mine/company/addcompany.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<web-view :src="srcHandler()" v-if="isSshowPlayVideo"></web-view>
+		<!-- <web-view :src="srcHandler()" v-if="isSshowPlayVideo"></web-view> -->
 		<!-- 		<u-navbar leftText="返回" title="企业认证" :safeAreaInsetTop="true">
 			<view class="u-nav-slot" slot="left">
 				<u-icon @click='navback' name="arrow-left" size="19"></u-icon>
@@ -9,12 +9,16 @@
 				<view @click="goDetailPage('/pages/mine/company/addcompanythree')" class='next'>下一步</view>
 			</view>
 		</u-navbar> -->
+		<view v-show="videoPlay">
+			<video controls id="myvideo" :src="dataDetails.videoAddressUrl" @fullscreenchange="screenChange" ></video>
+		</view>
 		<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" @blur='companyNameBlur'>
+					<u--input placeholder="输入企业名称" inputAlign='left' border="none" v-model="dataDetails.companyName"
+						@blur='companyNameBlur'>
 					</u--input>
 				</view>
 			</view>
@@ -29,7 +33,7 @@
 			<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"
+					<u--input disabledColor='#fff' placeholder="输入联系电话" inputAlign='left' border="none"
 						v-model="dataDetails.phone">
 					</u--input>
 				</view>
@@ -62,7 +66,7 @@
 			</view>
 			<view class="flex row">
 				<view class="left-text">营业期限截止日期</view>
-				<view style='font-size:16px;width:50%;' class='flex flex-space-between'
+				<view style='font-size:14px;width:50%;' class='flex flex-space-between'
 					@click="selectValidityPeriod(0)">
 					<view :style="{'color':dataDetails.businessTermDate ? '#000':'#C6CBD5'}">
 						{{dataDetails.businessTermDate?dataDetails.businessTermDate:'选择期限截止日期'}}
@@ -78,44 +82,9 @@
 					v-model="dataDetails.unifiedSocialCreditCode">
 				</u--input>
 			</view>
-			<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)" style='position:relative;' 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 uploadimage-small" :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"
@@ -126,22 +95,72 @@
 			</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="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>
+				</view>
+			</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>
+					<u-icon size="40" name="play-circle-fill" @click="videoShow()"></u-icon>
 				</view>
-			</view> -->
+			</view>
+		
 		</view>
-
-		<view class="content4">
+		
+		<view class='content3'>
 			<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>
+		<view v-if="value" class='content1'>
+			<view class="flex row">
+				<view class="left-text">企业用地是否自有</view>
+				<view class="flex right">
+					<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="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)" style='position:relative;'
+						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 uploadimage-small" :src="dataDetails.propertyAddressUrl" mode="aspectFit">
+						</image>
+					</view>
+				</view>
+			<view v-if="dataDetails.landOwnership=='租赁'" class="flex border-bottom mt20 align-center">
+				<view class="left-text">场地租赁截止日期</view>
+				<view style='font-size:14px;width:50%;' 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="10"></u-icon>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		<view class="content4">
+
 			<view class="flex service align-center">
 				<u--image @click='consent'
 					:src="consentStatus==true?'../../../static/images/mine/duihao@2x.png':'../../../static/images/mine/wxz.png'"
@@ -179,13 +198,14 @@
 		components: {},
 		data() {
 			return {
+				videoPlay: false,
 				isSshowPlayVideo: false,
 				srcHandler() {
 					return `/hybrid/html/play.html?src=${this.dataDetails.videoAddressUrl}`
 				},
 				consentStatus: false,
 				ValidityPeriodType: '',
-				value: true,
+				value: false,
 				radioCustomStyle: {
 					margin: '0 0 0 20rpx'
 				},
@@ -210,14 +230,22 @@
 					phone: '',
 					businessLicenseAddressUrl: '',
 					propertyAddressUrl: '',
-					advanceFreightService: 1,
+					advanceFreightService: 0,
 					landOwnership: '自有',
 					videoAddressUrl: null,
-					legalPersonName:''
+					legalPersonName: ''
 
 				}
 			}
 		},
+		onShow() {
+			console.log(uni.getStorageSync("videoSrc"))
+			var viderSrc = uni.getStorageSync("videoSrc")
+			if (viderSrc) {
+				this.dataDetails.videoAddressUrl = viderSrc
+			}
+
+		},
 		onLoad(options) {
 			this.validityPeriod = this.$helper.makeValidityPeriod(0, '长期')
 			console.log(this)
@@ -225,8 +253,11 @@
 			this.dataDetails.phone = this.userInfo.phone
 			console.log('```````````````')
 			console.log(options)
-			if(uni.getStorageSync('companydata')){
-				this.dataDetails = uni.getStorageSync('companydata')
+			if (uni.getStorageSync('companydata')) {
+				this.dataDetails = JSON.parse(uni.getStorageSync('companydata'))
+				if (!this.dataDetails.businessLicenseAddressUrl) {
+					this.dataDetails.businessLicenseAddressUrl = ""
+				}
 			}
 			this.dataDetails.videoAddressUrl = options.videoSrc
 			this.getName()
@@ -235,6 +266,24 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			screenChange(e) {
+				let fullScreen = e.detail.fullScreen; // 值true为进入全屏，false为退出全屏
+				console.log(e, "全屏");
+				if (!fullScreen) {
+					//退出全屏
+					this.videoPlay = false; // 隐藏播放盒子
+				}
+			},
+			// 触发全屏播放的点击事件
+			videoShow() {
+				this.videoContext = uni.createVideoContext("myvideo", this); // this这个是实例对象 必传
+				this.videoContext.requestFullScreen({
+					direction: 270
+				});
+				this.videoContext.play();
+				console.log(this.videoContext)
+				this.videoPlay = true; // 显示播放盒子
+			},
 			// getList(){
 			// 	uni.showLoading({
 			// 		title: '加载中',
@@ -254,14 +303,15 @@
 			// 		})
 			// 	});
 			// },
-			companyNameBlur(){
+			companyNameBlur() {
 				this.$request.baseRequest('get', '/companyInfo/repeatCompanyInfo', {
 						commonId: this.userInfo.id,
-						companyName:this.dataDetails.companyName
+						companyName: this.dataDetails.companyName
 					}).then(res => {
-						if (res.code==200) {debugger
+						if (res.code == 200) {
+							debugger
 							// that.dataDetails.legalPersonName = res.data.name
-						}else{
+						} else {
 							uni.showToast({
 								title: res.message,
 								icon: 'none',
@@ -278,12 +328,13 @@
 						})
 					});
 			},
-			getName(){
+			getName() {
 				let that = this
 				this.$request.baseRequest('get', '/cargoOwnerInfo/selectCargoOwner', {
 						commonId: this.userInfo.id
 					}).then(res => {
-						if (res.code==200) {debugger
+						if (res.code == 200) {
+							debugger
 							that.dataDetails.legalPersonName = res.data.name
 						}
 					})
@@ -316,7 +367,7 @@
 					})
 					return true
 				}
-				if (this.dataDetails.companyName.length<4||this.dataDetails.companyName.length>25) {
+				if (this.dataDetails.companyName.length < 4 || this.dataDetails.companyName.length > 25) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "企业名称字数在4-25个字！",
@@ -366,7 +417,8 @@
 					return true
 				}
 
-				if (uni.$u.test.isEmpty(this.dataDetails.propertyAddressUrl)) {
+				if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
+					.propertyAddressUrl)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "房产证或租赁合同不能为空！",
@@ -374,7 +426,7 @@
 					return true
 				}
 
-				if (this.dataDetails.landOwnership == '租赁') {
+				if (this.dataDetails.advanceFreightService == 1 && this.dataDetails.landOwnership == '租赁') {
 					if (uni.$u.test.isEmpty(this.dataDetails.siteLeaseDate)) {
 						this.$refs.uToast.show({
 							type: 'error',
@@ -401,7 +453,11 @@
 				this.$request.baseRequest('post', '/companyInfo/api/addCompanyInfo', _this.dataDetails).then(res => {
 						uni.hideLoading()
 						uni.$u.toast('提交成功')
-						this.goDetailPage('/pages/mine/company/index')
+						uni.removeStorageSync("videoSrc")
+						uni.navigateBack({
+							delta: 1
+						})
+
 					})
 					.catch(res => {
 						uni.hideLoading()
@@ -466,7 +522,7 @@
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage(res.tempFilePaths[0], 'appData/',
+							uploadImage('image', res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
 									console.log('图片地址', result)
@@ -474,6 +530,7 @@
 									switch (_this.uploadType) {
 										// 身份正面
 										case 1:
+											debugger
 											_this.dataDetails.businessLicenseAddressUrl = result
 											console.log(_this.dataDetails.businessLicenseAddressUrl)
 											break
@@ -495,7 +552,7 @@
 						sourceType: ['camera'],
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage(res.tempFilePaths[0], 'appData/',
+							uploadImage('image', res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
 									console.log('图片地址', result)
@@ -574,9 +631,11 @@
 	page {
 		background: #F5F6FA;
 	}
-/deep/uni-image.uploadimage-small{
-	width:100% !important;
-}
+
+	/deep/uni-image.uploadimage-small {
+		width: 100% !important;
+	}
+
 	.next {
 		color: #2772FB;
 		font-size: 13px;
@@ -666,7 +725,7 @@
 		}
 
 		.title {
-			color: #999999;
+			color: #333333;
 			margin: 20rpx 0;
 		}
 	}
@@ -703,6 +762,7 @@
 		left: 0;
 		padding: 40rpx 60rpx;
 		box-sizing: border-box;
+		z-index: 9999;
 	}
 
 	.newlyIncreased {
@@ -745,7 +805,6 @@
 		align-items: center;
 		color: #6A7282;
 	}
-	.myVideo{
-		
-	}
+
+	.myVideo {}
 </style>

pages/mine/company/companyvideo.nvue

@@ -3,8 +3,8 @@
 		<KJ-Camera ref='Camera' class="KJ-Camera" :style="{width:'100vw',height:cameraHeight}">
 		</KJ-Camera>
 		<view class="view-content" :style="contentStyle">
-			<image :showLoading="true" src="@/static/video-bgc.png" @click="click" class="img-bgc"
-				:style="contentStyle" mode='widthFix'></image>
+			<!-- <image :showLoading="true" src="@/static/video-bgc.png" @click="click" class="img-bgc"
+				:style="contentStyle" mode='widthFix'></image> -->
 		<!-- 	<image :showLoading="true" src="@/static/video-bgc.png" @click="click" class="img-bgc"
 				:style="contentStyle"></image> -->
 			<view class="content" :style="{width:width}">
@@ -113,7 +113,7 @@
 			
 				console.log("onReady")
 				 await this.$refs.Camera.initCamera();
-				 await this.$refs.Camera.setZoomFactor(1)
+				 await this.$refs.Camera.setZoomFactor(5)
 				 await this.$refs.Camera.switchCamera();
 				 await this.android_setCameraParams(); //因为andorid前后摄像头，设置相机参数不一样，需要重置
 			
@@ -182,13 +182,21 @@
 						} else if (res.status == "end") {
 							console.log("结束录像")
 							videoFilePath = res.filePath;
+							uni.showLoading({
+								title:"保存视频中"
+							})
 							uploadImage('mp4', videoFilePath, 'appData/',
 								result => {
+									uni.hideLoading()
 									// 上传成功回调函数
 									console.log('视频地址', result)
-									uni.$u.route('/pages/mine/company/addcompany', {
-										videoSrc: result,
-									});
+									uni.setStorageSync("videoSrc",result)
+									uni.navigateBack({
+										delta:1
+									})
+									// uni.$u.route('/pages/mine/company/addcompany', {
+									// 	videoSrc: result,
+									// });
 								}
 							)
 							//                uni.saveVideoToPhotosAlbum({
@@ -412,21 +420,24 @@
 
 		.content {
 			position: fixed;
-			top: 800rpx;
+			bottom: 200rpx;
+			// top: 800rpx;
 			// background: red;
+			background-color: rgba(169, 151, 151, 0.7);
+			
 		}
 
 		.title {
 			flex-direction: row;
 			justify-content: center;
+			padding: 5rpx;
 		}
 
 		.text {
-			margin-top: -100rpx;
 			flex-direction: column;
 			flex-wrap: wrap;
 			justify-content: center;
-			padding: 20rpx;
+			padding: 20rpx 10rpx 0rpx 10rpx;
 		}
 
 		.btn-view {

pages/mine/company/editcompany.vue

@@ -1,20 +1,15 @@
 <template>
 	<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 @click='navback' name="arrow-left" size="19"></u-icon>
-			</view>
-			<view class="u-nav-slot" slot="right">
-				<view @click="goDetailPage('/pages/mine/company/addcompanythree')" class='next'>下一步</view>
-			</view>
-		</u-navbar> -->
+		<view v-if="videoPlay">
+			<video controls id="myvideo" :src="dataDetails.videoAddressUrl" @fullscreenchange="screenChange"></video>
+		</view>
 		<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" @blur='companyNameBlur'>
+					<u--input placeholder="输入企业名称" inputAlign='left' border="none" v-model="dataDetails.companyName"
+						@blur='companyNameBlur'>
 					</u--input>
 				</view>
 			</view>
@@ -29,7 +24,7 @@
 			<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"
+					<u--input disabledColor='#fff' placeholder="输入联系电话" inputAlign='left' border="none"
 						v-model="dataDetails.phone">
 					</u--input>
 				</view>
@@ -62,7 +57,7 @@
 			</view>
 			<view class="flex row">
 				<view class="left-text">营业期限截止日期</view>
-				<view style='font-size:16px;width:50%;' class='flex flex-space-between'
+				<view style='font-size:14px;width:50%;' class='flex flex-space-between'
 					@click="selectValidityPeriod(0)">
 					<view :style="{'color':dataDetails.businessTermDate ? '#000':'#C6CBD5'}">
 						{{dataDetails.businessTermDate?dataDetails.businessTermDate:'选择期限截止日期'}}
@@ -74,74 +69,89 @@
 			</view>
 			<view class="flex row noborder">
 				<view class="left-text">统一社会信用代码</view>
-				<u--input disabled placeholder="请输入统一社会信用代码" inputAlign='left' border="none"
+				<u--input placeholder="请输入统一社会信用代码" inputAlign='left' border="none"
 					v-model="dataDetails.unifiedSocialCreditCode">
 				</u--input>
 			</view>
-			<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>
+
+		<!-- 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='content2'>
+		<view class='content3' v-if="dataDetails.videoAddressUrl">
+			<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>
+				</view>
+			</view>
+			<!-- <video class="myVideo" :src="dataDetails.videoAddressUrl" controls></video> -->
+			<view>
+				<view class="video-icon">
+					<u-icon size="40" name="play-circle-fill" @click="videoShow()"></u-icon>
+				</view>
+			</view>
+
+		</view>
+
+		<view class='content3'>
+			<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>
+		<view v-if="dataDetails.advanceFreightService == 1" class='content1'>
+			<view class="flex row">
+				<view class="left-text">企业用地是否自有</view>
+				<view class="flex right">
+					<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="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 v-if='dataDetails.propertyAddressUrl' @click.stop="uploadImg(2)" style='position:relative;'
+					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>
+					<image class="uploadimage uploadimage-small" :src="dataDetails.propertyAddressUrl" mode="aspectFit">
+					</image>
 				</view>
 			</view>
-		</view>
-		<view class='content3' v-if="dataDetails.landOwnership=='租赁'">
-			<view class="flex row flex-space-between">
+			<view v-if="dataDetails.landOwnership=='租赁'" class="flex border-bottom mt20 align-center">
 				<view class="left-text">场地租赁截止日期</view>
-				<view class='flex flex-space-between' @click="selectValidityPeriod(1)">
+				<view style='font-size:14px;width:50%;' 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>
+						<u-icon name="arrow-right" color="#7E7E7E" size="10"></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>
 		<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'"
@@ -179,13 +189,14 @@
 		components: {},
 		data() {
 			return {
+				videoPlay: false,
 				isSshowPlayVideo: false,
 				srcHandler() {
 					return `/hybrid/html/play.html?src=${this.dataDetails.videoAddressUrl}`
 				},
 				consentStatus: false,
 				ValidityPeriodType: '',
-				value: true,
+				value: false,
 				radioCustomStyle: {
 					margin: '0 0 0 20rpx'
 				},
@@ -213,20 +224,27 @@
 					advanceFreightService: 1,
 					landOwnership: '自有',
 					videoAddressUrl: null,
-					legalPersonName:''
+					legalPersonName: ''
 
 				}
 			}
 		},
+		onShow() {
+			console.log(uni.getStorageSync("videoSrc"))
+			var viderSrc = uni.getStorageSync("videoSrc")
+			if (viderSrc) {
+				this.dataDetails.videoAddressUrl = viderSrc
+			}
+		},
 		onLoad(options) {
-			this.dataDetails.id=options.id
+			this.dataDetails.id = options.id
 			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')){
+			if (uni.getStorageSync('companydata')) {
 				this.dataDetails = uni.getStorageSync('companydata')
 			}
 			this.dataDetails.videoAddressUrl = options.videoSrc
@@ -236,33 +254,52 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			getList(){
+			screenChange(e) {
+				let fullScreen = e.detail.fullScreen; // 值true为进入全屏，false为退出全屏
+				console.log(e, "全屏");
+				if (!fullScreen) {
+					//退出全屏
+					this.videoPlay = false; // 隐藏播放盒子
+				}
+			},
+			// 触发全屏播放的点击事件
+			videoShow() {
+				this.videoContext = uni.createVideoContext("myvideo", this); // this这个是实例对象 必传
+				this.videoContext.requestFullScreen({
+					direction: 270
+				});
+				this.videoContext.play();
+				this.videoPlay = true; // 显示播放盒子
+			},
+			getList() {
 				uni.showLoading({
 					title: '加载中',
-					mask:true
-				})
-				var _this=this
-				this.$request.baseRequest('get', '/companyInfo/getCompanyInfo', {id:this.dataDetails.id}).then(res => {
-					uni.hideLoading()
-					_this.dataDetails=res.data
+					mask: true
 				})
-				.catch(res => {
-					uni.hideLoading()
-					uni.showToast({
-						title: res.message,
-						icon: 'none',
-						duration: 2000
+				var _this = this
+				this.$request.baseRequest('get', '/companyInfo/getCompanyInfo', {
+						id: this.dataDetails.id
+					}).then(res => {
+						uni.hideLoading()
+						_this.dataDetails = res.data
 					})
-				});
+					.catch(res => {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
 			},
-			companyNameBlur(){
+			companyNameBlur() {
 				this.$request.baseRequest('get', '/companyInfo/repeatCompanyInfo', {
 						commonId: this.userInfo.id,
-						companyName:this.dataDetails.companyName
+						companyName: this.dataDetails.companyName
 					}).then(res => {
-						if (res.code==200) {
+						if (res.code == 200) {
 							// that.dataDetails.legalPersonName = res.data.name
-						}else{
+						} else {
 							uni.showToast({
 								title: res.message,
 								icon: 'none',
@@ -299,7 +336,7 @@
 					})
 					return true
 				}
-				if (this.dataDetails.companyName.length<4||this.dataDetails.companyName.length>25) {
+				if (this.dataDetails.companyName.length < 4 || this.dataDetails.companyName.length > 25) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "企业名称字数在4-25个字！",
@@ -349,7 +386,8 @@
 					return true
 				}
 
-				if (uni.$u.test.isEmpty(this.dataDetails.propertyAddressUrl)) {
+				if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
+						.propertyAddressUrl)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "房产证或租赁合同不能为空！",
@@ -357,7 +395,7 @@
 					return true
 				}
 
-				if (this.dataDetails.landOwnership == '租赁') {
+				if (this.dataDetails.advanceFreightService == 1 && this.dataDetails.landOwnership == '租赁') {
 					if (uni.$u.test.isEmpty(this.dataDetails.siteLeaseDate)) {
 						this.$refs.uToast.show({
 							type: 'error',
@@ -366,13 +404,13 @@
 						return true
 					}
 				}
-				// if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
-				// 	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
@@ -449,7 +487,7 @@
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image',res.tempFilePaths[0], 'appData/',
+							uploadImage('image', res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
 									console.log('图片地址', result)
@@ -478,7 +516,7 @@
 						sourceType: ['camera'],
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image',res.tempFilePaths[0], 'appData/',
+							uploadImage('image', res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
 									console.log('图片地址', result)
@@ -553,9 +591,11 @@
 	.content {
 		padding: 0 0 200rpx 0;
 	}
-	/deep/.uni-input-input:disabled{
-		background:#fff;
+
+	/deep/.uni-input-input:disabled {
+		background: #fff;
 	}
+
 	page {
 		background: #F5F6FA;
 	}
@@ -650,7 +690,7 @@
 		}
 
 		.title {
-			color: #999999;
+			color: #333333;
 			margin: 20rpx 0;
 		}
 	}
@@ -729,8 +769,6 @@
 		align-items: center;
 		color: #6A7282;
 	}
-	.myVideo{
-		
-	}
 
+	.myVideo {}
 </style>

pages/mine/evaluate.vue

@@ -1,55 +1,70 @@
 <template>
-	<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-		class="mescroll">
-	<view class="page_pingjia4">
-		
-		<view class="kuang">
-			<view class="order-row flex flex-space-between">
-				<view class="flex align-center">
-					<view>张先生</view>
-					<view>匿名评价</view>
+	<view class="content">
+			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" class="mescroll">
+		<view class="content-list" v-for="(item,index) in list" :key='index'>
+			<view class="top flex flex-space-between">
+				<view class="left flex">
+					<view>
+						{{item.orderNumber}}
+					</view>
+					<u-icon name="arrow-right" color="#ccc" size="18"></u-icon>
 				</view>
-				
-				<view class="flex align-center">
-					<!-- <image :src="objData.driverPortrait" mode="widthFix" class="tx-img"></image> -->
-					<!-- <view>{{objData.driverName}}</view> -->
-					<view>2022-04-21</view>
+				<view class="right gray999">
+					{{item.createDate.split(' ')[0]}}
+				</view>
+			</view>
+			<view class="flex align-center name-row">
+				<view v-if="item.driverAnonymous == 0" class="sj-row hz-name">
+					{{item.orderInfo.cargoOwner}}:
+				</view>
+				<view v-else class="sj-row hz-name">
+					匿名评价:
+				</view>
+				<view class="xx">
+					<start :count="count" v-model="item.count" size="35" activeColor="#ffaa00" :size="18" :allowHalf='true'>
+					</start>
+				</view>
+			</view>
+			<view class="gray999 flex xy-row">
+				<view class='item'>
+					信用：{{item.ownerCredit}}星
+				</view>
+				<view class='item'>
+					运费支付：{{item.freightPayment}}星
+				</view>
+				<view class='item'>
+					综合：{{item.comprehensiveSatisfaction}}星
 				</view>
 			</view>
+			<!-- 
 			<view class="xkuang">
-				<view style="display: flex;" class="flex-space-between" v-for="(item,index) in rate"
-					@click="clickStar(index)">
-					<view class="flex" style="margin: 10rpx 0;">
-						<view class="ziti">{{item.name}}</view>
-						<start :count="item.count" style="" size="35" activeIcon="heart-fill" inactiveIcon="heart"
-							activeColor="#ffaa00" v-model="item.value1" @change="getVal" :size="22">
-						</start>
-					</view>
-
-					<view class="">
-						{{item.level}}
-					</view>
+				<view style="display: flex;" class="flex-space-between" v-for="(item,index) in rate">
+					<view class="ziti">{{item.name}}</view>
+					<start :count="item.count" style="margin-top: 15px; margin-left: 50px;" size="35"
+						activeIcon="heart-fill" inactiveIcon="heart" activeColor="#ffaa00" v-model="item.value1">
+					</start>
 				</view>
+			</view> -->
+			<view class="pl-style">
+				{{item.driverContent}}
 			</view>
-			<view>
-				<!-- <u--textarea style="margin-top: 20px;" background-color="#6d6d6d" v-model="value3"
-					placeholder="评价一下这单发运任务~">
-				</u--textarea> -->
-				<view>是否点击可浪费啊据了解SD卡见风使舵是否点击拉分手的距离看拉圣诞节福利发送到节流防抖拉三级分类库山东假的李开复加空间撒的卢卡斯的房间里快递费</view>
+			<view class="color2979ff flex">
+				<view @click="clickZK">展开</view>
+				<u-icon name="arrow-down" color="#2979ff" size="18" v-if="isOpen"></u-icon>
+				<u-icon name="arrow-up" color="#2979ff" size="18" v-else></u-icon>
+			</view>
+			<view v-if="isOpen" class="img-content">
+				<u--image :showLoading="true" :src="item1" width="80px" height="80px" class="img"
+					v-for="(item1,index) in item.imgList"></u--image>
+				
+			</view>
+			<u-line class="line"></u-line>
+			<view class="gray999">
+				{{item.ownerAnonymous==1?"匿名评价":''}}
 			</view>
-		<!-- 	<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
-				name="1" multiple :maxCount="9" style="margin-bottom: 80rpx;"></u-upload> -->
-				<div class="imgShow">
-					<image src='https://cdn.uviewui.com/uview/album/1.jpg' class="img img_item" v-for="(item,index) in 9" :key='index'></image>
-				 </div>
-			<!-- <u-line></u-line> -->
 		</view>
-		<!-- <view class="anniu" v-for="(item,index) in button">
-			<u-button type="warning">{{item.name}}</u-button>
-		</view> -->
-		<u-toast ref="uToast"></u-toast>
-	</view>
 	</mescroll-body>
+	</view>
 </template>
 
 <script>
@@ -58,299 +73,141 @@
 		mapState
 	} from 'vuex';
 	import start from '../../common/components/uni-rate.vue'
-	import uploadImage from '@/components/ossutil/uploadFile.js';
 		import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 	export default {
-		mixins: [MescrollMixin], // 使用mixin
+			mixins: [MescrollMixin], // 使用mixin
 		components: {
 			start
 		},
-		computed: {
-			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
-		},
 		data() {
 			return {
-				imageList :[],
-					objData:{},
-				starIndex: '',
-				checkboxValue1: [],
-				checkboxList1: [{
-					name: '匿名评论',
-					disabled: false
-				}],
-				count: "5",
-				value: '',
-				value3: '',
-				fileList1: [],
-				por: [{
-					title: '"无可挑剔"',
-				}],
-			rate: [{
-					name: "货主信用",
-					count: "5",
-					value1: '5',
-					level: '非常好'
-				},
-				{
-					name: "运费支付",
-					count: "5",
-					value1: '5',
-					level: '非常好'
-				},
-				{
-					name: "综合满意度",
-					count: "5",
-					value1: '5',
-					level: '非常满意'
-				}
-			],
-				button: [{
-					name: '提交'
-				}],
-
-				hidden: [{
-					name: '匿名评论',
-					disabled: false
-				}],
-			}
+				list:[],
+				isOpen: true,
+				count: '5',
+				value: '3',
+				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
+				rate: [{
+						name: "司机信用",
+						count: "5",
+						value1: '5',
+					},
+					{
+						name: "运输效率",
+						count: "5",
+						value1: '3',
+					},
+					{
+						name: "运输安全",
+						count: "5",
+						value1: '5',
+					},
+					{
+						name: "服务质量",
+						count: "5",
+						value1: '2',
+					}, {
+						name: "满意度",
+						count: "5",
+						value1: '1',
+					}
+				],
+			};
 		},
-		onNavigationBarButtonTap() {debugger
-			let _data = {
-				 driverId: this.objData.commonId,
-				 ownerName:this.checkboxValue1?this.objData.cargoOwner:'',
-				 ownerPortrait:this.checkboxValue1?this.userInfo.avatarUrl:'',
-				 orderId:this.objData.id,
-				 orderNumber:this.objData.orderNo,
-				 driverCredit:this.rate[0].value1,
-				 tranEfficiency:this.rate[1].value1,
-				 tranSafety:this.rate[2].value1,
-				 serviceQuality:this.rate[3].value1,
-				 satisfaction:this.rate[4].value1,
-				 ownerContent:this.value3,
-				 ownerUrl:this.imageList.toString(),
-				 ownerAnonymous:this.checkboxValue1.length!=0?1:0
-				 
-			}
-			that.$request.baseRequest('post', '/evaluateInfo/api/addEvaluateInfo', _data).then(res => {
-				if (res.code==200) {
-					this.$refs.uToast.show({
-						type: 'success',
-						message: "评价成功",
-						complete() {
-							uni.navigateTo({
-								url: '/pages/order/index'
-							})
-						}
-					})
-				}else{
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "评价失败",
-					})
-				}
-			})
+		computed: {
+			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
-		onLoad(options) {
+		onLoad() {
 			that = this
-			// this.objData = JSON.parse(options.val)
-			// console.log(this.objData)
-			// that.imageList = []
-			// this.getList()
 		},
 		methods: {
 			upCallback(page) {
 				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
-						ownerId: this.userInfo.id,
+						evaluatoredId: this.userInfo.id,
 						flag: 2,
 						pageSize: page.size,
 						currentPage: page.num
 					}).then(res => {
-						debugger
-				// 		if (page.num == 1) that.list = [];
-				// 		that.list = that.list.concat(res.data.records); //追加新数据
-				// 		for (let i = 0; i < that.list.length; i++) {
-				// 			if (that.list[i].ownerUrl) {
-				// 				that.list[i].imgList = that.list[i].ownerUrl.split(',')
-				// 			}
-				
-				// 			that.list[i].count = (Number(that.list[i].ownerCredit) + Number(that.list[i]
-				// 				.tranEfficiency) + Number(that.list[i].freightPayment) + Number(that.list[i]
-				// 				.serviceQuality) + Number(that.list[i].comprehensiveSatisfaction)) / 15 * 5
-				// 		}
-				// 		that.mescroll.endBySize(res.data.records.length, res.data.total);
-				// 		uni.hideLoading()
-					})
-					.catch(res => {
-						uni.$u.toast(res.message);
-					});
-				that.$request.baseRequest('get', '/orderInfo/selectHaoPing', {
-						commonId: this.userInfo.id,
-						haoType: ''
-					}).then(res => {
-						
+						if (page.num == 1) that.list = [];
+						that.list = that.list.concat(res.data.records); //追加新数据
+						for (let i = 0; i < that.list.length; i++) {
+							that.list[i].imgList = that.list[i].driverUrl.split(',')
+							that.list[i].count = (Number(that.list[i].ownerCredit) + Number(that.list[i]
+								.freightPayment) + Number(that.list[i].comprehensiveSatisfaction)) / 15 * 5
+						}
+						that.mescroll.endBySize(res.data.records.length, res.data.total);
+						uni.hideLoading()
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);
 					});
 			},
-			clickStar(index) {
-				console.log(index)
-				this.selectStar = index
-				if (index == 0 || index == 1|| index == 2|| index == 3) {
-					if (this.starIndex == '1') {
-						this.rate[index].level = '极差'
-					} else if (this.starIndex == '2') {
-						this.rate[index].level = '差'
-					} else if (this.starIndex == '3') {
-						this.rate[index].level = '一般'
-					} else if (this.starIndex == '4') {
-						this.rate[index].level = '较好'
-					} else if (this.starIndex == '5') {
-						this.rate[index].level = '非常好'
-					}
-
-				} else {
-					if (this.starIndex == '1') {
-						this.rate[index].level = '极不满意'
-					} else if (this.starIndex == '2') {
-						this.rate[index].level = '不满意'
-					} else if (this.starIndex == '3') {
-						this.rate[index].level = '尚可'
-					} else if (this.starIndex == '4') {
-						this.rate[index].level = '满意'
-					} else if (this.starIndex == '5') {
-						this.rate[index].level = '非常满意'
-					}
-				}
-
-
-
-			},
-			getVal(e) {
-				debugger
-				this.starIndex = e.value
-				console.log(e)
-			},
-			checkboxChange(n) {
-				console.log('change', n);
-			},
-			// 删除图片
-			deletePic(event) {
-				this[`fileList${event.name}`].splice(event.index, 1)
+			clickZK() {
+				this.isOpen = !this.isOpen
 			},
-			// 新增图片
-			async afterRead(event) {
-				// console.log(this[`fileList${event.name}`])
-				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
-				let lists = [].concat(event.file)
-				let fileListLen = this[`fileList${event.name}`].length
-				lists.map((item) => {
-					this[`fileList${event.name}`].push({
-						...item,
-						status: 'uploading',
-						message: '上传中'
-					})
-				})
-				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',
-						message: '',
-						url: result
-					}))
-					fileListLen++
-				}
-			},
-			uploadFilePromise(file, url) {
-				debugger
-				uploadImage('image', url, 'appData/',
-					result => {
-						debugger
-						// 上传成功回调函数
-						console.log('图片地址', result)
-						that.imageList.push(result)
-						// this.dataDetails.certificateAddressUrl=this.dataDetails.certificateAddressUrl +',' +result
+		},
 
-					}
-				)
-			},
-			// 删除图片
-			deletePic(event) {
-				this[`fileList${event.name}`].splice(event.index, 1)
-			},
-		}
 	}
 </script>
 
 <style lang="scss">
-	.page_pingjia4 {
-		background-color: #ffffff;
+	.ziti {
+		color: #909090;
+		margin-top: 23px;
+	}
+
+	.xkuang {
+		margin-top: 20px;
+		background-color: #FAFAFA;
+		padding-left: 30px;
+	}
+
+	.content-list {
+		margin: 20rpx;
 		padding: 20rpx;
+		background: white;
+		border-radius: 20rpx;
 
-		.anniu {
-			margin-top: 48px;
-			margin-left: 20px;
-		}
+	}
 
-		.niming {
-			margin-top: 20px;
-		}
+	.hz-name {
+		color: #999;
+		margin-right: 10rpx;
+	}
 
-		.ziti {
-			color: #909090;
-			margin-right: 20rpx;
-			width: 160rpx;
-		}
+	.gray999 {
+		color: #999;
+	}
 
-		.xkuang {
-			margin-top: 20px;
-		}
+	.name-row {
+		margin: 20rpx 0;
+	}
 
-		.xx {
-			margin-left: 24%;
-			padding-top: 10px;
-		}
+	.item {
+		margin-right: 20rpx;
+		font-size: 26rpx;
+	}
 
-		.biaoti {
-			width: 80%;
-			margin: 0 auto;
-			text-align: center;
-			margin-top: 20px;
-		}
+	.xy-row {
+		margin-bottom: 40rpx;
+	}
 
-		.kuang {
-			background-color: #ffffff;
-		}
+	.pl-style {
+		margin-bottom: 40rpx;
 	}
 
-	.tx-img {
-		width: 40rpx;
-		margin-right: 20rpx;
+	.color2979ff {
+		color: #2979ff;
 	}
-	// .img-content{
-	// 	// display: flex;
-	// 	// justify-content: center;
+	.img-content{
+		margin-top: 20rpx;
+		.img{
+			display: inline-block;
+			margin-right: 10rpx;
+			border-radius: 20rpx;
+		}
 		
-	// 	// display: inline-block;
-	// 	.img{
-	// 		width: 160rpx;
-	// 		height: 160rpx;
-	// 	}
-	// }
-	.imgShow{
-	 width: 100%;
-	 display: flex;
-	 flex-wrap: wrap;
-	 margin-top: 20rpx;
 	}
-	.img_item{
-	 // height:0px;
-	 height: 85px!important;
-	 width: 30%;
-	 background-color: #f1f1f1;
-	 margin: 2px 1.66%;
-	 border-radius: 10rpx;
+	.line{
+		margin: 20rpx 0!important;
 	}
 </style>

pages/mine/index.vue

@@ -130,12 +130,6 @@
 			};
 		},
 		onShow() {
-			if (!this.hasLogin) {
-				this.isShowAlert = true
-				return
-			}
-		},
-		onLoad() {
 			uni.showLoading({
 				title: '加载中',
 				mask: true
@@ -144,14 +138,14 @@
 					commonId: this.userInfo.id
 				}).then(res => {
 					uni.hideLoading()
-
+			
 					if (res.data) {
 						if (res.data.authenticationStatus == '审核中' || res.data.authenticationStatus == '已驳回') {
 							this.status = false
 						} else {
 							this.status = true
 						}
-
+			
 					} else {
 						this.status = false
 					}
@@ -167,6 +161,13 @@
 			// 
 			this.userName = this.userInfo.userName
 			this.phone = this.userInfo.phone.replace(this.userInfo.phone.substring(3, 7), "****")
+			if (!this.hasLogin) {
+				this.isShowAlert = true
+				return
+			}
+		},
+		onLoad() {
+			
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),

pages/mine/manageBankCards/addBankCard.vue

@@ -94,7 +94,7 @@
 			savePhoto(path) {
 				// 
 				this.imagesrc = path;
-				uploadImage(path, 'appData/',
+				uploadImage('image',path, 'appData/',
 					result => {
 						// 上传成功
 						console.log('图片地址', result)
@@ -123,7 +123,7 @@
 					count: 1,
 					success: function(res) {
 						console.log(JSON.stringify(res.tempFilePaths));
-						uploadImage(res.tempFilePaths[0], 'appData/',
+						uploadImage('image',res.tempFilePaths[0], 'appData/',
 							result => {
 								// 上传成功
 								console.log('图片地址', result)
@@ -142,7 +142,7 @@
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage(res.tempFilePaths[0], 'appData/',
+							uploadImage('image',res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功
 									console.log('图片地址', result)

pages/order/addEvaluation.vue

@@ -148,8 +148,8 @@
 						type: 'success',
 						message: "评价成功",
 						complete() {
-							uni.navigateTo({
-								url: '/pages/order/index'
+							uni.navigateBack({
+								delta:1
 							})
 						}
 					})

pages/order/driverDetail.vue

@@ -56,7 +56,7 @@
 								:readonly='true'>
 							</start>
 						</view> -->
-						<view class="gray fontsize-24">累计发运150次</view>
+						<view class="gray fontsize-24">累计发运{{total}}次</view>
 					</view>
 				</view>
 				<view class="right">
@@ -153,7 +153,8 @@
 				}],
 
 				list3:[],
-				list4:[]
+				list4:[],
+				total:0
 			};
 		},
 		onNavigationBarButtonTap(e) {
@@ -161,8 +162,7 @@
 			this.show = true
 		},
 		onLoad(options) {
-			debugger
-			this.dataObj =JSON.parse(options.val) 
+			this.dataObj =JSON.parse(options.driver) 
 			console.log(this.dataObj)
 			that = this
 			// this.getList()
@@ -228,7 +228,7 @@
 						debugger
 						if (page.num == 1) that.list = [];
 						that.list = that.list.concat(res.data.records); //追加新数据
-
+						that.total = res.data.total
 						for (let i = 0; i < that.list.length; i++) {
 							if (that.list[i].ownerUrl) {
 								that.list[i].imgList = that.list[i].ownerUrl.split(',')

pages/order/evaluationRecord.vue

@@ -126,7 +126,7 @@
 		methods: {
 			upCallback(page) {
 				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
-						ownerId: this.userInfo.id,
+						evaluatorId: this.userInfo.id,
 						flag: 1,
 						pageSize: page.size,
 						currentPage: page.num

pages/order/index.vue

@@ -103,7 +103,7 @@
 						</view>
 						<view class="flex align-center">
 							<view style="margin-right: 20rpx;">运距 {{good.distance}}km</view>
-							<view class="car">{{good.freightInfo.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}</view>
+							<view class="car">{{good.freightInfo.freight?good.freightInfo.freight:good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}</view>
 						</view>
 						<!-- 		<view class="right">
 							<view class="flex fontsize-26 row">
@@ -147,7 +147,8 @@
 						<view class="normal" @click.stop="stop(good)"
 							v-if="good.cargoOwnerStatus=='待还款'||good.cargoOwnerStatus=='已还款'">还款</view>
 
-						<view class="start normal" @click.stop="addevaluation(good)"  v-if="good.cargoOwnerStatus=='已完结'">评价</view>
+						<!-- <view class="start normal" @click.stop="addevaluation(good)"  v-if="good.cargoOwnerStatus=='已完结'">评价</view> -->
+						<view class="start normal" @click.stop="addevaluation(good)" v-if="good.cargoOwnerStatus=='待结算'"  >评价</view>
 					</view>
 				</view>
 			</view>
@@ -372,9 +373,8 @@
 		// },
 		methods: {
 			goTodriverDetail(val){
-				debugger
 				uni.$u.route('/pages/order/driverDetail',{
-					val:JSON.stringify(val)
+					driver:JSON.stringify(val)
 				});
 			},
 			addevaluation(val){

pages/public/code.vue

@@ -218,7 +218,7 @@
 
 		}
 	}
-</script>1
+</script>
 
 <style>
 	.top {

pages/public/login.vue

@@ -178,88 +178,7 @@
 									}
 								}
 							})
-							// that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
-							// 	driverPhone: this.phone,
-							// }).then(res2 => {
-								
-							// 	// 
-							// 	// 
-							// })
 							
-							// that.$request.baseRequest('post', '/commonUser/api/loginQuickly', {
-							// 	mobilePhone: this.phone,
-							// 	veriCode: "123456",
-							// 	loginFlag: 1
-							// }).then(res1 => {
-							// 	console.log("loginQuickly", res)
-							// 	if (res1.code == 200) {
-							// 		uni.setStorageSync('pcuserInfo', res1.data)
-							// 		that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
-							// 			reCommonId: this.userInfo.id,
-							// 		}).then(res3 => {
-							// 			if (res3.data) {
-							// 				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 + ""
-							// 					})
-							// 				}
-							// 			}
-							// 		})
-							// 		uni.setStorageSync('pcuserInfo', res.data)
-							// 		uni.setStorageSync('userInfo', res.data)
-							// 		helper.getListByUserId()
-							// 		that.$store.commit('login', res.data)
-							// 		uni.hideLoading()
-							// 		uni.switchTab({
-							// 			url: '/pages/goodSource/index'
-							// 		});
-							// 	} else {
-							// 		that.$request.baseRequest('post', '/commonUser/api/loginQuickly', {
-							// 			mobilePhone: '14444444444',
-							// 			veriCode: "123456",
-							// 			loginFlag: 1
-							// 		}).then(res2 => {
-							// 			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
-							// 				reCommonId: this.userInfo.id,
-							// 			}).then(res3 => {
-							// 				if (res3.data) {
-							// 					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 + ""
-							// 						})
-							// 					}
-							// 				}
-							// 			})
-							// 			uni.setStorageSync('pcuserInfo', res2.data)
-							// 			helper.getListByUserId()
-							// 		})
-							// 	}
-
-							// })
 							that.$store.commit('login', res.data)
 							var name = 'userInfo';
 							var value = res.data;
@@ -267,8 +186,6 @@
 								name,
 								value
 							});
-							// that.liangxinLogin()
-
 							uni.switchTab({
 								url: '/pages/order/index'
 							});

pages/public/register.vue

@@ -7,7 +7,7 @@
 				class="flex">
 				<view class="NumberMedium" style='width:15%;border-right:1px solid #E8E9ED;'>+86</view>
 				<view style='width:85%;'>
-					<u-input border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
+					<input border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
 						placeholder="请输入手机号码" type="number" class="Regular" />
 				</view>
 				<!-- <image v-if='phone!=""' @click='phone=""' class='close' src='../../static/img/login/guanbi@2x.png'></image> -->
@@ -17,8 +17,8 @@
 					<u-input border="none" v-model='verifyCode' class="Regular" placeholder="请输入验证码" type="number" maxlength="6"/>
 					<!-- <image v-if='verifyCode' @click='verifyCode=""' class='close1' src='../../static/img/login/guanbi@2x.png'></image> -->
 				</view>
-				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
-					class='getcode Regular'>{{sendText}}</button>
+				<button class='getcode Regular' :class='codestatus?"activeCode":""' @click='getcode'
+					>{{sendText}}</button>
 			</view>
 			<view style='border-bottom:1px solid #E8E9ED;padding:10px;position:relative;'>
 				<u-input border="none" maxlength='16' class='Regular input-style' style='height:30px;'
@@ -95,6 +95,7 @@
 				canIUseProfile: false
 			}
 		},
+		
 		onShow() {
 			// this.loginType = "wechat"
 
@@ -147,9 +148,12 @@
 				return name
 			},
 			phoneinput(e) {
-				if (e.length == 11) {
+				if (e.detail.value.length == 11) {
 					this.codestatus = true
 				}
+				else{
+					this.codestatus = false
+				}
 			},
 			getcode() {
 				var that = this
@@ -158,13 +162,13 @@
 							phone: this.phone
 						}).then(res => {
 							if (res.code == 200) {
-								that.sendDisabled = true
+								that.codestatus = false
 								let sec = 60
 								let interval = setInterval(() => {
 									sec--;
 									that.sendText = sec + 's后重发'
 									if (sec <= 0) {
-										that.sendDisabled = false
+										that.sendDisabled = true
 										that.sendText = "获取验证码"
 										clearInterval(interval)
 									}
@@ -250,37 +254,45 @@
 									password: this.password,
 									loginFlag: 1
 								}).then(res => {
-
-									if (res.data.code == 200) {
-										// pc登录
-										that.$request.baseRequest('post', '/commonUser/api/loginQuickly', {
-											mobilePhone: this.phone,
-											veriCode: "123456",
-										}).then(res1 => {
-											if (res1.code == 200) {
-												uni.setStorageSync('pcUserInfo', res1.data)
-												
-												helper.getListByUserId()
-												uni.$u.route("/pages/mine/index")
-											} else {
-												that.$api.doRequest('post',
-													'/commonUser/api/loginQuickly', {
-														mobilePhone: '14444444444',
-														veriCode: "123456",
-													}).then(res2 => {
-													uni.setStorageSync('pcUserInfo', res2
-														.data)
-													helper.getListByUserId()
-												})
+									if (res.code == 200) {
+										console.log("userInfo", res.data)
+										uni.setStorageSync('userInfo', res.data)
+										that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
+											reCommonId: this.userInfo.id,
+										}).then(res3 => {
+											if (res3.data) {
+												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 + ""
+													})
+												}
 											}
 										})
-										uni.setStorageSync('userInfo', res.data)
+										uni.hideLoading()
 										that.$store.commit('login', res.data)
-										// that.liangxinLogin()
+										var name = 'userInfo';
+										var value = res.data;
+										that.$store.commit('$uStore', {
+											name,
+											value
+										});
 										uni.switchTab({
-											url: '/pages/sale/information'
+											url: '/pages/mine/index'
 										});
 									} else {
+										uni.hideLoading()
 										uni.showToast({
 											title: res.message,
 											icon: 'none',
@@ -461,7 +473,7 @@
 		color: #2772FB;
 	}
 
-	.getcode.active {
+	.activeCode {
 		background: #2772FB;
 		color: #fff;
 	}

pages/release/editRelease.vue

@@ -1,16 +1,12 @@
 <template>
 	<view class="content">
-		<view class="fixed1"></view>
-		<view class='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">
-				<u-icon class="" name="order" color="" size="28"></u-icon>
-				<view>
-					记录
-				</view>
-			</view>
-		</view>
+		<u-navbar  title="发布" :placeholder="true"  @leftClick="back()">
+			<!-- view class="u-nav-slot" slot="left">
+				<u-icon name="arrow-left" size="19"></u-icon>
+				<u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
+				<u-icon name="home" size="20"></u-icon>
+			</view> -->
+		</u-navbar>
 		<view class="content1">
 			<view class="row" @click="selectCargoOwner">
 				<view class="left select-sf">{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}</view>
@@ -833,7 +829,7 @@
 
 	.content1 {
 		background: white;
-		margin: var(--status-bar-height) 20rpx 0 20rpx;
+		margin: 20rpx 20rpx 0 20rpx;
 		border-radius: 20rpx;
 		padding: 40rpx;