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

# Conflicts:
#	pages.json
#	uni_modules/uni-icons/changelog.md
#	uni_modules/uni-icons/components/uni-icons/icons.js
#	uni_modules/uni-icons/components/uni-icons/uni-icons.vue
#	uni_modules/uni-icons/package.json

common/components/uni-rate.vue

@@ -0,0 +1,358 @@
+<template>
+	<view>
+		<view ref="uni-rate" class="uni-rate">
+			<view class="uni-rate__icon" :class="{'uni-cursor-not-allowed': disabled}"
+				:style="{ 'margin-right': marginNumber + 'px' }" v-for="(star, index) in stars" :key="index"
+				@touchstart.stop="touchstart" @touchmove.stop="touchmove" @mousedown.stop="mousedown"
+				@mousemove.stop="mousemove" @mouseleave="mouseleave">
+				<uni-icons :color="color" :size="size" :type="isFill ? 'star-filled' : 'star'" />
+				<!-- #ifdef APP-NVUE -->
+				<view :style="{ width: star.activeWitch.replace('%','')*size/100+'px'}" class="uni-rate__icon-on">
+					<uni-icons style="text-align: left;" :color="disabled?'#ccc':activeColor" :size="size"
+						type="star-filled" />
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef APP-NVUE -->
+				<view :style="{ width: star.activeWitch}" class="uni-rate__icon-on">
+					<uni-icons :color="disabled?disabledColor:activeColor" :size="size" type="star-filled" />
+				</view>
+				<!-- #endif -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Rate 评分
+	 * @description 评分组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=33
+	 * @property {Boolean} 	isFill = [true|false] 		星星的类型，是否为实心类型, 默认为实心
+	 * @property {String} 	color 						未选中状态的星星颜色，默认为 "#ececec"
+	 * @property {String} 	activeColor 				选中状态的星星颜色，默认为 "#ffca3e"
+	 * @property {String} 	disabledColor 				禁用状态的星星颜色，默认为 "#c0c0c0"
+	 * @property {Number} 	size 						星星的大小
+	 * @property {Number} 	value/v-model 				当前评分
+	 * @property {Number} 	max 						最大评分评分数量，目前一分一颗星
+	 * @property {Number} 	margin 						星星的间距，单位 px
+	 * @property {Boolean} 	disabled = [true|false] 	是否为禁用状态，默认为 false
+	 * @property {Boolean} 	readonly = [true|false] 	是否为只读状态，默认为 false
+	 * @property {Boolean} 	allowHalf = [true|false] 	是否实现半星，默认为 false
+	 * @property {Boolean} 	touchable = [true|false] 	是否支持滑动手势，默认为 true
+	 * @event {Function} change 						uniRate 的 value 改变时触发事件，e={value:Number}
+	 */
+
+	export default {
+		name: "UniRate",
+		props: {
+			isFill: {
+				// 星星的类型，是否镂空
+				type: [Boolean, String],
+				default: true
+			},
+			color: {
+				// 星星未选中的颜色
+				type: String,
+				default: "#ececec"
+			},
+			activeColor: {
+				// 星星选中状态颜色
+				type: String,
+				default: "#FEC823"
+			},
+			disabledColor: {
+				// 星星禁用状态颜色
+				type: String,
+				default: "#c0c0c0"
+			},
+			size: {
+				// 星星的大小
+				type: [Number, String],
+				default: 20
+			},
+			value: {
+				// 当前评分
+				type: [Number, String],
+				default: 0
+			},
+			modelValue: {
+				// 当前评分
+				type: [Number, String],
+				default: 0
+			},
+			max: {
+				// 最大评分
+				type: [Number, String],
+				default: 5
+			},
+			margin: {
+				// 星星的间距
+				type: [Number, String],
+				default: 0
+			},
+			disabled: {
+				// 是否可点击
+				type: [Boolean, String],
+				default: false
+			},
+			readonly: {
+				// 是否只读
+				type: [Boolean, String],
+				default: false
+			},
+			allowHalf: {
+				// 是否显示半星
+				type: [Boolean, String],
+				default: false
+			},
+			touchable: {
+				// 是否支持滑动手势
+				type: [Boolean, String],
+				default: true
+			}
+		},
+		data() {
+			return {
+				valueSync: "",
+				userMouseFristMove: true,
+				userRated: false,
+				userLastRate: 1
+			};
+		},
+		watch: {
+			value(newVal) {
+				this.valueSync = Number(newVal);
+			},
+			modelValue(newVal) {
+				this.valueSync = Number(newVal);
+			},
+		},
+		computed: {
+			stars() {
+				const value = this.valueSync ? this.valueSync : 0;
+				const starList = [];
+				const floorValue = Math.floor(value);
+				const ceilValue = Math.ceil(value);
+				for (let i = 0; i < this.max; i++) {
+					if (floorValue > i) {
+						starList.push({
+							activeWitch: "100%"
+						});
+					} else if (ceilValue - 1 === i) {
+						starList.push({
+							activeWitch: (value - floorValue) * 100 + "%"
+						});
+					} else {
+						starList.push({
+							activeWitch: "0"
+						});
+					}
+				}
+				return starList;
+			},
+
+			marginNumber() {
+				return Number(this.margin)
+			}
+		},
+		created() {
+			this.valueSync = Number(this.value || this.modelValue);
+			this._rateBoxLeft = 0
+			this._oldValue = null
+		},
+		mounted() {
+			setTimeout(() => {
+				this._getSize()
+			}, 100)
+			// #ifdef H5
+			this.PC = this.IsPC()
+			// #endif
+		},
+		methods: {
+			touchstart(e) {
+				// #ifdef H5
+				if (this.IsPC()) return
+				// #endif
+				if (this.readonly || this.disabled) return
+				const {
+					clientX,
+					screenX
+				} = e.changedTouches[0]
+				// TODO 做一下兼容，只有 Nvue 下才有 screenX，其他平台式 clientX
+				this._getRateCount(clientX || screenX)
+			},
+			touchmove(e) {
+				// #ifdef H5
+				if (this.IsPC()) return
+				// #endif
+				if (this.readonly || this.disabled || !this.touchable) return
+				const {
+					clientX,
+					screenX
+				} = e.changedTouches[0]
+				this._getRateCount(clientX || screenX)
+			},
+
+			/**
+			 * 兼容 PC @tian
+			 */
+
+			mousedown(e) {
+				// #ifdef H5
+				if (!this.IsPC()) return
+				if (this.readonly || this.disabled) return
+				const {
+					clientX,
+				} = e
+				this.userLastRate = this.valueSync
+				this._getRateCount(clientX)
+				this.userRated = true
+				// #endif
+			},
+			mousemove(e) {
+				// #ifdef H5
+				if (!this.IsPC()) return
+				if (this.userRated) return
+				if (this.userMouseFristMove) {
+					console.log('---mousemove----', this.valueSync);
+					this.userLastRate = this.valueSync
+					this.userMouseFristMove = false
+				}
+				if (this.readonly || this.disabled || !this.touchable) return
+				const {
+					clientX,
+				} = e
+				this._getRateCount(clientX)
+				// #endif
+			},
+			mouseleave(e) {
+				// #ifdef H5
+				if (!this.IsPC()) return
+				if (this.readonly || this.disabled || !this.touchable) return
+				if (this.userRated) {
+					this.userRated = false
+					return
+				}
+				this.valueSync = this.userLastRate
+				// #endif
+			},
+			// #ifdef H5
+			IsPC() {
+				var userAgentInfo = navigator.userAgent;
+				var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+				var flag = true;
+				for (let v = 0; v < Agents.length - 1; v++) {
+					if (userAgentInfo.indexOf(Agents[v]) > 0) {
+						flag = false;
+						break;
+					}
+				}
+				return flag;
+			},
+			// #endif
+
+			/**
+			 * 获取星星个数
+			 */
+			_getRateCount(clientX) {
+				this._getSize()
+				const size = Number(this.size)
+				if (size === NaN) {
+					return new Error('size 属性只能设置为数字')
+				}
+				const rateMoveRange = clientX - this._rateBoxLeft
+				let index = parseInt(rateMoveRange / (size + this.marginNumber))
+				index = index < 0 ? 0 : index;
+				index = index > this.max ? this.max : index;
+				const range = parseInt(rateMoveRange - (size + this.marginNumber) * index);
+				let value = 0;
+				if (this._oldValue === index && !this.PC) return;
+				this._oldValue = index;
+				if (this.allowHalf) {
+					if (range > (size / 2)) {
+						value = index + 1
+					} else {
+						value = index + 0.5
+					}
+				} else {
+					value = index + 1
+				}
+
+				value = Math.max(0.5, Math.min(value, this.max))
+				this.valueSync = value
+				this._onChange()
+			},
+
+			/**
+			 * 触发动态修改
+			 */
+			_onChange() {
+
+				this.$emit("input", this.valueSync);
+				this.$emit("update:modelValue", this.valueSync);
+				this.$emit("change", {
+					value: this.valueSync
+				});
+			},
+			/**
+			 * 获取星星距离屏幕左侧距离
+			 */
+			_getSize() {
+				// #ifndef APP-NVUE
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.uni-rate')
+					.boundingClientRect()
+					.exec(ret => {
+						if (ret) {
+							this._rateBoxLeft = ret[0].left
+						}
+					})
+				// #endif
+				// #ifdef APP-NVUE
+				dom.getComponentRect(this.$refs['uni-rate'], (ret) => {
+					const size = ret.size
+					if (size) {
+						this._rateBoxLeft = size.left
+					}
+				})
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.uni-rate {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		line-height: 1;
+		font-size: 0;
+		flex-direction: row;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-rate__icon {
+		position: relative;
+		line-height: 1;
+		font-size: 0;
+	}
+
+	.uni-rate__icon-on {
+		overflow: hidden;
+		position: absolute;
+		top: 0;
+		left: 0;
+		line-height: 1;
+		text-align: left;
+	}
+
+	.uni-cursor-not-allowed {
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+</style>

config/index.js

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

pages.json

@@ -12,11 +12,11 @@
 				"text": "货源"
 			},
 			{
-					"pagePath": "pages/riders/index",
-					"iconPath": "static/images/common/huoyuan@2x(1).png",
-					"selectedIconPath": "static/images/common/huoyuan@2x.png",
-					"text": "车友"
-				},
+				"pagePath": "pages/riders/index",
+				"iconPath": "static/images/common/huoyuan@2x(1).png",
+				"selectedIconPath": "static/images/common/huoyuan@2x.png",
+				"text": "车友"
+			},
 			{
 				"pagePath": "pages/order/index",
 				"iconPath": "static/images/common/dingdan@2x(1).png",
@@ -49,8 +49,8 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
-		
-		},{
+
+		}, {
 			"path": "pages/order/index",
 			"style": {
 				"navigationStyle": "custom"
@@ -88,7 +88,7 @@
 		{
 			"path": "pages/public/register",
 			"style": {
-				 "navigationStyle": "custom"
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/goodSource/shippingDetails",
@@ -101,10 +101,20 @@
 		{
 			"path": "pages/goodSource/cargoOwnerSee",
 			"style": {
-				"navigationBarTitleText": "货主详请",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "货主详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "white",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "&#xf0141",
+							"fontSrc": "/static/iconfont.ttf",
+							"fontSize": "20"
+						}]
+					}
+				}
+
 			}
-		
 		},
 		{
 			"path": "pages/riders/myTeam",
@@ -112,21 +122,21 @@
 				"navigationBarTitleText": "我的车队",
 				"enablePullDownRefresh": false
 			}
-		
-		},{
+
+		}, {
 			"path": "pages/riders/inTeam",
 			"style": {
 				"navigationBarTitleText": "入队申请",
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
 		{
 			"path": "pages/riders/fleetSee",
 			"style": {
 				"navigationStyle": "custom"
 			}
-		
+
 		},
 		{
 			"path": "pages/riders/addFleet",
@@ -134,16 +144,15 @@
 				"navigationBarTitleText": "创建车队",
 				"enablePullDownRefresh": false
 			}
-		
-		},{
+
+		}, {
 			"path": "pages/riders/fleetInvitation",
 			"style": {
 				"navigationBarTitleText": "车队邀请",
 				"enablePullDownRefresh": false
 			}
-		
-		},
-		{
+
+		}, {
 			"path": "pages/order/orderDetails",
 			"style": {
 				"navigationStyle": "custom",
@@ -164,8 +173,8 @@
 				"navigationBarTitleText": "评价记录",
 				"enablePullDownRefresh": false
 			}
-		
-		},{
+
+		}, {
 			"path": "pages/order/confirmUnloading",
 			"style": {
 				"navigationBarTitleText": "确认卸车",
@@ -176,16 +185,16 @@
 			"path": "pages/mine/driverCertification",
 			"style": {
 				"navigationBarTitleText": "司机认证",
-				"navigationBarBackgroundColor":"#2772FB",
-				"navigationBarTextStyle":"white"
+				"navigationBarBackgroundColor": "#2772FB",
+				"navigationBarTextStyle": "white"
 			}
 
 		}, {
 			"path": "pages/mine/driverCertificationNext",
 			"style": {
 				"navigationBarTitleText": "司机认证",
-				"navigationBarBackgroundColor":"#2772FB",
-				"navigationBarTextStyle":"white"
+				"navigationBarBackgroundColor": "#2772FB",
+				"navigationBarTextStyle": "white"
 			}
 
 		},
@@ -193,36 +202,35 @@
 			"path": "pages/mine/editDriverCertification",
 			"style": {
 				"navigationBarTitleText": "司机认证",
-				"navigationBarBackgroundColor":"#2772FB",
-				"navigationBarTextStyle":"white"
+				"navigationBarBackgroundColor": "#2772FB",
+				"navigationBarTextStyle": "white"
 			}
-		
+
 		}, {
 			"path": "pages/mine/editDriverCertificationNext",
 			"style": {
 				"navigationBarTitleText": "司机认证",
-				"navigationBarBackgroundColor":"#2772FB",
-				"navigationBarTextStyle":"white"
+				"navigationBarBackgroundColor": "#2772FB",
+				"navigationBarTextStyle": "white"
 			}
-		
+
 		},
 		{
 			"path": "pages/mine/often/oftenRoute",
 			"style": {
 				"navigationBarTitleText": "常用路线",
-				"navigationBarBackgroundColor":"#2772FB",
-				"navigationBarTextStyle":"white"
+				"navigationBarBackgroundColor": "#2772FB",
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
 			"path": "pages/mine/often/addRoute",
 			"style": {
 				"navigationBarTitleText": "添加路线",
-				"navigationBarBackgroundColor":"#2772FB",
-				"navigationBarTextStyle":"white"
+				"navigationBarBackgroundColor": "#2772FB",
+				"navigationBarTextStyle": "white"
 			}
 		},
-		
 		{
 			"path": "pages/mine/helpDescription",
 			"style": {
@@ -235,7 +243,7 @@
 			"style": {
 				"navigationBarTitleText": "管理车辆",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor":"white"
+				"navigationBarBackgroundColor": "white"
 			}
 
 		}, {
@@ -257,7 +265,7 @@
 			"style": {
 				"navigationBarTitleText": "银行卡",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor":"white"
+				"navigationBarBackgroundColor": "white"
 			}
 
 		}, {
@@ -279,7 +287,7 @@
 			"style": {
 				"navigationBarTitleText": "设置",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor":"white"
+				"navigationBarBackgroundColor": "white"
 			}
 
 		},
@@ -288,9 +296,9 @@
 			"style": {
 				"navigationBarTitleText": "评价",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor":"white"
+				"navigationBarBackgroundColor": "white"
 			}
-		
+
 		},
 		{
 			"path": "pages/mine/camera/idcard/idcard",
@@ -312,60 +320,81 @@
 				"navigationStyle": "custom"
 			}
 
-		}
-	    ,{
-            "path" : "pages/mine/settings/editAvatar",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "修改头像",
-                "enablePullDownRefresh": false
-            }
-            
-        },
+		}, {
+			"path": "pages/mine/settings/editAvatar",
+			"style": {
+				"navigationBarTitleText": "修改头像",
+				"enablePullDownRefresh": false
+			}
+
+		},
 		{
-		    "path" : "pages/mine/settings/editPhone",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "修改账号",
-		        "enablePullDownRefresh": false
-		    }
-		    
+			"path": "pages/mine/settings/editPhone",
+			"style": {
+				"navigationBarTitleText": "修改账号",
+				"enablePullDownRefresh": false
+			}
+
 		},
 		{
-		    "path" : "pages/mine/settings/editPassword",
-		    "style" :                                                                                    
-		    {
-		        "navigationStyle": "custom"
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/mine/settings/feedback",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "意见反馈",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/public/loginOther",
-            "style" :                                                                                    
-            {
-              "navigationStyle": "custom"
-            }
-            
-        },
+			"path": "pages/mine/settings/editPassword",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/mine/settings/feedback",
+			"style": {
+				"navigationBarTitleText": "意见反馈",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/public/loginOther",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
+		},
 		{
-		    "path" : "pages/order/signContract",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "签订合同",
-		        "enablePullDownRefresh": false
-		    }
-		    
+			"path": "pages/order/signContract",
+			"style": {
+				"navigationBarTitleText": "签订合同",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/goodSource/jb",
+			"style": {
+				"navigationBarTitleText": "举报",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/goodSource/fk",
+			"style": {
+				"navigationBarTitleText": "反馈",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/order/addEvaluation",
+			"style": {
+				"navigationBarTitleText": "评价",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "提交",
+							"fontSize": "14",
+							"color": "#007AFF"
+						}]
+					}
+				}
+			}
+
 		}
-    ],
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

pages/goodSource/cargoOwnerSee.vue

@@ -1,92 +1,206 @@
 <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
-				:src="objectInfo.cargoOwnerPortrait?objectInfo.cargoOwnerPortrait:'../../static/images/mine/tx.png'"
-				width='180rpx' height='180rpx' shape="circle" >
-			</u--image>
-			<view class="name">{{objectInfo.cargoOwnerName}}</view>
-			<view class="title_css" v-show="objectInfo.cargoOwner">企</view>
-			<view class="feedback_css">反举</view>
+					:src="objectInfo.cargoOwnerPortrait?objectInfo.cargoOwnerPortrait:'../../static/images/mine/tx.png'"
+					width='170rpx' height='170rpx' shape="circle">
+				</u--image>
+				<view class="name">{{objectInfo.cargoOwnerName}}</view>
+				<image src="../../static/qy@2x.png" mode="widthFix" class="title_css" v-show="objectInfo.cargoOwner">
+				</image>
+				<view class="feedback_css"></view>
+			</view>
+		</view>
+		<view class="pf-row flex">
+			<view class="flex">
+				<view class="text">发运次数</view>
+				<view class="number">{{dataObj.countFa}}</view>
 			</view>
 			<view class="flex">
-				<view class="switchbtn" @click="switchsubmit(1)" :class="indexBtn == 1 ? 'switchbtn1':''">货主信息</view>
-				<view class="switchbtn" @click="switchsubmit(2)" :class="indexBtn == 2 ? 'switchbtn1':''">评价</view>
+				<view class="text">好评率</view>
+				<view class="number">{{dataObj.haoPingLv}}</view>
 			</view>
+			<view class="flex">
+				<view class="text">评论</view>
+				<view class="number">{{list.length}}</view>
+			</view>
+		</view>
+
+		<u-line></u-line>
+		<view class="flex">
+			<view class="switchbtn" @click="switchsubmit(1)" :class="indexBtn == 1 ? 'switchbtn1':''">货主信息</view>
+			<view class="switchbtn" @click="switchsubmit(2)" :class="indexBtn == 2 ? 'switchbtn1':''">评价</view>
 		</view>
 		<!-- 货主信息 -->
 		<view v-if="indexBtn == 1" class="enterprise">
 			<view>
-			 <view class="enterprise_title" v-if="objectInfo.cargoOwner">所属企业</view>
-			 <view class="enterprise_title" v-if="!objectInfo.cargoOwner">个人货主，暂未代理企业</view>
-		     <view class="enterprise_name" v-if="objectInfo.cargoOwner">{{objectInfo.cargoOwner}}</view>
-			 <view class="recordInfo">发运记录</view>
-			 <view class="enterprise_name">累计发运150次 <span>，好评率99%</span></view>
+				<view class="enterprise_title" v-if="objectInfo.cargoOwner">所属企业</view>
+				<view class="enterprise_title" v-if="!objectInfo.cargoOwner">个人货主，暂未代理企业</view>
+				<view class="enterprise_name" v-if="objectInfo.cargoOwner">{{objectInfo.cargoOwner}}</view>
 			</view>
 		</view>
 		<!-- 评价信息 -->
-		<view v-if="indexBtn == 2">
-			<view class="flex">
-				<u-button :type="btnData == 1 ? 'primary':''" @click="btnChange(1)">全部评价</u-button>
-				<u-button :type="btnData == 2 ? 'primary':''" @click="btnChange(2)">最新</u-button>
-				<u-button :type="btnData == 3 ? 'primary':''" @click="btnChange(3)">好评</u-button>
-				<u-button :type="btnData == 4 ? 'primary':''" @click="btnChange(4)">差评</u-button>
-			</view>
-			<view class="evaluate_css" v-for="(item,index) in 4">
-				<view class="flex">
-					<u--image
-					:src="objectInfo.cargoOwnerPortrait?objectInfo.cargoOwnerPortrait:'../../static/images/mine/tx.png'"
-					width='70rpx' height='70rpx' shape="circle" >
-				</u--image>
-				<view class="evaluate_name">{{objectInfo.cargoOwnerName}}</view>
-				<view class="branch_css ">{{index}}</view>
-		 		<view class="branch_css"><u-rate count="5" v-model="index" gutter="1"></u-rate></view>
-				<view class="evaluate_date">2021-05-12</view>
+			<view v-if="indexBtn == 2" class="pl-style">
+				<view class="flex flex-space-between">
+					<view :class="btnData == 1 ? 'btn-active':'btn'" @click="btnChange(1)">全部(1)</view>
+					<view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">最新(1)</view>
+					<view :class="btnData == 3 ? 'btn-active':'btn'" @click="btnChange(3)">好评(1)</view>
+					<view :class="btnData == 4 ? 'btn-active':'btn'" @click="btnChange(4)">差评(1)</view>
+				</view>
+				<view class="evaluate_css" v-for="(item,index) in list">
+					<view class="flex">
+						<view class="row1 flex">
+							<u--image
+								:src="objectInfo.cargoOwnerPortrait?objectInfo.cargoOwnerPortrait:'../../static/images/mine/tx.png'"
+								width='70rpx' height='70rpx' shape="circle">
+							</u--image>
+							<view class="right">
+								<view class="evaluate_name">{{objectInfo.driverName}}</view>
+								<view class="evaluate_date m-top10">{{objectInfo.createDate.split(' ')[0]}}</view>
+								<view class="flex m-top10">
+									<view class="branch_css ">{{item.count}}</view>
+									<view class="">
+										<start count="5" v-model="item.count" size="35" activeColor="#ffaa00" :size="18"
+											:allowHalf='true' :readonly='true'>
+										</start>
+									</view>
+								</view>
+								<view class="">
+									{{item.driverContent}}
+								</view>
+								<view>
+									<u--image
+										:src="objectInfo.cargoOwnerPortrait?objectInfo.cargoOwnerPortrait:'../../static/images/mine/tx.png'"
+										width='70rpx' height='70rpx'>
+									</u--image>
+								</view>
+							</view>
+						</view>
+					</view>
 				</view>
 			</view>
-				
-		</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>
 
 <script>
-	export default{
-		data(){
-			return{
-				id:"",
-				objectInfo:{},
-				indexBtn:1,
-				btnData:1
+	var that
+		import start from '../../common/components/uni-rate.vue'
+		import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		mixins: [MescrollMixin], // 使用mixin
+		components: {
+			start
+		},
+		data() {
+			return {
+				list:[],
+				dataObj:{},
+				show: false,
+				columns: [
+					['反馈', '举报']
+				],
+				id: "",
+				objectInfo: {},
+				indexBtn: 1,
+				btnData: 1
 			}
 		},
-		onShow(){
-			
+		computed: {
+			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
+		},
+		onShow() {
+
 		},
 		onLoad(options) {
-			this.objectInfo = JSON.parse(options.obj)
+			debugger
+			that = this
+			this.objectInfo = options
+			console.log(options)
+		},
+		onNavigationBarButtonTap(e) {
+			console.log("success")
+			this.show = true
 		},
-		methods:{
-			getList(){
-				// this.$request.baseRequest('get', '/publishTaskInfo/api/addOrder', _obj).then(res => {
-				// 		if (res.code == 200) {
-				// 			this.
-				// 		} else {
-				// 			this.$refs.uToast.show({
-				// 				type: 'error',
-				// 				message: res.message,
-				// 			})
-				// 		}
-				// 	})
-				// 	.catch(res => {
-				// 		uni.$u.toast(res.message);
-				// 	});
+		methods: {
+			selectTypeClose() {
+				this.show = false
 			},
-			switchsubmit(num){
+			upCallback(page) {
+				
+				this.getList()
+				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
+						ownerId: this.objectInfo.commonId,
+						flag: 1,
+						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].driverUrl){
+								that.list[i].imgList = that.list[i].driverUrl.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()
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			getList() {
+				this.$request.baseRequest('get', '/orderInfo/selectHaoPing', {
+						commonId: this.userInfo.id,
+						haoType:''
+					}).then(res => {
+						if (res.code == 200) {
+								this.dataObj = res.data
+							
+						} else {
+							this.$refs.uToast.show({
+								type: 'error',
+								message: res.message,
+							})
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			switchsubmit(num) {
 				this.indexBtn = num
 				this.getList()
 			},
-			btnChange(num){
+			confirmBtn(e) {
+				debugger
+				console.log(e.value)
+				if (e.value == '反馈') {
+					uni.$u.route('/pages/goodSource/fk', {
+						val: JSON.stringify(this.objectInfo)
+					});
+				} else {
+					uni.$u.route('/pages/goodSource/jb', {
+						val: JSON.stringify(this.objectInfo)
+					});
+				}
+				this.show = false
+			},
+			btnChange(num) {
 				debugger
 				this.btnData = num
 				this.getList()
@@ -96,67 +210,136 @@
 </script>
 
 <style lang="scss">
-	.center{
+	.center {
 		padding: 40rpx;
 	}
-	.center_top{
-		.name{
-			margin: 40rpx ;
+
+	.center_top {
+		.name {
+			margin: 40rpx;
 			font-size: 48rpx;
 			font-weight: 600;
 		}
-		.title_css{
+
+		.title_css {
 			width: 50rpx;
 			height: 50rpx;
-			background-color: #F60;
 			border-radius: 10rpx;
 			text-align: center;
 			line-height: 50rpx;
 			margin-top: 44rpx;
 		}
-		.feedback_css{
+
+		.feedback_css {
 			margin-top: 44rpx;
 			margin-left: 50px;
 		}
-		.switchbtn{
-			margin-right: 40rpx;
-			margin-top: 20rpx;
-			font-size: 36rpx;
-			font-weight: 600;
-		}
-		.switchbtn1{
-			color: #2772FB;
-		}
 	}
-	.enterprise{
+
+	.switchbtn {
+		margin-right: 40rpx;
+		margin-top: 20rpx;
+		font-weight: 600;
+	}
+
+	.switchbtn1 {
+		color: #2772FB;
+		position: relative;
+	}
+
+	.switchbtn1:before {
+		width: 20px;
+		height: 3px;
+		content: '';
+		position: absolute;
+		bottom: -7px;
+		background: #2772FB;
+		left: 0;
+		right: 0;
+		margin: 0 auto;
+	}
+
+	.enterprise {
 		margin-top: 30rpx;
-		.enterprise_title{
-			font-size: 18px;
+
+		.enterprise_title {
+			font-weight: 700;
+			margin-top: 80rpx;
 		}
-		.enterprise_name{
-			font-size: 18px;
+
+		.enterprise_name {
 			margin-top: 10rpx;
 		}
-		.recordInfo{
-			font-size: 40rpx;
+
+		.recordInfo {
 			margin-top: 20rpx;
 			font-weight: 600;
 		}
 	}
-	.evaluate_css{
+
+	.evaluate_css {
 		margin-top: 30rpx;
 		display: flex;
 		width: 100%;
-		.evaluate_name{
-			margin: 10rpx 10rpx 0 30rpx;
-		}
-		.branch_css{
-			margin: 10rpx 0 0 20rpx;
+		padding-bottom: 40rpx;
+		border-bottom: 1px solid #E6E6E6;
+
+		.evaluate_name {}
+
+		.branch_css {
 			// margin: 0;
+			margin-right: 20rpx;
+		}
+
+		.evaluate_date {}
+
+		.row1 {
+			.right {
+				display: flex;
+				flex-direction: column;
+				margin-left: 40rpx;
+			}
+		}
+	}
+
+	.pf-row {
+		margin: 20rpx 0;
+
+		.text {
+			color: #999;
+			margin-right: 20rpx;
 		}
-		.evaluate_date{
-			display: flex;
-			justify-content: flex-end;
+
+		.number {
+			color: #2772FB;
+		}
+
+		.flex {
+			margin-right: 20rpx;
 		}
 	}
+
+	.pl-style {
+		margin-top: 80rpx;
+	}
+
+	.btn-active {
+		background-color: #2772FB;
+		color: white;
+		border-radius: 50rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 10rpx 20rpx;
+	}
+
+	.btn {
+		background: #F8F9FB;
+		color: #363636;
+		border-radius: 50rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 10rpx 20rpx;
+	}
 </style>

pages/goodSource/fk.vue

@@ -0,0 +1,142 @@
+<template>
+	<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>{{dataDetails.cargoOwnerName}}</view>
+			</view>
+		</view>
+		<u-line class="line"></u-line>
+		<view class="row2">
+			<view class="title">反馈信息</view>
+			<u--textarea v-model="value1" placeholder="输入要反馈的内容,10-300字" count maxlength='300'></u--textarea>
+			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
+				name="1" multiple :maxCount="9"></u-upload>
+		</view>
+		<view class="row3" @click="submit">提交</view>
+		<u-toast ref="uToast"></u-toast>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	import uploadImage from '@/components/ossutil/uploadFile.js';
+	export default {
+		data() {
+			return {
+				imgList: [],
+				value1: '',
+				fileList1: [],
+				dataDetails: {},
+			};
+		},
+		onLoad(options) {
+			debugger
+			this.dataDetails = JSON.parse(options.val)
+			console.log(this.dataDetails)
+			this.imgList = []
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
+		},
+		methods: {
+			submit() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$request.baseRequest('post', '/feedbackReport/api/addInfo', {
+						commonId: this.userInfo.id,
+						name: this.dataDetails.cargoOwnerName,
+						content: this.value1,
+						url: this.imgList.toString(),
+						flag: 1,
+					}).then(res => {
+						let that = this
+						uni.hideLoading()
+						this.$refs.uToast.show({
+							type: 'success',
+							message: "反馈成功",
+							complete() {
+								uni.$u.route('/pages/order/driverDetail', {
+									driver: JSON.stringify(that.dataDetails)
+								});
+
+							}
+						})
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 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].url)
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+				}
+			},
+			uploadFilePromise(url) {
+				uploadImage('image', url, 'appData/',
+					result => {
+						// 上传成功回调函数
+						console.log('图片地址', result)
+						this.imgList.push(result)
+
+					}
+				)
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		background: white;
+	}
+
+	.img {
+		width: 40rpx;
+	}
+
+	.row1,
+	.row2 {
+		padding: 40rpx;
+	}
+
+	.title {
+		margin-bottom: 20rpx;
+	}
+
+	.row3 {
+		width: 80%;
+		background: #2772FB;
+		text-align: center;
+		color: white;
+		padding: 20rpx;
+		margin: auto;
+		border-radius: 10rpx;
+	}
+</style>

pages/goodSource/index.vue

@@ -269,12 +269,10 @@
 
 		},
 		methods: {
-			cargoOwner(_obj){
+			cargoOwner(_obj){debugger
 				// uni.$u.route('/pages/order/evaluateList');
 				console.log("查看---------------",_obj)
-				uni.$u.route('/pages/goodSource/cargoOwnerSee',{
-				obj:JSON.stringify(_obj) 
-				})
+				uni.$u.route('/pages/goodSource/cargoOwnerSee',_obj)
 			},
 			mescrollInit(mescroll) {
 				this.mescroll = mescroll;

pages/goodSource/jb.vue

@@ -0,0 +1,142 @@
+<template>
+	<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>{{dataDetails.cargoOwnerName}}</view>
+			</view>
+		</view>
+		<u-line class="line"></u-line>
+		<view class="row2">
+			<view class="title">举报信息</view>
+			<u--textarea v-model="value1" placeholder="输入要举报的内容,10-300字" count maxlength='300'></u--textarea>
+			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
+				name="1" multiple :maxCount="9"></u-upload>
+		</view>
+		<view class="row3" @click="submit">提交</view>
+		<u-toast ref="uToast"></u-toast>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	import uploadImage from '@/components/ossutil/uploadFile.js';
+	export default {
+		data() {
+			return {
+				imgList: [],
+				value1: '',
+				fileList1: [],
+				dataDetails: {},
+			};
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
+		},
+		onLoad(options) {
+			debugger
+			this.dataDetails = JSON.parse(options.val)
+			console.log(this.dataDetails)
+			this.imgList = []
+		},
+		methods: {
+			submit() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$request.baseRequest('post', '/feedbackReport/api/addInfo', {
+						commonId: this.userInfo.id,
+						name: this.dataDetails.cargoOwnerName,
+						content: this.value1,
+						url: this.imgList.toString(),
+						flag: 2,
+					}).then(res => {
+						let that = this
+						uni.hideLoading()
+						this.$refs.uToast.show({
+							type: 'success',
+							message: "举报成功",
+							complete() {
+								uni.$u.route('/pages/order/driverDetail', {
+									driver: JSON.stringify(that.dataDetails)
+								});
+
+							}
+						})
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 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].url)
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+				}
+			},
+			uploadFilePromise(url) {
+				uploadImage('image', url, 'appData/',
+					result => {
+						// 上传成功回调函数
+						console.log('图片地址', result)
+						this.imgList.push(result)
+
+					}
+				)
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		background: white;
+	}
+
+	.img {
+		width: 40rpx;
+	}
+
+	.row1,
+	.row2 {
+		padding: 40rpx;
+	}
+
+	.title {
+		margin-bottom: 20rpx;
+	}
+
+	.row3 {
+		width: 80%;
+		background: #2772FB;
+		text-align: center;
+		color: white;
+		padding: 20rpx;
+		margin: auto;
+		border-radius: 10rpx;
+	}
+</style>

pages/mine/settings/editAvatar.vue

@@ -10,10 +10,12 @@
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
 <script>
+	var that;
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	import {
 		mapState
@@ -49,7 +51,7 @@
 						sourceType: that.$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)
@@ -138,7 +140,7 @@
 										name,
 										value
 									});
-									this.$refs.uToast.show({
+									that.$refs.uToast.show({
 										type: 'success',
 										message: "修改成功！",
 									})

pages/order/addEvaluation.vue

@@ -0,0 +1,288 @@
+<template>
+	<view class="page_pingjia4">
+		<view class="kuang">
+			<view class="order-row flex flex-space-between">
+				<view class="flex">
+					<view>{{objData.orderNo}}</view>
+					<view>{{objData.goodsName}}</view>
+				</view>
+				<view class="flex align-center">
+					<image src="../../static/ITkoala-amap/start.png" mode="widthFix" class="tx-img"></image>
+					<view>{{objData.cargoOwner}}</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">
+						</start>
+					</view>
+
+					<view class="">
+						{{item.level}}
+					</view>
+				</view>
+			</view>
+			<view>
+				<u--textarea style="margin-top: 20px;" background-color="#6d6d6d" v-model="value3"
+					placeholder="这趟活跑的怎么样~">
+				</u--textarea>
+			</view>
+			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
+				name="1" multiple :maxCount="9" style="margin-bottom: 80rpx;"></u-upload>
+			<u-line></u-line>
+			<view class="niming">
+				<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+					<u-checkbox :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1" :key="index"
+						:label="item.name" :name="item.name">
+					</u-checkbox>
+				</u-checkbox-group>
+			</view>
+		</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>
+</template>
+
+<script>
+	var that
+	import {
+		mapState
+	} from 'vuex';
+	import start from '../../common/components/uni-rate.vue'
+	import uploadImage from '@/components/ossutil/uploadFile.js';
+	export default {
+		components: {
+			start
+		},
+		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
+				}],
+			}
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
+		},
+		onNavigationBarButtonTap() {
+			debugger
+			let _data = {
+				ownerId: this.objData.cargoCommonId,
+				driverName: this.checkboxValue1 ? this.objData.driverName : '',
+				driverPortrait: this.checkboxValue1 ? this.userInfo.avatarUrl : '',
+				orderId: this.objData.id,
+				orderNumber: this.objData.orderNo,
+				ownerCredit: this.rate[0].value1,
+				freightPayment: this.rate[1].value1,
+				comprehensiveSatisfaction: this.rate[2].value1,
+				driverContent: this.value3,
+				driverUrl: this.imageList.toString(),
+				driverAnonymous: 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: "评价失败",
+					})
+				}
+			})
+		},
+		onLoad(options) {
+		that = this
+			this.objData = JSON.parse(options.val)
+			console.log(this.objData)
+		},
+		methods: {
+			clickStar(index) {
+				console.log(index)
+				this.selectStar = index
+				if (index == 0 || index == 1) {
+					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: '上传中'
+					})
+				})
+				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;
+		padding: 20rpx;
+
+		.anniu {
+			margin-top: 48px;
+			margin-left: 20px;
+		}
+
+		.niming {
+			margin-top: 20px;
+		}
+
+		.ziti {
+			color: #909090;
+			margin-right: 20rpx;
+			width: 160rpx;
+		}
+
+		.xkuang {
+			margin-top: 20px;
+		}
+
+		.xx {
+			margin-left: 24%;
+			padding-top: 10px;
+		}
+
+		.biaoti {
+			width: 80%;
+			margin: 0 auto;
+			text-align: center;
+			margin-top: 20px;
+		}
+
+		.kuang {
+			background-color: #ffffff;
+		}
+	}
+
+	.tx-img {
+		width: 40rpx;
+	}
+</style>

pages/order/evaluateList.vue

@@ -1,8 +1,211 @@
 <template>
+	<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 class="flex align-center name-row">
+				<view class="sj-row hz-name">
+					{{item.orderInfo.cargoOwner}}:
+				</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">
+					<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 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>
+	</mescroll-body>
+	</view>
 </template>
 
 <script>
+	var that
+	import {
+		mapState
+	} from 'vuex';
+	import start from '../../common/components/uni-rate.vue'
+		import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default {
+			mixins: [MescrollMixin], // 使用mixin
+		components: {
+			start
+		},
+		data() {
+			return {
+				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',
+					}
+				],
+			};
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
+		},
+		onLoad() {
+			that = this
+		},
+		methods: {
+			upCallback(page) {
+				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
+						driverId: this.userInfo.id,
+						flag: 1,
+						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++) {
+							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
+			},
+		},
+
+	}
 </script>
 
-<style>
+<style lang="scss">
+	.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;
+
+	}
+
+	.hz-name {
+		color: #999;
+		margin-right: 10rpx;
+	}
+
+	.gray999 {
+		color: #999;
+	}
+
+	.name-row {
+		margin: 20rpx 0;
+	}
+
+	.item {
+		margin-right: 20rpx;
+		font-size: 26rpx;
+	}
+
+	.xy-row {
+		margin-bottom: 40rpx;
+	}
+
+	.pl-style {
+		margin-bottom: 40rpx;
+	}
+
+	.color2979ff {
+		color: #2979ff;
+	}
+	.img-content{
+		margin-top: 20rpx;
+		.img{
+			display: inline-block;
+			margin-right: 10rpx;
+			border-radius: 20rpx;
+		}
+		
+	}
+	.line{
+		margin: 20rpx 0!important;
+	}
 </style>

pages/order/index.vue

@@ -36,7 +36,15 @@
 	
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
 				class="mescroll">
-				<view class="evaluatePage" v-show="tabIndex == 6"><span @click="evaluateClick">我的评价记录</span> </view>
+				<view class="evaluatePage flex flex-space-between" v-show="tabIndex == 6"  @click="evaluateClick">
+					<view class="left flex flex-space-between" @click="evaluateClick">
+						<u-icon size="20" name="edit-pen"></u-icon>
+						<view style="margin-left: 20prx;">我的评价</view> 
+					</view>
+					<view class="right">
+							<u-icon size="20" name="arrow-right"></u-icon>
+					</view>
+					</view>
 				<view :id="'good'+good.id" class="good-list" v-for="good in goods" :key="good.id"
 					@click="toDetail(good.id)">
 					<view style="padding: 0 35rpx 20rpx 35rpx;">
@@ -124,6 +132,7 @@
 							-->
 							<view class="start normal" @click.stop="closed(good)" v-if="good.orderStatus=='结算中'">完结
 							</view>
+							<view class="start normal" @click.stop="addevaluation(good)">评价</view>
 						</view>
 					</view>
 				</view>
@@ -337,7 +346,9 @@
 
 		},
 		methods: {
-			
+			addevaluation(good){
+					uni.$u.route('/pages/order/addEvaluation',{val:JSON.stringify(good)});
+			},
 			evaluateClick(){
 				//我的评价记录
 				uni.$u.route('/pages/order/evaluateList');
@@ -866,8 +877,9 @@
 		color: white;
 	}
 	.evaluatePage{
-		margin-top: 20rpx;
-		text-align: right;
-		margin-right: 40rpx;
+		background: white;
+		margin: 20rpx;
+		padding: 20rpx;
+		border-radius: 20rpx;
 	}
 </style>

pages/riders/fleetSee.vue

@@ -68,7 +68,7 @@
 				
 			},
 			poinIn(e){
-				console.log(e)
+				
 			},
 			okSubjecthander() {
 

uni_modules/uni-icons/changelog.md

@@ -1,9 +1,3 @@
-## 1.3.5（2022-01-24）
-- 优化 size 属性可以传入不带单位的字符串数值
-## 1.3.4（2022-01-24）
-- 优化 size 支持其他单位
-## 1.3.3（2022-01-17）
-- 修复 nvue 有些图标不显示的bug，兼容老版本图标
 ## 1.3.2（2021-12-01）
 - 优化 示例可复制图标名称
 ## 1.3.1（2021-11-23）

uni_modules/uni-icons/components/uni-icons/icons.js

@@ -173,13 +173,6 @@ export default {
       "unicode": "e6bb",
       "unicode_decimal": 59067
     },
-		{
-		  "icon_id": "24923353",
-		  "name": "arrowthinright",
-		  "font_class": "arrowthinright",
-		  "unicode": "e6bb",
-		  "unicode_decimal": 59067
-		},
     {
       "icon_id": "24923354",
       "name": "arrowthinleft",
@@ -187,13 +180,6 @@ export default {
       "unicode": "e6bc",
       "unicode_decimal": 59068
     },
-		{
-		  "icon_id": "24923354",
-		  "name": "arrowthinleft",
-		  "font_class": "arrowthinleft",
-		  "unicode": "e6bc",
-		  "unicode_decimal": 59068
-		},
     {
       "icon_id": "24923355",
       "name": "arrowthinup",
@@ -201,25 +187,12 @@ export default {
       "unicode": "e6bd",
       "unicode_decimal": 59069
     },
-		{
-		  "icon_id": "24923355",
-		  "name": "arrowthinup",
-		  "font_class": "arrowthinup",
-		  "unicode": "e6bd",
-		  "unicode_decimal": 59069
-		},
     {
       "icon_id": "24923356",
       "name": "arrowthindown",
       "font_class": "arrow-down",
       "unicode": "e6be",
       "unicode_decimal": 59070
-    },{
-      "icon_id": "24923356",
-      "name": "arrowthindown",
-      "font_class": "arrowthindown",
-      "unicode": "e6be",
-      "unicode_decimal": 59070
     },
     {
       "icon_id": "24923349",
@@ -227,12 +200,6 @@ export default {
       "font_class": "bottom",
       "unicode": "e6b8",
       "unicode_decimal": 59064
-    },{
-      "icon_id": "24923349",
-      "name": "arrowdown",
-      "font_class": "arrowdown",
-      "unicode": "e6b8",
-      "unicode_decimal": 59064
     },
     {
       "icon_id": "24923346",
@@ -241,13 +208,6 @@ export default {
       "unicode": "e6b5",
       "unicode_decimal": 59061
     },
-		{
-		  "icon_id": "24923346",
-		  "name": "arrowright",
-		  "font_class": "arrowright",
-		  "unicode": "e6b5",
-		  "unicode_decimal": 59061
-		},
     {
       "icon_id": "24923347",
       "name": "arrowup",
@@ -255,13 +215,6 @@ export default {
       "unicode": "e6b6",
       "unicode_decimal": 59062
     },
-		{
-		  "icon_id": "24923347",
-		  "name": "arrowup",
-		  "font_class": "arrowup",
-		  "unicode": "e6b6",
-		  "unicode_decimal": 59062
-		},
     {
       "icon_id": "24923348",
       "name": "arrowleft",
@@ -269,13 +222,6 @@ export default {
       "unicode": "e6b7",
       "unicode_decimal": 59063
     },
-		{
-		  "icon_id": "24923348",
-		  "name": "arrowleft",
-		  "font_class": "arrowleft",
-		  "unicode": "e6b7",
-		  "unicode_decimal": 59063
-		},
     {
       "icon_id": "24923334",
       "name": "eye",

uni_modules/uni-icons/components/uni-icons/uni-icons.vue

@@ -1,18 +1,14 @@
 <template>
 	<!-- #ifdef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" @click="_onClick">{{unicode}}</text>
 	<!-- #endif -->
 	<!-- #ifndef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
 	<!-- #endif -->
 </template>
 
 <script>
 	import icons from './icons.js';
-	const getVal = (val) => {
-		const reg = /^[0-9]*$/g
-		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
-	} 
 	// #ifdef APP-NVUE
 	var domModule = weex.requireModule('dom');
 	import iconUrl from './uniicons.ttf'
@@ -65,9 +61,6 @@
 					return unescape(`%u${code.unicode}`)
 				}
 				return ''
-			},
-			iconSize(){
-				return getVal(this.size)
 			}
 		},
 		methods: {

uni_modules/uni-icons/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "1.3.5",
+  "version": "1.3.2",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",

uni_modules/uni-rate/changelog.md

@@ -0,0 +1,23 @@
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-rate](https://uniapp.dcloud.io/component/uniui/uni-rate)
+## 1.2.2（2021-09-10）
+- 优化 默认值修改为 0 颗星
+## 1.2.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.2（2021-05-12）
+- 新增 组件示例地址
+## 1.1.1（2021-04-21）
+- 修复 布局变化后 uni-rate  星星计算不准确的 bug
+- 优化 添加依赖 uni-icons, 导入 uni-rate 自动下载依赖
+## 1.1.0（2021-04-16）
+- 修复 uni-rate 属性 margin 值为 string 组件失效的 bug
+
+## 1.0.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.8（2021-02-05）
+- 调整为uni_modules目录规范
+- 支持 pc 端

uni_modules/uni-rate/package.json

@@ -0,0 +1,88 @@
+{
+  "id": "uni-rate",
+  "displayName": "uni-rate 评分",
+  "version": "1.3.0",
+  "description": "Rate 评分组件，可自定义评分星星图标的大小、间隔、评分数。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "评分"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-rate/readme.md

@@ -0,0 +1,12 @@
+
+
+## Rate 评分
+> **组件名：uni-rate**
+> 代码块： `uRate`
+> 关联组件：`uni-icons`
+
+
+评分组件，多用于购买商品后，对商品进行评价等场景
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-rate)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839