前端

pages/carSource/driverSee.vue

@@ -3,10 +3,10 @@
 		<view class="item3 flex align-center flex-space-between">
 			<view class="flex align-center flex-space-between row1">
 				<view class="flex align-center">
-					<u--image :showLoading="true" :src="dataObj.avatarUrl" width="100rpx" height="100rpx" @click=""
+					<u--image :showLoading="true" :src="driverList.avatarUrl" width="100rpx" height="100rpx" @click=""
 						shape='circle'>
 					</u--image>
-					<view class="name">{{dataObj.driverName}}</view>
+					<view class="name">{{driverList.driverName}}</view>
 				</view>
 
 				<view class="right flex s-row align-center phone">
@@ -17,20 +17,20 @@
 				</view>
 			</view>
 		</view>
-		<!-- 	<view class="row2 flex">
-			<view class="flex item">
+			<view class="row2 flex">
+			<view class="flex item">&
 				<view class="pf-name">评分</view>
-				<view class="pf-number">4.98</view>
+				<view class="pf-number">{{ping.zong}}</view>
 			</view>
 			<view class="flex item">
 				<view class="pf-name">发运次数</view>
-				<view class="pf-number">4.98</view>
+				<view class="pf-number">{{driverList.shipmentsNumber?driverList.shipmentsNumber:0}}</view>
 			</view>
-			<view class="flex item">
-				<view class="pf-name">评价</view>
-				<view class="pf-number">4.98</view>
+			<view v-if='total>=20' class="flex item">
+				<view class="pf-name">好评率</view>
+				<view class="pf-number">{{driverList.favorableRate?driverList.favorableRate:0}}</view>
 			</view>
-		</view> -->
+		</view>
 		<view class="row3 flex">
 			<view :class="index==1?'row3-active':''" @click="clickTap(1)">司机信息</view>
 			<view :class="index==2?'row3-active':''" @click="clickTap(2)">评价</view>
@@ -51,12 +51,12 @@
 						4.8
 					</view>
 					<view>
-						<!-- 	<view>
+					<!-- 	<view>
 							<start count="5" v-model="zhpf" size="35" activeColor="#ffaa00" :size="18" :allowHalf='true'
 								:readonly='true'>
 							</start>
 						</view> -->
-						<view class="gray fontsize-24">累计发运150次</view>
+						<view class="gray fontsize-24">累计发运{{total}}次</view>
 					</view>
 				</view>
 				<view class="right">
@@ -67,15 +67,16 @@
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
 				class="mescroll">
 				<view class="flex flex-space-between">
-					<view :class="btnData == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{list.length}})</view>
+					<view :class="haoType == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{ping.haoPing+ping.chaPing}}})</view>
 					<!-- <view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">最新(1)</view> -->
-					<view :class="btnData == 1 ? 'btn-active':'btn'" @click="btnChange(1)">好评({{list3.length}})</view>
-					<view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">差评({{list4.length}})</view>
+					<view :class="haoType == 1 ? 'btn-active':'btn'" @click="btnChange(1)">好评({{ping.haoPing}})</view>
+					<view :class="haoType == 2 ? 'btn-active':'btn'" @click="btnChange(2)">差评({{ping.chaPing}})</view>
 				</view>
 				<view class="evaluate_css" v-for="(item,index) in list">
 					<view class="flex">
 						<view class="row1 flex">
-							<u--image :src="item.ownerPortrait?item.ownerPortrait:'../../static/images/mine/tx.png'"
+							<u--image
+								:src="item.ownerPortrait?item.ownerPortrait:'../../static/images/mine/tx.png'"
 								width='70rpx' height='70rpx' shape="circle">
 							</u--image>
 							<view class="right">
@@ -84,9 +85,9 @@
 									{{item.createDate?item.createDate.split(' ')[0]:''}}
 								</view>
 								<view class="flex m-top10">
-									<view class="branch_css ">{{item.count}}</view>
+									<view class="branch_css ">{{item.driverScoreObtained}}</view>
 									<view class="">
-										<start count="5" v-model="item.count" size="35" activeColor="#ffaa00" :size="18"
+										<start count="5" v-model="item.driverScoreObtained" size="35" activeColor="#ffaa00" :size="18"
 											:allowHalf='true' :readonly='true'>
 										</start>
 									</view>
@@ -106,18 +107,18 @@
 			</mescroll-body>
 		</view>
 		<view class="row5">
-			<view class="">
-				<view v-if="tabIndex==1&&index==1" v-for="(items,index) in dataObj.driverCarInfoList" :key="index">
-					<view class="">
-						<view>{{items.carNumber}}</view>
-						<view class="flex align-center">{{items.carType}} | 车长{{items.carLong/1000}}米 |
-							载重{{items.carApprovedWeight/1000}}吨</view>
-					</view>
+			<view class='carMessage' v-if="tabIndex==1&&index==1">
+				<view class='carMessage-item' v-for='(item,index) in hyDriverCarInfoList' :style="{'border-radius':(index!=hyDriverCarInfoList.length-1?'#ccc':'transparent')}">
+					<view v-if='item.carCategory=="挂车"'>{{item.guaCarNumber}}</view>
+					<view v-else>{{item.carNumber}}</view>
+					<view v-if='item.carCategory=="挂车"' class="flex align-center">{{item.carType}} | 车长{{item.guaCarLong}}米 | 载重{{item.guaCarApprovedWeight}}吨</view>
+					<view v-else class="flex align-center">{{item.carType}} | 车长{{item.carLong}}米 | 载重{{item.carApprovedWeight}}吨</view>
 				</view>
-				<view class="carInfo" v-if="tabIndex==2&index==1">
-					<view>
-						累计发运150次，好评率90%
-					</view>
+				
+			</view>
+			<view class="carInfo" v-if="tabIndex==2&&index==1">
+				<view style='text-align:center;'>
+					累计发运{{driverList.shipmentsNumber?driverList.shipmentsNumber:0}}次<text v-if='total>=20'>，好评率{{driverList.favorableRate?driverList.favorableRate:0}}%</text>
 				</view>
 			</view>
 		</view>
@@ -146,8 +147,9 @@
 				index: 1,
 				show: false,
 				objectInfo: {},
+				haoType:'',
 				columns: [
-					['反馈', '举报']
+					['投诉', '举报']
 				],
 				list: [],
 				list1: [{
@@ -156,10 +158,12 @@
 					name: '评价',
 				}],
 
-				list3: [],
-				list4: [],
-				dataObj: {},
-				commonId: "",
+				list3:[],
+				list4:[],
+				ping:[],
+				hyDriverCarInfoList:[],
+				driverList:{},
+				total:0
 			};
 		},
 		onNavigationBarButtonTap(e) {
@@ -167,32 +171,42 @@
 			this.show = true
 		},
 		onLoad(options) {
-			debugger
-			this.commonId = options.commonId
-			console.log(this.dataObj)
+			// this.dataObj =JSON.parse(options.driver) 
+			// console.log(this.dataObj)
 			that = this
-			this.getList()
+			// this.getList()
+		},
+		onShow(){
+			var that=this
+			
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		methods: {
-			getList() {
-				that.$request.baseRequest('get', '/driverInfo/getDriver', {
-					commonId: this.commonId
-				}).then(res => {
-					this.dataObj = res.data
-				})
+			toPhone(){
+				console.log(this.driverList.driverPhone)
+				var that=this
+				uni.makePhoneCall({
+					phoneNumber: that.driverList.driverPhone,
+					success: (res) => {
+						console.log('调用成功!')
+					},
+					// 失败回调
+					fail: (res) => {
+						console.log('调用失败!')
+					}
+				});
 			},
 			confirmBtn(e) {
 				console.log(e.value)
-				if (e.value == '反馈') {
+				if (e.value == '投诉') {
 					uni.$u.route('/pages/order/fk', {
-						val: JSON.stringify(this.dataObj)
+						val: JSON.stringify(this.driverList)
 					});
 				} else {
 					uni.$u.route('/pages/order/jb', {
-						val: JSON.stringify(this.dataObj)
+						val: JSON.stringify(this.driverList)
 					});
 				}
 				this.show = false
@@ -207,70 +221,70 @@
 				this.tabIndex = index
 			},
 			btnChange(num) {
-				this.btnData = num
-				this.upCallback({
-					size: 10,
-					num: 1,
-				})
+				// debugger
+				this.haoType = num
+				this.upCallback({size:10,num:1})
+				// this.getList()
 			},
 			upCallback(page) {
-				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
-					evaluatoredId: this.dataObj.id,
-					flag: 2,
-					pageSize: page.size,
-					// 1好2差
-					haoType: 1,
-					searchType: 1,
-					currentPage: page.num
-				}).then(res => {
-					if (page.num == 1) that.list3 = [];
-					that.list3 = that.list3.concat(res.data.records); //追加新数据
-				})
-				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
-					evaluatoredId: this.dataObj.id,
-					flag: 2,
-					pageSize: page.size,
-					haoType: 2,
-					searchType: 1,
-					currentPage: page.num
-				}).then(res => {
-					if (page.num == 1) that.list4 = [];
-					that.list4 = that.list4.concat(res.data.records); //追加新数据
-				})
-				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
-						evaluatoredId: this.dataObj.id,
-						flag: 2,
-						searchType: 1,
-						pageSize: page.size,
-						currentPage: page.num
+				var that =this
+				that.$request.baseRequest('get', '/driverInfo/getDriver', {
+						commonId:'2939c4c23ca14e4ab6f16d7a6b3f8d5e'
 					}).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++) {
-							if (that.list[i].ownerUrl) {
-								that.list[i].imgList = that.list[i].ownerUrl.split(',')
+						console.log(res.data)
+						that.driverList=res.data
+						if(res.data.hyDriverCarInfoList){
+							for (var i = 0; i < res.data.hyDriverCarInfoList.length; i++) {
+								res.data.hyDriverCarInfoList[i].carApprovedWeight=res.data.hyDriverCarInfoList[i].carApprovedWeight/1000
+								res.data.hyDriverCarInfoList[i].guaCarApprovedWeight=res.data.hyDriverCarInfoList[i].guaCarApprovedWeight/1000
+								res.data.hyDriverCarInfoList[i].carLong=res.data.hyDriverCarInfoList[i].carLong/1000
+								res.data.hyDriverCarInfoList[i].guaCarLong=res.data.hyDriverCarInfoList[i].guaCarLong/1000
+								res.data.hyDriverCarInfoList[i].carNumber = res.data.hyDriverCarInfoList[i].carNumber.replace(res.data.hyDriverCarInfoList[i].carNumber.substring(2, 6),
+									"****")
+								res.data.hyDriverCarInfoList[i].guaCarNumber = res.data.hyDriverCarInfoList[i].guaCarNumber.replace(res.data.hyDriverCarInfoList[i].guaCarNumber.substring(2, 6),
+								"****")
 							}
-
-							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.hyDriverCarInfoList=res.data.hyDriverCarInfoList
 						}
-						that.mescroll.endBySize(res.data.records.length, res.data.total);
-						uni.hideLoading()
+						that.$request.baseRequest('get', '/orderInfo/selectHaoPing', {
+								commonId:that.driverList.commonId,
+								evaluateFlag:1,
+						
+							}).then(res => {
+								that.ping=res.data
+							})
+							.catch(res => {
+								uni.$u.toast(res.message);
+							});
+						that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
+								evaluatoredId: that.driverList.commonId,
+								flag: 2,
+								haoType:that.haoType,
+								searchType:1,
+								
+								pageSize: page.size,
+								currentPage: page.num
+							}).then(res => {
+								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(',')
+									}
+						
+									// 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);
+							});
 					})
-					.catch(res => {
-						uni.$u.toast(res.message);
-					});
-				that.$request.baseRequest('get', '/orderInfo/selectHaoPing', {
-						commonId: this.userInfo.id,
-						haoType: ''
-					}).then(res => {
-
-					})
-					.catch(res => {
-						uni.$u.toast(res.message);
-					});
+				
 			},
 			// getList() {
 
@@ -301,7 +315,12 @@
 	.content {
 		height: 100vh;
 	}
-
+	.carMessage{
+		background:#fff;border-radius: 20rpx;
+		.carMessage-item{
+			padding:40rpx;
+		}
+	}
 	.item3,
 	.row3 {
 		background: white;
@@ -450,18 +469,17 @@
 		padding: 40rpx;
 		background: white;
 	}
-
-	.img-style {
+	.img-style{
 		display: inline-block;
 		margin-right: 20rpx;
 	}
-
+	
 	.pf-number1 {
 		color: #363636;
 		font-size: 60rpx;
 		margin-right: 30rpx;
 	}
-
+	
 	.pf {
 		margin-bottom: 20rpx;
 	}

pages/carSource/index.vue

@@ -660,7 +660,8 @@
 
 			.exchange {
 				line-height: 200rpx;
-				margin-top: 60rpx;
+				margin-left: -108rpx;
+				transform: rotate(90deg);
 			}
 		}
 	}

pages/mine/evaluate.vue

@@ -3,29 +3,44 @@
 			<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 style='align-items: center;' class="left flex">
+						<u--image :showLoading="true" :src="item.driverPortrait" width="100rpx" height="100rpx" @click=""
+							shape='circle'>
+						</u--image>
+						{{item.driverName}}
 				</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 class="sj-row hz-name">
+					货主信用:
 				</view>
-				<view v-else class="sj-row hz-name">
-					匿名评价:
+				<view class="xx">
+					<start :count="count" v-model="item.ownerCredit" size="35" activeColor="#ffaa00" :size="18" :allowHalf='true'>
+					</start>
+				</view>
+			</view>
+			<view class="flex align-center name-row">
+				<view class="sj-row hz-name">
+					运费支付:
+				</view>
+				<view class="xx">
+					<start :count="count" v-model="item.freightPayment" size="35" activeColor="#ffaa00" :size="18" :allowHalf='true'>
+					</start>
+				</view>
+			</view>
+			<view class="flex align-center name-row">
+				<view 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 :count="count" v-model="item.comprehensiveSatisfaction" size="35" activeColor="#ffaa00" :size="18" :allowHalf='true'>
 					</start>
 				</view>
 			</view>
-			<view class="gray999 flex xy-row">
+			<!-- <view class="gray999 flex xy-row">
 				<view class='item'>
 					信用：{{item.ownerCredit}}星
 				</view>
@@ -35,7 +50,7 @@
 				<view class='item'>
 					综合：{{item.comprehensiveSatisfaction}}星
 				</view>
-			</view>
+			</view> -->
 			<!-- 
 			<view class="xkuang">
 				<view style="display: flex;" class="flex-space-between" v-for="(item,index) in rate">
@@ -49,11 +64,12 @@
 				{{item.driverContent}}
 			</view>
 			<view class="color2979ff flex">
-				<view @click="clickZK">展开</view>
-				<u-icon name="arrow-down" color="#2979ff" size="18" v-if="isOpen"></u-icon>
+				<view @click="clickZK(item)">展开</view>
+				<u-icon name="arrow-down" color="#2979ff" size="18" v-if="item.isOpen"></u-icon>
 				<u-icon name="arrow-up" color="#2979ff" size="18" v-else></u-icon>
 			</view>
-			<view v-if="isOpen" class="img-content">
+			
+			<view v-if="item.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>
 				
@@ -82,7 +98,7 @@
 		data() {
 			return {
 				list:[],
-				isOpen: true,
+				// isOpen: false,
 				count: '5',
 				value: '3',
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
@@ -128,21 +144,28 @@
 						currentPage: page.num
 					}).then(res => {
 						if (page.num == 1) that.list = [];
-						that.list = that.list.concat(res.data.records); //追加新数据
+						 //追加新数据
+						 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].isOpen=false
+							this.$set(that.list[i],'isOpen',false)
+							that.$set(that.list[i],'imgList',that.list[i].driverUrl.split(','))
+							// 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);
 					});
 			},
-			clickZK() {
-				this.isOpen = !this.isOpen
+			clickZK(item) {
+				this.$set(item,'isOpen',!item.isOpen)
+
+				console.log(item)
 			},
 		},
 

pages/mine/index.vue

@@ -48,7 +48,7 @@
 				<view class="flex flex-space-between content1-item"
 					@click="goDetailPage('/pages/mine/myAccount/index')">
 					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
+						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/zhanghu.png"
 							width="20px" height="20px"></u--image>我的账户
 					</view>
 					<view>
@@ -67,7 +67,7 @@
 				<view class="flex flex-space-between content1-item"
 					@click="goDetailPage('/pages/mine/manageBankCards/index')">
 					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
+						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/yinhangka.png"
 							width="20px" height="20px"></u--image>我的银行卡
 					</view>
 					<view>

pages/mine/myAccount/bill.vue

@@ -1,20 +1,23 @@
 <template>
 	<view class="center">
-		<view class="" @click="dataShow = true">{{data}}</view>
+		<view style='border-bottom:1px solid #ccc;' class="" @click="dataShow = true">{{data}}</view>
 		<u-picker :show="dataShow" :columns="columns" @confirm="dataChange" @cancel="dataShow = false"
 			@close="dataShow = false"></u-picker>
-		<view class="formData" v-for="(item,index) in formlist">
-			<view class="flex row">
-				<view class="left-text">{{item.types}}</view>
-				<view class="flex right-text">
-					{{item.amountMoney}}
+			<view v-if='formlist.length>0'>
+				<view class="formData" v-for="(item,index) in formlist">
+					<view class="flex row">
+						<view class="left-text">{{item.types}}</view>
+						<view class="flex right-text">
+							{{item.amountMoney}}
+						</view>
+					</view>
+					<view class="date_css">
+						{{item.createDate}}
+					</view>
+
 				</view>
 			</view>
-			<view class="date_css">
-				{{item.createDate}}
-			</view>
-
-		</view>
+		<view v-else style='text-align:center;padding:10px;'>暂无账单</view>
 
 	</view>
 </template>

pages/mine/myAccount/index.vue

@@ -48,7 +48,7 @@
 
 		},
 		onNavigationBarButtonTap(e) {
-			uni.$u.route('/pages/mine/myAccount/bill?type=' + this.accountType)
+			uni.$u.route('/pages/mine/myAccount/bill?type=' + this.accountType+'&id='+this.id)
 		},
 		methods: {
 			getList() {

pages/order/driverDetail.vue

@@ -3,10 +3,10 @@
 		<view class="item3 flex align-center flex-space-between">
 			<view class="flex align-center flex-space-between row1">
 				<view class="flex align-center">
-					<u--image :showLoading="true" :src="dataObj.driverPortrait" width="100rpx" height="100rpx" @click=""
+					<u--image :showLoading="true" :src="driverList.avatarUrl" width="100rpx" height="100rpx" @click=""
 						shape='circle'>
 					</u--image>
-					<view class="name">{{dataObj.driverName}}</view>
+					<view class="name">{{driverList.driverName}}</view>
 				</view>
 
 				<view class="right flex s-row align-center phone">
@@ -28,7 +28,7 @@
 			</view>
 			<view v-if='total>=20' class="flex item">
 				<view class="pf-name">好评率</view>
-				<view class="pf-number">{{driverList.favorableRate?driverList.favorableRate:0}}</view>
+				<view class="pf-number">{{driverList.favorableRate?driverList.favorableRate:0}}%</view>
 			</view>
 		</view>
 		<view class="row3 flex">
@@ -48,7 +48,7 @@
 			<view class="pf flex-space-between flex">
 				<view class="left flex align-center" style="margin-right: 20rpx;">
 					<view class="pf-number1">
-						4.8
+						{{ping.zong}}
 					</view>
 					<view>
 					<!-- 	<view>
@@ -60,7 +60,7 @@
 					</view>
 				</view>
 				<view class="right">
-					<view>98%</view>
+					<view>{{driverList.favorableRate?driverList.favorableRate:0}}%</view>
 					<view class="gray fontsize-24">好评率</view>
 				</view>
 			</view>
@@ -116,7 +116,7 @@
 				</view>
 				
 			</view>
-			<view class="carInfo" v-if="tabIndex==2&index==1">
+			<view class="carInfo" v-if="tabIndex==2&&index==1">
 				<view style='text-align:center;'>
 					累计发运{{driverList.shipmentsNumber?driverList.shipmentsNumber:0}}次<text v-if='total>=20'>，好评率{{driverList.favorableRate?driverList.favorableRate:0}}%</text>
 				</view>
@@ -171,8 +171,8 @@
 			this.show = true
 		},
 		onLoad(options) {
-			this.dataObj =JSON.parse(options.driver) 
-			console.log(this.dataObj)
+			// this.dataObj =JSON.parse(options.driver) 
+			// console.log(this.dataObj)
 			that = this
 			// this.getList()
 		},
@@ -186,9 +186,6 @@
 		methods: {
 			toPhone(){
 				console.log(this.driverList.driverPhone)
-				// uni.makePhoneCall({
-				// 	phoneNumber: this.driverList.driverPhone
-				// });
 				var that=this
 				uni.makePhoneCall({
 					phoneNumber: that.driverList.driverPhone,
@@ -205,11 +202,11 @@
 				console.log(e.value)
 				if (e.value == '投诉') {
 					uni.$u.route('/pages/order/fk', {
-						val: JSON.stringify(this.dataObj)
+						val: JSON.stringify(this.driverList)
 					});
 				} else {
 					uni.$u.route('/pages/order/jb', {
-						val: JSON.stringify(this.dataObj)
+						val: JSON.stringify(this.driverList)
 					});
 				}
 				this.show = false

pages/order/evaluationRecord.vue

@@ -3,7 +3,7 @@
 		<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  class="left flex">
 						<view>
 							{{item.orderNumber}}
 						</view>
@@ -13,17 +13,63 @@
 						{{item.createDate.split(' ')[0]}}
 					</view>
 				</view>
+				<view style='font-size:14px;' class="flex align-center name-row">
+					<view class="driver">
+						司机
+					</view>
+					<view>{{item.driverName}}</view>
+				</view>
+				<view class="flex align-center name-row">
+					<view class="sj-row hz-name">
+						司机信用:
+					</view>
+					<view class="xx">
+						<start :count="count" v-model="item.driverCredit" size="35" activeColor="#ffaa00" :size="18"
+							:allowHalf='true' :readonly='true'>
+						</start>
+					</view>
+				</view>
 				<view class="flex align-center name-row">
 					<view class="sj-row hz-name">
-						{{item.orderInfo.driverName}}:
+						运输效率:
 					</view>
 					<view class="xx">
-						<start :count="count" v-model="item.count" size="35" activeColor="#ffaa00" :size="18"
+						<start :count="count" v-model="item.tranEfficiency" size="35" activeColor="#ffaa00" :size="18"
 							:allowHalf='true' :readonly='true'>
 						</start>
 					</view>
 				</view>
-				<view class="gray999 xy-row">
+				<view class="flex align-center name-row">
+					<view class="sj-row hz-name">
+						运输安全:
+					</view>
+					<view class="xx">
+						<start :count="count" v-model="item.tranSafety" size="35" activeColor="#ffaa00" :size="18"
+							:allowHalf='true' :readonly='true'>
+						</start>
+					</view>
+				</view>
+				<view class="flex align-center name-row">
+					<view class="sj-row hz-name">
+						服务质量:
+					</view>
+					<view class="xx">
+						<start :count="count" v-model="item.serviceQuality" size="35" activeColor="#ffaa00" :size="18"
+							:allowHalf='true' :readonly='true'>
+						</start>
+					</view>
+				</view>
+				<view class="flex align-center name-row">
+					<view class="sj-row hz-name">
+						满意度:
+					</view>
+					<view class="xx">
+						<start :count="count" v-model="item.satisfaction" size="35" activeColor="#ffaa00" :size="18"
+							:allowHalf='true' :readonly='true'>
+						</start>
+					</view>
+				</view>
+				<!-- <view class="gray999 xy-row">
 					<view class='item'>
 						司机信用：{{item.driverCredit}}星
 					</view>
@@ -39,7 +85,7 @@
 					<view class='item'>
 						满意度：{{item.satisfaction}}星
 					</view>
-				</view>
+				</view> -->
 				<!-- 
 			<view class="xkuang">
 				<view style="display: flex;" class="flex-space-between" v-for="(item,index) in rate">
@@ -53,11 +99,11 @@
 					{{item.ownerContent}}
 				</view>
 				<view class="color2979ff flex">
-					<view @click="clickZK">展开</view>
-					<u-icon name="arrow-down" color="#2979ff" size="18" v-if="isOpen"></u-icon>
+					<view @click="clickZK(item)">展开</view>
+					<u-icon name="arrow-down" color="#2979ff" size="18" v-if="item.isOpen"></u-icon>
 					<u-icon name="arrow-up" color="#2979ff" size="18" v-else></u-icon>
 				</view>
-				<view v-if="isOpen" class="img-content">
+				<view v-if="item.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>
@@ -134,7 +180,13 @@
 						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].ownerUrl.split(',')
+							that.$set(that.list[i],'isOpen',false)
+							if(that.list[i].ownerUrl){
+								that.$set(that.list[i],'imgList',that.list[i].ownerUrl.split(','))
+							}else{
+								that.list[i].imgList = []
+							}
+							
 							that.list[i].count = (Number(that.list[i].driverCredit) + Number(that.list[i]
 								.tranEfficiency) + Number(that.list[i].tranSafety) + Number(that.list[i]
 								.serviceQuality) + Number(that.list[i].satisfaction)) / 25 * 5
@@ -146,8 +198,9 @@
 						uni.$u.toast(res.message);
 					});
 			},
-			clickZK() {
-				this.isOpen = !this.isOpen
+			clickZK(item) {
+				that.$set(item,'isOpen',!item.isOpen)
+				// item.isOpen = !item.isOpen
 			},
 			getList() {
 
@@ -176,7 +229,12 @@
 		border-radius: 20rpx;
 
 	}
-
+	.driver{
+		background:rgb(255, 170, 0);
+		color:#fff;font-size:28rpx;padding:8rpx;
+		border-radius: 10rpx;
+		margin-right:10rpx;
+	}
 	.hz-name {
 		color: #999;
 		margin-right: 10rpx;

pages/order/fk.vue

@@ -2,8 +2,8 @@
 	<view class="content">
 		<view class="row1 flex flex-space-between">
 			<view>被投诉人</view>
-			<view class='flex'>
-				<image :src="dataDetails.driverPortrait" mode="widthFix" class="img"></image>
+			<view style='align-items: center;' class='flex'>
+				<image :src="dataDetails.avatarUrl" mode="widthFix" class="img"></image>
 				<view>{{dataDetails.driverName}}</view>
 			</view>
 		</view>

pages/order/index.vue

@@ -140,8 +140,10 @@
 						<!-- <view class="start normal" @click.stop="confirmLoading(good,1)">确认装车</view> -->
 						<view class="start normal" v-if="good.cargoOwnerStatus!='待接单'&&good.cargoOwnerStatus!='未装车'">
 							联系客服</view>
-						<view class="start normal" @click.stop="confirmLoading(good,4)"
-							v-if="good.cargoOwnerStatus=='待收货'">确认卸车</view>
+							<view class="start normal" @click.stop="toDetail(good.id)"
+								v-if="good.cargoOwnerStatus=='待收货'">确认卸车</view>
+						<!-- <view class="start normal" @click.stop="confirmLoading(good,4)"
+							v-if="good.cargoOwnerStatus=='待收货'">确认卸车</view> -->
 						<!-- <view class="start normal" @click.stop="confirmLoading(good,2)">确认卸车</view> -->
 						<!-- <view class="normal" @click.stop="stop(good)" v-if="good.cargoOwnerStatus=='已结算'">付款</view> -->
 						<!-- <view class="normal" @click.stop="stop(good)"

pages/order/jb.vue

@@ -2,8 +2,8 @@
 	<view class="content">
 		<view class="row1 flex flex-space-between">
 			<view>被举报人</view>
-			<view class='flex'>
-				<image :src="dataDetails.driverPortrait" mode="widthFix" class="img"></image>
+			<view style='align-items: center;' class='flex'>
+				<image :src="dataDetails.avatarUrl" mode="widthFix" class="img"></image>
 				<view>{{dataDetails.driverName}}</view>
 			</view>
 		</view>

pages/order/orderDetails.vue

@@ -40,8 +40,10 @@
 
 				<u-button class="btn" text="驳回卸车信息" @click="confirmUnLoading" v-if="dataObj.cargoOwnerStatus=='待收货'">
 				</u-button>
-				<u-button class="btn" text="确认卸车" @click="confirmUnLoading" v-if="dataObj.cargoOwnerStatus=='待收货'">
+				<u-button class="btn" text="确认卸车" @click="confirmUnLoading(4)" v-if="dataObj.cargoOwnerStatus=='待收货'">
 				</u-button>
+				<!-- <u-button class="btn" text="确认卸车" @click="confirmLoading(4)" v-if="dataObj.cargoOwnerStatus=='待收货'">
+				</u-button> -->
 				<u-button class="btn" text="付款" @click="closed"
 					v-if="dataObj.cargoOwnerStatus=='待结算'||dataObj.cargoOwnerStatus=='已结算'"></u-button>
 				<u-button class="btn" text="还款" @click="stop" v-if="dataObj.cargoOwnerStatus=='待还款'"></u-button>
@@ -194,7 +196,7 @@
 				<view class="row-left-text gray">卸车照片</view>
 				<view class="flex">
 					<u--image :showLoading="true" :src="item" width="40px" height="40px"
-						v-for="(item,index) in xcImgList" :key='index'></u--image>
+						v-for="(item,index) in xcImgList" :key='index' @click='ylImg(item)'></u--image>
 				</view>
 			</view>
 		</view>
@@ -363,7 +365,6 @@
 		},
 		methods: {
 			ylImg(src) {
-				debugger
 				uni.previewImage({
 					urls: [src],
 					longPressActions: {
@@ -453,23 +454,24 @@
 				}
 				this.type = type
 				if (type == 3) {
-					uni.$u.route("/pages/order/confirmLoading", {
-						obj: JSON.stringify({
-							id: this.id
-						}),
-					})
-					// this.alertTitle = '确认装车？'
-					// this.confirmText = '确定'
+					this.alertTitle = '确认装车？'
+					this.confirmText = '确定'
+					this.isShowAlert = true
 				} else if (type == 4) {
 					this.alertTitle = '确认卸车？'
 					this.confirmText = '确定'
+					this.isShowAlert = true
 				}
-				this.isShowAlert = true
+				
 				// uni.$u.route('/pages/order/confirmLoading', item);
 			},
-			confirmUnLoading() {
-				let item = this.dataObj
-				uni.$u.route('/pages/order/confirmUnloading', item);
+			confirmUnLoading(type) {
+				this.type=type
+				this.alertTitle = '确认卸车？'
+				this.confirmText = '确定'
+				this.isShowAlert = true
+				// let item = this.dataObj
+				// uni.$u.route('/pages/order/confirmUnloading', item);
 			},
 			confirmClick() {
 				that.isShowAlert = false

pages/public/login.vue

@@ -12,8 +12,9 @@
 					<!-- <u--input class="phone-number" border="none" maxlength='11' v-model='phone'
 						placeholder="请输入手机号码" type="number"></u--input>
 					<u-input /> -->
-					<u--input v-model="phone" border="none" type='number' placeholder="请输入手机号码" class="phone-number"
-						maxlength='11' :clearable='true'></u--input>
+					<input class='phone' maxlength='11' v-model='phone'  placeholder="请输入手机号码" type="number">
+					<!-- <u--input v-model="phone" border="none" type='number' placeholder="请输入手机号码" class="phone-number"
+						maxlength='11' :clearable='true'></u--input> -->
 				</view>
 			</view>
 			<view style='margin-top:20px;border-bottom:1px solid #E8E9ED;position:relative;height:40px'>
@@ -249,7 +250,10 @@
 	page {
 		background: #fff;
 	}
-
+	.phone{
+		padding:20rpx;
+		font-size:28rpx;
+	}
 	.close {
 		width: 20px;
 		height: 20px;