前端

common/components/uni-rate.vue

@@ -5,16 +5,20 @@
 				: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'" />
+				<image style='width:19px;height:19px;' src="./xingxing.png" mode=""></image>
+				<!-- <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" />
+					<!-- <uni-icons style="text-align: left;" :color="disabled?'#ccc':activeColor" :size="size"
+						type="star-filled" /> -->
+						<image style='width:19px;height:19px;' src="./xingxing_check.png" mode=""></image>
 				</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" />
+					<!-- <uni-icons :color="disabled?disabledColor:activeColor" :size="size" type="star-filled" /> -->
+					<!-- <image style='width:19px;height:19px;' src="'../../static/images/xingxing.png'" mode=""></image> -->
+					<image style='width:19px;height:19px;' src="./xingxing_check.png" mode=""></image>
 				</view>
 				<!-- #endif -->
 			</view>

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	baseUrlNew: 'https://apitest.eliangeyun.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	// baseUrlNew: 'https://apitest.eliangeyun.com',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/carSource/driverSee.vue

@@ -10,8 +10,9 @@
 				</view>
 
 				<view class="right flex s-row align-center phone">
-					<view class="bgc flex flex-space-between">
-						<u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="toPhone"></u-icon>
+					<view class="bgc flex flex-space-between flex-center">
+						<image class='phone-icon' src="@/static/images/carSource/dianhua.png" mode=""></image>
+						<!-- <u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="toPhone"></u-icon> -->
 						<view class="hz-name">联系司机</view>
 					</view>
 				</view>
@@ -28,7 +29,7 @@
 			</view>
 			<view v-if='total>=20' class="flex item">
 				<view class="pf-name">好评率</view>
-				<view class="pf-number">{{driverList.favorableRate?driverList.favorableRate:0}}</view>
+				<view class="pf-number">{{driverList.favorableRate?driverList.favorableRate:0}}%</view>
 			</view>
 		</view>
 		<view class="row3 flex">
@@ -59,8 +60,8 @@
 						<view class="gray fontsize-24">累计发运{{total}}次</view>
 					</view>
 				</view>
-				<view class="right">
-					<view>98%</view>
+				<view v-if='total>=20' class="right">
+					<view>{{driverList.favorableRate?driverList.favorableRate:0}}</view>
 					<view class="gray fontsize-24">好评率</view>
 				</view>
 			</view>
@@ -109,10 +110,12 @@
 		<view class="row5">
 			<view class='carMessage' v-if="tabIndex==1&&index==1">
 				<view class='carMessage-item' v-for='(item,index) in hyDriverCarInfoList' :style="{'border-radius':(index!=hyDriverCarInfoList.length-1?'#ccc':'transparent')}">
-					<view v-if='item.carCategory=="挂车"'>{{item.guaCarNumber}}</view>
+					<!-- <view v-if='item.carCategory=="挂车"'>{{item.guaCarNumber}}</view>
 					<view v-else>{{item.carNumber}}</view>
 					<view v-if='item.carCategory=="挂车"' class="flex align-center">{{item.carType}} | 车长{{item.guaCarLong}}米 | 载重{{item.guaCarApprovedWeight}}吨</view>
-					<view v-else class="flex align-center">{{item.carType}} | 车长{{item.carLong}}米 | 载重{{item.carApprovedWeight}}吨</view>
+					<view v-else class="flex align-center">{{item.carType}} | 车长{{item.carLong}}米 | 载重{{item.carApprovedWeight}}吨</view> -->
+					<view>{{item.carNumber}}</view>
+					<view class="flex align-center">{{item.carType}} | 车长{{item.carLong}}米 | 载重{{item.carApprovedWeight}}吨</view>
 				</view>
 				
 			</view>
@@ -486,4 +489,9 @@
 	.pf {
 		margin-bottom: 20rpx;
 	}
+	.phone-icon{
+		width:12px;
+		height:12px;
+		margin-right:3px;
+	}
 </style>

pages/carSource/index.vue

@@ -345,14 +345,24 @@
 					return
 				}
 				this.sendInfo.sendProvince = address.province ? address.province : ''
-				this.sendInfo.sendCity = address.city ? address.city : ''
+				if(address.city=='北京'||address.city=='天津'||address.city=='上海'||address.city=='重庆'||address.city=='台湾'){
+					this.sendInfo.sendCity = ''
+				}else{
+					this.sendInfo.sendCity = address.city ? address.city : ''
+				}
+				// this.sendInfo.sendCity = address.city ? address.city : ''
 				this.sendInfo.sendArea = address.area ? address.area : ''
 				if (address.city == '全省') {
 					this.title1 = address.province
 					this.sendInfo.sendCity = ""
 					this.sendInfo.sendArea = ""
 				} else if (address.area == '全市') {
-					this.title1 = address.province + address.city
+					if(address.city=='北京'||address.city=='天津'||address.city=='上海'||address.city=='重庆'||address.city=='台湾'){
+						this.title1 = address.province 
+					}else{
+						this.title1 = address.province + address.city
+					}
+					
 					this.sendInfo.sendArea = ""
 				} else {
 					this.title1 = address.province + address.city + address.area;
@@ -362,14 +372,24 @@
 			},
 			confirmChangeTwo(address) {
 				this.unloadInfo.unloadProvince = address.province ? address.province : ''
-				this.unloadInfo.unloadCity = address.city ? address.city : ''
+				if(address.city=='北京'||address.city=='天津'||address.city=='上海'||address.city=='重庆'||address.city=='台湾'){
+					this.sendInfo.unloadCity = ''
+				}else{
+					this.sendInfo.unloadCity = address.city ? address.city : ''
+				}
+				// this.unloadInfo.unloadCity = address.city ? address.city : ''
 				this.unloadInfo.unloadArea = address.area ? address.area : ''
 				if (address.city == '全省') {
 					this.title2 = address.province
 					this.unloadInfo.unloadCity = ""
 					this.unloadInfo.unloadArea = ""
 				} else if (address.area == '全市') {
-					this.title2 = address.province + address.city
+					if(address.city=='北京'||address.city=='天津'||address.city=='上海'||address.city=='重庆'||address.city=='台湾'){
+						this.title2 = address.province 
+					}else{
+						this.title2 = address.province + address.city
+					}
+					// this.title2 = address.province + address.city
 					this.unloadInfo.unloadArea = ""
 				} else {
 					if (address.province == '全国') {

pages/mine/cargoowner/addEnerprise.vue

@@ -148,6 +148,7 @@
 		onShow() {
 			if (uni.getStorageSync('currectcompany')) {
 				this.dataDetails.company = uni.getStorageSync('currectcompany').companyName
+				this.dataDetails.compId = uni.getStorageSync('currectcompany').id
 				this.dataDetails.advanceFreightService = uni.getStorageSync('currectcompany').advanceFreightService
 				var name = '',
 					legalPersonNamelength = uni.getStorageSync('currectcompany').legalPersonName.length

pages/mine/company/addcompany.vue

@@ -43,7 +43,7 @@
 			</view>
 			<view class="flex row noborder">
 				<view class="left-text">统一社会信用代码</view>
-				<u--input placeholder="请输入统一社会信用代码" inputAlign='left' border="none"
+				<u--input @blur='codeBlur' placeholder="请输入统一社会信用代码" inputAlign='left' border="none"
 					v-model="dataDetails.unifiedSocialCreditCode" maxlength='18'>
 				</u--input>
 			</view>
@@ -536,6 +536,33 @@
 						})
 					});
 			},
+			codeBlur(){
+
+
+				this.$request.baseRequest('get', '/companyInfo/checkCreditCode', {
+						unifiedSocialCreditCode: this.dataDetails.unifiedSocialCreditCode
+					}).then(res => {
+						console.log(res)
+						if (res.code == 200) {
+							// that.dataDetails.legalPersonName = res.data.name
+						} else {
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.catch(res => {
+						console.log(res)
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
 			getName() {
 				let that = this
 				this.$request.baseRequest('get', '/cargoOwnerInfo/selectCargoOwner', {

pages/mine/company/companyvideo.nvue

@@ -199,7 +199,9 @@
 						console.log("startVideoCapture: " + JSON.stringify(res))
 						if (res.status == "start") {
 							console.log("开始录像")
-							this.isAlreadyRecord = true
+							setTimeout(()=>{
+								this.isAlreadyRecord = true
+							},1000)
 						} else if (res.status == "end") {
 							console.log("结束录像")
 							uni.showLoading({

pages/mine/company/editcompany.vue

@@ -135,13 +135,13 @@
 			</view>
 			<view class="flex row border-bottom mt20">
 				<view class="left khzh-styel">开户支行</view>
-				<view class="flex align-center" v-if="isShowManualInput">
+				<view class="flex align-center flex-space-between right" v-if="isShowManualInput">
 					<u--input class="select-bankzh point" placeholder="输入开户支行" inputAlign='left' border="none"
 						v-model="dataDetails.bankDepositBranch">
 					</u--input>
 					<view @click="manualInput" class="type">选择支行</view>
 				</view>
-				<view class="flex align-center" v-if="!isShowManualInput">
+				<view class="flex align-center flex-space-between right" v-if="!isShowManualInput">
 					<!-- 	<u--input  @click="selectZhbank" placeholder="选择开户支行" inputAlign='left' border="none" disabled>
 					</u--input> -->
 					<view class="select-bankzh" @click="selectZhbank">

pages/mine/company/index.vue

@@ -62,7 +62,23 @@
 				uni.$u.route("/pages/mine/myAccount/index?id=" + item.id + "&companyId=" + item.id)
 			},
 			goDetailPage(src) {
-				uni.$u.route(src);
+				var that=this
+				if(src=='/pages/mine/company/addcompany'){
+					this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+						phone: this.userInfo.phone,
+					}).then(res => {
+						if (res.data.authenticationStatus == '已认证') {
+							uni.$u.route(src);
+						}else{
+							that.$refs.uToast.show({
+								type: 'error',
+								message: "请先完成个人认证"
+							})
+						}
+					})
+				}else{
+					uni.$u.route(src);
+				}
 			},
 			edit(item) {
 				this.goDetailPage('/pages/mine/company/editcompany?id=' + item.id)

pages/mine/index.vue

@@ -52,7 +52,8 @@
 							width="20px" height="20px"></u--image>我的账户
 					</view>
 					<view>
-						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+						<image class='right' src="@/static/mine/right.png" mode=""></image>
+						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
 					</view>
 				</view>
 				<view class="flex flex-space-between content1-item" @click="goDetailPage('/pages/mine/company/index')">
@@ -61,7 +62,8 @@
 							width="20px" height="20px"></u--image>我的公司
 					</view>
 					<view class='flex'>
-						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+						<image class='right' src="@/static/mine/right.png" mode=""></image>
+						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
 					</view>
 				</view>
 				<view class="flex flex-space-between content1-item"
@@ -71,7 +73,8 @@
 							width="20px" height="20px"></u--image>我的银行卡
 					</view>
 					<view>
-						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+						<image class='right' src="@/static/mine/right.png" mode=""></image>
+						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
 					</view>
 				</view>
 				<view class="flex flex-space-between content1-item"
@@ -81,7 +84,8 @@
 							width="20px" height="20px"></u--image>货主认证
 					</view>
 					<view class='flex'>
-						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+						<image class='right' src="@/static/mine/right.png" mode=""></image>
+						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
 					</view>
 				</view>
 				<view class="flex flex-space-between content1-item"
@@ -91,7 +95,8 @@
 							width="20px" height="20px"></u--image>代理货主
 					</view>
 					<view>
-						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+						<image class='right' src="@/static/mine/right.png" mode=""></image>
+						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
 					</view>
 				</view>
 				<view class="flex flex-space-between content1-item"
@@ -101,7 +106,8 @@
 							src="../../static/mine/bangzhushuoming.png" width="20px" height="20px"></u--image>帮助说明
 					</view>
 					<view>
-						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+						<image class='right' src="@/static/mine/right.png" mode=""></image>
+						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
 					</view>
 				</view>
 
@@ -406,4 +412,7 @@
 	.items-center {
 		align-items: center;
 	}
+	.right{
+		width:10px;height:10px;
+	}
 </style>

pages/mine/manageBankCards/addBankCard.vue

@@ -245,6 +245,13 @@
 					})
 					return true
 				}
+				if (uni.$u.test.rangeLength(this.dataDetails.bankCard,[16,20])) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "银行卡号输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.bankDeposit)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -252,6 +259,13 @@
 					})
 					return true
 				}
+				if (uni.$u.test.rangeLength(this.dataDetails.bankDeposit,[4,25])) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "开户行输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.bankDepositBranch)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -259,6 +273,13 @@
 					})
 					return true
 				}
+				if (uni.$u.test.rangeLength(this.dataDetails.bankDepositBranch,[4,25])) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "开户支行输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.cardholderName)) {
 					this.$refs.uToast.show({
 						type: 'error',

pages/order/driverDetail.vue

@@ -59,7 +59,7 @@
 						<view class="gray fontsize-24">累计发运{{total}}次</view>
 					</view>
 				</view>
-				<view class="right">
+				<view v-if='total>=20' class="right">
 					<view>{{driverList.favorableRate?driverList.favorableRate:0}}%</view>
 					<view class="gray fontsize-24">好评率</view>
 				</view>
@@ -108,11 +108,16 @@
 		</view>
 		<view class="row5">
 			<view class='carMessage' v-if="tabIndex==1&&index==1">
-				<view class='carMessage-item' v-for='(item,index) in hyDriverCarInfoList' :style="{'border-radius':(index!=hyDriverCarInfoList.length-1?'#ccc':'transparent')}">
-					<view v-if='item.carCategory=="挂车"'>{{item.guaCarNumber}}</view>
+				<view  v-for='(item,index) in hyDriverCarInfoList' :style="{'border-radius':(index!=hyDriverCarInfoList.length-1?'#ccc':'transparent')}">
+					<view v-if='item.status=="已通过"' class='carMessage-item'>
+						<view>{{item.carNumber}}</view>
+					<view class="flex align-center">{{item.carType}} | 车长{{item.carLong}}米 | 载重{{item.carApprovedWeight}}吨</view>
+					</view>
+					
+					<!-- <view v-if='item.carCategory=="挂车"'>{{item.guaCarNumber}}</view>
 					<view v-else>{{item.carNumber}}</view>
 					<view v-if='item.carCategory=="挂车"' class="flex align-center">{{item.carType}} | 车长{{item.guaCarLong}}米 | 载重{{item.guaCarApprovedWeight}}吨</view>
-					<view v-else class="flex align-center">{{item.carType}} | 车长{{item.carLong}}米 | 载重{{item.carApprovedWeight}}吨</view>
+					<view v-else class="flex align-center">{{item.carType}} | 车长{{item.carLong}}米 | 载重{{item.carApprovedWeight}}吨</view> -->
 				</view>
 				
 			</view>
@@ -241,8 +246,10 @@
 								res.data.hyDriverCarInfoList[i].guaCarLong=res.data.hyDriverCarInfoList[i].guaCarLong/1000
 								res.data.hyDriverCarInfoList[i].carNumber = res.data.hyDriverCarInfoList[i].carNumber.replace(res.data.hyDriverCarInfoList[i].carNumber.substring(2, 6),
 									"****")
-								res.data.hyDriverCarInfoList[i].guaCarNumber = res.data.hyDriverCarInfoList[i].guaCarNumber.replace(res.data.hyDriverCarInfoList[i].guaCarNumber.substring(2, 6),
+								if(res.data.hyDriverCarInfoList[i].guaCarNumber){
+									res.data.hyDriverCarInfoList[i].guaCarNumber = res.data.hyDriverCarInfoList[i].guaCarNumber.replace(res.data.hyDriverCarInfoList[i].guaCarNumber.substring(2, 6),
 								"****")
+								}
 							}
 							that.hyDriverCarInfoList=res.data.hyDriverCarInfoList
 						}

pages/order/fk.vue

@@ -10,7 +10,7 @@
 		<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--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>
@@ -43,6 +43,20 @@
 		},
 		methods: {
 			submit() {
+				if (!this.value1) {
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "投诉信息不能为空！",
+					})
+					return
+				}
+				if (this.value1.length<10||this.value1.length>300) {
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "投诉信息输入错误！",
+					})
+					return
+				}
 				uni.showLoading({
 					title: '加载中'
 				})

pages/order/index.vue

@@ -17,7 +17,8 @@
 			
 				<view class="fixed1"></view>
 			<view class="fix-content">
-				<u-search placeholder="搜索订单" v-model="searchKeyWord" bgColor='white' :actionStyle='searchStyle'
+				<u-search placeholder="搜索订单" 
+				v-model="searchKeyWord" bgColor='white' :actionStyle='searchStyle'
 					@custom="getSearch" @search="getSearch" :clearabled="true"></u-search>
 				<view class="tab-content">
 					<u-tabs :list="tabList" @click="clickTab" lineColor='transparent' :current='tabIndex'
@@ -30,7 +31,8 @@
 										'border-radius':'40rpx'
 									}" class="tabs"></u-tabs>
 					<view class="right-btn" @click="showMenu=true">
-						<u-icon name="grid-fill" color="white" size="28"></u-icon>
+						<!-- <u-icon name="grid-fill" color="white" size="28"></u-icon> -->
+						<image class="quanbu" src="@/static/images/order/quanbuyewu.png"></image>
 						<view class="">
 							全部
 						</view>
@@ -53,11 +55,13 @@
 		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" @down="downCallback" @up="upCallback" class="mescroll">
 	<view class="evaluatePage flex flex-space-between" v-show="tabIndex == 10"  @click="evaluationRecord">
 		<view class="left flex flex-space-between">
-			<u-icon size="20" name="edit-pen"></u-icon>
+			<!-- <u-icon size="20" name="edit-pen"></u-icon> -->
+			<image class="pingjia" src="@/static/images/order/pingjia.png"></image>
 			<view style="margin-left: 20prx;">我的评价</view> 
 		</view>
 		<view class="right">
-				<u-icon size="20" name="arrow-right"></u-icon>
+			<image style='width:12px;height:12px;' src="@/static/images/order/right.png"></image>
+				<!-- <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"
@@ -187,7 +191,10 @@
 		</u-modal>
 		<u-popup :show="show" mode="bottom" @close="close" @open="open">
 			<view class="">
-				<view ><u-icon @click="closepopup" class='close' name="close" size="20"></u-icon></view>
+				<view >
+					<image style='width:12px;height:12px;' @click='closepopup' class='close'  src="../../static/images/order/guanbi@3x.png" mode=""></image>
+					<!-- <u-icon @click="closepopup" class='close' name="close" size="20"></u-icon> -->
+				</view>
 				
 				<view style='fon-size:34rpx;margin-bottom:20px;text-align:center;font-weight: 600;'>确认终止订单</view>
 				<view style="margin: 0 auto;">
@@ -408,6 +415,12 @@
 
 		// },
 		methods: {
+			closepopup(){
+				this.show=false
+			},
+			close(){
+				this.show=false
+			},
 			goTodriverDetail(val){
 				uni.$u.route('/pages/order/driverDetail',{
 					driver:JSON.stringify(val)
@@ -1077,6 +1090,7 @@
 	.close{
 		position:absolute;
 		right:20px;
+		top:26px;
 	}
 	.termination{
 		background:#F1F3F6;
@@ -1090,4 +1104,13 @@
 		background: #2772FB;
 		color: white;
 	}
+	.quanbu{
+		width:16px;
+		height:16px;
+	}
+	.pingjia{
+		width:14px;
+		height:14px;
+	}
+	
 </style>

pages/order/jb.vue

@@ -10,7 +10,7 @@
 		<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--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>
@@ -63,6 +63,20 @@
 				}
 			},
 			submit() {
+				if (!this.value1) {
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "举报信息不能为空！",
+					})
+					return
+				}
+				if (this.value1.length<10||this.value1.length>300) {
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "举报信息输入错误！",
+					})
+					return
+				}
 				uni.showLoading({
 					title: '加载中'
 				})

pages/order/map.nvue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<map v-if="polyline[0].points.length > 0" id="myMap" :markers="markers" :polyline="polyline"
+		<map v-if="polyline[0].points.length > 0" ref="myMap" id="myMap" :markers="markers" :polyline="polyline"
 			:latitude="polyline[0].points[0].latitude" :longitude="polyline[0].points[0].longitude"
 			style="width: 100%; height: 2000rpx" @updated="test" />
 		<view v-if="polyline[0].points.length > 0" class="hcp-bottom">
@@ -65,11 +65,11 @@
 						'content-type': 'application/json' //'application/x-www-form-urlencoded; charset=UTF-8',
 					},
 					success: (res) => {
-						console.log(res.data,11111111)
+						// console.log(res.data,11111111)
 						if(res.data.code==200){
 							if(res.data.data){
 								if(res.data.data.longitudeLatitude){
-									console.log(JSON.parse(res.data.data.longitudeLatitude));
+									// console.log(JSON.parse(res.data.data.longitudeLatitude));
 									this.polyline[0].points =JSON.parse(res.data.data.longitudeLatitude)
 								}
 							}else{
@@ -109,8 +109,12 @@
 				// 	// 	var longitude = this.polyline[0].points[this.polyline[0].points.length -1].longitude + 0.0001
 				// 	// 	this.polyline[0].points.push({latitude,longitude})
 				// 	// }
-					this.durationTime = Math.ceil(30000 / this.polyline[0].points.length)	//默认播放全程使用30秒，计算相连两点动画时长
-					this.initMapData()
+				var that = this
+				setTimeout(()=>{
+					that.durationTime = Math.ceil(30000 / that.polyline[0].points.length)	//默认播放全程使用30秒，计算相连两点动画时长
+					that.initMapData()
+				},1000)
+					
 				// 	})
 				// 	.catch(res => {
 				// 		uni.hideLoading()
@@ -131,7 +135,7 @@
 
 			},
 			test() {
-				console.log("1111111111111111")
+				// console.log("1111111111111111")
 				this.mapContext.includePoints({
 					points: this.polyline[0].points,
 					padding: [100, 100, 1000, 100]
@@ -139,6 +143,7 @@
 			},
 			//设置位置（从起点开始）
 			initMarkers() {
+				console.log(this.polyline[0])
 				this.markers[0].latitude = this.polyline[0].points[0].latitude
 				this.markers[0].longitude = this.polyline[0].points[0].longitude
 			},
@@ -164,6 +169,7 @@
 				})
 				return
 				*/
+			   console.log(this.mapContext)
 				this.mapContext.moveAlong({
 					duration: 10000,
 					markerId: this.markers[0].id,

pages/order/orderDetails.vue

@@ -4,9 +4,11 @@
 		<view class="fixed1"></view>
 		<view class="fixed">
 			<view class='title flex flex-center'>
-				<u-icon class="back" name="arrow-left" color="" size="20" @click="back"></u-icon>
+				<image class="back"  src="../../static/images/return.png" @click="back" mode="" style="width: 40rpx; height: 40rpx;"></image>
+				<!-- <u-icon class="back" name="arrow-left" color="" size="20" @click="back"></u-icon> -->
 				<view class="nav-title">订单详情</view>
-				<u-icon class="search" name="server-fill" color="" size="28" @click="$helper.contactCustomerService()">
+				<image class="search" style='width:18px;height:18px;' src="../../static/images/kefu.png" @click="$helper.contactCustomerService" mode=""></image>
+				<!-- <u-icon class="search" name="server-fill" color="" size="28" @click="$helper.contactCustomerService()"> -->
 				</u-icon>
 			</view>
 		</view>
@@ -64,7 +66,8 @@
 				</view>
 				<view class="right flex s-row align-center phone">
 					<view class="bgc">
-						<u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="toPhone"></u-icon>
+						<image class="phone" style='width:24px;height:24px;' src="../../static/images/dianhua.png" @click="toPhone" mode=""></image>
+						<!-- <u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="toPhone"></u-icon> -->
 					</view>
 
 					<view class="hz-name">联系司机</view>
@@ -264,7 +267,10 @@
 		</u-modal>
 		<u-popup :show="show" mode="bottom" @close="close" @open="open">
 			<view class="">
-				<view ><u-icon @click="closepopup" class='close' name="close" size="20"></u-icon></view>
+				<view >
+					<image style='width:12px;height:12px;' @click='closepopup' class='close'  src="../../static/images/order/guanbi@3x.png" mode=""></image>
+					<!-- <u-icon @click="closepopup" class='close' name="close" size="20"></u-icon> -->
+				</view>
 				
 				<view style='fon-size:34rpx;margin-bottom:20px;text-align:center;font-weight: 600;'>确认终止订单</view>
 				<view style="margin: 0 auto;">
@@ -389,6 +395,16 @@
 			this.getList()
 		},
 		methods: {
+			radioChange(n) {
+				console.log('radioChange', n);
+			
+			},
+			closepopup(){
+				this.show=false
+			},
+			close(){
+				this.show=false
+			},
 			ylImg(src) {
 				uni.previewImage({
 					urls: src,
@@ -513,6 +529,7 @@
 				// uni.$u.route('/pages/order/confirmUnloading', item);
 			},
 			confirmClick() {
+				var that=this
 				that.isShowAlert = false
 				if (this.type == 1 || this.type == 2) {
 					let _title = ''
@@ -530,7 +547,7 @@
 									type: 'success',
 									message: _title,
 									complete() {
-										that.mescroll.resetUpScroll()
+										that.getList()
 									}
 								})
 							} else {
@@ -543,7 +560,7 @@
 									type: 'success',
 									message: _title,
 									complete() {
-										that.mescroll.resetUpScroll()
+										
 									}
 								})
 							}
@@ -625,7 +642,49 @@
 						.catch(res => {
 							uni.$u.toast(res.message);
 						});
-				} 
+				} else{
+					var that=this
+										if (this.radiovalue1 == '其他' && !this.value2) {
+											this.$refs.uToast.show({
+												type: 'error',
+												message: "请填写终止原因描述!",
+											})
+											return
+										}
+										let _terminationReason = ''
+										if (this.radiovalue1 == '已与货主协商') {
+											_terminationReason = 1
+										} else if (this.radiovalue1 == '货主原因终止') {
+											_terminationReason = 2
+										} else if (this.radiovalue1 == '司机个人原因终止') {
+											_terminationReason = 3
+										} else if (this.radiovalue1 == '其他') {
+											_terminationReason = 4
+										}
+										this.$request.baseRequest('post', '/orderInfo/api/end', {
+												id: this.id,
+												terminator: 2,
+												terminationReason: _terminationReason,
+												terminationReasonDescription: this.value2
+											}).then(res => {
+												if (res.code == 200) {
+													that.show=false
+													this.$refs.uToast.show({
+														type: 'success',
+														message: '终止订单成功',
+													})
+													that.getList()
+												} else {
+													this.$refs.uToast.show({
+														type: 'success',
+														message: '终止订单失败',
+													})
+												}
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
+				}
 			},
 			termination(){
 				var that=this
@@ -658,6 +717,7 @@
 									type: 'success',
 									message: '终止订单成功',
 								})
+								that.getList()
 							} else {
 								this.$refs.uToast.show({
 									type: 'success',

pages/release/addAddress.vue

@@ -200,4 +200,7 @@
 		right: 0;
 		margin: auto;
 	}
+	/deep/input{
+		word-break:break-all;
+	}
 </style>

pages/release/lookRelease.vue

@@ -21,7 +21,9 @@
 		<view class="flex place">
 			<view class="left flex">
 				<view class="flex">
-					<view class="ssx">{{$helper.getProvinceAbbreviation(dataObj.sendPrivate?dataObj.sendPrivate:dataObj.sendCity)}}</view>
+					<view class="ssx">
+						{{$helper.getProvinceAbbreviation(dataObj.sendPrivate?dataObj.sendPrivate:dataObj.sendCity)}}
+					</view>
 					<view class="level2-title">{{dataObj.sendCity}}</view>
 				</view>
 				<view class="level2-title">{{dataObj.sendArea}}</view>
@@ -125,7 +127,7 @@
 				<view class="left">任务描述</view>
 			</view>
 			<view class="row">
-				<u--textarea disabled v-model="dataObj.taskDescription" placeholder="请输入内容"></u--textarea>
+				<u--textarea v-model="dataObj.taskDescription" placeholder="请输入内容" disabled></u--textarea>
 			</view>
 
 
@@ -394,7 +396,8 @@
 		}
 	}
 
-	.content2,.content5 {
+	.content2,
+	.content5 {
 		.row {
 			margin: 20rpx 0;
 		}
@@ -402,7 +405,8 @@
 		.left {
 			color: #8F8F8F;
 		}
-		.right{
+
+		.right {
 			color: #333333;
 		}
 	}

pages/release/release.vue

@@ -106,7 +106,7 @@
 			<view class="row">
 				<view class="left">收货方信用代码（选填）</view>
 				<view class="right flex">
-					<input placeholder="输入收货方信用代码" class="input" v-model="dataObj.receiverCreditCode" />
+					<input placeholder="统一社会信用代码" class="input" v-model="dataObj.receiverCreditCode" />
 				</view>
 			</view>
 			<view class="flex row">
@@ -502,6 +502,8 @@
 					}).then(res => {
 						if (uni.getStorageSync('releaseCargoOwner')) {
 							this.dataObj.cargoOwner = uni.getStorageSync('releaseCargoOwner')
+							this.dataObj.compId =uni.getStorageSync('releasecompId')
+							
 						}
 						// 可用企业货主
 						this.qyList = []
@@ -515,6 +517,7 @@
 						if (!_self) _self = []
 						if (_self.length > 0) {
 							for (let i = 0; i < _self.length; i++) {
+								_self[i].compStatus='wd'
 								if (_self[i].status == '已认证') {
 									this.qyList.push(_self[i])
 								}
@@ -522,6 +525,7 @@
 						}
 						if (_dlhz.length > 0) {
 							for (let i = 0; i < _dlhz.length; i++) {
+								_dlhz[i].compStatus='ss'
 								if (_dlhz[i].status == '已认证') {
 									this.qyList.push(_dlhz[i])
 								}
@@ -587,6 +591,13 @@
 					})
 					return true
 				}
+				if (!uni.$u.test.chinese(this.dataObj.goodsName)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "货名输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataObj.receiver)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -616,6 +627,20 @@
 					})
 					return true
 				}
+				if(this.dataObj.receiverIdcard&&!uni.$u.test.rangeLength(this.dataObj.receiverIdcard, [18, 18])){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "身份证号输入错误！",
+					})
+					return true
+				}
+				if(this.dataObj.receiverCreditCode&&!uni.$u.test.rangeLength(this.dataObj.receiverCreditCode, [18, 18])){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "信用代码输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataObj.freightPrice)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -778,6 +803,9 @@
 						uni.removeStorage({
 							key: 'releaseCargoOwner'
 						});
+						uni.removeStorage({
+							key: 'releasecompId'
+						});
 						this.$refs.uToast.show({
 							type: 'success',
 							message: "发布成功",
@@ -912,9 +940,18 @@
 				for (let i = 0; i < this.qyList.length; i++) {
 					let _name = this.qyList[i].company ? this.qyList[i].company : this.qyList[i].companyName
 					if (_name == e.value[0]) {
+						if(e.value[0]!='个人货主'){
+							if(this.qyList[i].compStatus=='ss'){
+								this.dataObj.compId=this.qyList[i].compId
+							}else{
+								this.dataObj.compId=this.qyList[i].id
+							}
+							uni.setStorageSync('releasecompId', this.dataObj.compId)
+						}
 						this.dataObj.freightAdvance = this.qyList[i].advanceFreightService == 1 ? true : false
 					}
 				}
+				
 				uni.setStorageSync('releaseCargoOwner', this.dataObj.cargoOwner)
 				this.show = false
 			},

pages/release/selectAddress.vue

@@ -300,8 +300,10 @@
 										uni.setStorageSync('storage_saddress',data)
 									}
 									
-									
-									uni.$u.route('/pages/release/release');
+									uni.navigateBack({
+										delta:1
+									})
+									// uni.$u.route('/pages/release/release');
 									// that.temporaryAddress.latitude = res.latitude
 									// that.temporaryAddress.longitude = res.longitude
 									// that.temporaryAddress.detailedAddress = locationObj.ADDRESS

util/request.js

@@ -1,13 +1,13 @@
 import * as config from '@/config'
 let baseUrl = config.def().baseUrlNew
 // 定义基础请求路径(后端服务器地址)
-const baseRequest = (method, url, data,header) => {
+const baseRequest = (method, url, data, header) => {
 	var contentheader = 'application/json'
 	if (header) {
 		contentheader = header
 	}
 	let baseDefaultOpts = {
-		url: baseUrl+url,
+		url: baseUrl + url,
 		// 请求接口地址
 		data: data,
 		// 传入请求参数
@@ -16,58 +16,73 @@ const baseRequest = (method, url, data,header) => {
 		header: {
 			'content-type': contentheader //'application/x-www-form-urlencoded; charset=UTF-8',
 		}
-		}
-		let promise = new Promise(function(resolve, reject) {
-			uni.request(baseDefaultOpts).then(
-				(res) => {
-					// console.log(JSON.stringify(res[1].data))
-					// if(res[1].data.code == '200' || res[1].data.code == 200){
-					// 	// 后端返回的状态码100为成功状态,成功则返回请求结果,在app调试时可以通过console.log(JSON.stringify(res[1].data))来查看返回值（以项目实际情况为准）
-					// 	resolve(res[1].data)
-					// }else{
-					// 	uni.showToast({
-					// 		icon:'none',
-					// 	    title: res[1].data.message,
-					// 	    duration: 2000 
-					// 	}); 
-					// }
-					if(res[1]){
-						if(res[1].data.code == '200' || res[1].data.code == 200){
-							resolve(res[1].data)
+	}
+	let promise = new Promise(function(resolve, reject) {
+		uni.getNetworkType({}).then((res) => {
+			console.log(res)
+			if (res[1].networkType === "none") {
+				uni.showToast({
+					icon: 'none',
+					title: '网络异常，请检查网络状况',
+					duration: 2000
+				});
+			} else {
+				uni.request(baseDefaultOpts).then(
+					(res) => {
+						console.log(JSON.stringify(res[1].data))
+						// if(res[1].data.code == '200' || res[1].data.code == 200){
+						// 	// 后端返回的状态码100为成功状态,成功则返回请求结果,在app调试时可以通过console.log(JSON.stringify(res[1].data))来查看返回值（以项目实际情况为准）
+						// 	resolve(res[1].data)
+						// }else{
+						// 	uni.showToast({
+						// 		icon:'none',
+						// 	    title: res[1].data.message,
+						// 	    duration: 2000 
+						// 	}); 
+						// }
+						if (res[1]) {
+							if (res[1].data.code == '200' || res[1].data.code == 200) {
+								resolve(res[1].data)
+							}else{
+								resolve(res[1].data)
+							}
+						} else {
+							reject(response)
+							// uni.showToast({
+							// 	icon: 'none',
+							// 	title: '网络异常，请检查网络状况',
+							// 	duration: 2000
+							// });
 						}
-					}else{
-						uni.showToast({
-								icon:'none',
-							    title: '网络异常，请检查网络状况',
-							    duration: 2000 
-							}); 
+						// // 登录失败
+						// if(res[1].data.code == '11006' || res[1].data.code == 11006){
+						// 	reject(res[1].data)
+						// }
+						// if(res[1].data.code == '105' || res[1].data.code == 105){
+						// 	// 后端返回状态码为105则为未登录状态（以项目实际情况为准）
+						// 	uni.showToast({
+						// 		icon:'none',
+						// 	    title: '尚未登录',
+						// 	    duration: 2000 
+						// 	}); 
+						// 	// 尚未登录的逻辑处理
+						// 	return false
+						// }
 					}
-					// // 登录失败
-					// if(res[1].data.code == '11006' || res[1].data.code == 11006){
-					// 	reject(res[1].data)
-					// }
-					// if(res[1].data.code == '105' || res[1].data.code == 105){
-					// 	// 后端返回状态码为105则为未登录状态（以项目实际情况为准）
-					// 	uni.showToast({
-					// 		icon:'none',
-					// 	    title: '尚未登录',
-					// 	    duration: 2000 
-					// 	}); 
-					// 	// 尚未登录的逻辑处理
-					// 	return false
-					// }
-				}
-			).catch(
-				(response) => {
-					reject(response)
-				}
-			)
+				).catch(
+					(response) => {
+						reject(response)
+					}
+				)
+			}
+
 		})
-		return promise	
+	})
+	return promise
 };
 
 //带Token请求
-const TokenRequest = (method, url, data,header) => {
+const TokenRequest = (method, url, data, header) => {
 	var contentheader = 'application/json'
 	if (header) {
 		contentheader = header
@@ -81,29 +96,29 @@ const TokenRequest = (method, url, data,header) => {
 	});
 	//此token是登录成功后后台返回保存在storage中的
 	let DefaultOpts = {
-		url: baseUrl+url,
+		url: baseUrl + url,
 		data: data,
 		method: method,
-	header: {
-		'content-type': contentheader ,
-		'Token': ac_token,
-	}
+		header: {
+			'content-type': contentheader,
+			'Token': ac_token,
+		}
 	}
 	let promise = new Promise(function(resolve, reject) {
 		uni.request(DefaultOpts).then(
 			(res) => {
 				console.log(JSON.stringify(res[1].data))
-				if(res[1].data.code == '200' || res[1].data.code == 200){
+				if (res[1].data.code == '200' || res[1].data.code == 200) {
 					// 后端返回的状态码100为成功状态,成功则返回请求结果,在app调试时可以通过console.log(JSON.stringify(res[1].data))来查看返回值（以项目实际情况为准）
 					resolve(res[1].data)
 				}
-				if(res[1].data.code == '105' || res[1].data.code == 105){
+				if (res[1].data.code == '105' || res[1].data.code == 105) {
 					// 后端返回状态码为105则为未登录状态（以项目实际情况为准）
 					uni.showToast({
-						icon:'none',
-					    title: '尚未登录',
-					    duration: 2000 
-					}); 
+						icon: 'none',
+						title: '尚未登录',
+						duration: 2000
+					});
 					// 尚未登录的逻辑处理
 					return false
 				}
@@ -120,4 +135,4 @@ export default {
 	baseUrl,
 	baseRequest,
 	TokenRequest
-}
+}