更新

common/helper.js

@@ -96,6 +96,7 @@ const setAudit = (item) => {
 }
 const contactCustomerService = (phone) => {
 	console.log(phone)
+	//客服
 	if (!phone) {
 		phone = '400123123'
 	}
@@ -122,6 +123,7 @@ const contactCustomerService = (phone) => {
 				  phoneNumber: phone,
 				success: (res) => {
 					console.log('调用成功!')
+					
 				},
 			  
 				// 失败回调

pages/mine/evaluate.vue

@@ -15,7 +15,7 @@
 				</view>
 				<view class="flex align-center name-row">
 					<view class="sj-row hz-name">
-						{{item.ownerAnonymous=='1'?'匿名评价':item.orderInfo.driverName}}:
+						{{item.ownerAnonymous=='1'?'匿名评价':item.ownerName}}:
 					</view>
 					<view class="xx">
 						<start :count="count" v-model="item.count" size="35" activeColor="#ffaa00" :size="18"
@@ -25,19 +25,13 @@
 				</view>
 				<view class="gray999 xy-row">
 					<view class='item'>
-						司机信用：{{item.driverCredit}}星
+						货主信用：{{item.ownerCredit}}星
 					</view>
 					<view class='item'>
-						运费效率：{{item.tranEfficiency}}星
+						运费支付：{{item.freightPayment}}星
 					</view>
 					<view class='item'>
-						运输安全：{{item.tranSafety}}星
-					</view>
-					<view class='item'>
-						服务质量：{{item.serviceQuality}}星
-					</view>
-					<view class='item'>
-						满意度：{{item.satisfaction}}星
+						综合满意度：{{item.comprehensiveSatisfaction}}星
 					</view>
 				</view>
 				<!-- 
@@ -127,14 +121,17 @@
 			upCallback(page) {
 				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
 						evaluatoredId: this.userInfo.id,
-						flag: 2,
+						flag: 1,
 						pageSize: page.size,
-						currentPage: page.num
+						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(',')
+							if( that.list[i].ownerUrl){
+								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

pages/mine/manageVehicles/addVehicle.vue

@@ -487,11 +487,13 @@
 						_this.dataDetails.trailerLicenseBackPage = ""//挂车行驶证副页
 						break;
 				}
+				
 				_this.$forceUpdate()
 			},
 			uploadImg(type) {
 				this.uploadType = type
-				this.isShowimgType = true
+				this.imgTypeSelect()
+				// this.isShowimgType = true
 			},
 			selectValidityPeriod(type) {
 				this.ValidityPeriodType = type
@@ -499,10 +501,9 @@
 			},
 			// 上传图片
 			imgTypeSelect(val) {
-				if (val.name == '相册') {
+				// if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
-						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							uploadImage("images", res.tempFilePaths[0], 'appData/',
 								result => {
@@ -718,9 +719,7 @@
 						}
 					});
 
-				} else {
-
-				}
+				// }
 			},
 			confirmValidityPeriod(e) {
 				console.log('confirm', e)

pages/mine/manageVehicles/editVehicle.vue

@@ -497,7 +497,8 @@
 			},
 			uploadImg(type) {
 				this.uploadType = type
-				this.isShowimgType = true
+				this.imgTypeSelect()
+				// this.isShowimgType = true
 			},
 			selectValidityPeriod(type) {
 				this.ValidityPeriodType = type
@@ -505,12 +506,9 @@
 			},
 			// 上传图片
 			imgTypeSelect(val) {
-				console.log(val)
-				console.log(this.uploadType)
-				if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
-						sourceType: this.$helper.chooseImage.sourceType,
+						// sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
 							uploadImage("images", res.tempFilePaths[0], 'appData/',
@@ -734,10 +732,6 @@
 							)
 						}
 					});
-
-				} else {
-
-				}
 			},
 			confirmValidityPeriod(e) {
 				console.log('confirm', e)

pages/order/confirmLoading.vue

@@ -140,6 +140,7 @@
 			// #endif
 			console.log(options)
 			this.id = JSON.parse(decodeURIComponent(options.obj)).id
+			this.detailData.hyCarrierInfo.id = JSON.parse(decodeURIComponent(options.obj)).carrierId
 			this.cyId = JSON.parse(decodeURIComponent(options.obj)).carrierId
 			this.getInfo()
 			// this.detailData = JSON.parse(options.obj) ;
@@ -398,7 +399,6 @@
 				}
 				this.isShowAlert = true
 				this.detailData.statusFlag = type
-				console.log(15456)
 				// this.$refs.uToast.show({
 				// 	...params,
 				// 	complete() {
@@ -483,8 +483,9 @@
 					this.detailData.hyCarrierInfo.loadingDate = this.detailData.hyCarrierInfo.loadingDate.split(" ")[0] + " " + h + ":" + f + ":" + m
 				}
 				this.detailData.hyCarrierInfo.statusFlag = this.detailData.statusFlag
-				this.detailData.hyCarrierInfo.id = this.cyId
+				// this.detailData.hyCarrierInfo.id = this.cyId
 				this.detailData.hyCarrierInfo.loadingImg = this.imgList.toString()
+				console.log("查看id--------",this.detailData.hyCarrierInfo.id)
 				this.$request.baseRequest('post', '/carrierInfo/loadingAdd', this.detailData.hyCarrierInfo).then(res => {
 						if (res.code == 200) {
 							uni.hideLoading()

pages/order/confirmUnloading.vue

@@ -313,10 +313,18 @@
 				} else {
 					this.alertContent = '确定提交卸车信息？'
 				}
+				if(!this.detailData.totalFreight){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请输入合计运费！",
+					})
+					return
+				}
 				this.isShowAlert = true
 				this.detailData.statusFlag = type
 			},
 			confirmClick() {
+				
 				if (this.detailData.statusFlag == 1) {
 					delete this.detailData.carrierInfo.unloadingAreaLongitude;
 					delete this.detailData.carrierInfo.unloadingAreaLatitude;