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

App.vue

@@ -43,7 +43,8 @@
 				appSecurity: "", //网络货运企业在省平台申请的接入安全码
 				enterpriseSenderCode: "", //网络货运企业在省平台申请的企业发送代码
 				environment: "", //环境:“debug”接入测试环境,“release”接入正式环境。
-				version: "" // 版本号
+				version: "" ,// 版本号
+				id:""
 			}
 		},
 		methods: {
@@ -335,6 +336,7 @@
 							res => {
 								// console.log('====确认装车开启连续定位====');
 								// console.log(res)
+								that.id = res1.data[0].id
 								let _data = {
 									orderId: res1.data[0].id,
 									longitude: res.longitude,
@@ -351,7 +353,8 @@
 								if (uni.getStorageSync('mapGJ').length > 100) {
 									// console.log(JSON.stringify(uni.getStorageSync('mapGJ')))
 									this.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo', {
-											orderId: "cdae6ec34c2349768c490a9fefa03fb3",
+											orderId: that.id,
+											// orderId: "cdae6ec34c2349768c490a9fefa03fb3",
 											longitudeLatitude: JSON.stringify(uni.getStorageSync(
 												'mapGJ'))
 										}).then(res => {

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	baseUrlNew: 'https://api.changyuntong56.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	// baseUrlNew: 'https://api.changyuntong56.com',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.110.67:8999',
 	h5Appid: 'wxb66b599f7f61b46f',

pages.json

@@ -457,7 +457,8 @@
 						"buttons": [{
 							"text": "账单",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
-							"fontSize": "18"
+							"fontSize": "16",
+							 "textAlign":"left"
 							 // "redDot": "true"
 						}]
 					}

pages/goodSource/index.vue

@@ -30,19 +30,19 @@
 							color: scrollTop>1200?'':'#000000',
 							fontWeight: 'bold',
 							transform: 'scale(1.25)',
-							
 						}" :class="scrollTop>1200?'fixed':''"></u-tabs>
-			<view class="tab-right" @click="selectType">
+			<!-- 全部类型 -->
+			<!-- <view class="tab-right" @click="selectType">
 				<view>{{pickerSelect}}</view>
 				<image style='width:8px;height:8px;margin-left:5px;'
 					:src="!showMenu?'../../static/images/order/xiala.png':'../../static/images/order/shangla.png'"
 					mode=""></image>
-				<!-- <u-icon name="arrow-down" size="20"></u-icon> -->
-			</view>
+			</view> -->
 		</view>
-		<u-picker :show="show" :columns="columns" :closeOnClickOverlay='true' @close='selectTypeClose'
-			@cancel='selectTypeClose' @confirm='confirmSelectType'></u-picker>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback">
+		<!-- <u-picker :show="show" :columns="columns" :closeOnClickOverlay='true' @close='selectTypeClose'
+			@cancel='selectTypeClose' @confirm='confirmSelectType'></u-picker> -->
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+			style="min-height: 410px !important;">
 			<view v-for="(good,index) in goods" :key="index" @click="toDetail(good.id)">
 				<view v-if="good.peripheralInfo==1&&isFirstIndex==index" class="other-goods">周边货源</view>
 				<view class="good-list">
@@ -207,9 +207,7 @@
 						duration: 300
 					});
 				}
-
 			}
-
 		},
 		created() {
 
@@ -546,7 +544,7 @@
 					goodsType: item.goodsType,
 					goodsTypeKey: item.goodsTypeKey
 				}
-				console.log("查看抢单",_obj)
+				console.log("查看抢单", _obj)
 				that.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
 						if (res.code == 200) {
 							that.$refs.uToast.show({
@@ -1157,7 +1155,6 @@
 	}
 
 	.place {
-
 		height: var(--status-bar-height);
 	}
 
@@ -1165,7 +1162,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding-left: 20rpx;
+		// padding-left: 20rpx;
 	}
 
 	.tab-right {

pages/mine/editDriverCertificationNext.vue

@@ -531,8 +531,7 @@
 				// 	})
 				// 	return true
 				// }
-			
-				if (this.dataDetails.qualificationCertificateNumber.length!=19||this.dataDetails.qualificationCertificateNumber.length!=18) {
+				if (this.dataDetails.qualificationCertificateNumber.length>19||this.dataDetails.qualificationCertificateNumber.length<18) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "从业资格证号输入错误！",

pages/mine/manageVehicles/editVehicle.vue

@@ -176,10 +176,11 @@
 				</view>
 			</view>
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
-				<view class="left-text">挂车行驶证车辆类型</view>
+				<view class="left-text" style="width: 150px !important;">挂车行驶证车辆类型</view>
 				<u--input maxlength='15' placeholder="输入挂车行驶证车辆类型" inputAlign='right' border="none"
 					v-model="dataDetails.trailerVehicleType">
 				</u--input>
+				<u-icon name="arrow-down-fill" @click="selectCarType"></u-icon>
 			</view>
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
 				<view class="left-text">挂车行驶证车辆识别代号</view>
@@ -407,6 +408,8 @@
 		<u-picker :show="isShowCarType" ref="uPicker" :columns="carTypeList" @confirm="confirmCarType"
 			:closeOnClickOverlay='true' @close='isShowCarType=false' @cancel='isShowCarType=false'>
 		</u-picker>
+		<u-picker :show="carTypeShow" :closeOnClickOverlay='true' ref="uPicker" :columns="tcarTypeList"
+			@close="carTypeShow = false" @cancel='carTypeShow=false' @confirm="tCarType"></u-picker>
 	</view>
 </template>
 
@@ -469,17 +472,16 @@
 				uploadType: '',
 				isShowimgType: false,
 				sign: "挂车",
-				startYear:1980
-
+				startYear:1980,
+				carTypeShow:false,
+				tcarTypeList:[],
 			};
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication']),
 		},
 		onLoad(options) {
-			
 			_this = this;
-			console.log(options)
 			if(options.guaCarNumber){
 				options.guaCarNumber=options.guaCarNumber.substring(0,6);
 				options.guaCarNumber1=options.guaCarNumber.substring(0,6);
@@ -497,6 +499,7 @@
 			this.fileList2 = [{
 				url: options.guaAddressUrl
 			}]
+			this.xiala()
 			this.get_camera_permission()
 		},
 		onShow(){
@@ -520,6 +523,27 @@
 					});	
 				}
 			},
+			tCarType(e) {
+				this.dataDetails.trailerVehicleType = e.value[0]
+				this.carTypeShow = false
+			},
+			xiala() {
+				this.$request.baseRequest('get', '/commonSysParameter/getInfo', {
+						constId: "TRAILER1",
+					}).then(res => {
+						var list = []
+						for (let i = 0; i < res.data.length; i++) {
+							list.push(res.data[i].constValue)
+						}
+						this.tcarTypeList.push(list)
+					})
+					.catch(res => {
+						// uni.$u.toast(res.message);
+					});
+			},
+			selectCarType() {
+				this.carTypeShow = true
+			},
 			driveType() {
 				this.isShowCarType = true
 			},

pages/mine/often/oftenRoute.vue

@@ -309,11 +309,11 @@
 
 		.add_btn {
 			width: 90%;
-			height: 70rpx;
-			line-height: 70rpx;
+			height: 92rpx;
+			line-height: 92rpx;
 			background: #2772FB;
 			text-align: center;
-			border-radius: 35rpx;
+			border-radius: 46rpx;
 			color: #FFFFFF;
 			margin-top: 30rpx;
 			// height: 60rpx;

pages/mine/set.vue

@@ -47,7 +47,7 @@
 				</view>
 				<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 			</view>
-			
+
 			<!-- <u-line color="#EEEEEE" class="line"></u-line>
 			<view class='flex flex-space-between' @click='clearStorage'>
 				<view>
@@ -239,8 +239,7 @@
 
 <style lang="scss" scoped>
 	.content {
-		height: calc(100vh - 7vh);
-
+		height: calc(100vh);
 		color: #333333;
 	}
 

pages/news/index.vue

@@ -15,7 +15,6 @@
 						</image>
 						<image src="@/static/images/news/xt.png" class="img" v-else>
 						</image>
-
 					</view>
 					<view class="right" :style="{'border-bottom':index==news.length-1?'1px solid #fff':'1px solid #e6e6e6'}">
 						<view class="row1 flex flex-space-between">
@@ -28,7 +27,7 @@
 						</view>
 						<view class="row2 flex flex-space-between align-center">
 							<view style='white-space: pre-wrap;' class="text point1">
-								{{item.newsTitle}}
+								{{item.newsContent}}
 							</view>
 							<view class="red-point" v-if="item.newsFlag==0"></view>
 						</view>
@@ -289,9 +288,10 @@
 		overflow: hidden;
 		/* white-space: nowrap; */
 		display: -webkit-box;
-		-webkit-line-clamp: 3;
+		-webkit-line-clamp: 1;
 		-webkit-box-orient: vertical;
 		text-overflow: ellipsis;
+		margin-top: 20rpx;
 	}
 
 	.top-bgc {
@@ -320,6 +320,7 @@
 		.img {
 			width: 80rpx;
 			height: 80rpx;
+			margin-top: 20rpx;
 		}
 
 		.left {
@@ -335,6 +336,7 @@
 				.title {
 					font-size: 32rpx;
 					color: #000000;
+					font-weight: 600;
 				}
 
 				.time {

pages/news/newsSee.vue

@@ -1,9 +1,8 @@
 <template>
 	<view class="center">
 		<view class="news_info">
-
-<!-- 			<view class="">{{dataInfo.newsTitle}}</view> -->
-			<view style='white-space: pre-wrap;' class="">{{dataInfo.newsContent}}</view>
+			<view class="text">{{dataInfo.newsTitle}}</view>
+			<view style='white-space: pre-wrap;' class="info">{{dataInfo.newsContent}}</view>
 		</view>
 	</view>
 </template>
@@ -34,6 +33,15 @@
 		padding:30rpx;
 		height: calc(100vh - 4vh);
 		background: #F5F6FA ;
+		.text{
+			font-size: 18px;
+			font-weight: 600;
+		}
+		.info{
+			font-size: 14px;
+			color: #999999;
+			margin-top: 20rpx;
+		}
 		.news_info{
 			background: #FFFFFF;
 			padding: 20rpx 30rpx;

pages/order/confirmLoading.vue

@@ -74,7 +74,7 @@
 			</view>
 			<view class='row-between'>
 				<view class="">预付款（元）</view>
-				{{detailData.advanceCharge ? detailData.advanceCharge:"来自合同"}}
+				{{detailData.advanceCharge ? detailData.advanceCharge:"0"}}
 				<!-- 	<view class=""><input class="input" type="text" value="" v-model="detailData.carrierInfo.freight"
 						placeholder="请输入运费"></view> -->
 			</view>
@@ -666,6 +666,7 @@
 						})
 						return
 					}
+					
 					this.alertTitle = '确定提交装车信息？'
 				}
 
@@ -828,16 +829,18 @@
 									uni.setStorageSync('mapGJ', this.$helper.gjList);
 									// console.log('this.$helper.gjList')
 									// console.log(this.$helper.gjList)
-									// console.log("条数", uni.getStorageSync('mapGJ').length)
+									console.log("条数", uni.getStorageSync('mapGJ').length)
+									// console.log("条数", uni.getStorageSync('mapGJ'))
 									if (uni.getStorageSync('mapGJ').length > 100) {
 										// console.log(JSON.stringify(uni.getStorageSync('mapGJ')))
 										// that.send()
-										this.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo', {
+										that.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo', {
 												orderId: that.id,
 												longitudeLatitude: JSON.stringify(uni.getStorageSync('mapGJ'))
 											}).then(res => {
+												console.log("已发送定位----------------",res)
 												uni.removeStorageSync('mapGJ');
-												this.$helper.gjList = []
+												that.$helper.gjList = []
 											})
 											.catch(res => {
 												uni.$u.toast(res.message);

pages/order/confirmUnloading.vue

@@ -35,7 +35,6 @@
 				<view class="row-left-text">运费</view>
 				<view class="row-right-text">{{detailData.freight}}{{detailData.billingMethod==0?'元/吨':'元/车'}}</view>
 			</view>
-
 		</view>
 		<view class="content2">
 			<view class="level2-title">卸车信息</view>
@@ -252,7 +251,6 @@
 				// this.$forceUpdate()
 			},
 			eliminate(){
-				console.log(11111)
 				this.$set(this.detailData,'totalFreight','')
 				// t.totalFreight=''
 				console.log(this.detailData.totalFreight)

pages/order/index.vue

@@ -17,9 +17,9 @@
 									transform: 'scale(1.05)'
 								}"></u-tabs>
 					<view class="right-btn flex align-center" @click="showMenu=!showMenu">
-						<view class="">
+						<!-- <view class="">
 							全部类型
-						</view>
+						</view> -->
 						<image style='width:8px;height:8px;'
 							:src="!showMenu?'../../static/images/order/xiala.png':'../../static/images/order/shangla.png'"
 							mode=""></image>
@@ -953,7 +953,7 @@
 
 	.tab-content {
 		position: relative;
-		padding-right: 200rpx;
+		padding-right: 100rpx;
 	}
 
 	.right-btn {

pages/order/orderDetails.vue

@@ -218,7 +218,7 @@
 			@cancel="cancelClick" class="modal">
 			<u-radio-group v-model="radiovalue1" placement="" v-if='isShowTerminationReason' class='row'>
 				<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
-					:label="item.name" :name="item.name" @change="radioChange">
+					:label="item.name" :name="item.name">
 				</u-radio>
 			</u-radio-group>
 			<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
@@ -236,7 +236,7 @@
 				<view style="margin: 0 auto;">
 		           	<u-radio-group iconPlacement="right" v-model="radiovalue1" placement="" v-if='isShowTerminationReason' >
 		           	<u-radio  :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
-		           		:label="item.name" :name="item.name" @change="radioChange" >
+		           		:label="item.name" :name="item.name">
 		           	</u-radio>
 		           </u-radio-group>
 		           </view>
@@ -593,6 +593,9 @@
 </script>
 
 <style lang="scss">
+	.content{
+		min-height: 100vh;
+	}
 	.fixed,
 	.fixed1 {
 		background: white;

pages/riders/fleetSee.vue

@@ -36,7 +36,7 @@
 				<view class="flex member_top">
 					<view class="notice_title member_title">车队成员</view>
 					<view class="member_right" @click="setUp('/pages/riders/fleetMember')">
-						<span>查看{{fleetInfo.fleetMemberNum}}名群成员</span>
+						<span >查看{{fleetInfo.fleetMemberNum}}名群成员</span>
 						<image src="../../static/images/myimg/gengduo1.png" mode=""
 							style="width: 18rpx;height: 24rpx;margin:10rpx 0 0 20rpx;"></image>
 					</view>
@@ -89,7 +89,7 @@
 				</view>
 			</view>
 			<view class="setUp">
-				<view class="set_item quit" @click="quitFleet">退出车队</view>
+				<view class="set_item quit" @click="quitFleet" v-if="!tips">退出车队</view>
 			</view>
 
 		</view>
@@ -115,7 +115,8 @@
 				quitShow: false,
 				alertTitle: "",
 				seeInfoShow: false,
-				four: 4
+				four: 4,
+				tips:""
 			}
 		},
 		onShow() {
@@ -125,6 +126,10 @@
 			this.fleetId = options.fleetId
 			this.id = options.id
 			this.type = options.type
+			if(options.tips){
+				this.tips = options.tips //判断是从哪页面进入的，判断是否显示退出车队按钮
+			}
+			
 			this.read() //已读接口
 			// this.getList()
 		},

pages/riders/index.vue

@@ -351,7 +351,7 @@
 				}
 			},
 			lookfleet(item) {
-				uni.$u.route("/pages/riders/fleetSee?fleetId=" + item.id)
+				uni.$u.route("/pages/riders/fleetSee?fleetId=" + item.id+"&tips="+"1")
 			},
 			async getPassOnce() {