Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-huozhuapp

pages.json

@@ -79,6 +79,12 @@
 				"navigationBarTitleText": "反馈处理结果",
 				"enablePullDownRefresh": false
 			}
+		},{
+			"path": "pages/news/newsSee",
+			"style": {
+				"navigationBarTitleText": "系统消息",
+				"enablePullDownRefresh": false
+			}
 		},
 
 		// {

pages/carSource/index.vue

@@ -433,6 +433,9 @@
 			getList() {
 				this.status = 'loading';
 				if (this.indexbtn == 1) {
+					if(this.unloadInfo.unloadProvince =="全国"){
+						this.unloadInfo.unloadProvince= ""
+					}
 					this.$request.baseRequest('get', '/commonRoute/driverList', {
 							pageSize: 10,
 							currentPage: 1,

pages/mine/settings/editAvatar.vue

@@ -126,8 +126,8 @@
 			color: #6A7282;
 		}
 		.xj-image {
-			width: 100rpx;
-			height: 100rpx;
+			width: 100%;
+			height: 100%;
 		}
 		.submit{
 			margin-top: 20rpx;

pages/news/index.vue

@@ -172,6 +172,7 @@
 					});
 			},
 			read(val) {
+				uni.$u.route("/pages/news/newsSee?_obj="+JSON.stringify(val))
 				if(val.newsType == "投诉结果" || val.newsType == "举报结果"){
 					uni.$u.route("/pages/news/feedbackResults?id=" + val.bussId + "&type=" + val.newsType)
 				}

pages/news/newsSee.vue

@@ -0,0 +1,43 @@
+<template>
+	<view class="center">
+		<view class="news_info">
+			<view class="">{{dataInfo.newsTitle}}</view>
+			<view class="">{{dataInfo.newsContent}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				dataInfo:{},
+				
+			}
+		},
+		onLoad(options) {
+			this.dataInfo = JSON.parse(options._obj)
+				uni.setNavigationBarTitle({
+				title: this.dataInfo.newsType
+			})
+			
+		},
+		
+		methods:{
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.center{
+		padding:30rpx;
+		height: calc(100vh - 11.2vh);
+		background: #F5F6FA ;
+		.news_info{
+			background: #FFFFFF;
+			padding: 20rpx 30rpx;
+			border-radius: 20rpx;
+		}
+	}
+</style>

pages/order/index.vue

@@ -128,7 +128,7 @@
 						<!-- <image class="jt-icon" src="@/static/images/order/position.png" mode='widthFix'
 							@click.stop="toMap(good)">
 						</image> -->
-						<view v-if="good.cargoOwnerStatus=='运输中'" class="start normal look-map" @click.stop="toMap(good)">
+						<view v-if="good.cargoOwnerStatus=='运输中'||good.cargoOwnerStatus=='已完结'" class="start normal look-map" @click.stop="toMap(good)">
 							查看轨迹</view>
 						<view class="stop" @click.stop="accept(good,1)" v-if="good.cargoOwnerStatus=='待接单'">接受
 						</view>

pages/order/orderDetails.vue

@@ -38,7 +38,7 @@
 				<u-button class="btn" text="确认装车" @click="confirmLoading(3)" v-if="dataObj.cargoOwnerStatus=='待确认装车'">
 				</u-button>
 
-				<u-button class="btn" text="驳回卸车信息" @click="confirmUnLoading" v-if="dataObj.cargoOwnerStatus=='待收货'">
+				<u-button class="btn" text="驳回卸车信息" @click="confirmUnLoading(6)" v-if="dataObj.cargoOwnerStatus=='待收货'">
 				</u-button>
 				<u-button class="btn" text="确认卸车" @click="confirmUnLoading(4)" v-if="dataObj.cargoOwnerStatus=='待收货'">
 				</u-button>
@@ -474,9 +474,16 @@
 			},
 			confirmUnLoading(type) {
 				this.type=type
-				this.alertTitle = '确认卸车？'
-				this.confirmText = '确定'
-				this.isShowAlert = true
+				if(type == 4){
+					this.alertTitle = '确认卸车？'
+					this.confirmText = '确定'
+					this.isShowAlert = true
+				}else if(type == 6){
+					this.alertTitle = '确定驳回卸车信息？'
+					this.confirmText = '确定'
+					this.isShowAlert = true
+				}
+				
 				// let item = this.dataObj
 				// uni.$u.route('/pages/order/confirmUnloading', item);
 			},
@@ -546,8 +553,53 @@
 						.catch(res => {
 							uni.$u.toast(res.message);
 						});
-				}else if(this.type==""){
+				}else if(this.type==5){
+					this.$request.baseRequest('post', '/carrierInfo/cargoOwnerLoadingAdd', {
+							id: this.dataObj.id,
+							loadingFlag: 1,
+							flag: 2
+						}).then(res => {
+							if (res.code == 200) {
+								this.$refs.uToast.show({
+									type: 'success',
+									message: "驳回装车成功！",
+									complete() {
+										that.getList()
+										// that.upCallback({
+										// 	size: 10,
+										// 	num: 1
+										// })
+									}
+								})
+							}
+						})
+						.catch(res => {
+							uni.$u.toast(res.message);
+						});
+				}else if(this.type == 6){
+					this.$request.baseRequest('post', '/carrierInfo/cargoOwnerLoadingAdd', {
+							id: this.dataObj.id,
+							loadingFlag: 2,
+							flag: 2
+						}).then(res => {
+							if (res.code == 200) {
+								this.$refs.uToast.show({
+									type: 'success',
+									message: "驳回卸车信息成功",
+									complete() {
+										that.getList()
+										// that.upCallback({
+										// 	size: 10,
+										// 	num: 1
+										// })
+									}
+								})
 					
+							}
+						})
+						.catch(res => {
+							uni.$u.toast(res.message);
+						});
 				} else {
 					if (this.radiovalue1 == '其他' && !this.value2) {
 						this.$refs.uToast.show({

pages/release/record.vue

@@ -49,8 +49,9 @@
 									<!-- <image class="hz-good" src="@/static/images/order/good-img.png"></image> -->
 									<view>{{good.goodsName}}</view>
 								</view>
+								<view class="sline" v-if="good.carLengthSmall&&good.carLength"></view>
 								<view class="cc" v-if="good.carLengthSmall&&good.carLength">{{good.carLengthSmall}} - {{good.carLength}} 米</view>
-								<view class="sline"></view>
+								<view class="sline" v-if="carType(good)"></view>
 								<view>{{carType(good)}}</view>
 							</view>
 							<view class="flex align-center">
@@ -175,7 +176,7 @@
 			carType(good) {
 				let _val = '';
 				if (good.carModel == 1) {
-					_val = '不限'
+					_val = ''
 				} else {
 					if (good.carModel&&good.carModel.includes(2)) {
 						_val += '高栏/'
@@ -484,7 +485,7 @@
 			}
 
 			.cc {
-				margin-left: 20rpx;
+				margin-left: 10rpx;
 			}
 
 			.yj {