11

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
-	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	baseUrlNew: 'http://192.168.1.114:8099',
-	// baseUrlNew: 'http://192.168.1.116:8999',
+	baseUrlNew: 'https://apitest.eliangeyun.com',
+	// baseUrlNew: 'http://192.168.1.114:8099',
+	// baseUrlNew: 'http://192.168.1.119:8999',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/goodSource/cargoOwnerSee.vue

@@ -1,5 +1,7 @@
 <template>
 	<view class="center">
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+			class="mescroll">
 		<view class="center_top">
 			<view class="flex">
 				<u--image
@@ -65,8 +67,6 @@
 					<view class="gray fontsize-24">好评率</view>
 				</view>
 			</view>
-			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-				class="mescroll">
 				<view class="flex flex-space-between">
 					<view :class="btnData == 1 ? 'btn-active':'btn'" @click="btnChange(1)">全部({{totalPL}})</view>
 					<view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">最新</view>
@@ -103,11 +103,12 @@
 						</view>
 					</view>
 				</view>
-			</mescroll-body>
 		</view>
 		<u-picker :show="show" :columns="columns" :closeOnClickOverlay='true' @close='selectTypeClose'
 			@cancel='selectTypeClose' @confirm='confirmBtn'></u-picker>
 		<u-toast ref="uToast"></u-toast>
+		
+		</mescroll-body>
 	</view>
 </template>
 
@@ -162,8 +163,10 @@
 			},
 			upCallback(page) {
 				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
-						ownerId: this.objectInfo.commonId,
-						flag: 1,
+						evaluatoredId: this.objectInfo.commonId,
+						flag: 2,
+						haoType:'',
+						searchType:'',
 						pageSize: page.size,
 						currentPage: page.num
 					}).then(res => {
@@ -188,8 +191,8 @@
 			},
 			getList() {
 				this.$request.baseRequest('get', '/orderInfo/selectHaoPing', {
-						commonId: this.userInfo.id,
-						haoType: ''
+						commonId: this.objectInfo.commonId,
+						evaluateFlag: 2
 					}).then(res => {
 						if (res.code == 200) {
 							this.dataObj = res.data

pages/mine/evaluate.vue

@@ -1,50 +1,72 @@
 <template>
-	<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>
-				
-				<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="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="right gray999">
+						{{item.createDate.split(' ')[0]}}
+					</view>
 				</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">
+				<view class="flex align-center name-row">
+					<view class="sj-row hz-name">
+						{{item.ownerAnonymous=='1'?'匿名评价':item.orderInfo.driverName}}:
+					</view>
+					<view class="xx">
+						<start :count="count" v-model="item.count" size="35" activeColor="#ffaa00" :size="18"
+							:allowHalf='true' :readonly='true'>
 						</start>
 					</view>
-
-					<view class="">
-						{{item.level}}
+				</view>
+				<view class="gray999 xy-row">
+					<view class='item'>
+						司机信用：{{item.driverCredit}}星
+					</view>
+					<view class='item'>
+						运费效率：{{item.tranEfficiency}}星
+					</view>
+					<view class='item'>
+						运输安全：{{item.tranSafety}}星
+					</view>
+					<view class='item'>
+						服务质量：{{item.serviceQuality}}星
+					</view>
+					<view class='item'>
+						满意度：{{item.satisfaction}}星
 					</view>
 				</view>
+				<!-- 
+			<view class="xkuang">
+				<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.ownerContent}}
+				</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>
 			</view>
-			<view>
-				<!-- <u--textarea style="margin-top: 20px;" background-color="#6d6d6d" v-model="value3"
-					placeholder="评价一下这单发运任务~">
-				</u--textarea> -->
-				<view>是否点击可浪费啊据了解SD卡见风使舵是否点击拉分手的距离看拉圣诞节福利发送到节流防抖拉三级分类库山东假的李开复加空间撒的卢卡斯的房间里快递费</view>
-			</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>
+		</mescroll-body>
 	</view>
 </template>
 
@@ -54,274 +76,150 @@
 		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
 		components: {
 			start
 		},
-		computed: {
-			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
-		},
 		data() {
 			return {
-				imageList :[],
-					objData:{},
-				starIndex: '',
-				checkboxValue1: [],
-				checkboxList1: [{
-					name: '匿名评论',
-					disabled: false
-				}],
-				count: "5",
-				value: '',
-				value3: '',
-				fileList1: [],
-				por: [{
-					title: '"无可挑剔"',
-				}],
+				imgList: [],
+				list: [],
+				isOpen: true,
+				count: '5',
+				value: '3',
+				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
 				rate: [{
 						name: "司机信用",
 						count: "5",
 						value1: '5',
-						level: '非常好'
 					},
 					{
 						name: "运输效率",
 						count: "5",
-						value1: '5',
-						level: '非常好'
+						value1: '3',
 					},
 					{
 						name: "运输安全",
 						count: "5",
 						value1: '5',
-						level: '非常好'
 					},
 					{
-						name: "运输安全",
+						name: "服务质量",
 						count: "5",
-						value1: '5',
-						level: '非常好'
-					},
-					{
+						value1: '2',
+					}, {
 						name: "满意度",
 						count: "5",
-						value1: '5',
-						level: '非常满意'
+						value1: '1',
 					}
 				],
-				button: [{
-					name: '提交'
-				}],
-
-				hidden: [{
-					name: '匿名评论',
-					disabled: false
-				}],
-			}
+			};
 		},
-		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 = []
 		},
 		methods: {
-			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)
-			},
-			// 新增图片
-			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: '上传中'
+			upCallback(page) {
+				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
+						evaluatoredId: this.userInfo.id,
+						flag: 2,
+						pageSize: page.size,
+						currentPage: page.num
+					}).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].ownerUrl.split(',')
+							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
+						}
+						that.mescroll.endBySize(res.data.records.length, res.data.total);
+						uni.hideLoading()
 					})
-				})
-				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++
-				}
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
 			},
-			uploadFilePromise(file, url) {
-				debugger
-				uploadImage('image', url, 'appData/',
-					result => {
-						debugger
-						// 上传成功回调函数
-						console.log('图片地址', result)
-						that.imageList.push(result)
-						// this.dataDetails.certificateAddressUrl=this.dataDetails.certificateAddressUrl +',' +result
-
-					}
-				)
+			clickZK() {
+				this.isOpen = !this.isOpen
 			},
-			// 删除图片
-			deletePic(event) {
-				this[`fileList${event.name}`].splice(event.index, 1)
+			getList() {
+
 			},
-		}
+		},
+
 	}
 </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;
+		display: inline-block;
+	}
 
-		.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;
-		
-	// 	// display: inline-block;
-	// 	.img{
-	// 		width: 160rpx;
-	// 		height: 160rpx;
-	// 	}
-	// }
-	.imgShow{
-	 width: 100%;
-	 display: flex;
-	 flex-wrap: wrap;
-	 margin-top: 20rpx;
+
+	.img-content {
+		margin-top: 20rpx;
+
+		.img {
+			display: inline-block;
+			margin-right: 10rpx;
+			border-radius: 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/news/index.vue

@@ -26,7 +26,7 @@
 					<view class="row2 flex flex-space-between align-center">
 						<view class="text point1">
 							{{item.newsContent}}
-						</view>{{item.newsFlag}}
+						</view>
 						<view class="red-point" v-if="item.newsFlag==0"></view>
 					</view>
 				</view>

pages/order/addEvaluation.vue

@@ -132,8 +132,8 @@
 						type: 'success',
 						message: "评价成功",
 						complete() {
-							uni.navigateTo({
-								url: '/pages/order/index'
+							uni.navigateBack({
+								delta:1
 							})
 						}
 					})
@@ -147,7 +147,7 @@
 		},
 		onLoad(options) {
 			that = this
-			// this.objData = JSON.parse(options.val)
+			this.objData = JSON.parse(options.val)
 			console.log(this.objData)
 		},
 		methods: {

pages/order/confirmLoading.vue

@@ -125,7 +125,7 @@
 				gjList: []
 			}
 		},
-		onLoad(options) {debugger
+		onLoad(options) {
 			that = this
 			// debugger
 			// #ifdef APP-PLUS
@@ -141,7 +141,6 @@
 		},
 		methods: {
 			toSignContract(){
-				debugger
 				uni.$u.route('/pages/order/signContract', {
 					obj: JSON.stringify(this.detailData),
 				});
@@ -415,7 +414,6 @@
 				
 				this.isShowAlert = false
 				 if(this.validate()) return 
-				debugger
 				//1暂存
 				if (this.detailData.statusFlag == 1) {
 					delete this.detailData.carrierInfo.loadingAreaLongitude;

pages/order/confirmUnloading.vue

@@ -240,7 +240,6 @@
 			},
 			// 新增图片
 			async afterRead(event) {
-				debugger
 				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
 				let fileListLen = this[`fileList${event.name}`].length

pages/order/evaluateList.vue

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

pages/order/index.vue

@@ -137,7 +137,8 @@
 							-->
 							<view class="start normal" @click.stop="closed(good)" v-if="good.orderStatus=='结算中'">完结
 							</view>
-							<view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='已完结'">评价</view>
+							<!-- <view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='已完结'">评价</view> -->
+							<view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='待结算'">评价</view>
 						</view>
 					</view>
 				</view>

pages/order/orderDetails.vue

@@ -415,7 +415,7 @@
 						
 					})
 			},
-			goConfirmLoading(id) {debugger
+			goConfirmLoading(id) {
 				uni.$u.route('/pages/order/confirmLoading', {
 					obj: JSON.stringify({id:this.id}),
 				});

pages/order/signContract.vue

@@ -221,7 +221,6 @@
 					// driverId:this.firstAuthentication.id
 				}).then(res => {
 					if (res.code == '200') {
-						debugger
 						uni.hideLoading()
 						if (res.data.length > 0) {
 							let _list = []
@@ -254,7 +253,6 @@
 			},
 			//车牌号弹出键盘
 			handleShowKeyboard() {
-				debugger
 				if (!this.dataDetails.carrierInfo.carNo) {
 					this.carNumber = ''
 				} else {
@@ -345,7 +343,6 @@
 				}
 				console.log(that.dataDetails)
 				let _obj = {}
-				debugger
 				_obj.trailerNumber = that.dataDetails.trailerNumber
 				_obj.startDates = that.dataDetails.startDates
 				_obj.endDates = that.dataDetails.endDates