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: {
@@ -295,7 +296,6 @@
 			// #ifdef APP-PLUS
 			var that = this
 			//判断该用户是否需要开启持续定位
-			console.log("onlaunch11111111",uni.getStorageSync('userInfo'))
 			if (uni.getStorageSync('userInfo')) {
 				this.$request.baseRequest('get', '/orderInfo/getData', {
 					commonId: uni.getStorageSync('userInfo').id,
@@ -336,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,
@@ -352,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 => {
@@ -504,18 +506,17 @@
 		},
 		onShow: function() {
 			console.log('App Show')
-		
 			// #ifdef APP-PLUS
-			var isContains = true;//隐私权政策是否包含高德开平隐私权政策  true是包含
-			var isShow = true;//隐私权政策是否弹窗展示告知用户 true是展示 
-			sdkwx.updatePrivacyShow(isContains, isShow);
+			// var isContains = true;//隐私权政策是否包含高德开平隐私权政策  true是包含
+			// var isShow = true;//隐私权政策是否弹窗展示告知用户 true是展示 
+			// sdkwx.updatePrivacyShow(isContains, isShow);
 			
-			var isAgree = true;//隐私权政策是否取得用户同意  true是用户同意
-			sdkwx.updatePrivacyAgree(isAgree);
-			//检查定位权限
-			sdkwx.checkLocationPermission(function(res){
-				console.log(res);
-			});
+			// var isAgree = true;//隐私权政策是否取得用户同意  true是用户同意
+			// sdkwx.updatePrivacyAgree(isAgree);
+			// //检查定位权限
+			// sdkwx.checkLocationPermission(function(res){
+			// 	console.log(res);
+			// });
 			getCurrentNo(res => {
 				// 进页面获取当前APP版本号（用于页面显示）
 				this.version = res.versionName;

common/helper.js

@@ -1,4 +1,6 @@
 import * as config from '../config'
+
+var sdkwx = uni.requireNativePlugin('Hdgq-LocSdkWX');
 const rolesList = []
 const gjList=[]
 const ossUploadUrl = 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/';
@@ -15,6 +17,66 @@ const imgTypeList = [{
 		name: '拍照',
 	}
 ]
+//定位sdk授权
+const sdkAuth = function(){
+	var enterpriseSenderCode = config.def().enterpriseSenderCode
+	var environment = config.def().environment
+	var appId = ''
+	var appSecurity = ''
+	let phoneType = uni.getSystemInfoSync().platform //判断手机类型
+	if (phoneType == "android") {
+		appId = config.def().androidAppId
+		appSecurity = config.def().androidAppSecurity
+	} else if (phoneType == "ios") {
+		appId = config.def().iosAppId
+		appSecurity = config.def().iosAppSecurity
+	}
+	console.log("appid：" + appId + "安全码：" + appSecurity + "发送代码：" + enterpriseSenderCode)
+	sdkwx.auth(appId, appSecurity, enterpriseSenderCode, environment, function(res) {
+		if (res.type == "onSuccess") {
+			//成功
+			
+			console.log("授权成功")
+			console.log(res)
+		} else if (res.type == "onFailure") {
+			//失败
+			var errorCode = res.data.errorCode; //错误码
+			var errorMsg = res.data.errorMsg; //错误描述
+			console.log("授权失败")
+			console.log(res)
+		}
+	});
+}
+//定位sdk开启
+const sdkStart = function(carNo,driverName,remark,shippingNoteInfos){
+	sdkwx.start(carNo, driverName, remark, shippingNoteInfos,
+		function(res) {
+			if (res.type == "onSuccess") {
+				//成功
+				console.log("开启定位成功！！！")
+				console.log(res)
+				var shippingNoteInfos = res.data[0]; //运单信息列表
+				console.log(shippingNoteInfos, "sdassss")
+				if (shippingNoteInfos) {
+					let dateTtime = Number(shippingNoteInfos.interval + 1000)
+					console.log("开始定时", dateTtime)
+					// that.send()
+				}
+			} else if (res.type == "onFailure") {
+				//失败
+				console.log("开启定位失败！！！")
+				console.log(res)
+				var errorCode = res.data.errorCode; //错误码
+				var errorMsg = res.data.errorMsg; //错误描述
+				setTimeout(() => {
+					console.log("定时")
+					// that.send()
+				}, 915204);
+			}
+		});
+}
+
+
 // 当前日期是否超过今天（校验有效期）
 const periodOfValidity=function(year1,month1,day1){
 	let nowDate = new Date();
@@ -455,9 +517,11 @@ export default {
 	imgTypeList,
 	makeValidityPeriod,
 	periodOfValidity,
+	sdkAuth,
 	getProvinceAbbreviation,
 	filterUrban,
 	filterArea,
+	sdkStart,
 	fUN_AmapLocation,
 	changeTime,
 	gjList

config/componentConfig.js

@@ -28,39 +28,42 @@ export default {
 		 */
 		/****************以下是示例*******************/
 		// 可以用自己项目的请求方法（接口自己找后台要，插件不提供）
-		const baseUrlNew = config.def().baseUrlNew
-		uni.request({
-			url: baseUrlNew + '/appVersion/selectInfo',
-			data: {
-				appid: plus.runtime.appid,
-				version: plus.runtime.version,
-				imei: "1",
-				type: 'sj'
-			},
-			method: 'GET',
-			success: (res) => {
-				if (res.data.data && res.data.data.wgtUrl) {
-					res.data.data.versionName = res.data.data.version
-					res.data.data.versionInfo = res.data.data.note
-					res.data.data.downloadUrl = res.data.data.wgtUrl
-					// 兼容之前的版本（updateType是新版才有的参数）
-					if (res.data.data.updateType) {
-						callback && callback(res.data.data);
-					} else {
-						if (res.forceUpdate) {
-							res.updateType = "forcibly";
+		plus.runtime.getProperty(plus.runtime.appid, (info) => {
+			const baseUrlNew = config.def().baseUrlNew
+			uni.request({
+				url: baseUrlNew + '/appVersion/selectInfo',
+				data: {
+					appid: plus.runtime.appid,
+					version: info.version,
+					imei: "1",
+					type: 'sj'
+				},
+				method: 'GET',
+				success: (res) => {
+					if (res.data.data && res.data.data.wgtUrl) {
+						res.data.data.versionName = res.data.data.version
+						res.data.data.versionInfo = res.data.data.note
+						res.data.data.downloadUrl = res.data.data.wgtUrl
+						// 兼容之前的版本（updateType是新版才有的参数）
+						if (res.data.data.updateType) {
+							callback && callback(res.data.data);
 						} else {
-							res.updateType = "solicit";
+							if (res.forceUpdate) {
+								res.updateType = "forcibly";
+							} else {
+								res.updateType = "solicit";
+							}
+							callback && callback(res.data.data);
 						}
-						callback && callback(res.data.data);
+					} else if (isPrompt) {
+						uni.showToast({
+							title: "暂无新版本",
+							icon: "none"
+						});
 					}
-				} else if (isPrompt) {
-					uni.showToast({
-						title: "暂无新版本",
-						icon: "none"
-					});
 				}
-			}
+		})
+		
 		})
 		//      $http.get("api/common/v1/app_version", httpData,{
 		//          isPrompt: isPrompt

config/index.js

@@ -1,10 +1,8 @@
 const dev = {
 	baseUrlNew: 'https://api.changyuntong56.com',
-	// baseUrlNew: 'https://apitest.changyuntong56.com',
-	// baseUrlNew: 'https://apitest.eliangeyun.com',
 	// baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
-	// baseUrlNew: 'http://192.168.1.119:8999',
+	// baseUrlNew: 'http://192.168.110.67:8999',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false,
 	//部网络货运 持续定位

manifest.json

@@ -2,8 +2,8 @@
     "name" : "畅运通",
     "appid" : "__UNI__9C76CB6",
     "description" : "",
-    "versionName" : "1.1.5",
-    "versionCode" : 115,
+    "versionName" : "1.2.2",
+    "versionCode" : 122,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -56,10 +56,13 @@
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
                     "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
                     "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
-                ]
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {},

pages.json

@@ -195,6 +195,15 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/sale/webview",
+			"style": {
+				// #ifdef MP 
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": ""
+				// #endif 
+			}
+		},
 		{
 			"path": "pages/riders/notice",
 			"style": {
@@ -448,7 +457,8 @@
 						"buttons": [{
 							"text": "账单",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
-							"fontSize": "18"
+							"fontSize": "16",
+							 "textAlign":"left"
 							 // "redDot": "true"
 						}]
 					}

pages/goodSource/cargoOwnerSee.vue

@@ -1,116 +1,121 @@
 <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='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.zong}}</view>
-			</view>
-			<view class="flex">
-				<view class="text">发运次数</view>
-				<view class="number">{{dataObj.countFa}}</view>
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" class="mescroll">
+			<view class="center_top">
+				<view class="left">
+					<u--image
+						:src="objectInfo.cargoOwnerPortrait?objectInfo.cargoOwnerPortrait:'../../static/images/mine/tx.png'"
+						width='172rpx' height='172rpx' 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>
+				<view class="feedback_css">+关注</view>
 			</view>
-			<!-- <view class="flex">
+			<view class="pf-row flex">
+				<view class="flex">
+					<view class="text">评分</view>
+					<view class="number">{{dataObj.zong}}</view>
+				</view>
+				<view class="flex">
+					<view class="text">发运次数</view>
+					<view class="number">{{dataObj.countFa}}</view>
+				</view>
+				<!-- <view class="flex">
 				<view class="text">好评率</view>
 				<view class="number">{{dataObj.haoPingLv}}</view>
 			</view> -->
-			<view class="flex">
-				<view class="text">评价</view>
-				<view class="number">{{totalPL}}</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="companyList.length>0">所属企业:</view>
-				<view class="enterprise_title" v-else>个人货主，暂未代理企业</view>
-				<view v-for='item in companyList'>
-					<view style="color: #999999;margin: 20rpx;">{{item.company?item.company:item.companyName}}</view>
+				<view class="flex">
+					<view class="text">评价</view>
+					<view class="number">{{totalPL}}</view>
 				</view>
-			<!-- 	<view class="enterprise_name" v-if="companyList.length>0">{{objectInfo.cargoOwner}}</view> -->
 			</view>
-		</view>
-		<!-- 评价信息 -->
-		<view v-if="indexBtn == 2" class="pl-style">
-			<view class="pf flex-space-between flex">
-				<view class="left flex align-center" style="margin-right: 20rpx;">
-					<view class="pf-number">
-						{{dataObj.zong}}
+
+			<u-line></u-line>
+			<view class="pj-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>
+				<!-- 货主信息 -->
+				<view v-if="indexBtn == 1" class="enterprise">
 					<view>
-						<view>
-							<start count="5" v-model="dataObj.zong" size="35" activeColor="#ffaa00" :size="18" :allowHalf='true'
-								:readonly='true'>
-							</start>
+						<view class="enterprise_title" v-if="companyList.length>0">所属企业:</view>
+						<view class="enterprise_title" v-else>个人货主，暂未代理企业</view>
+						<view v-for='item in companyList'>
+							<view style="color: #999999;margin: 20rpx;">{{item.company?item.company:item.companyName}}
+							</view>
 						</view>
-						<view class="gray fontsize-24">累计发运{{dataObj.countFa}}次</view>
+						<!-- 	<view class="enterprise_name" v-if="companyList.length>0">{{objectInfo.cargoOwner}}</view> -->
 					</view>
 				</view>
-				<view v-if='dataObj.haoPing>20' class="right">
-					<view>{{dataObj.haoPingLv}}%</view>
-					<view class="gray fontsize-24">好评率</view>
-				</view>
-			</view>
-				<view class="flex flex-space-between">
-					<view :class="btnData == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{totalPL}})</view>
-					<!-- <view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">最新</view> -->
-					<view :class="btnData == 1 ? 'btn-active':'btn'" @click="btnChange(1)">好评({{dataObj.haoPing}})</view>
-					<view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">差评({{dataObj.chaPing}})</view>
-				</view>
-				<view class="evaluate_css" v-for="(item,index) in list">
+				<!-- 评价信息 -->
+				<view v-if="indexBtn == 2" class="pl-style">
+					<view class="pf flex-space-between flex">
+						<view class="left flex align-center" style="margin-right: 20rpx;">
+							<view class="pf-number">
+								{{dataObj.zong}}
+							</view>
+							<view class="pf-number-right">
+								<start count="5" v-model="dataObj.zong" size="35" activeColor="#ffaa00" :size="18"
+									:allowHalf='true' :readonly='true'>
+								</start>
+								<view class="gray fontsize-24">累计发运{{dataObj.countFa}}次</view>
+							</view>
+						</view>
+						<view v-if='dataObj.haoPing>20' class="right">
+							<view>{{dataObj.haoPingLv}}%</view>
+							<view class="gray fontsize-24">好评率</view>
+						</view>
+					</view>
 					<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">{{item.driverName}}</view>
-								<view class="evaluate_date m-top10">{{objectInfo.createDate.split(' ')[0]}}</view>
-								<view class="flex m-top10">
-									<view class="branch_css ">{{item.ownerScoreObtained}}</view>
-									<view class="">
-										<start count="5" v-model="item.ownerScoreObtained" size="35" activeColor="#ffaa00" :size="18"
-											:allowHalf='true' :disabled='true'>
-										</start>
+						<view :class="btnData == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{totalPL}})</view>
+						<!-- <view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">最新</view> -->
+						<view :class="btnData == 1 ? 'btn-active':'btn'" @click="btnChange(1)">好评({{dataObj.haoPing}})
+						</view>
+						<view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">差评({{dataObj.chaPing}})
+						</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='68rpx' height='68rpx' shape="circle">
+								</u--image>
+								<view class="right">
+									<view class="evaluate_name">{{item.driverName}}</view>
+									<view class="evaluate_date m-top10">{{objectInfo.createDate.split(' ')[0]}}</view>
+									<view class="flex m-top10">
+										<view class="branch_css">{{item.ownerScoreObtained}}</view>
+										<view class="">
+											<start count="5" v-model="item.ownerScoreObtained" size="35"
+												activeColor="#ffaa00" :size="18" :allowHalf='true' :disabled='true'>
+											</start>
+										</view>
+									</view>
+									<view class="" style="font-size: 28rpx;">
+										{{item.driverContent}}
+									</view>
+									<view style='flex-wrap: wrap;' class='flex'>
+										<u--image style='margin:7rpx;border:1px solid #ccc;'
+											v-for="(item1,index) in item.imgList" @click='ylImg(item.imgList)'
+											:src="item1" width='170rpx' height='170rpx'>
+										</u--image>
 									</view>
-								</view>
-								<view class="">
-									{{item.driverContent}}
-								</view>
-								<view style='flex-wrap: wrap;' class='flex'>
-									<u--image style='margin:7rpx;border:1px solid #ccc;' v-for="(item1,index) in item.imgList" @click='ylImg(item.imgList)' :src="item1" width='170rpx'
-										height='170rpx'>
-									</u--image>
 								</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>
-		
+			</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>
@@ -138,12 +143,12 @@
 				],
 				id: "",
 				objectInfo: {},
-				haoType:'',
-				companyList:[],
-				commonId:'',
+				haoType: '',
+				companyList: [],
+				commonId: '',
 				indexBtn: 1,
 				btnData: '',
-				totalPL:'0'
+				totalPL: '0'
 			}
 		},
 		computed: {
@@ -154,7 +159,7 @@
 		},
 		onLoad(options) {
 			that = this
-			this.commonId=options.commonId
+			this.commonId = options.commonId
 			this.objectInfo = options
 			console.log(options)
 
@@ -183,7 +188,7 @@
 				this.show = false
 			},
 			upCallback(page) {
-				console.log(this.commonId,11111111)
+				console.log(this.commonId, 11111111)
 				this.$request.baseRequest('get', '/cargoOwnerCompInfo/cargoOwnerList', {
 						commonId: this.commonId
 					}).then(res => {
@@ -219,14 +224,14 @@
 				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
 						evaluatoredId: this.objectInfo.commonId,
 						flag: 2,
-						haoType:this.haoType,
-						searchType:2,
+						haoType: this.haoType,
+						searchType: 2,
 						pageSize: page.size,
 						currentPage: page.num
 					}).then(res => {
 						if (page.num == 1) that.list = [];
 						that.list = that.list.concat(res.data.records); //追加新数据
-						if(this.haoType==''){
+						if (this.haoType == '') {
 							that.totalPL = res.data.total
 						}
 						for (let i = 0; i < that.list.length; i++) {
@@ -282,10 +287,13 @@
 				this.show = false
 			},
 			btnChange(num) {
-				this.haoType=num
+				this.haoType = num
 				this.btnData = num
 				this.getList()
-				this.upCallback({size:10,num:1})
+				this.upCallback({
+					size: 10,
+					num: 1
+				})
 			}
 		}
 	}
@@ -293,13 +301,23 @@
 
 <style lang="scss">
 	.center {
-		padding: 40rpx;
+		padding: 40rpx 0;
 	}
 
 	.center_top {
+		padding: 0 53rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.left {
+			display: flex;
+			align-items: center;
+		}
+
 		.name {
-			margin: 40rpx;
-			font-size: 48rpx;
+			// margin: 40rpx 30rpx;
+			font-size: 46rpx;
 			font-weight: 600;
 		}
 
@@ -313,13 +331,20 @@
 		}
 
 		.feedback_css {
-			margin-top: 44rpx;
-			margin-left: 50px;
+			width: 124rpx;
+			height: 58rpx;
+			background: #2772FB;
+			border-radius: 29rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #fff;
+			font-size: 28rpx;
 		}
 	}
 
 	.switchbtn {
-		margin-right: 40rpx;
+		margin-right: 117rpx;
 		margin-top: 20rpx;
 		font-weight: 600;
 	}
@@ -347,6 +372,7 @@
 		.enterprise_title {
 			font-weight: 700;
 			margin-top: 80rpx;
+			font-size: 28rpx;
 		}
 
 		.enterprise_name {
@@ -366,14 +392,22 @@
 		padding-bottom: 40rpx;
 		border-bottom: 1px solid #E6E6E6;
 
-		.evaluate_name {}
+		.evaluate_name {
+			font-size: 26rpx;
+		}
 
 		.branch_css {
 			// margin: 0;
 			margin-right: 20rpx;
+			font-size: 22rpx;
+			color: #878787;
 		}
 
-		.evaluate_date {}
+		.evaluate_date {
+			font-size: 22rpx;
+			font-weight: 400;
+			color: #999999;
+		}
 
 		.row1 {
 			.right {
@@ -386,18 +420,24 @@
 
 	.pf-row {
 		margin: 20rpx 0;
+		display: flex;
+		padding: 0 53rpx;
+
 
 		.text {
 			color: #999;
 			margin-right: 20rpx;
+			font-size: 22rpx;
 		}
 
 		.number {
 			color: #2772FB;
+			font-size: 28rpx;
 		}
 
 		.flex {
 			margin-right: 20rpx;
+			align-items: center;
 		}
 	}
 
@@ -413,6 +453,8 @@
 		align-items: center;
 		justify-content: center;
 		padding: 10rpx 20rpx;
+		font-size: 24rpx;
+		margin-right: 16rpx;
 	}
 
 	.btn {
@@ -423,15 +465,29 @@
 		align-items: center;
 		justify-content: center;
 		padding: 10rpx 20rpx;
+		font-size: 24rpx;
+		margin-right: 16rpx;
 	}
 
 	.pf-number {
 		color: #363636;
-		font-size: 60rpx;
+		font-size: 94rpx;
 		margin-right: 30rpx;
 	}
 
+	.pf-number-right {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		height: 80rpx;
+	}
+
 	.pf {
 		margin-bottom: 20rpx;
 	}
+
+	.pj-view {
+		padding: 0 53rpx;
+		font-size: 30rpx;
+	}
 </style>

pages/goodSource/fk.vue

@@ -3,26 +3,28 @@
 		<view class="row1 flex flex-space-between">
 			<view>被投诉人</view>
 			<view class='flex'>
-				<image :src="dataDetails.cargoOwnerPortrait" mode="widthFix"  style="width: 40rpx;height: 40rpx;" class="img_css"> </image>
+				<image :src="dataDetails.cargoOwnerPortrait" mode="widthFix" style="width: 40rpx;height: 40rpx;"
+					class="img_css"> </image>
 				<view>{{dataDetails.cargoOwnerName?dataDetails.cargoOwnerName:dataDetails.cargoOwner}}</view>
 			</view>
 		</view>
-		<u-line class="line"></u-line>
+		<u-line class="line" color="#E6E6E6"></u-line>
 		<view class="row1 flex flex-space-between">
 			<view>关联订单（选填）</view>
 			<view style='align-items: center;' class='flex'>
 				<view @click='selectorder'>{{dataDetails.orderNo?dataDetails.orderNo:'选择订单'}}></view>
 			</view>
 		</view>
-		<u-line class="line"></u-line>
+		<u-line class="line" color="#E6E6E6"></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字" maxlength='300' border="none">
+			</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="$u.throttle(submit, 5000)">提交</view>
-		<u-picker :show="isShow" ref="uPicker"  :columns="orderList" keyName="orderNo" @confirm="confirmorder"
+		<view class="row3" @click="$u.throttle(submit, 1000)">提交</view>
+		<u-picker :show="isShow" ref="uPicker" :columns="orderList" keyName="orderNo" @confirm="confirmorder"
 			:closeOnClickOverlay='true' @close='isShow=false' @cancel='isShow=false'>
 		</u-picker>
 		<u-toast ref="uToast"></u-toast>
@@ -42,69 +44,69 @@
 				value1: '',
 				fileList1: [],
 				dataDetails: {},
-				orderList:[],
-				isShow:false,
-				type:0
+				orderList: [],
+				isShow: false,
+				type: 0
 			};
 		},
 		onLoad(options) {
 			this.get_camera_permission()
 			this.dataDetails = JSON.parse(options.val)
-			this.type=options.type
+			this.type = options.type
 			console.log(this.dataDetails)
 			this.imgList = []
 		},
-		onShow(){
+		onShow() {
 			uni.showLoading({
 				title: '加载中'
 			})
-			var commonId=''
-			if(this.type==1){
-				commonId=this.dataDetails.cargoCommonId
-			}else{
-				commonId=this.dataDetails.commonId
+			var commonId = ''
+			if (this.type == 1) {
+				commonId = this.dataDetails.cargoCommonId
+			} else {
+				commonId = this.dataDetails.commonId
 			}
-			this.$request.baseRequest('get', '/orderInfo/getAssociatedOrder',{
-				cargoCommonId: commonId,
-				commonId:this.userInfo.id
-			}).then(res => {
-				let that = this
-				uni.hideLoading()
-				this.orderList=[res.data]
-				// console.log(this.orderList)
-			})
-			.catch(res => {
-				uni.$u.toast(res.message);
-			});
+			this.$request.baseRequest('get', '/orderInfo/getAssociatedOrder', {
+					cargoCommonId: commonId,
+					commonId: this.userInfo.id
+				}).then(res => {
+					let that = this
+					uni.hideLoading()
+					this.orderList = [res.data]
+					// console.log(this.orderList)
+				})
+				.catch(res => {
+					uni.$u.toast(res.message);
+				});
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		methods: {
-			confirmorder(e){
+			confirmorder(e) {
 				console.log(e)
-				this.dataDetails.orderId=e.value[0].id
-				this.dataDetails.orderNo=e.value[0].orderNo
-				this.isShow=false
+				this.dataDetails.orderId = e.value[0].id
+				this.dataDetails.orderNo = e.value[0].orderNo
+				this.isShow = false
 			},
-			selectorder(){
-				this.isShow=true
+			selectorder() {
+				this.isShow = true
 			},
 			async get_camera_permission() {
-				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
-				if(photol == false){
+				var photol = await permision.requestAndroidPermission("android.permission.CAMERA")
+				if (photol == false) {
 					uni.showModal({
 						title: '提示',
 						content: '您已经关闭相册权限,去设置',
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
 								permision.gotoAppPermissionSetting()
-									            // plus.runtime.openURL("app-settings:");
+								// plus.runtime.openURL("app-settings:");
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
 						}
-					});	
+					});
 				}
 			},
 			submit() {
@@ -113,21 +115,21 @@
 				})
 				console.log()
 				this.$request.baseRequest('post', '/feedbackReport/api/addInfo', {
-						initiator:this.firstAuthentication.driverName,
-						initiatorNumber:this.firstAuthentication.driverPhone,
+						initiator: this.firstAuthentication.driverName,
+						initiatorNumber: this.firstAuthentication.driverPhone,
 						commonId: this.firstAuthentication.commonId,
 						passive: this.dataDetails.cargoOwnerName,
 						passiveNumber: this.dataDetails.cargoOwnerPhone,
-						passiveCommonId:this.dataDetails.commonId,
-						orderId:this.dataDetails.orderId,
-						orderNo:this.dataDetails.orderNo,
+						passiveCommonId: this.dataDetails.commonId,
+						orderId: this.dataDetails.orderId,
+						orderNo: this.dataDetails.orderNo,
 						content: this.value1,
 						url: this.imgList.toString(),
 						flag: 1,
-						objectFlag:2
+						objectFlag: 2
 					}).then(res => {
 						let that = this
-						this.type=0
+						this.type = 0
 						uni.hideLoading()
 						this.$refs.uToast.show({
 							type: 'success',
@@ -200,6 +202,7 @@
 	.row1,
 	.row2 {
 		padding: 40rpx;
+		font-size: 28rpx;
 	}
 
 	.title {
@@ -211,8 +214,9 @@
 		background: #2772FB;
 		text-align: center;
 		color: white;
-		padding: 20rpx;
+		padding: 25rpx;
 		margin: auto;
+		font-size: 36rpx;
 		border-radius: 10rpx;
 	}
 </style>

pages/goodSource/index.vue

@@ -4,104 +4,115 @@
 		<!-- 		<fh-no-network></fh-no-network> -->
 		<view class="banner">
 			<image class="banner-img" src="@/static/images/goodSource/banner@2x.png" mode='widthFix'></image>
-			<view class="head flex s-row paddingr35">
+			<view class="head flex s-row">
 				<view class="flex flex-space-between">
 					<view class="flex s-row item1" @click="goCity(0)">
-						<view class="fontsize-28 gray">装车</view>
+						<view class="fontsize-28 gray place-title">装车</view>
 						<view class="fontsize-46 fontweight-500 text">{{startPlace.selected}}</view>
 					</view>
 					<image class="change-btn item2" src="@/static/images/goodSource/change.png" mode='widthFix'
 						@click="changeCity"></image>
 					<view class="flex s-row item3" @click="goCity(1)">
-						<view class="fontsize-28 gray text-align-right">卸车</view>
+						<view class="fontsize-28 gray text-align-right place-title">卸车</view>
 						<view class="fontsize-46 fontweight-500 text">{{endPlace.selected}}</view>
 					</view>
 				</view>
 				<view>
-					<u-button type="" class="btn-color fontsize-36 m-top20" @click="upCallback({size:10,num:1})"> 查询
+					<u-button type="" class="btn-color fontsize-36" @click="upCallback({size:10,num:1})"> 查询
 					</u-button>
 				</view>
 			</view>
 		</view>
 		<view :class="scrollTop>1200?'fixed1':''"></view>
 		<view class="tab-view">
-			<u-tabs :list="tabList" @click="clickTab" :lineColor="scrollTop>1200?'white':'#303133'" :current='tabIndex'
+			<u-tabs :list="tabList" @click="clickTab" :lineColor="scrollTop>1200?'white':'#000000'" :current='tabIndex'
 				:inactiveStyle="{color: scrollTop>1200?'white':'',}" :activeStyle="{
-							color: scrollTop>1200?'white':'',
+							color: scrollTop>1200?'':'#000000',
 							fontWeight: 'bold',
-							transform: 'scale(1.05)'
+							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">
-					<view style="padding: 0 35rpx 20rpx 35rpx;position: relative;">
+					<view class="good-view">
 						<image src="@/static/images/goodSource/xf.png" mode="widthFix" class="xf-iamge"
 							v-if="good.freightAdvance==1"></image>
-						<view class="flex align-center">
-							<view class="item1">
-								<view class="ssx">
-									{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}
+						<view class="list-left">
+							<view class="flex align-center">
+								<view class="item1">
+									<view class="ssx">
+										{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}
+									</view>
+									<view class="level2-title">{{$helper.filterUrban(good.sendCity)}}
+										{{$helper.filterArea(good.sendArea)}}
+									</view>
 								</view>
-								<view class="level2-title">{{$helper.filterUrban(good.sendCity)}}
-									{{$helper.filterArea(good.sendArea)}}
+
+								<image class="jt-icon item2" src="@/static/images/goodSource/jt.png" mode='widthFix'>
+								</image>
+								<view class="item3">
+									<view class="ssx">
+										{{$helper.getProvinceAbbreviation(good.unloadPrivate?good.unloadPrivate:good.unloadCity)}}
+									</view>
+									<view class="level2-title">{{$helper.filterUrban(good.unloadCity)}}
+										{{$helper.filterArea(good.unloadArea)}}
+									</view>
 								</view>
 							</view>
 
-							<image class="jt-icon item2" src="@/static/images/goodSource/jt.png" mode='widthFix'>
-							</image>
-							<view class="item3">
-								<view class="ssx">
-									{{$helper.getProvinceAbbreviation(good.unloadPrivate?good.unloadPrivate:good.unloadCity)}}
+							<view class="flex flex-space-between yf-style">
+								<view class="left">
+									<view class="flex">
+										<view class="gray" v-if="good.cargoDistance"><text class="text-space">货距</text>
+											<text class="text-space">{{good.cargoDistance}}km</text>
+										</view>
+										<view class="gray " v-if="good.distance"><text class="text-space">运距</text><text
+												class="text-space">{{good.distance}}km</text> </view>
+									</view>
+									<view class="u-flex-wrap flex gray row ">
+										<view>{{good.goodsName}}</view>
+										<!-- <u-line direction="col"></u-line> -->
+										<view v-if="carLength(good)"><text class="line">|</text> {{carLength(good)}}
+										</view>
+										<view v-if="carType(good)"><text class="line">|</text>{{carType(good)}} </view>
+										<view v-if="carWeight(good)"><text class="line">|</text>{{carWeight(good)}}
+										</view>
+									</view>
+									<view class="flex row">
+										<view class="row-tips" v-if="good.taskDescription">{{good.taskDescription}}
+										</view>
+									</view>
 								</view>
-								<view class="level2-title">{{$helper.filterUrban(good.unloadCity)}}
-									{{$helper.filterArea(good.unloadArea)}}
+								<view class="right flex h-color">
+									<text class="fontsize-46">
+										{{good.freightPrice}}
+									</text>
+									<text class="flex dw">{{good.billingMethod == 0?"元/吨":"元/车"}}</text>
 								</view>
 							</view>
 						</view>
-						<view class="right gray">
+
+						<!-- <view class="right gray">
 							{{$helper.changeTime(good.updateDate)}}
-						</view>
-						<view class="flex flex-space-between yf-style">
-							<view class="left">
-								<view class="flex">
-									<view class="gray mr20" v-if="good.cargoDistance">货距 {{good.cargoDistance}}km</view>
-									<view class="gray " v-if="good.distance">运距 {{good.distance}}km</view>
-								</view>
-								<view class="u-flex-wrap flex gray row ">
-									<view>{{good.goodsName}}</view>
-									<!-- <u-line direction="col"></u-line> -->
-									<view v-if="carLength(good)">|{{carLength(good)}}</view>
-									<view v-if="carType(good)">|{{carType(good)}} </view>
-									<view v-if="carWeight(good)">|{{carWeight(good)}}</view>
-								</view>
-								<view class="flex row">
-									<view class="row-tips" v-if="good.taskDescription">{{good.taskDescription}}</view>
-								</view>
-							</view>
-							<view class="right flex h-color">
-								<view class="fontsize-46">
-									{{good.freightPrice}}
-								</view>
-								<view class="flex dw">{{good.billingMethod == 0?"元/吨":"元/车"}}</view>
-							</view>
-						</view>
+						</view> -->
 					</view>
 					<view class="flex flex-space-between item-bottom">
 						<view class="left flex row" @click.stop="cargoOwner(good)">
 							<u--image
 								:src="good.cargoOwnerPortrait?good.cargoOwnerPortrait:'../../static/images/mine/tx.png'"
-								width='100rpx' height='100rpx' shape="circle">
+								width='57rpx' height='57rpx' shape="circle">
 							</u--image>
 							<view class="name">{{good.cargoOwnerName}}</view>
 							<!-- <view class="hp flex fontsize-24">
@@ -123,7 +134,7 @@
 		</mescroll-body>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :confirmText='confirmText'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 5000)"
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 1000)"
 			@close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -181,9 +192,9 @@
 				lat: '',
 				bool: false,
 				showMenu: false,
-				driverCommonId:"",
-				driverPhone:"",
-				driverName:""
+				driverCommonId: "",
+				driverPhone: "",
+				driverName: ""
 			}
 		},
 		onTabItemTap(e) {
@@ -196,9 +207,7 @@
 						duration: 300
 					});
 				}
-
 			}
-
 		},
 		created() {
 
@@ -395,51 +404,70 @@
 					var main = plus.android.runtimeMainActivity();
 					var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
 					if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
-						uni.showModal({
-							title: '提示',
-							content: '请打开定位服务功能',
-							// showCancel: false, // 不显示取消按钮
-							success(res) {
-								if (res.confirm) {
-									uni.setStorageSync('confirm_location', 1)
-									if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
-
-										var Intent = plus.android.importClass('android.content.Intent');
-										var Settings = plus.android.importClass('android.provider.Settings');
-										var intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-										main.startActivity(intent); // 打开系统设置GPS服务页面
-									} else {
-										uni.setStorageSync('fPlaceObj', {
-											fchoosearea: '全部',
-											fchoosecity: '市辖区',
-											fchooseprovince: '北京',
-											selected: '东城'
-										})
-										uni.setStorageSync('sPlaceObj', {
-											schoosearea: '请选择区',
-											schoosecity: '请选择市',
-											schooseprovince: '全国',
-											selected: '全国'
-										})
-										uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
-									}
-								} else {
-									uni.setStorageSync('fPlaceObj', {
-										fchoosearea: '全部',
-										fchoosecity: '市辖区',
-										fchooseprovince: '北京',
-										selected: '东城'
-									})
-									uni.setStorageSync('sPlaceObj', {
-										schoosearea: '请选择区',
-										schoosecity: '请选择市',
-										schooseprovince: '全国',
-										selected: '全国'
-									})
-									uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
-								}
-							}
-						});
+						// uni.showModal({
+						// 	title: '提示',
+						// 	content: '请打开定位服务功能',
+						// 	// showCancel: false, // 不显示取消按钮
+						// 	success(res) {
+						// 		if (res.confirm) {
+						// 			uni.setStorageSync('confirm_location', 1)
+						// 			if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
+
+						// 				var Intent = plus.android.importClass('android.content.Intent');
+						// 				var Settings = plus.android.importClass('android.provider.Settings');
+						// 				var intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+						// 				main.startActivity(intent); // 打开系统设置GPS服务页面
+						// 			} else {
+						// 				uni.setStorageSync('fPlaceObj', {
+						// 					fchoosearea: '全部',
+						// 					fchoosecity: '市辖区',
+						// 					fchooseprovince: '北京',
+						// 					selected: '东城'
+						// 				})
+						// 				uni.setStorageSync('sPlaceObj', {
+						// 					schoosearea: '请选择区',
+						// 					schoosecity: '请选择市',
+						// 					schooseprovince: '全国',
+						// 					selected: '全国'
+						// 				})
+						// 				uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
+						// 			}
+						// 		} else {
+						// 			uni.setStorageSync('fPlaceObj', {
+						// 				fchoosearea: '全部',
+						// 				fchoosecity: '市辖区',
+						// 				fchooseprovince: '北京',
+						// 				selected: '东城'
+						// 			})
+						// 			uni.setStorageSync('sPlaceObj', {
+						// 				schoosearea: '请选择区',
+						// 				schoosecity: '请选择市',
+						// 				schooseprovince: '全国',
+						// 				selected: '全国'
+						// 			})
+						// 			uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
+						// 		}
+						// 	}
+						// });
+						uni.setStorageSync('fPlaceObj', {
+							fchoosearea: '全部',
+							fchoosecity: '市辖区',
+							fchooseprovince: '北京',
+							selected: '东城'
+						})
+						uni.setStorageSync('sPlaceObj', {
+							schoosearea: '请选择区',
+							schoosecity: '请选择市',
+							schooseprovince: '全国',
+							selected: '全国'
+						})
+						if (uni.getStorageSync('fPlaceObj')) {
+							that.startPlace = uni.getStorageSync('fPlaceObj');
+						}
+						if (uni.getStorageSync('sPlaceObj')) {
+							that.endPlace = uni.getStorageSync('sPlaceObj');
+						}
+						uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
 					} else {
 						this.getLngLat()
 					}
@@ -490,12 +518,11 @@
 			confirmClick() {
 				let item = this.ObjSelect
 				var that = this
-
 				let _obj = {
 					driverCommonId: that.driverCommonId,
 					commonId: item.commonId,
 					compId: item.compId,
-					cargoOwnerName: item.cargoOwnerName,
+					cargoOwnerName: item.cargoOwnerReallyName,
 					cargoOwner: item.cargoOwner,
 					sendPrivate: item.sendPrivate,
 					sendCity: item.sendCity,
@@ -517,6 +544,7 @@
 					goodsType: item.goodsType,
 					goodsTypeKey: item.goodsTypeKey
 				}
+				console.log("查看抢单", _obj)
 				that.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
 						if (res.code == 200) {
 							that.$refs.uToast.show({
@@ -623,7 +651,7 @@
 							message: '司机审核中！',
 						})
 						return
-					} else if(res2.data.authenticationStatus == '已认证'){
+					} else if (res2.data.authenticationStatus == '已认证') {
 						this.driverCommonId = res2.data.commonId
 						this.driverPhone = res2.data.driverPhone
 						this.driverName = res2.data.driverName
@@ -1017,6 +1045,7 @@
 		background: white;
 		margin: 0 20rpx;
 		border-radius: 20rpx;
+		padding: 33rpx 33rpx 48rpx 33rpx;
 
 		.item1,
 		.item3 {
@@ -1047,10 +1076,15 @@
 	.good-list {
 		background-color: white;
 		margin: 10px 10px 15px 10px;
-		padding: 10px 0px 0px 0;
+		// padding: 10px 0px 0px 0;
 		border-radius: 30rpx;
 		box-shadow: 0px 5rpx 20rpx #E3E3E3;
 
+		.good-view {
+			padding: 10rpx 35rpx 10rpx 35rpx;
+			position: relative;
+		}
+
 		.item1,
 		.item3 {
 			// width: 40%;
@@ -1075,7 +1109,7 @@
 
 	.jt-icon {
 		position: relative;
-		top: 6rpx;
+		// top: 6rpx;
 		width: 60rpx;
 		margin: 0 20rpx;
 
@@ -1088,8 +1122,8 @@
 
 	.item-bottom {
 		background: #F0F5FF;
-		padding: 0 30rpx;
-		border-radius: 0 0 30rpx 30rpx;
+		padding: 23rpx 30rpx;
+		border-radius: 0px 0px 18px 18px;
 
 		.name {
 			font-size: 26rpx;
@@ -1108,11 +1142,11 @@
 
 		.qd {
 			background: linear-gradient(97deg, #4FABFD 0%, #2772FB 100%);
-			border-radius: 13px;
+			border-radius: 13rpx;
 			font-size: 29rpx;
 			font-weight: 400;
 			color: #FFFFFF;
-			padding: 10rpx 35rpx;
+			padding: 15rpx 35rpx;
 		}
 	}
 
@@ -1121,7 +1155,6 @@
 	}
 
 	.place {
-
 		height: var(--status-bar-height);
 	}
 
@@ -1129,11 +1162,12 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
+		// padding-left: 20rpx;
 	}
 
 	.tab-right {
 		display: flex;
-		margin-right: 20rpx;
+		margin-right: 39rpx;
 		align-items: center;
 	}
 
@@ -1153,10 +1187,22 @@
 	.yf-style {
 		position: relative;
 
+		.left {
+			font-size: 25.39rpx;
+
+			.text-space {
+				margin-right: 20rpx;
+			}
+
+			.line {
+				margin: 0 10rpx;
+			}
+		}
+
 		.h-color {
-			position: absolute;
-			right: 0;
-			top: -30rpx;
+			// position: absolute;
+			// right: 0;
+			// top: -30rpx;
 		}
 	}
 
@@ -1167,4 +1213,13 @@
 		top: -20rpx;
 		right: 0;
 	}
+
+	.place-title {
+		margin-bottom: 11rpx;
+	}
+
+	.btn-color {
+		margin-top: 52rpx;
+		padding: 30rpx 0;
+	}
 </style>

pages/goodSource/jb.vue

@@ -7,22 +7,22 @@
 				<view>{{dataDetails.cargoOwnerName}}</view>
 			</view>
 		</view>
-		<u-line class="line"></u-line>
+		<u-line class="line" color="#E6E6E6"></u-line>
 		<view class="row1 flex flex-space-between">
 			<view>关联订单（选填）</view>
 			<view style='align-items: center;' class='flex'>
 				<view @click='selectorder'>{{dataDetails.orderNo?dataDetails.orderNo:'选择订单'}}></view>
 			</view>
 		</view>
-		<u-line class="line"></u-line>
+		<u-line class="line" color="#E6E6E6"></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字" maxlength='300' border="none"></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="$u.throttle(submit, 5000)">提交</view>
-		<u-picker :show="isShow" ref="uPicker"  :columns="orderList" keyName="orderNo" @confirm="confirmorder"
+		<view class="row3" @click="$u.throttle(submit, 1000)">提交</view>
+		<u-picker :show="isShow" ref="uPicker" :columns="orderList" keyName="orderNo" @confirm="confirmorder"
 			:closeOnClickOverlay='true' @close='isShow=false' @cancel='isShow=false'>
 		</u-picker>
 		<u-toast ref="uToast"></u-toast>
@@ -42,9 +42,9 @@
 				value1: '',
 				fileList1: [],
 				dataDetails: {},
-				orderList:[],
-				isShow:false,
-				type:0
+				orderList: [],
+				isShow: false,
+				type: 0
 			};
 		},
 		computed: {
@@ -53,58 +53,58 @@
 		onLoad(options) {
 			this.get_camera_permission()
 			this.dataDetails = JSON.parse(options.val)
-			this.type=options.type
+			this.type = options.type
 			console.log(this.dataDetails)
 			this.imgList = []
 		},
-		onShow(){
+		onShow() {
 			uni.showLoading({
 				title: '加载中'
 			})
-			var commonId=''
-			if(this.type==1){
-				commonId=this.dataDetails.cargoCommonId
-			}else{
-				commonId=this.dataDetails.commonId
+			var commonId = ''
+			if (this.type == 1) {
+				commonId = this.dataDetails.cargoCommonId
+			} else {
+				commonId = this.dataDetails.commonId
 			}
-			this.$request.baseRequest('get', '/orderInfo/getAssociatedOrder',{
-				cargoCommonId: commonId,
-				commonId:this.userInfo.id
-			}).then(res => {
-				let that = this
-				uni.hideLoading()
-				this.orderList=[res.data]
-				// console.log(this.orderList)
-			})
-			.catch(res => {
-				uni.$u.toast(res.message);
-			});
+			this.$request.baseRequest('get', '/orderInfo/getAssociatedOrder', {
+					cargoCommonId: commonId,
+					commonId: this.userInfo.id
+				}).then(res => {
+					let that = this
+					uni.hideLoading()
+					this.orderList = [res.data]
+					// console.log(this.orderList)
+				})
+				.catch(res => {
+					uni.$u.toast(res.message);
+				});
 		},
 		methods: {
-			confirmorder(e){
+			confirmorder(e) {
 				console.log(e)
-				this.dataDetails.orderId=e.value[0].id
-				this.dataDetails.orderNo=e.value[0].orderNo
-				this.isShow=false
+				this.dataDetails.orderId = e.value[0].id
+				this.dataDetails.orderNo = e.value[0].orderNo
+				this.isShow = false
 			},
-			selectorder(){
-				this.isShow=true
+			selectorder() {
+				this.isShow = true
 			},
 			async get_camera_permission() {
-				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
-				if(photol == false){
+				var photol = await permision.requestAndroidPermission("android.permission.CAMERA")
+				if (photol == false) {
 					uni.showModal({
 						title: '提示',
 						content: '您已经关闭相册权限,去设置',
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
 								permision.gotoAppPermissionSetting()
-									            // plus.runtime.openURL("app-settings:");
+								// plus.runtime.openURL("app-settings:");
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
 						}
-					});	
+					});
 				}
 			},
 			submit() {
@@ -112,21 +112,21 @@
 					title: '加载中'
 				})
 				this.$request.baseRequest('post', '/feedbackReport/api/addInfo', {
-						initiator:this.firstAuthentication.driverName,
-						initiatorNumber:this.firstAuthentication.driverPhone,
+						initiator: this.firstAuthentication.driverName,
+						initiatorNumber: this.firstAuthentication.driverPhone,
 						commonId: this.firstAuthentication.commonId,
 						passive: this.dataDetails.cargoOwnerName,
 						passiveNumber: this.dataDetails.cargoOwnerPhone,
-						passiveCommonId:this.dataDetails.commonId,
-						orderId:this.dataDetails.orderId,
-						orderNo:this.dataDetails.orderNo,
+						passiveCommonId: this.dataDetails.commonId,
+						orderId: this.dataDetails.orderId,
+						orderNo: this.dataDetails.orderNo,
 						content: this.value1,
 						url: this.imgList.toString(),
 						flag: 2,
-						objectFlag:2
+						objectFlag: 2
 					}).then(res => {
 						let that = this
-						this.type=0
+						this.type = 0
 						uni.hideLoading()
 						this.$refs.uToast.show({
 							type: 'success',
@@ -136,7 +136,7 @@
 								// 	driver: JSON.stringify(that.dataDetails)
 								// });
 								uni.navigateBack({
-									delta:1
+									delta: 1
 								})
 							}
 						})
@@ -199,6 +199,7 @@
 	.row1,
 	.row2 {
 		padding: 40rpx;
+		font-size: 28rpx;
 	}
 
 	.title {
@@ -210,8 +211,9 @@
 		background: #2772FB;
 		text-align: center;
 		color: white;
-		padding: 20rpx;
+		padding: 25rpx;
 		margin: auto;
+		font-size: 36rpx;
 		border-radius: 10rpx;
 	}
 </style>

pages/goodSource/selectCity.vue

@@ -11,7 +11,8 @@
 				<view class="content1" v-if="type==0">
 					<view class="history-city-title">历史发货地</view>
 					<view class="city-list">
-						<view class="city" v-for="(item,index) in historyFcityList" :key='index' @click="historyClick(0,item)">
+						<view class="city" v-for="(item,index) in historyFcityList" :key='index'
+							@click="historyClick(0,item)">
 							{{item.selected}}
 						</view>
 					</view>
@@ -19,7 +20,8 @@
 				<view class="content2" v-if="type==1">
 					<view class="history-city-title">历史收货地</view>
 					<view class="city-list">
-						<view class="city" v-for="(item,index) in historyScityList" :key='index' @click="historyClick(1,item)">
+						<view class="city" v-for="(item,index) in historyScityList" :key='index'
+							@click="historyClick(1,item)">
 							{{item.selected}}
 						</view>
 					</view>
@@ -56,7 +58,8 @@
 				<view class="container" v-if="(type==0?fstatus:sstatus)==0">
 					<view class="content-item" :class="index ==(type==0?isfprovince:issprovince) ?'active':''"
 						@click="selectProvince(item, index,(type==0?fstatus:sstatus))"
-						v-for="(item,index) in (type==0?fprovincelist:sprovincelist)" v-show='type==1||type==0&&item.label!="全国"' :key="index">
+						v-for="(item,index) in (type==0?fprovincelist:sprovincelist)"
+						v-show='type==1||type==0&&item.label!="全国"' :key="index">
 						{{item.label}}
 					</view>
 				</view>
@@ -120,8 +123,8 @@
 				type: 0,
 				count: 0,
 				ftitle: '',
-				ftitleList:[],
-				stitleList:[],
+				ftitleList: [],
+				stitleList: [],
 				stitle: '',
 				selectList: [],
 			}
@@ -152,75 +155,75 @@
 		},
 		mounted() {
 			if (uni.getStorageSync('fPlaceObj')) {
-				this.fchooseprovince=uni.getStorageSync('fPlaceObj').fchooseprovince
-				this.fchoosecity=uni.getStorageSync('fPlaceObj').fchoosecity
-				this.fchoosearea=uni.getStorageSync('fPlaceObj').fchoosearea
+				this.fchooseprovince = uni.getStorageSync('fPlaceObj').fchooseprovince
+				this.fchoosecity = uni.getStorageSync('fPlaceObj').fchoosecity
+				this.fchoosearea = uni.getStorageSync('fPlaceObj').fchoosearea
 				for (var i = 0; i < this.fprovincelist.length; i++) {
-					if(this.fprovincelist[i].label==this.fchooseprovince){
-						this.fprovincelist[i].checked=true
+					if (this.fprovincelist[i].label == this.fchooseprovince) {
+						this.fprovincelist[i].checked = true
 						this.fcitylist = this.fprovincelist[i].child
 						for (var q = 0; q < this.fcitylist.length; q++) {
-							if(this.fcitylist[q].label==this.fchoosecity){
-								this.fcitylist[q].checked=true
+							if (this.fcitylist[q].label == this.fchoosecity) {
+								this.fcitylist[q].checked = true
 								this.farealist = this.fcitylist[q].child
 								for (var area = 0; area < this.farealist.length; area++) {
-									if(this.farealist[area].label==this.fchoosearea){
-										this.farealist[area].checked=true
+									if (this.farealist[area].label == this.fchoosearea) {
+										this.farealist[area].checked = true
 									}
 								}
 							}
 						}
 					}
 				}
-				this.fstatus=2
+				this.fstatus = 2
 			}
 			if (uni.getStorageSync('sPlaceObj')) {
 				// sprovincelist
 				// console.log(this.sprovincelist)
-				this.schooseprovince=uni.getStorageSync('sPlaceObj').schooseprovince
-				this.schoosecity=uni.getStorageSync('sPlaceObj').schoosecity
-				this.schoosearea=uni.getStorageSync('sPlaceObj').schoosearea
-				
-				if(this.schooseprovince=='全国'){
-					this.sstatus=0
-					this.$set(this.sprovincelist[0],'checked',true)
-					this.issprovince=0
-				}else{
+				this.schooseprovince = uni.getStorageSync('sPlaceObj').schooseprovince
+				this.schoosecity = uni.getStorageSync('sPlaceObj').schoosecity
+				this.schoosearea = uni.getStorageSync('sPlaceObj').schoosearea
+
+				if (this.schooseprovince == '全国') {
+					this.sstatus = 0
+					this.$set(this.sprovincelist[0], 'checked', true)
+					this.issprovince = 0
+				} else {
 					for (var i = 0; i < this.sprovincelist.length; i++) {
-						if(this.sprovincelist[i].label==this.schooseprovince){
-							this.sprovincelist[i].checked=true
+						if (this.sprovincelist[i].label == this.schooseprovince) {
+							this.sprovincelist[i].checked = true
 							this.scitylist = this.sprovincelist[i].child
 							for (var q = 0; q < this.scitylist.length; q++) {
-								if(this.scitylist[q].label==this.schoosecity){
-									this.scitylist[q].checked=true
+								if (this.scitylist[q].label == this.schoosecity) {
+									this.scitylist[q].checked = true
 									this.sarealist = this.scitylist[q].child
 									for (var area = 0; area < this.sarealist.length; area++) {
-										if(this.sarealist[area].label==this.schoosearea){
-											this.sarealist[area].checked=true
+										if (this.sarealist[area].label == this.schoosearea) {
+											this.sarealist[area].checked = true
 										}
 									}
 								}
 							}
 						}
 					}
-					this.sstatus=2
+					this.sstatus = 2
 				}
 			}
 		},
 		methods: {
-			historyClick(type,val){
+			historyClick(type, val) {
 				console.log(type)
-				if(type==0){
+				if (type == 0) {
 					this.historyFcityList.unshift(val)
 					let _newList = this.makeHistoryList(val)
 					uni.setStorageSync('fPlaceList', _newList);
 					uni.setStorageSync('fPlaceObj', val);
-				}else{
+				} else {
 					this.historyScityList.unshift(val)
 					let _newList = this.makeHistoryList(val)
 					uni.setStorageSync('sPlaceList', _newList);
-					uni.setStorageSync('sPlaceObj',val )
-			
+					uni.setStorageSync('sPlaceObj', val)
+
 				}
 				uni.switchTab({
 					url: '/pages/goodSource/index'
@@ -281,155 +284,157 @@
 				}
 			},
 			confirmBtn() {
-				
+
 				//设置地区 0发货地 1收货地
-					if (this.fchooseprovince == '选择' ||(this.fchoosearea == '请选择区'&&this.fchoosecity!='全部')|| (this.fchoosecity == '请选择市' && this.fchooseprovince != '全国')) {
-							this.$refs.uToast.show({
-								type: 'error',
-								message: "请选择发货地区域！",
-							})
+				if (this.fchooseprovince == '选择' || (this.fchoosearea == '请选择区' && this.fchoosecity != '全部') || (this
+						.fchoosecity == '请选择市' && this.fchooseprovince != '全国')) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请选择发货地区域！",
+					})
 					return
+				}
+
+				//收货地
+				if (this.schooseprovince == '选择' || (this.schoosearea == '请选择区' && this.schoosecity != '全部' && this
+						.schooseprovince != '全国') || (this.schoosecity == '请选择市' && this.schooseprovince != '全国')) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请选择收货地区域！",
+					})
+					return
+				}
+				// }
+				// console.log("省", this.fchooseprovince)
+				// console.log("市", this.fchoosecity)
+				// console.log("区", this.fchoosearea)
+				let _obj = {
+					fchooseprovince: this.fchooseprovince,
+					fchoosecity: this.fchoosecity,
+					fchoosearea: this.fchoosearea,
+					selected: ''
+				}
+				//选中全国
+				if (this.fchoosecity == '请选择市' && this.fchooseprovince == '全国') {
+					_obj.selected = this.fchooseprovince
+					this.historyFcityList.unshift(_obj)
+					let _newList = this.makeHistoryList(_obj)
+					uni.setStorageSync('fPlaceList', _newList);
+
+				}
+				//选择省
+				if (this.fchoosearea == '请选择区' && this.fchoosecity == '全部') {
+					_obj.selected = this.fchooseprovince
+					this.historyFcityList.unshift(_obj)
+					let _newList = this.makeHistoryList(_obj)
+
+					uni.setStorageSync('fPlaceList', _newList);
+				}
+				//选择市
+				if (this.fchoosearea == '全部') {
+					if (this.fchoosecity == '市辖区') {
+						_obj.selected = this.fchooseprovince
+					} else {
+						_obj.selected = this.fchoosecity
 					}
-					
-					//收货地
-					if (this.schooseprovince == '选择' ||(this.schoosearea == '请选择区'&&this.schoosecity!='全部'&& this.schooseprovince != '全国')|| (this.schoosecity == '请选择市' && this.schooseprovince != '全国')) {
-						this.$refs.uToast.show({
-							type: 'error',
-							message: "请选择收货地区域！",
-						})
-						return
-					}
+					this.historyFcityList.unshift(_obj)
+					let _newList = this.makeHistoryList(_obj)
+					uni.setStorageSync('fPlaceList', _newList);
+				}
+				uni.setStorageSync('fPlaceObj', _obj);
+				//选择区
+				if (this.fchoosearea != '请选择区' && this.fchoosearea != '全部') {
+					console.log(this.fchooseprovince, this.fchoosecity, this.fchoosearea)
+					// let _list = this.fchoosearea.split(',')
+					// let _newList
+					// //设置历史收发地并去重，区重名判断是否是同一个市在去重
+					// for (let i = 0; i < _list.length; i++) {
+					// 	let _deepObj = uni.$u.deepClone(_obj)
+					// 	_deepObj.selected = _list[i]
+					// 	this.historyFcityList.unshift(_deepObj)
+					// 	_newList = this.makeHistoryList(_deepObj)
+
 					// }
-					// console.log("省", this.fchooseprovince)
-					// console.log("市", this.fchoosecity)
-					// console.log("区", this.fchoosearea)
-					let _obj = {
+					// console.log(_newList)
+					uni.setStorageSync('fPlaceList', this.historyFcityList);
+					uni.setStorageSync('fPlaceObj', {
 						fchooseprovince: this.fchooseprovince,
 						fchoosecity: this.fchoosecity,
 						fchoosearea: this.fchoosearea,
-						selected: ''
-					}
-					//选中全国
-					if (this.fchoosecity == '请选择市' && this.fchooseprovince == '全国') {
-						_obj.selected = this.fchooseprovince
-						this.historyFcityList.unshift(_obj)
-						let _newList = this.makeHistoryList(_obj)
-						uni.setStorageSync('fPlaceList', _newList);
+						selected: this.fchoosearea
+					});
+				}
+				console.log(this.historyFcityList)
+				// uni.switchTab({
+				// 	url: '/pages/goodSource/index'
+				// });
+				// } else {
 
-					}
-					//选择省
-					if (this.fchoosearea == '请选择区' && this.fchoosecity == '全部') {
-						_obj.selected = this.fchooseprovince
-						this.historyFcityList.unshift(_obj)
-						let _newList = this.makeHistoryList(_obj)
+				let _obj1 = {
+					schooseprovince: this.schooseprovince,
+					schoosecity: this.schoosecity,
+					schoosearea: this.schoosearea,
+					selected: ''
+				}
+				//选中全国
+				if (this.schoosecity == '请选择市' && this.schooseprovince == '全国') {
+					_obj1.selected = this.schooseprovince
+					this.historyScityList.unshift(_obj1)
+					let _newList = this.makeHistoryList(_obj1)
+					uni.setStorageSync('sPlaceList', _newList);
+				}
+				//选择省
+				if (this.schoosearea == '请选择区' && this.schoosecity == '全部') {
+					_obj1.selected = this.schooseprovince
+					this.historyScityList.unshift(_obj1)
+					let _newList = this.makeHistoryList(_obj1)
 
-						uni.setStorageSync('fPlaceList', _newList);
-					}
-					//选择市
-					if (this.fchoosearea == '全部') {
-						if(this.fchoosecity=='市辖区'){
-							_obj.selected = this.fchooseprovince
-						}else{
-							_obj.selected = this.fchoosecity
-						}
-						this.historyFcityList.unshift(_obj)
-						let _newList = this.makeHistoryList(_obj)
-						uni.setStorageSync('fPlaceList', _newList);
+					uni.setStorageSync('sPlaceList', _newList);
+				}
+				//选择市
+				if (this.schoosearea == '全部') {
+					if (this.schoosecity == '市辖区') {
+						_obj1.selected = this.schooseprovince
+					} else {
+						_obj1.selected = this.schoosecity
 					}
-					uni.setStorageSync('fPlaceObj', _obj);
-					//选择区
-					if (this.fchoosearea != '请选择区' && this.fchoosearea != '全部') {
-						console.log(this.fchooseprovince,this.fchoosecity,this.fchoosearea)
-						// let _list = this.fchoosearea.split(',')
-						// let _newList
-						// //设置历史收发地并去重，区重名判断是否是同一个市在去重
-						// for (let i = 0; i < _list.length; i++) {
-						// 	let _deepObj = uni.$u.deepClone(_obj)
-						// 	_deepObj.selected = _list[i]
-						// 	this.historyFcityList.unshift(_deepObj)
-						// 	_newList = this.makeHistoryList(_deepObj)
-
-						// }
-						// console.log(_newList)
-						uni.setStorageSync('fPlaceList', this.historyFcityList);
-						uni.setStorageSync('fPlaceObj', {
-							fchooseprovince: this.fchooseprovince,
-							fchoosecity: this.fchoosecity,
-							fchoosearea: this.fchoosearea,
-							selected: this.fchoosearea
-						});
+
+					this.historyScityList.unshift(_obj1)
+					let _newList = this.makeHistoryList(_obj1)
+					uni.setStorageSync('sPlaceList', _newList);
+				}
+				uni.setStorageSync('sPlaceObj', _obj1);
+				//选择区
+				if (this.schoosearea != '请选择区' && this.schoosearea != '全部') {
+					let _list = this.schoosearea.split(',')
+					let _newList
+					for (let i = 0; i < _list.length; i++) {
+
+						let _deepObj = uni.$u.deepClone(_obj1)
+						_deepObj.selected = _list[i]
+						this.historyScityList.unshift(_deepObj)
+						_newList = this.makeHistoryList(_deepObj)
 					}
-					console.log(this.historyFcityList)
-					// uni.switchTab({
-					// 	url: '/pages/goodSource/index'
-					// });
-				// } else {
-					
-					let _obj1 = {
+					// console.log(_newList)
+					uni.setStorageSync('sPlaceList', this.historyScityList);
+					uni.setStorageSync('sPlaceObj', {
 						schooseprovince: this.schooseprovince,
 						schoosecity: this.schoosecity,
 						schoosearea: this.schoosearea,
-						selected: ''
-					}
-					//选中全国
-					if (this.schoosecity == '请选择市' && this.schooseprovince == '全国') {
-						_obj1.selected = this.schooseprovince
-						this.historyScityList.unshift(_obj1)
-						let _newList = this.makeHistoryList(_obj1)
-						uni.setStorageSync('sPlaceList', _newList);
-					}
-					//选择省
-					if (this.schoosearea == '请选择区' && this.schoosecity == '全部') {
-						_obj1.selected = this.schooseprovince
-						this.historyScityList.unshift(_obj1)
-						let _newList = this.makeHistoryList(_obj1)
-
-						uni.setStorageSync('sPlaceList', _newList);
-					}
-					//选择市
-					if (this.schoosearea == '全部') {
-						if(this.schoosecity=='市辖区'){
-							_obj1.selected = this.schooseprovince
-						}else{
-							_obj1.selected = this.schoosecity
-						}
-						
-						this.historyScityList.unshift(_obj1)
-						let _newList = this.makeHistoryList(_obj1)
-						uni.setStorageSync('sPlaceList', _newList);
-					}
-					uni.setStorageSync('sPlaceObj', _obj1);
-					//选择区
-					if (this.schoosearea != '请选择区' && this.schoosearea != '全部') {
-						let _list = this.schoosearea.split(',')
-						let _newList
-						for (let i = 0; i < _list.length; i++) {
-
-							let _deepObj = uni.$u.deepClone(_obj1)
-							_deepObj.selected = _list[i]
-							this.historyScityList.unshift(_deepObj)
-							_newList = this.makeHistoryList(_deepObj)
-						}
-						// console.log(_newList)
-						uni.setStorageSync('sPlaceList', this.historyScityList);
-						uni.setStorageSync('sPlaceObj', {
-							schooseprovince: this.schooseprovince,
-							schoosecity: this.schoosecity,
-							schoosearea: this.schoosearea,
-							selected: this.schoosearea
-						});
-					}
-					console.log(this.historyScityList)
-					this.schooseprovince='选择'
-					this.schoosecity='请选择市'
-					this.schoosearea='请选择区'
-					this.fchooseprovince='选择'
-					this.fchoosecity='请选择市'
-					this.fchoosearea='请选择区'
-					uni.removeStorageSync('longitudeAndLatitude')
-					uni.switchTab({
-						url: '/pages/goodSource/index'
+						selected: this.schoosearea
 					});
+				}
+				console.log(this.historyScityList)
+				this.schooseprovince = '选择'
+				this.schoosecity = '请选择市'
+				this.schoosearea = '请选择区'
+				this.fchooseprovince = '选择'
+				this.fchoosecity = '请选择市'
+				this.fchoosearea = '请选择区'
+				uni.removeStorageSync('longitudeAndLatitude')
+				uni.switchTab({
+					url: '/pages/goodSource/index'
+				});
 			},
 			//返回上一级
 			backLevel() {
@@ -445,13 +450,13 @@
 						this.fchoosearea = ''
 						this.ftitle = ''
 						this.isfcity = null
-						this.ftitleList=[]
+						this.ftitleList = []
 					} else {
 						this.schoosecity = '请选择市'
 						this.schoosearea = ''
 						this.stitle = ''
 						this.isscity = null
-						this.stitleList=[]
+						this.stitleList = []
 					}
 				} else if ((this.type == 0 ? this.fstatus : this.sstatus) == 0) {
 					if (this.type == 0) {
@@ -487,23 +492,23 @@
 						this.fchooseprovince = '选择'
 						this.fchoosecity = '请选择市'
 						this.fchoosearea = '请选择区'
-						this.ftitleList=[]
+						this.ftitleList = []
 					} else {
 						this.schooseprovince = '选择'
 						this.schoosecity = '请选择市'
 						this.schoosearea = '请选择区'
-						this.stitleList=[]
+						this.stitleList = []
 					}
 
 				} else if (status == 1) {
 					if (this.type == 0) {
 						this.fchoosecity = '请选择市'
 						this.fchoosearea = '请选择区'
-						this.ftitleList=[]
+						this.ftitleList = []
 					} else {
 						this.schoosecity = '请选择市'
 						this.schoosearea = '请选择区'
-						this.stitleList=[]
+						this.stitleList = []
 					}
 				}
 			},
@@ -553,13 +558,13 @@
 			},
 			// 选择市
 			selectCity(item, i, statusIndex) {
-			if(item.label=='全部'){
-				this.$refs.uToast.show({
-					type: 'error',
-					message: "不能选择全部，请重新选择！"
-				})
-				return
-			}
+				if (item.label == '全部') {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "不能选择全部，请重新选择！"
+					})
+					return
+				}
 				this.count = 0;
 				if (this.type == 0) {
 					this.isfcity = i
@@ -601,7 +606,7 @@
 								this.farealist[i].checked = false
 							}
 						}
-						this.ftitleList=[]
+						this.ftitleList = []
 						this.fchoosearea = '全部'
 						this.$forceUpdate()
 						return
@@ -613,7 +618,7 @@
 								this.sarealist[i].checked = false
 							}
 						}
-						this.stitleList=[]
+						this.stitleList = []
 						this.schoosearea = '全部'
 						this.$forceUpdate()
 						return
@@ -623,15 +628,15 @@
 					this.farealist[0].checked = false
 					if (this.ftitleList.length < 3) {
 						item.checked = !item.checked
-						if (item.checked ) {
-							if(this.ftitleList.indexOf(item.label)==-1){
+						if (item.checked) {
+							if (this.ftitleList.indexOf(item.label) == -1) {
 								this.ftitleList.push(item.label)
 							}
 						} else if (!item.checked) {
 							for (var i = 0; i < this.ftitleList.length; i++) {
 								console.log(this.ftitleList[i])
-								if(this.ftitleList[i]==item.label){
-									this.ftitleList.splice(i,1)
+								if (this.ftitleList[i] == item.label) {
+									this.ftitleList.splice(i, 1)
 								}
 							}
 						}
@@ -639,8 +644,8 @@
 						if (item.checked) {
 							item.checked = !item.checked
 							for (var i = 0; i < this.ftitleList.length; i++) {
-								if(this.ftitleList[i]==item.label){
-									this.ftitleList.splice(i,1)
+								if (this.ftitleList[i] == item.label) {
+									this.ftitleList.splice(i, 1)
 								}
 							}
 						} else {
@@ -650,21 +655,21 @@
 							})
 						}
 					}
-					this.ftitle=this.ftitleList.toString()
-					this.fchoosearea=this.ftitleList.toString()
-				}else{
+					this.ftitle = this.ftitleList.toString()
+					this.fchoosearea = this.ftitleList.toString()
+				} else {
 					this.sarealist[0].checked = false
 					if (this.stitleList.length < 3) {
 						item.checked = !item.checked
-						if (item.checked ) {
-							if(this.stitleList.indexOf(item.label)==-1){
+						if (item.checked) {
+							if (this.stitleList.indexOf(item.label) == -1) {
 								this.stitleList.push(item.label)
 							}
 						} else if (!item.checked) {
 							for (var i = 0; i < this.stitleList.length; i++) {
 								console.log(this.stitleList[i])
-								if(this.stitleList[i]==item.label){
-									this.stitleList.splice(i,1)
+								if (this.stitleList[i] == item.label) {
+									this.stitleList.splice(i, 1)
 								}
 							}
 						}
@@ -672,8 +677,8 @@
 						if (item.checked) {
 							item.checked = !item.checked
 							for (var i = 0; i < this.stitleList.length; i++) {
-								if(this.stitleList[i]==item.label){
-									this.stitleList.splice(i,1)
+								if (this.stitleList[i] == item.label) {
+									this.stitleList.splice(i, 1)
 								}
 							}
 						} else {
@@ -683,8 +688,8 @@
 							})
 						}
 					}
-					this.stitle=this.stitleList.toString()
-					this.schoosearea=this.stitleList.toString()
+					this.stitle = this.stitleList.toString()
+					this.schoosearea = this.stitleList.toString()
 				}
 				console.log(this.ftitleList)
 				this.$forceUpdate()
@@ -697,7 +702,7 @@
 				// 	if (item.checked && !this.fchoosearea.includes(item.label)) {
 				// 		if (this.ftitle) {
 				// 			this.ftitle += ',' + item.label
-							
+
 				// 		} else {
 				// 			this.ftitle += item.label
 				// 		}
@@ -853,15 +858,14 @@
 	.content-item {
 		background: #F7F8FA;
 		margin: 10rpx;
-		font-size: 30rpx;
+		font-size: 24rpx;
 		color: #333333;
 		text-align: center;
-		padding: 10rpx 0;
-		border-radius: 10rx;
+		padding: 15rpx 0;
+		border-radius: 10rpx;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
-		padding: 6rpx 8rpx;
 		box-sizing: border-box;
 		flex: 0 0 calc(25% - 20rpx);
 	}

pages/goodSource/shippingDetails.vue

@@ -4,30 +4,44 @@
 		<!-- <u-navbar title="发运详情" :bgColor="bgColor" @leftClick='back' :placeholder='true' leftIconColor="#fff" titleStyle='color:#fff'
 			:rightText='caseText' @rightClick="rightClick">
 		</u-navbar> -->
-		<u-navbar title="发运详情" :bgColor="bgColor" @leftClick='back' :placeholder='true' leftIconColor="#fff"
-			titleStyle='color:#fff'>
+		<!-- <u-navbar leftText="发运详情" height="50" :bgColor="bgColor" @leftClick='back' :placeholder='true'
+			leftIconColor="#fff" :titleStyle='titleStyle' leftIconSize='38rpx' rightIcon>
+		</u-navbar> -->
+		<u-navbar :placeholder='true' :bgColor="bgColor" @leftClick='back'>
+			<view class="u-nav-slot nav-left" slot="left">
+				<u-icon name="arrow-left" size="19" color="#fff"></u-icon>
+				<text style="margin-left:20rpx;">发运详情</text>
+				<!-- <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
+				<u-icon name="home" size="20"></u-icon> -->
+			</view>
+			<view class="u-nav-slot nav-right" slot="right">
+				<!-- <text class="case-style" @click="rightClick">已关注</text>
+				<image src="../../static/fenxiang.png" mode="widthFix" style="width: 40rpx;" @click="share"></image> -->
+			</view>
 		</u-navbar>
 		<view class="top-bgc"></view>
 		<view class="content-move">
 			<view class="content1">
 				<view class="row1 flex flex-space-between">
 					<view class="left flex">
-						<u--image :src="detailData.cargoOwnerPortrait?detailData.cargoOwnerPortrait:'../../static/images/mine/tx.png'" width='122rpx' height='122rpx' shape="circle">
+						<u--image
+							:src="detailData.cargoOwnerPortrait?detailData.cargoOwnerPortrait:'../../static/images/mine/tx.png'"
+							width='122rpx' height='122rpx' shape="circle">
 						</u--image>
 						<view class="fontsize-46 ml20">{{detailData.cargoOwnerCall}}</view>
 					</view>
 					<view class="right">
 						<view class="flex">
-							<view class="call fontsize-28" @click="$helper.contactCustomerService(detailData.cargoOwnerPhone)">
-								<image style='width:12px;height:12px;margin-right:4px;' src="../../static/images/goodSource/dianhua.png" mode=""></image>联系货主
+							<view class="call fontsize-28"
+								@click="$helper.contactCustomerService(detailData.cargoOwnerPhone)">
+								<image style='width:12px;height:12px;margin-right:4px;'
+									src="../../static/images/goodSource/dianhua.png" mode=""></image>联系货主
 							</view>
 						</view>
 					</view>
 				</view>
-				<view class="row">
-					<view class="flex">
-						{{detailData.cargoOwner}}
-					</view>
+				<view class="row hztype-style">
+					{{detailData.cargoOwner}}
 				</view>
 				<!-- 当前版本不做 -->
 				<view class="row3 flex fontsize-24">
@@ -75,7 +89,8 @@
 					<view class="left">距离</view>
 					<view class="right flex align-center">
 						<view>运输距离约{{detailData.distance}}公里</view>
-						<image @click="toMap()" style='width:14px;height:14px;margin-left:4px;' src="../../static/images/goodSource/dituzuobiao.png" mode=""></image>
+						<image @click="toMap()" style='width:14px;height:14px;margin-left:4px;'
+							src="../../static/images/goodSource/dituzuobiao.png" mode=""></image>
 					</view>
 				</view>
 				<view class="flex align-center">
@@ -83,31 +98,38 @@
 					<view class="right">{{detailData.freightPrice}}元/吨</view>
 				</view>
 				<view class="flex msx20">
-					<view class="left">发布</view>
+					<view class="left">日期</view>
 					<view class="right">
 						<view class="in-row flex">
+							<text style="margin-right: 40rpx;">发布</text>
 							<view class="time">{{detailData.createDate}}</view>
 						</view>
 					</view>
 				</view>
 				<view class="flex msx20">
-					<view class="left">装车</view>
+					<view class="left"></view>
 					<view class="right">
 						<view class="in-row flex">
-							<view class="time" v-if='detailData.loadingDateStart=="随时"&&detailData.loadingDateEnd=="随时"'>{{detailData.loadingDateStart}}</view>
-							<view class="time" v-else>{{detailData.loadingDateStart}}~{{detailData.loadingDateEnd}}</view>
+							<text style="margin-right: 40rpx;">装车</text>
+							<view class="time"
+								v-if='detailData.loadingDateStart=="随时"&&detailData.loadingDateEnd=="随时"'>
+								{{detailData.loadingDateStart}}
+							</view>
+							<view class="time" v-else>{{detailData.loadingDateStart}}~{{detailData.loadingDateEnd}}
+							</view>
 						</view>
 					</view>
 				</view>
 				<view class="flex align-center">
 					<view class="left">车型</view>
 					<view v-if='carLength!=""&&carType!="不限"&&carWeight!=""' class="right">
-						{{carLength}} | 
+						{{carLength}} |
 						<text v-if='carType!="不限"'> {{carType}} </text>
-						| {{carWeight}}</view>
-						<view class="right" v-else>不限</view>
+						| {{carWeight}}
+					</view>
+					<view class="right" v-else>不限</view>
 				</view>
-				<view  class="flex mt20">
+				<view class="flex mt20">
 					<view class="left">描述</view>
 					<view class="right">
 						{{detailData.taskDescription?detailData.taskDescription:'无'}}
@@ -124,9 +146,10 @@
 					<u-button type="error" text="已抢单" disabled></u-button>
 				</view> -->
 			</view>
-			 <u-toast ref="uToast"></u-toast>
+			<u-toast ref="uToast"></u-toast>
 			<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-				confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
+				confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 1000)" @close="cancelClick"
+				@cancel="cancelClick"></u-modal>
 		</view>
 	</view>
 </template>
@@ -138,6 +161,11 @@
 	export default {
 		data() {
 			return {
+				titleStyle: {
+					"fontSize": "38rpx",
+					"fontWeight": 500,
+					"color": "#FFFFFF"
+				},
 				isShowAlert: false,
 				alertTitle: '确定抢单？',
 				caseText: '关注',
@@ -202,6 +230,9 @@
 			},
 		},
 		methods: {
+			share() {
+				console.log('share')
+			},
 			rightClick() {
 				uni.$u.toast('后台接口未写');
 				// 关注
@@ -229,15 +260,15 @@
 					});
 			},
 			toMap() {
-				uni.setStorageSync('sendaddress',{
-					sendLatitude:this.detailData.sendLatitude,
-					sendLongitude:this.detailData.sendLongitude,
-					})
-				uni.setStorageSync('unsendaddress',{
-					unsendLatitude:this.detailData.unsendLatitude,
-					unsendLongitude:this.detailData.unsendLongitude,
-					})
-				uni.setStorageSync('distance',this.detailData.distance,)
+				uni.setStorageSync('sendaddress', {
+					sendLatitude: this.detailData.sendLatitude,
+					sendLongitude: this.detailData.sendLongitude,
+				})
+				uni.setStorageSync('unsendaddress', {
+					unsendLatitude: this.detailData.unsendLatitude,
+					unsendLongitude: this.detailData.unsendLongitude,
+				})
+				uni.setStorageSync('distance', this.detailData.distance, )
 				uni.$u.route('/pages/goodSource/map', {
 					id: 1,
 				});
@@ -259,78 +290,79 @@
 			confirmClick() {
 				let item = this.detailData
 				console.log(item)
-				var that=this
+				var that = this
 				this.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
 					driverPhone: this.userInfo.phone,
 				}).then(res2 => {
-					if(res2.data.authenticationStatus=='已过期'){
+					if (res2.data.authenticationStatus == '已过期') {
 						that.$refs.uToast.show({
 							type: 'error',
 							message: '证件已过期,请上传新证件！',
 						})
 						return
-					}else if(res2.data.authenticationStatus=='未认证'||res2.data.authenticationStatus=='已驳回'){
+					} else if (res2.data.authenticationStatus == '未认证' || res2.data.authenticationStatus ==
+						'已驳回') {
 						that.$refs.uToast.show({
 							type: 'error',
 							message: '请先完成司机认证！',
 						})
 						return
-					}
-					else if(res2.data.authenticationStatus=='审核中'){
+					} else if (res2.data.authenticationStatus == '审核中') {
 						that.$refs.uToast.show({
 							type: 'error',
 							message: '司机审核中！',
 						})
 						return
 					}
-				let _obj = {
-					driverCommonId: res2.data.commonId,
-					commonId: item.commonId,
-					id:item.id,
-					compId:item.compId,
-					cargoOwnerName: item.cargoOwnerReallyName,
-					cargoOwner: item.cargoOwner,
-					sendPrivate: item.sendPrivate,
-					sendCity: item.sendCity,
-					sendArea: item.sendArea,
-					sendDetailedAddress: item.sendDetailedAddress,
-					unloadPrivate: item.unloadPrivate,
-					unloadCity: item.unloadCity,
-					unloadArea: item.unloadArea,
-					unloadDetailedAddress: item.unloadDetailedAddress,
-					goodsName: item.goodsName,
-					distance: item.distance,
-					freightPrice: item.freightPrice,
-					driverName: res2.data.driverName,
-					driverPhone: res2.data.driverPhone,
-					cargoOwnerPhone: item.cargoOwnerPhone
-				}
+					let _obj = {
+						driverCommonId: res2.data.commonId,
+						commonId: item.commonId,
+						id: item.id,
+						compId: item.compId,
+						cargoOwnerName: item.cargoOwnerName,
+						cargoOwner: item.cargoOwner,
+						sendPrivate: item.sendPrivate,
+						sendCity: item.sendCity,
+						sendArea: item.sendArea,
+						sendDetailedAddress: item.sendDetailedAddress,
+						unloadPrivate: item.unloadPrivate,
+						unloadCity: item.unloadCity,
+						unloadArea: item.unloadArea,
+						unloadDetailedAddress: item.unloadDetailedAddress,
+						goodsName: item.goodsName,
+						goodsType:item.goodsType,
+						distance: item.distance,
+						freightPrice: item.freightPrice,
+						driverName: res2.data.driverName,
+						driverPhone: res2.data.driverPhone,
+						cargoOwnerPhone: item.cargoOwnerPhone
+					}
 
-				that.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
-						if (res.code == 200) {
-							that.$refs.uToast.show({
-								type: 'success',
-								message: "抢单成功！",
-								complete() {
-									uni.switchTab({
-										url: "/pages/order/index"
-									})
-								}
-							})
-
-						}else{
-							that.$refs.uToast.show({
-								type: 'error',
-								message: res.message,
-							})
-						}
-					})
-					.catch(res => {
-						uni.$u.toast(res.message);
-					});
-					}).catch(res => {
-						uni.$u.toast(res.message);
-					});
+					that.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
+							if (res.code == 200) {
+								that.$refs.uToast.show({
+									type: 'success',
+									message: "抢单成功！",
+									complete() {
+										uni.switchTab({
+											url: "/pages/order/index"
+										})
+									}
+								})
+
+							} else {
+								that.$refs.uToast.show({
+									type: 'error',
+									message: res.message,
+								})
+							}
+						})
+						.catch(res => {
+							uni.$u.toast(res.message);
+						});
+				}).catch(res => {
+					uni.$u.toast(res.message);
+				});
 				this.isShowAlert = false
 			},
 			cancelClick() {
@@ -350,6 +382,7 @@
 	}
 
 	.top-bgc {
+		padding-top: 30rpx;
 		position: relative;
 		width: 100%;
 		height: 519rpx;
@@ -366,9 +399,20 @@
 		background: white;
 		margin: 0 20rpx;
 		border-radius: 20rpx;
-		padding: 0 30rpx;
+
+		// padding: 0 46rpx;
+		.hztype-style {
+			width: 100%;
+			font-size: 28rpx;
+			color: #121212;
+			padding: 0 0 20rpx 46rpx;
+			font-weight: 700;
+			border-bottom: 2px dotted #ccc
+		}
 
 		.row1 {
+			padding: 0 46rpx;
+
 			.left {
 				position: relative;
 				top: -50rpx;
@@ -386,7 +430,7 @@
 
 		.row4 {
 			align-items: center;
-			padding-bottom: 20rpx;
+			padding: 0 46rpx 46rpx 46rpx;
 			margin-top: 20rpx;
 
 			.left {
@@ -429,7 +473,7 @@
 		display: flex;
 		align-items: center;
 		background: #E5F0FE;
-		padding: 6rpx 30rpx;
+		padding: 10rpx 30rpx;
 		border-radius: 30rpx;
 		color: #2772FB;
 	}
@@ -443,12 +487,14 @@
 		border-radius: 20rpx;
 		margin: 20rpx;
 		padding: 30rpx;
+		font-size: 26rpx;
 
 		.left {
 			color: #666666;
 			margin-right: 20rpx;
 			box-sizing: border-box;
-			width: 20%;
+			width: 8vw;
+
 		}
 
 		.right {
@@ -469,7 +515,7 @@
 		display: flex;
 		background: white;
 		justify-content: space-between;
-		padding: 30rpx 20rpx;
+		padding: 40rpx 20rpx;
 		box-sizing: border-box;
 		align-items: center;
 
@@ -488,6 +534,31 @@
 		color: white;
 		font-size: 28rpx;
 		border-radius: 40rpx;
-		padding: 10rpx 30rpx;
+		padding: 20rpx 40rpx;
+	}
+
+	.nav-left {
+		display: flex;
+		color: #fff;
+		font-size: 38rpx;
+		padding-top: 60rpx;
+		box-sizing: border-box;
+	}
+
+	.nav-right {
+		display: flex;
+		align-items: center;
+		padding-top: 60rpx;
+		box-sizing: border-box;
+
+		.case-style {
+			margin-right: 20rpx;
+			background: rgba(255, 255, 255, 0.2);
+			border-radius: 32rpx;
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			padding: 6rpx 28rpx;
+		}
 	}
 </style>

pages/mine/driverCertificationNext.vue

@@ -311,6 +311,8 @@
 														if(res.data.allowCar == 'A2' || res.data.allowCar == 'B2'){
 															_this.dataDetails.quasiDrivingVehicle = res.data.allowCar
 														}
+														let sdate = res.data.driverStartDate.substr(0,4)+"-"+res.data.driverStartDate.substr(4,2)+"-"+res.data.driverStartDate.substr(6,2)
+														_this.dataDetails.driverLicenseValidityStartDate = sdate
 														_this.dataDetails.lssuingAuthority = res.data.issuingAuthority
 														_this.$forceUpdate()
 													}
@@ -509,8 +511,14 @@
 				// 	})
 				// 	return true
 				// }
-
-				if (this.dataDetails.qualificationCertificateNumber.length > 30) {
+				// if (this.dataDetails.qualificationCertificateNumber.length !=19 || this.dataDetails.qualificationCertificateNumber.length !=18) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "从业资格证号输入错误！",
+				// 	})
+				// 	return true
+				// }
+				if (this.dataDetails.qualificationCertificateNumber.length>19||this.dataDetails.qualificationCertificateNumber.length<18) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "从业资格证号输入错误！",
@@ -579,7 +587,7 @@
 			},
 			btnBClick() {
 							// 此处用法为在js中调用，需要写uni.$u.throttle()
-				uni.$u.throttle(this.submit(), 5000)
+				uni.$u.throttle(this.submit(), 1000)
 			},
 			submit() {
 	

pages/mine/editDriverCertificationNext.vue

@@ -531,8 +531,7 @@
 				// 	})
 				// 	return true
 				// }
-			
-				if (this.dataDetails.qualificationCertificateNumber.length!=19) {
+				if (this.dataDetails.qualificationCertificateNumber.length>19||this.dataDetails.qualificationCertificateNumber.length<18) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "从业资格证号输入错误！",
@@ -614,7 +613,7 @@
 			},
 			btnBClick() {
 							// 此处用法为在js中调用，需要写uni.$u.throttle()
-				uni.$u.throttle(this.submit(), 5000)
+				uni.$u.throttle(this.submit(), 1000)
 			},
 			submit() {
 				if (!this.consentStatus) {

pages/mine/fleet/addBinding.vue

@@ -20,7 +20,7 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="tipsShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick"
+			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 1000)" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 	</view>
 </template>

pages/mine/fleet/bindingCarCaptain.vue

@@ -20,7 +20,7 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="tipsShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 1000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/mine/fleet/carCaptainAuthentication.vue

@@ -66,12 +66,12 @@
 					</image>
 				</view> -->
 				<view class="title">上传银行卡卡号页</view>
-				<view @click="uploadImg(3)" class="picture picture3" v-if="!dataDetails.payeeAddressUrl">
+				<view @click="uploadImg(3,0)" class="picture picture3" v-if="!dataDetails.payeeAddressUrl">
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传银行卡卡号页</view>
 				</view>
 
-				<view v-if="dataDetails.payeeAddressUrl" @click.stop="uploadImg(3)" class="preview-card-img picture">
+				<view v-if="dataDetails.payeeAddressUrl" @click.stop="uploadImg(3,0)" class="preview-card-img picture">
 					<!-- <image class="card-img" :src="dataDetails.cardAddressUrl"></image> -->
 					<view @click.stop="delCard(3)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">

pages/mine/fleet/fleetManage.vue

@@ -41,7 +41,7 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="tipsShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick"
+			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 1000)" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -230,7 +230,9 @@
 							if (res.data) {
 								this.fleetInfo = res.data
 								this.nextGetInfo()
-
+							}else{
+								this.isLoadMore = true
+								this.loadStatus = 'nomore'
 							}
 						} else {
 							uni.$u.toast(res.message);

pages/mine/index.vue

@@ -19,7 +19,6 @@
 					<view @click="toLogin" class="phone" v-if="hasLogin">{{starUserphone}}</view>
 				</view>
 			</view>
-			<view></view>
 		</view>
 		<view class="content1">
 			<view @click="goDetailPage('/pages/mine/driverCertification',1)" class="left">
@@ -137,7 +136,7 @@
 					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
 			</view>
-			<view class="flex flex-space-between" @click="goDetailPage('/pages/mine/index1')">
+			<!-- <view class="flex flex-space-between" @click="goDetailPage('/pages/mine/index1')">
 				<view class="flex align-center">
 					<image class="img" src="@/static/images/mine/set.png" mode='widthFix'>
 					</image>
@@ -146,7 +145,7 @@
 				<view>
 					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
-			</view>
+			</view> -->
 			<!--<view class="flex flex-space-between" @click="goDetailPage('/pages/mine/evaluate')">
 				<view class="flex align-center">
 					<image class="img" src="@/static/images/mine/set.png" mode='widthFix'>
@@ -198,8 +197,14 @@
 		},
 		onShow() {
 			// #ifdef APP-PLUS
-			this.version = plus.runtime.version
-			this.checkVersion()
+			plus.runtime.getProperty(plus.runtime.appid, (info) => {
+				//版本号
+				this.version = info.version;
+				console.log("当前版本为：", this.version)
+				this.checkVersion()
+			})
+			// this.version = plus.runtime.version
+			// this.checkVersion()
 			// #endif
 			uni.setTabBarItem({
 				index: 0,
@@ -287,15 +292,16 @@
 					url: baseUrlNew + '/appVersion/selectInfo',
 					data: {
 						appid: plus.runtime.appid,
-						version: plus.runtime.version,
+						version: this.version,
 						imei: "1",
 						type: 'sj'
 					},
 					method: 'GET',
 					success: (res) => {
-						var versionNo = plus.runtime.version
-						if (versionNo == res.data.data.version) {
-							this.version = "当前为最新版" + res.data.data.version
+						console.log("查看1111",this.version)
+						console.log("查看11111",res)
+						if (!res.data.data.version) {//有返回值证明需要更新   没有则不需要
+							this.version = "当前为最新版" + this.version
 						} else {
 							this.version = "发现新版本，立即更新"
 						}

pages/mine/index1.vue

@@ -1,6 +1,103 @@
 <template>
 	<view class="content">
-		<image class="logo" src="/static/logo.png"></image>
+		<view class='row-between'>
+			<view class="">运单号</view>
+			<view class="flex align-center">
+				<u--input placeholder="运单号" border="none"  v-model="shippingNoteInfos[0].shippingNoteNumber" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">分单号</view>
+			<view class="flex align-center">
+				<u--input placeholder="分单号" border="none"  v-model="shippingNoteInfos[0].serialNumber" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">始发地区划码</view>
+			<view class="flex align-center">
+				<u--input placeholder="始发地区划码" border="none"  v-model="shippingNoteInfos[0].startCountrySubdivisionCode" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">目的地区划码</view>
+			<view class="flex align-center">
+				<u--input placeholder="目的地区划码" border="none"  v-model="shippingNoteInfos[0].endCountrySubdivisionCode" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">始发地经度</view>
+			<view class="flex align-center">
+				<u--input placeholder="始发地经度" border="none"  v-model="shippingNoteInfos[0].startLongitude" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">始发地纬度</view>
+			<view class="flex align-center">
+				<u--input placeholder="始发地纬度" border="none"  v-model="shippingNoteInfos[0].startLatitude" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">目的地经度</view>
+			<view class="flex align-center">
+				<u--input placeholder="目的地经度" border="none"  v-model="shippingNoteInfos[0].endLongitude" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">目的地纬度</view>
+			<view class="flex align-center">
+				<u--input placeholder="目的地纬度" border="none"  v-model="shippingNoteInfos[0].endLatitude" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">始发地</view>
+			<view class="flex align-center">
+				<u--input placeholder="始发地" border="none"  v-model="shippingNoteInfos[0].startLocationText" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">目的地</view>
+			<view class="flex align-center">
+				<u--input placeholder="目的地" border="none"  v-model="shippingNoteInfos[0].endLocationText" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">车牌号</view>
+			<view class="flex align-center">
+				<u--input placeholder="车牌号" border="none"  v-model="shippingNoteInfos[0].vehicleNumber" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">司机姓名</view>
+			<view class="flex align-center">
+				<u--input placeholder="司机姓名" border="none"  v-model="shippingNoteInfos[0].driverName" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">时间间隔</view>
+			<view class="flex align-center">
+				<u--input placeholder="时间间隔" border="none"  v-model="shippingNoteInfos[0].interval" inputAlign='right'
+					clearable></u--input>
+			</view>
+		</view>
+		<view class='row-between'>
+			<view class="">备注</view>
+			<view class="flex align-center">
+				<u--input placeholder="备注" border="none"  v-model="remark" inputAlign='right'></u--input>
+			</view>
+		</view>
+		
 		<button type="primary" @click="auth()">授权</button>
 		<button type="primary" @click="start()">开启定位</button>		
 		<button type="primary" @click="send()">发送定位</button>	
@@ -13,29 +110,36 @@
 <script>
 	//插件对象
 	var sdkwx = uni.requireNativePlugin('Hdgq-LocSdkWX');
+	import * as config from '@/config/index.js'
 	export default {
 		data() {
 			return {
 				title: 'Hello',
-				vehicleNumber:"辽A77777",//车牌号
-				driverName:"尚师傅",//司机姓名
+				vehicleNumber:"辽HG6663",//车牌号
+				driverName:"孙亚洲",//司机姓名
 				remark:"测试",//备注
+				appId: "", //网络货运企业APP的唯一标识
+				appSecurity: "", //网络货运企业在省平台申请的接入安全码
+				enterpriseSenderCode: "", //网络货运企业在省平台申请的企业发送代码
+				environment: "debug", //环境:“debug”接入测试环境,“release”接入正式环境。
 				shippingNoteInfos:[{
-					shippingNoteNumber:"CY20221027199993",//运单号
-					serialNumber:"0000",//分单号
-					startCountrySubdivisionCode:"210804",//起点位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
-					endCountrySubdivisionCode:"210804",//到达位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
-					startLongitude:"122.17153",//起点位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-					startLatitude:"40.266814",//起点位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-					endLongitude:"122.146806",//到达位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-					endLatitude:"40.261078",//到达位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-					startLocationText:"营口市",//起点地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-					endLocationText:"营口市",//到达地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-					vehicleNumber:"辽A12347",//车牌号，SDK 回调返回，调 用 start/stop/pause/restart/必 填，send 时非必填
-					driverName:"尚师傅",//司机姓名，SDK 回调返回， 调用 start/stop/pause/restart/ 必填，send 时非必填
-					interval:"5000"//请求时间间隔，SDK 回调返 回(单位 ms)				 
+					shippingNoteNumber:"CY20221206018406",
+					serialNumber:"0000",
+					startCountrySubdivisionCode:"210804",
+					endCountrySubdivisionCode:"210804",
+					startLongitude: "122.22580",
+					startLatitude:"40.63070",
+					endLongitude:"122.15483",
+					endLatitude: "40.26812",
+					startLocationText:"营口市",
+					endLocationText:"营口市",
+					vehicleNumber:"辽HG6663",
+					// vehicleNumber:"辽PD0990",
+					driverName:"孙亚洲",
+					interval:"5000" 
 				}],//运单信息列表,一辆车运单数最大支持数为 10
-				timer:""
+				timer:"",
+				// columns[["[00]车辆损坏","[01货主临时改变收货位置]",""]]
 			}
 		},
 		onLoad() {
@@ -60,12 +164,24 @@
 		},
 		methods: {
 			auth() { 
+				let phoneType = uni.getSystemInfoSync().platform //判断手机类型
+				this.enterpriseSenderCode = config.def().enterpriseSenderCode
+				this.environment = config.def().environment
+				if (phoneType == "android") {
+					this.appId = config.def().androidAppId
+					this.appSecurity = config.def().androidAppSecurity
+				} else if (phoneType == "ios") {
+					// this.appId = "uni.UNIDCD13AC"
+					// this.appSecurity = "b01e4805276646eeb25f0fad91de97a4f32e8c2c0e0d42e5b24cc4737e9f040f"
+					this.appId = config.def().iosAppId
+					this.appSecurity = config.def().iosAppSecurity
+				}
 				//授权
-				var appId = "uni.UNI9C76CB6";//网络货运企业APP的唯一标识
-				var appSecurity = "24c593b7037347e08857a6ab05fd231b0509f5bb7cb741078f524f506ad32db8";//网络货运企业在省平台申请的接入安全码
-				var enterpriseSenderCode = "23106960";//网络货运企业在省平台申请的企业发送代码
-				var environment = "debug";//环境:“debug”接入测试环境,“release”接入正式环境。
-				sdkwx.auth(appId, appSecurity, enterpriseSenderCode, environment, function(res) {
+				// var appId = "uni.UNI9C76CB6";//网络货运企业APP的唯一标识
+				// var appSecurity = "24c593b7037347e08857a6ab05fd231b0509f5bb7cb741078f524f506ad32db8";//网络货运企业在省平台申请的接入安全码
+				// var enterpriseSenderCode = "23106960";//网络货运企业在省平台申请的企业发送代码
+				// var environment = "debug";//环境:“debug”接入测试环境,“release”接入正式环境。
+				sdkwx.auth(this.appId, this.appSecurity, this.enterpriseSenderCode, this.environment, function(res) {
 					console.log(res);
 					if (res.type == "onSuccess") {
 						//成功
@@ -87,7 +203,15 @@
 				var driverName = this.driverName;//司机姓名
 				var remark = this.remark;//备注
 				var shippingNoteInfos = this.shippingNoteInfos;//运单信息列表
-				sdkwx.start(vehicleNumber, driverName, remark, shippingNoteInfos, function(res){
+				// var startParam = uni.getStorageSync("sdkStartParam")
+				// if(startParam){
+				// 	this.$helper.sdkStart(startParam.carNo,startParam.driverName,startParam.remark,startParam.shippingNoteInfos)
+				// }
+				console.log("更换前",shippingNoteInfos)
+				// shippingNoteInfos = startParam.shippingNoteInfos
+				// shippingNoteInfos[0].shippingNoteNumber = 'CY20221028860222'
+				console.log("更换后",shippingNoteInfos)
+				sdkwx.start(shippingNoteInfos[0].vehicleNumber,shippingNoteInfos[0].driverName, remark, shippingNoteInfos, function(res){
 					console.log(res);
 					if (res.type == "onSuccess") {
 					//成功
@@ -98,16 +222,19 @@
 					if (shippingNoteInfos) {
 						let dateTtime = Number(shippingNoteInfos.interval + 1000)
 						console.log("开始定时", dateTtime)
-						that.timer = setTimeout(() => {
-							console.log("定时")
-							that.send()
-						}, dateTtime);
+						// that.timer = setTimeout(() => {
+						// 	console.log("定时")
+						// 	that.send()
+						// }, dateTtime);
 					}
 					} else if (res.type == "onFailure"){
 						//失败
 						var errorCode = res.data.errorCode;//错误码
 						var errorMsg = res.data.errorMsg;//错误描述
 					}
+					uni.showModal({
+						content:JSON.stringify(res)
+					});
 				});			   
 			},
 			send(){
@@ -117,7 +244,7 @@
 				var driverName = this.driverName;//司机姓名
 				var remark = this.remark;//备注
 				var shippingNoteInfos = this.shippingNoteInfos;//运单信息列表
-				sdkwx.send(vehicleNumber, driverName, remark, shippingNoteInfos, function(res){
+				sdkwx.send(shippingNoteInfos[0].vehicleNumber,shippingNoteInfos[0].driverName, remark, shippingNoteInfos, function(res){
 					var shippingNoteInfos = res.data[0]; //运单信息列表
 					if (res.type == "onSuccess") {
 						console.log("App.vue发送定位成功")
@@ -141,6 +268,9 @@
 							that.send()
 						}, dateTime1);
 					}
+					uni.showModal({
+						content:JSON.stringify(res)
+					});
 				});	
 			},
 			pause(){
@@ -149,7 +279,7 @@
 				var driverName = this.driverName;//司机姓名
 				var remark = this.remark;//备注
 				var shippingNoteInfos = this.shippingNoteInfos;//运单信息列表
-				sdkwx.pause(vehicleNumber, driverName, remark, shippingNoteInfos, function(res) {
+				sdkwx.pause(shippingNoteInfos[0].vehicleNumber,shippingNoteInfos[0].driverName, remark, shippingNoteInfos, function(res) {
 					console.log(res);
 					if (res.type == "onSuccess") {
 						//成功
@@ -158,6 +288,9 @@
 						var errorCode = res.data.errorCode;//错误码
 						var errorMsg = res.data.errorMsg;//错误描述
 					}
+					uni.showModal({
+						content:JSON.stringify(res)
+					});
 				});			 			
 			},
 			restart(){
@@ -166,7 +299,7 @@
 				var driverName = this.driverName;//司机姓名
 				var remark = this.remark;//备注
 				var shippingNoteInfos = this.shippingNoteInfos;//运单信息列表
-				sdkwx.restart(vehicleNumber, driverName, remark, shippingNoteInfos, function(res) {
+				sdkwx.restart(shippingNoteInfos[0].vehicleNumber,shippingNoteInfos[0].driverName, remark, shippingNoteInfos, function(res) {
 					console.log(res);
 					
 					if (res.type == "onSuccess") {
@@ -176,7 +309,10 @@
 						//失败
 						var errorCode = res.data.errorCode;//错误码
 						var errorMsg = res.data.errorMsg;//错误描述
-					}	
+					}
+						uni.showModal({
+							content:JSON.stringify(res)
+						});
 				});			
 			},
 			stop(){
@@ -186,7 +322,7 @@
 				var driverName = this.driverName;//司机姓名
 				var remark = this.remark;//备注
 				var shippingNoteInfos = this.shippingNoteInfos;//运单信息列表
-				sdkwx.stop(vehicleNumber, driverName, remark, shippingNoteInfos, function(res) {
+				sdkwx.stop(shippingNoteInfos[0].vehicleNumber,shippingNoteInfos[0].driverName, remark, shippingNoteInfos, function(res) {
 					console.log(res);
 					if (res.type == "onSuccess") {
 						clearInterval(that.timer)
@@ -198,6 +334,9 @@
 						var errorCode = res.data.errorCode;//错误码
 						var errorMsg = res.data.errorMsg;//错误描述
 					}	
+					uni.showModal({
+						content:JSON.stringify(res)
+					});
 				});			
 			},
 		}
@@ -207,10 +346,15 @@
 
 <style>
 	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
+		background: white;
+		margin: 20rpx;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		
+		.place {
+			width: 80%;
+			text-align: right;
+		}
 	}
 
 	.logo {
@@ -231,4 +375,7 @@
 		font-size: 36rpx;
 		color: #8f8f94;
 	}
+	.row-between {
+		margin: 20rpx 0;
+	}
 </style>

pages/mine/manageBankCards/addBankCard.vue

@@ -87,9 +87,7 @@
 					payeeName: '',
 				},
 				imagesrc: '',
-				columns: [
-
-				],
+				columns: [],
 				isShowBank: false,
 				isShowManualInput: false,
 				index: ''
@@ -242,7 +240,8 @@
 										if (res.data.bankName) {
 											_this.dataDetails.bankDeposit = res.data.bankName
 										}
-										// 开户支行LIst
+										// 开户支行List
+										_this.columns=[]
 										if (res.data.bankNameZhihang) {
 											_this.columns.push(res.data
 												.bankNameZhihang)

pages/mine/manageBankCards/editBankCard.vue

@@ -50,7 +50,7 @@
 		</view>
 
 		<u-toast ref="uToast"></u-toast>
-		<view class="submit-btn" @click="$u.throttle(submit, 5000)">提交</view>
+		<view class="submit-btn" @click="$u.throttle(submit, 1000)">提交</view>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>

pages/mine/manageBankCards/index.vue

@@ -33,7 +33,7 @@
 					<view class="default-card">设为默认收款账户</view>
 				</view>
 				<view>
-					<u-icon name="trash" size="24" @click="$u.throttle(del(item,index), 5000)"></u-icon>
+					<u-icon name="trash" size="24" @click="$u.throttle(del(item,index), 1000)"></u-icon>
 				</view>
 			</view>
 		</view>

pages/mine/manageVehicles/editVehicle.vue

@@ -89,6 +89,18 @@
 				</view>
 				<image class="" :src="dataDetails.drivingLicenseBackPage" mode="aspectFit"></image>
 			</view>
+			<view class="flex row flex-space-between">
+				<view class="left-text">行驶证车辆类型</view>
+				<u--input maxlength='10' placeholder="输入行驶证上的车辆类型" inputAlign='right' border="none"
+					v-model="dataDetails.vehicleType">
+				</u--input>
+			</view>
+			<view class="flex row flex-space-between">
+				<view class="left-text">行驶证车辆识别代号</view>
+				<u--input maxlength='25' placeholder="输入行驶证车辆识别代号" inputAlign='right' border="none"
+					v-model="dataDetails.carCode">
+				</u--input>
+			</view>
 			<view class="flex row flex-space-between">
 				<view class="left-text">行驶证档案编号</view>
 				<u--input maxlength='12' placeholder="输入行驶证档案编号" inputAlign='right' border="none"
@@ -163,6 +175,19 @@
 					<image class="" :src="dataDetails.trailerLicenseBackPage" mode="aspectFit"></image>
 				</view>
 			</view>
+			<view class="flex row flex-space-between" v-if="sign == '挂车'">
+				<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>
+				<u--input maxlength='25' placeholder="输入挂车车辆识别代码" inputAlign='right' border="none"
+					v-model="dataDetails.trailerCarCode">
+				</u--input>
+			</view>
 			<view class="flex row" v-if="sign == '挂车'">
 				<view  class="left-text">挂车行驶证档案编号</view>
 				<u--input maxlength='12' placeholder="输入挂车行驶证档案编号" inputAlign='right' border="none"
@@ -362,7 +387,7 @@
 			<!-- <view class="level1-title">证件信息</view> -->
 		</view>
 		<view class='submit-btn-wrap'>
-			<view class="submit-btn" @click="$u.throttle(submit, 5000)">提交</view>
+			<view class="submit-btn" @click="$u.throttle(submit, 1000)">提交</view>
 		</view>
 		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"
 			:defaultValue="carNumber" @keyboardClick="handleClick"></master-keyboard>
@@ -383,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>
 
@@ -445,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);
@@ -473,6 +499,7 @@
 			this.fileList2 = [{
 				url: options.guaAddressUrl
 			}]
+			this.xiala()
 			this.get_camera_permission()
 		},
 		onShow(){
@@ -496,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
 			},
@@ -678,6 +726,8 @@
 															.carNum //车牌号
 														_this.dataDetails.owner = res.data
 															.owner //车辆所有人
+															_this.dataDetails.vehicleType = res.data.vehicleType//行驶证车辆类型
+															_this.dataDetails.carCode =res.data.carCode  //行驶证车辆识别代号
 														_this.$forceUpdate()
 													}
 												})
@@ -774,6 +824,8 @@
 															.carNum //车牌号
 														_this.dataDetails.guaOwner = res.data
 															.owner //车辆所有人
+															_this.dataDetails.trailerVehicleType = res.data.vehicleType//挂车行驶证车辆类型
+															_this.dataDetails.trailerCarCode =res.data.carCode  //挂车行驶证车辆识别代号
 														_this.$forceUpdate()
 													}
 												})
@@ -1194,6 +1246,14 @@
 					})
 					return true
 				}
+				
+				if(!this.dataDetails.carCode){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "行驶证车辆识别代号不能为空！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseNumber)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1276,6 +1336,20 @@
 						})
 						return true
 					}
+					if (uni.$u.test.isEmpty(this.dataDetails.trailerVehicleType)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车行驶证车辆类型不能为空！",
+						})
+						return true
+					}
+					if (uni.$u.test.isEmpty(this.dataDetails.trailerCarCode)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车行驶证识别代号不能为空！",
+						})
+						return true
+					}
 					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseNumber)) {
 						this.$refs.uToast.show({
 							type: 'error',

pages/mine/often/oftenRoute.vue

@@ -86,8 +86,13 @@
 			
 				//联网加载数据
 				this.status = 'loading';
+				let commonNo =  uni.getStorageSync("firstAuthentication").commonId
+				if(!commonNo){
+					this.mescroll.endBySize(0, 0);
+					return
+				}
 				this.$request.baseRequest('get', '/commonRoute/select', {
-						commonId: uni.getStorageSync("firstAuthentication").commonId,
+						commonId: commonNo,
 						pageSize: page.size,
 						currentPage: page.num
 					}).then(res => {
@@ -304,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/mine/settings/editPassword.vue

@@ -275,8 +275,9 @@
 		width: 100vw;
 		height:calc(100vh - 85px);
 		overflow: hidden;
-			background: url('~@/static/images/mine/bg@2x.png');
-		background-size:100%;
+		background: url('~@/static/images/mine/bg@2x.png');
+		background-size:100% 100vh;
+		background-repeat: no-repeat;
 	}
 
 	.wrapper {

pages/news/index.vue

@@ -8,14 +8,13 @@
 		<view class="top-bgc"></view>
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
 			style="background-color: #F5F6FA;">
-			<view class="content">
+			<view class="content" v-if="news.length > 0">
 				<view class="info-item flex" v-for="(item,index) in news" :key="index" @click="read(item)">
 					<view class="left">
 						<image src="@/static/images/news/cy.png" class="img" v-if="item.newsType=='承运通知'">
 						</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/addEvaluation.vue

@@ -112,7 +112,7 @@
 		
 		onNavigationBarButtonTap() {
 			console.log(12112)
-			uni.$u.throttle(this.submit(), 5000)
+			uni.$u.throttle(this.submit(), 1000)
 		},
 		onLoad(options) {
 			that = this

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>
@@ -85,6 +85,13 @@
 					<view class="sx-style" @click.stop="getLngLat()">刷新</view>
 				</view>
 			</view>
+			<view class='row-between'>
+				<view class="">运输时长（小时）</view>
+				<view class="flex align-center">
+					<u--input placeholder="请输入运输时长" border="none" type="digit" v-model="detailData.transportationDuration" inputAlign='right'
+						clearable></u--input>
+				</view>
+			</view>
 			<view class='s-flex'>
 				<view class="" style="margin:20rpx 0;">上传装车照片</view>
 				<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
@@ -99,8 +106,8 @@
 
 		</view>
 		<view class="bottom-btn">
-			<view class="store" @click="$u.throttle(submit(1), 5000)">暂存</view>
-			<view class="submit" @click="$u.throttle(submit(3), 5000)">提交</view>
+			<view class="store" @click="$u.throttle(submit(1), 1000)">暂存</view>
+			<view class="submit" @click="$u.throttle(submit(3), 1000)">提交</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
 			:showCancelButton='true' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
@@ -191,10 +198,20 @@
 				this.getInfo()
 			}
 			console.log(options)
+			var isContains = true;//隐私权政策是否包含高德开平隐私权政策  true是包含
+			var isShow = true;//隐私权政策是否弹窗展示告知用户 true是展示 
+			sdkwx.updatePrivacyShow(isContains, isShow);
+			
+			var isAgree = true;//隐私权政策是否取得用户同意  true是用户同意
+			sdkwx.updatePrivacyAgree(isAgree);
+			//检查定位权限
+			sdkwx.checkLocationPermission(function(res){
+				console.log(res);
+			});
+			this.auth()
 			// this.detailData = JSON.parse(options.obj) ;
 			// console.log(this.detailData)
 			// CYHT20220317000001
-			//隐私合规接口,HBuildx3.3.3及其以后的版本需要调用合规检查
 		},
 		onHide() {
 			uni.removeStorageSync(
@@ -212,18 +229,12 @@
 			...mapState(['hasLogin', 'userInfo', "firstAuthentication"])
 		},
 		methods: {
-			
 			auth() { //授权
-				// var appId = "uni.UNI9C76CB6";//网络货运企业APP的唯一标识
-				// var appSecurity = "24c593b7037347e08857a6ab05fd231b0509f5bb7cb741078f524f506ad32db8";//网络货运企业在省平台申请的接入安全码
-				// var enterpriseSenderCode = "23106960";//网络货运企业在省平台申请的企业发送代码
-				// var environment = "debug";//环境:“debug”接入测试环境,“release”接入正式环境。
 				console.log("appid：" + this.appId + "安全码：" + this.appSecurity + "发送代码：" + this.enterpriseSenderCode)
 				let that = this
 				sdkwx.auth(this.appId, this.appSecurity, this.enterpriseSenderCode, this.environment, function(res) {
 					if (res.type == "onSuccess") {
 						//成功
-						that.start()
 						console.log("授权成功")
 						console.log(res)
 					} else if (res.type == "onFailure") {
@@ -246,26 +257,35 @@
 				this.shippingNoteInfos[0].startCountrySubdivisionCode = this.detailData.publishTaskInfo.sendAdCode, //起点位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
 				this.shippingNoteInfos[0].endCountrySubdivisionCode = this.detailData.publishTaskInfo.unsendAdCode, //到达位置行政区划代码，调 用 start/stop/pause/restart 时 必填，调用 send 非必填
 				this.shippingNoteInfos[0].startLongitude = this.detailData.publishTaskInfo.sendLongitude, //起点位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].startLatitude = this.detailData.publishTaskInfo.sendLatitude, //起点位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].endLongitude = this.detailData.publishTaskInfo.unsendLongitude, //到达位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].endLatitude = this.detailData.publishTaskInfo.unsendLatitude, //到达位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].startLocationText = this.detailData.publishTaskInfo.sendCity, //起点地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
-				this.shippingNoteInfos[0].endLocationText = this.detailData.publishTaskInfo.unloadCity, //到达地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].startLatitude =  this.detailData.publishTaskInfo.sendLatitude, //起点位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].endLongitude =  this.detailData.publishTaskInfo.unsendLongitude, //到达位置经度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].endLatitude =  this.detailData.publishTaskInfo.unsendLatitude, //到达位置纬度，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].startLocationText = this.detailData.sendCity, //起点地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
+				this.shippingNoteInfos[0].endLocationText = this.detailData.unloadCity, //到达地址文字描述，调用 start/stop/pause/restart 时必 填，调用 send 非必填
 				this.shippingNoteInfos[0].vehicleNumber = this.detailData.carNumber, //车牌号，SDK 回调返回，调 用 start/stop/pause/restart/必 填，send 时非必填
 				this.shippingNoteInfos[0].driverName = this.detailData.driverName, //司机姓名，SDK 回调返回， 调用 start/stop/pause/restart/ 必填，send 时非必填
 				this.shippingNoteInfos[0].interval = "5000" //请求时间间隔，SDK 回调返 回(单位 ms)
+
+				//}],//运单信息列表,一辆车运单数最大支持数为 10
 				var remark = "测试"; //备注
 				let that = this
 				console.log("start this.shippingNoteInfos")
 				console.log(this.shippingNoteInfos)
-				var shippingNoteInfos = this.shippingNoteInfos
-				sdkwx.start(this.detailData.carNo, this.firstAuthentication.driverName, remark, shippingNoteInfos,
+				var param = {}
+				param.carNo = this.detailData.carNo
+				param.driverName = this.firstAuthentication.driverName
+				param.remark = remark
+				param.shippingNoteInfos = this.shippingNoteInfos
+				// uni.setStorageSync("sdkStartParam",param)
+				// uni.setStorageSync("sdkStartParamOrderNum",this.detailData.orderNo)
+				// this.$helper.sdkStart(this.detailData.carNo, this.firstAuthentication.driverName, remark, this.shippingNoteInfos)
+				sdkwx.start(this.detailData.carNo, this.firstAuthentication.driverName, remark, this.shippingNoteInfos,
 					function(res) {
-						var shippingNoteInfos = res.data[0]; //运单信息列表
 						if (res.type == "onSuccess") {
 							//成功
 							console.log("开启定位成功！！！")
 							console.log(res)
+							var shippingNoteInfos = res.data[0]; //运单信息列表
 							console.log(shippingNoteInfos, "sdassss")
 							if (shippingNoteInfos) {
 								let dateTtime = Number(shippingNoteInfos.interval + 1000)
@@ -282,11 +302,18 @@
 							console.log(res)
 							var errorCode = res.data.errorCode; //错误码
 							var errorMsg = res.data.errorMsg; //错误描述
+							that.$refs.uToast.show({
+								type: 'error',
+								message: errorMsg
+							})
 							that.timer = setTimeout(() => {
 								console.log("定时")
 								that.send()
 							}, 915204);
 						}
+						// uni.showModal({
+						// 	content:JSON.stringify(res)
+						// });
 					});
 			},
 			send() { //发送定位
@@ -294,21 +321,16 @@
 				let that = this
 				console.log("send this.shippingNoteInfos")
 				console.log(this.shippingNoteInfos)
-				var shippingNoteInfos = this.shippingNoteInfos;
-				sdkwx.send(this.detailData.carNo, this.firstAuthentication.driverName, remark, shippingNoteInfos,
+				sdkwx.send(this.detailData.carNo, this.firstAuthentication.driverName, remark, this.shippingNoteInfos,
 					function(res) {
 						console.log('发送定位', res);
-						var shippingNoteInfos = res.data[0]; //运单信息列表
 						if (res.type == "onSuccess") {
-
-							if (shippingNoteInfos) {
-								let dateTime = Number(shippingNoteInfos.interval + 1000)
-								console.log("定时开始", dateTime)
-								that.timer = setTimeout(() => {
-									//TODO 
-									that.send()
-								}, dateTime);
-							}
+							var shippingNoteInfos = res.data[0]; //运单信息列表
+							let dateTtime = Number(shippingNoteInfos.interval + 1000)
+							console.log("开始定时", dateTtime)
+							that.timer = setTimeout(() => {
+								that.send()
+							}, dateTtime);
 						} else if (res.type == "onFailure") {
 							var errorCode = res.data.errorCode; //错误码
 							var errorMsg = res.data.errorMsg; //错误描述
@@ -343,6 +365,9 @@
 					if (res.code == 200) {
 
 						this.detailData = res.data
+						if(res.data.hyCarrierInfo && res.data.hyCarrierInfo.transportationDuration){
+							this.detailData.transportationDuration = res.data.hyCarrierInfo.transportationDuration
+						}
 						// #ifdef APP-PLUS
 						this.getLngLat();
 						// #endif
@@ -364,6 +389,7 @@
 								console.log(this.fileList1)
 								this.detailData.carNo = res.data.carNo
 								this.detailData.loadingDate = res.data.loadingDate
+							
 								if (res.data.loadingDate) {
 									this.detailData.loadingDate1 = res.data.loadingDate.split(' ')[0]
 								}
@@ -372,7 +398,6 @@
 								this.detailData.freight = res.data.estimatedFreight
 							}
 						})
-
 						// this.detailData.contractNo = ''
 						// this.detailData.id = this.detailData.carrierId
 						// this.detailData.carrierInfo.loadingDate = ''
@@ -392,9 +417,7 @@
 						// 	this.status2 = true
 						// }
 					}
-
 				})
-
 			},
 			//车牌号弹出键盘
 			handleShowKeyboard() {
@@ -640,6 +663,7 @@
 						})
 						return
 					}
+					
 					this.alertTitle = '确定提交装车信息？'
 				}
 
@@ -678,17 +702,31 @@
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.detailData.loadingCity)) {
+				// if (uni.$u.test.isEmpty(this.detailData.loadingCity)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "定位不能为空！",
+				// 	})
+				// 	return true
+				// }
+				// if (uni.$u.test.isEmpty(this.detailData.loadingArea)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "定位不能为空！",
+				// 	})
+				// 	return true
+				// }
+				if (uni.$u.test.isEmpty(this.detailData.transportationDuration)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "定位不能为空！",
+						message: "运输时长不能为空！",
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.detailData.loadingArea)) {
+				if (this.detailData.transportationDuration < 0 || this.detailData.transportationDuration >1000) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "定位不能为空！",
+						message: "运输时长输入错误！",
 					})
 					return true
 				}
@@ -735,7 +773,8 @@
 					loadingCity: this.detailData.loadingCity,
 					loadingLongitude: this.detailData.loadingLongitude,
 					loadingLatitude: this.detailData.loadingLatitude,
-					id: this.detailData.hyCarrierInfo.id
+					id: this.detailData.hyCarrierInfo.id,
+					transportationDuration:this.detailData.transportationDuration
 				}
 
 				// console.log("查看id--------",this.detailData.hyCarrierInfo.id)
@@ -743,10 +782,10 @@
 						if (res.code == 200) {
 							uni.hideLoading()
 							let _title = ''
-							if (this.detailData.statusFlag == 1) {
+							if (that.detailData.statusFlag == 1) {
 								_title = '暂存成功！'
 							} else {
-								that.auth() //开始授权并开始定位
+								that.start() //开始授权并开始定位
 								_title = '提交成功！'
 							}
 							that.$helper.fUN_AmapLocation.start({
@@ -787,16 +826,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);
@@ -805,6 +846,7 @@
 									//判断缓存数据条数，超过reportInterval时清空缓存，重新存入缓存
 								}
 							);
+							
 							this.$refs.uToast.show({
 								type: 'success',
 								message: _title,

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>
@@ -86,8 +85,8 @@
 			</view>
 		</view>
 		<view class="bottom-btn">
-			<view class="store" @click="$u.throttle(submit(1), 5000)">暂存</view>
-			<view class="submit" @click="$u.throttle(submit(3), 5000)">提交</view>
+			<view class="store" @click="$u.throttle(submit(1), 1000)">暂存</view>
+			<view class="submit" @click="$u.throttle(submit(3), 1000)">提交</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
 			:showCancelButton='true' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
@@ -210,6 +209,8 @@
 					this.shippingNoteInfos[0].driverName = this.detailData.driverName, //司机姓名，SDK 回调返回， 调用 start/stop/pause/restart/ 必填，send 时非必填
 					this.shippingNoteInfos[0].interval = "5000" //请求时间间隔，SDK 回调返 回(单位 ms)
 				// var shippingNoteInfos = this.shippingNoteInfos;//运单信息列表
+				console.log("查看结束参数",this.shippingNoteInfos)
+				
 				let remark = ""
 				sdkwx.stop(this.detailData.carNumber, this.detailData.driverName, remark, this.shippingNoteInfos, function(res) {
 					if (res.type == "onSuccess") {
@@ -220,6 +221,11 @@
 						//失败
 						var errorCode = res.data.errorCode;//错误码
 						var errorMsg = res.data.errorMsg;//错误描述
+						this.$refs.uToast.show({
+							type: 'error',
+							message: errorMsg,
+						})
+						return
 					}	
 				});			
 			},
@@ -245,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

@@ -6,7 +6,8 @@
 			<view class="fixed">
 				<view class='title flex flex-center'>
 					<view>订单</view>
-					<image class="search" style='width:18px;height:18px;' src="../../static/images/search_icon.png" @click="search" mode=""></image>
+					<image class="search" style='width:18px;height:18px;' src="../../static/images/search_icon.png"
+						@click="search" mode=""></image>
 					<!-- <u-icon class="search" name="search" color="" size="28" @click="search"></u-icon> -->
 				</view>
 				<view class="tab-content">
@@ -16,16 +17,22 @@
 									transform: 'scale(1.05)'
 								}"></u-tabs>
 					<view class="right-btn flex align-center" @click="showMenu=!showMenu">
-						<view class="">
+						<!-- <view class="">
 							全部类型
-						</view>
-						<image style='width:8px;height:8px;' :src="!showMenu?'../../static/images/order/xiala.png':'../../static/images/order/shangla.png'" mode=""></image>
+						</view> -->
+						<image style='width:8px;height:8px;'
+							:src="!showMenu?'../../static/images/order/xiala.png':'../../static/images/order/shangla.png'"
+							mode=""></image>
 						<!-- <u-icon :name="!showMenu?'arrow-down-fill':'arrow-up-fill'" color="#333333" size="12"></u-icon> -->
 					</view>
 				</view>
 			</view>
 			<view class="all-menu">
+
 				<u-transition :show="showMenu" mode="fade">
+					<view class="" style="background: white;padding:71rpx 0 23rpx 20rpx;font-weight: 700;">
+						类型
+					</view>
 					<view class="transition">
 						<view v-for="(item,index) in tabList" class="transition-item-style"
 							:class="tabIndex==index?'menu-active':''" @click="clickTab({index:index})">
@@ -33,7 +40,7 @@
 						</view>
 					</view>
 				</u-transition>
-				<view @touchmove.stop.prevent="moveHandle" class="modal-black" v-show="showMenu" ></view>
+				<view @touchmove.stop.prevent="moveHandle" class="modal-black" v-show="showMenu"></view>
 			</view>
 
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
@@ -41,15 +48,16 @@
 				<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> -->
-						<image style='width:14px;height:14px;margin-right:7px;' src="../../static/images/order/pingjiabianji.png" mode=""></image>
+						<image style='width:14px;height:14px;margin-right:7px;'
+							src="../../static/images/order/pingjiabianji.png" mode=""></image>
 						<view style="margin-left: 20prx;">我的评价</view>
 					</view>
 					<view class="right">
-						<image style='width:12px;height:12px;' src="../../static/images/order/right.png" mode=""></image>
+						<image style='width:12px;height:12px;' src="../../static/images/order/right.png" mode="">
+						</image>
 					</view>
 				</view>
-				<view :id="'good'+good.id" class="good-list" v-for="good in goods" 
-					@click="toDetail(good)">
+				<view :id="'good'+good.id" class="good-list" v-for="good in goods" @click="toDetail(good)">
 					<view style="padding: 0 35rpx 20rpx 35rpx;">
 						<view class="flex flex-space-between row1">
 							<view class="item1">
@@ -61,7 +69,9 @@
 						</view>
 						<view class="flex row2">
 							<view class="left flex flex-space-between">
-								<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}</view>
+								<view class="ssx">
+									{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}
+								</view>
 								<view class="level2-title">{{$helper.filterUrban(good.sendCity)}}
 									{{$helper.filterArea(good.sendArea)}}
 								</view>
@@ -83,7 +93,7 @@
 							</view>
 							<view class="right">
 								<view class="flex row">
-									<view >{{good.compName}}</view>
+									<view>{{good.compName}}</view>
 									<view class="sline"></view>
 									<view style="min-width: 100rpx;">{{good.cargoOwner}}</view>
 								</view>
@@ -113,7 +123,7 @@
 								<!-- {{good.totalFreight}}{{good.illingMethod==0?'元/吨':'元/车'}} -->
 								{{good.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
 							</view>
-							
+
 							<!-- <view class='pay flex'
 								v-if="good.orderStatus=='运输中'||good.orderStatus=='待货主确认卸车'||good.orderStatus=='待平台确认卸车'||good.orderStatus=='货主驳回卸车信息'||good.orderStatus=='平台驳回卸车信息'||good.orderStatus=='结算中'||good.orderStatus=='待结算'">
 								<div>已付</div>
@@ -141,11 +151,15 @@
 								确认卸车</view>
 							<view class="start normal" @click.stop="closed(good)" v-if="good.orderStatus=='结算中'">完结
 							</view>
-							<view class="start normal" @click.stop="toDetail(good)" v-if="good.orderStatus=='待确认运费'">确认运费
+							<view class="start normal" @click.stop="toDetail(good)" v-if="good.orderStatus=='待确认运费'">
+								确认运费
 							</view>
 							<!-- <view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='已完结'">评价</view> -->
-							<view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='已完结' && good.driverEvaluated != 1"><!-- driverEvaluated 为1是已评价过-->
-								评价</view>
+							<view class="start normal" @click.stop="addevaluation(good)"
+								v-if="good.orderStatus=='已完结' && good.driverEvaluated != 1">
+								<!-- driverEvaluated 为1是已评价过-->
+								评价
+							</view>
 						</view>
 					</view>
 				</view>
@@ -164,7 +178,8 @@
 					<u-icon name="trash-fill" color="#AFB3BF" size="20" class="back-icon" @click="del"></u-icon>
 				</view>
 				<view class="">
-					<view v-for="(item,index) in useSearchList" :key="index" class="item-style inline-block" @click="getSearch(item)">
+					<view v-for="(item,index) in useSearchList" :key="index" class="item-style inline-block"
+						@click="getSearch(item)">
 						{{item}}
 					</view>
 				</view>
@@ -172,48 +187,51 @@
 			</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick"
-			@cancel="cancelClick">
-			
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 1000)"
+			@close="cancelClick" @cancel="cancelClick">
+
 			<view style="margin: 0 auto;">
-				<u-radio-group 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" >
-				</u-radio>
-			</u-radio-group>
+				<u-radio-group 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">
+					</u-radio>
+				</u-radio-group>
 			</view>
-			
+
 			<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
 				v-if='isShowTerminationReason'>
 			</u--textarea>
 		</u-modal>
-					<!-- 普通弹窗 -->
-			<u-popup :show="show" mode="bottom" @close="close" @open="open">
-				<view class="u-popup-wrap">
-					<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;">
-			           	<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" >
-			           	</u-radio>
-			           </u-radio-group>
-			           </view>
-					   <view style='border-top:10px solid #F2F4F7;position:absolute;left:0;height:0;width:100%;'></view>
-			           <view style='padding:40rpx 0 30rpx;'>终止原因描述</view>
-			           <u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
-			           	v-if='isShowTerminationReason'>
-			           </u--textarea>
-					   <view class='termination' :class="{'active':value2.length>0}" @click='$u.throttle(confirmClick, 5000)'>终止</view>
+		<!-- 普通弹窗 -->
+		<u-popup :show="show" mode="bottom" @close="close" @open="open">
+			<view class="u-popup-wrap">
+				<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>
-			           
-			</u-popup>
+
+				<view style='fon-size:34rpx;margin-bottom:20px;text-align:center;font-weight: 600;'>确认终止订单</view>
+				<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">
+						</u-radio>
+					</u-radio-group>
+				</view>
+				<view style='border-top:10px solid #F2F4F7;position:absolute;left:0;height:0;width:100%;'></view>
+				<view style='padding:40rpx 0 30rpx;'>终止原因描述</view>
+				<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
+					v-if='isShowTerminationReason'>
+				</u--textarea>
+				<view class='termination' :class="{'active':value2.length>0}" @click='$u.throttle(confirmClick, 1000)'>
+					终止</view>
+			</view>
+
+		</u-popup>
 		<u-toast ref="uToast"></u-toast>
-	<!-- 	<view class="modal-black" v-show="showMenu" @click="closeMenu"></view> -->
+		<!-- 	<view class="modal-black" v-show="showMenu" @click="closeMenu"></view> -->
 	</view>
 </template>
 
@@ -228,7 +246,7 @@
 	} from "@/api/mock.js"
 	import uniPopup from '@/components/uni-popup/uni-popup.vue'
 	export default {
-		components:{
+		components: {
 			uniPopup
 		},
 		mixins: [MescrollMixin], // 使用mixin
@@ -237,8 +255,8 @@
 				confirmText: '确定',
 				showCancelButton: true,
 				showMenu: false,
-				show:false,
-				type:'bottom',
+				show: false,
+				type: 'bottom',
 				searchStyle: {
 					background: "#317AFE",
 					color: 'white',
@@ -285,7 +303,7 @@
 				isSearch: false,
 				startPlace: '齐齐哈尔齐齐哈尔',
 				endPlace: '全国',
-				isdblclick:0,
+				isdblclick: 0,
 				goods: [], // 数据列表
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
 				height: "", // 需要固定swiper的高度
@@ -317,14 +335,14 @@
 		onTabItemTap(e) {
 			this.isdblclick++
 			// tab 点击时执行，此处直接接收单击事件
-			if(this.scrollTop>1200){
-				if(this.isdblclick>1){
+			if (this.scrollTop > 1200) {
+				if (this.isdblclick > 1) {
 					uni.pageScrollTo({
 						scrollTop: 0,
 						duration: 300
 					});
 				}
-				
+
 			}
 		},
 		created() {
@@ -352,7 +370,7 @@
 
 		// },
 		onHide() {
-			this.isdblclick=0
+			this.isdblclick = 0
 		},
 		onShow() {
 			if (this.scrollTop > 1200) {
@@ -369,11 +387,11 @@
 				iconPath: 'static/images/common/huoyuan@2x(1).png',
 				selectedIconPath: 'static/images/common/huoyuan@2x.png'
 			})
-			var that=this
+			var that = this
 			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 				reCommonId: this.userInfo.id,
 			}).then(res3 => {
-				if (res3.data||res3.data==0) {
+				if (res3.data || res3.data == 0) {
 					let name = 'myTip';
 					let value = res3.data
 					if (value == 0) {
@@ -398,10 +416,10 @@
 				num: 1
 			})
 		},
-		
+
 		onPageScroll(res) {
 			this.scrollTop = res.scrollTop
-			console.log("页面滚动了", res.scrollTop)
+			// console.log("页面滚动了", res.scrollTop)
 			if (this.scrollTop > 1200) {
 				uni.setTabBarItem({
 					index: 2,
@@ -420,35 +438,35 @@
 
 		},
 		methods: {
-			moveHandle(){
+			moveHandle() {
 				// this.closeMenu()
 				// console.log(1111)
 			},
-			closepopup(){
-				this.show=false
+			closepopup() {
+				this.show = false
 			},
-			toggle(item){
+			toggle(item) {
 				this.id = item.id
 				if (item.orderStatusKey == 1) {
-						this.isShowTerminationReason = false
-					} else {
-						this.isShowTerminationReason = true
-					}
-				if(item.orderStatus=='未装车'){
-					
-					
+					this.isShowTerminationReason = false
+				} else {
+					this.isShowTerminationReason = true
+				}
+				if (item.orderStatus == '未装车') {
+
+
 					this.show = true
-				}else{
-					this.isShowAlert=true
+				} else {
+					this.isShowAlert = true
 				}
-				
+
 			},
 			open() {
-			          // console.log('open');
+				// console.log('open');
 			},
 			close() {
 				this.show = false
-			          // console.log('close');
+				// console.log('close');
 			},
 			addevaluation(good) {
 				uni.$u.route('/pages/order/addEvaluation', {
@@ -531,7 +549,7 @@
 					return
 				}
 				// #endif
-				var that =this
+				var that = this
 				if (this.alertTitle == '确定删除全部历史记录?') {
 					uni.removeStorageSync('useSearchList');
 					this.useSearchList = [];
@@ -568,7 +586,7 @@
 									type: 'success',
 									message: "终止订单成功",
 									complete() {
-										
+
 										that.mescroll.resetUpScroll()
 									}
 								})
@@ -577,7 +595,7 @@
 							} else {
 								uni.$u.toast("终止订单失败！");
 							}
-							this.show=false
+							this.show = false
 							this.isShowAlert = false
 
 						})
@@ -592,7 +610,7 @@
 			},
 			getSearch(e) {
 				console.log(e)
-				if(!e){
+				if (!e) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "搜索内容不能为空！",
@@ -615,12 +633,12 @@
 				this.isSearch = false
 			},
 			toDetail(item) {
-				if(item.orderStatus!='待货主确认'){
+				if (item.orderStatus != '待货主确认') {
 					uni.$u.route('/pages/order/orderDetails', {
 						id: item.id,
 					});
 				}
-				
+
 			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {
@@ -658,7 +676,7 @@
 						if (page.num == 1) this.goods = []; //如果是第一页需手动制空列表
 						this.goods = this.goods.concat(res.data.records); //追加新数据
 						this.mescroll.endBySize(res.data.records.length, res.data.total);
-						this.searchKeyWord = ""//搜索完成之后清空筛选内容
+						this.searchKeyWord = "" //搜索完成之后清空筛选内容
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);
@@ -704,10 +722,12 @@
 		z-index: 999;
 		width: 100%;
 	}
-	/deep/.u-popup__content{
+
+	/deep/.u-popup__content {
 		border-radius: 10px;
 		// padding:20px;
 	}
+
 	.fixed {
 		.title {
 			background: white;
@@ -933,7 +953,7 @@
 
 	.tab-content {
 		position: relative;
-		padding-right: 200rpx;
+		padding-right: 100rpx;
 	}
 
 	.right-btn {
@@ -976,7 +996,8 @@
 			background: #F7F8FA;
 			border-radius: 6px;
 			margin: 20rpx 20rpx 0 20rpx;
-			padding: 16rpx 0;
+			padding: 22rpx 0;
+			font-size: 26rpx;
 
 		}
 
@@ -994,11 +1015,11 @@
 		z-index: 999;
 		opacity: 0.3;
 	}
-	
+
 	.all-menu {
 		position: fixed;
 		z-index: 99;
-		top: 200rpx;
+		top: 136rpx;
 	}
 
 	.menu-active {
@@ -1012,27 +1033,32 @@
 		padding: 20rpx;
 		border-radius: 20rpx;
 	}
-	/deep/.u-radio{
-		margin:40rpx 0;
+
+	/deep/.u-radio {
+		margin: 40rpx 0;
 	}
-	.close{
-		position:absolute;
-		right:20px;
-		top:26px;
+
+	.close {
+		position: absolute;
+		right: 20px;
+		top: 26px;
 	}
-	.termination{
-		background:#F1F3F6;
-		color:#C5CAD4;
-		padding:10px;
-		border-radius:30px;
+
+	.termination {
+		background: #F1F3F6;
+		color: #C5CAD4;
+		padding: 10px;
+		border-radius: 30px;
 		text-align: center;
-		margin-top:30rpx;
+		margin-top: 30rpx;
 	}
-	.termination.active{
+
+	.termination.active {
 		background: #2772FB;
 		color: white;
 	}
-	.u-popup-wrap{
-		padding:20px;
+
+	.u-popup-wrap {
+		padding: 20px;
 	}
 </style>

pages/order/orderDetails.vue

@@ -79,12 +79,10 @@
 			<view class="flex flex-space-between border">
 				<view class="flex s-row item1">
 					<view class="fontsize-46 fontweight-500 text">{{dataObj.sendCity}}</view>
-
 					<view class="fontsize-28 gray">发货地</view>
 				</view>
 				<image class="change-btn" src="@/static/images/common/jt.png" mode='widthFix'></image>
 				<view class="flex s-row item2">
-
 					<view class="fontsize-46 fontweight-500 text" @click="">{{dataObj.unloadCity}}</view>
 					<view class="fontsize-28 gray text-align-right">卸货地</view>
 				</view>
@@ -156,6 +154,10 @@
 				<view class=" gray">装车时间</view>
 				<view class="">{{carrierInfo.loadingDate}}</view>
 			</view>
+			<view class='row-between'>
+				<view class=" gray">运输时长</view>
+				<view class="">{{carrierInfo.transportationDuration }} 小时</view>
+			</view>
 			<view class='row-between'>
 				<view class=" gray">装车照片</view>
 				<view class="flex">
@@ -210,11 +212,11 @@
 			</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
-			:closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick"
+			:closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="$u.throttle(confirmClick(), 1000)" @close="cancelClick"
 			@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'
@@ -232,7 +234,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>
@@ -241,7 +243,7 @@
 		           <u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
 		           	v-if='isShowTerminationReason'>
 		           </u--textarea>
-				   <view class='termination' :class="{'active':value2.length>0}" @click='$u.throttle(confirmClick, 5000)'>终止</view>
+				   <view class='termination' :class="{'active':value2.length>0}" @click='$u.throttle(confirmClick, 1000)'>终止</view>
 			</view>
 		           
 		</u-popup>
@@ -553,9 +555,8 @@
 						if(res.code==200){
 							this.dataObj = res.data
 							if(res.data.hyCarrierInfo){
-								
+								this.carrierInfo = res.data.hyCarrierInfo
 							}
-							this.carrierInfo = res.data.hyCarrierInfo
 							this.freightInfo =  res.data.freightInfo
 							if(this.carrierInfo.loadingImg&&this.carrierInfo.loadingImg.length>0){
 								this.zcPhoneList = this.carrierInfo.loadingImg.split(',')
@@ -590,6 +591,9 @@
 </script>
 
 <style lang="scss">
+	.content{
+		min-height: 100vh;
+	}
 	.fixed,
 	.fixed1 {
 		background: white;

pages/order/signContract.vue

@@ -83,14 +83,14 @@
 			<view class='row-between'>
 				<view class="gray">装车毛重(吨)</view>
 				<view class="flex">
-					<u--input placeholder="请输入装车毛重" border="none" v-model="dataDetails.grossWeight" inputAlign='right'
+					<u--input placeholder="请输入装车毛重" border="none" type="digit" v-model="dataDetails.grossWeight" inputAlign='right'
 						clearable></u--input>
 				</view>
 			</view>
 			<view class='row-between'>
 				<view class="gray">装车净重(吨)</view>
 				<view class="flex">
-					<u--input placeholder="请输入装车净重" border="none" v-model="dataDetails.weight" inputAlign='right'
+					<u--input placeholder="请输入装车净重" border="none" type="digit" v-model="dataDetails.weight" inputAlign='right'
 						clearable></u--input>
 				</view>
 			</view>
@@ -170,7 +170,7 @@
 					:class="[selectColor === 'red' ? 'color_select' : '', 'black-select']"></image> -->
 
 				<!-- <button @click="saveCanvasAsImg" class="saveBtn">保存</button> -->
-				<view @click="$u.throttle(submit(), 5000)" class="saveBtn">提交</view>
+				<view @click="$u.throttle(submit(), 1000)" class="saveBtn">提交</view>
 				<!-- <button @click="previewCanvasImg" class="previewBtn">预览</button> -->
 				<!-- <button @click="subCanvas" class="subBtn">完成</button> -->
 			</view>
@@ -524,6 +524,7 @@
 						return
 					}
 				}
+				
 				_obj.trailerNumber = that.dataDetails.trailerNumber
 				_obj.tranStartDate = that.dataDetails.tranStartDate
 				_obj.tranEndDate = that.dataDetails.tranEndDate
@@ -535,14 +536,21 @@
 				_obj.weight = that.dataDetails.weight
 				_obj.grossWeight = that.dataDetails.grossWeight
 				_obj.advanceCharge = that.dataDetails.advanceCharge
-				_obj.bankCard = that.dataDetails.bankCard
-				_obj.bankDeposit = that.dataDetails.bankDeposit
-				_obj.bankDepositBranch = that.dataDetails.bankDepositBranch
-				_obj.payeeName = that.dataDetails.payeeName
+				// _obj.bankCard = that.dataDetails.bankCard
+				// _obj.bankDeposit = that.dataDetails.bankDeposit
+				// _obj.bankDepositBranch = that.dataDetails.bankDepositBranch
+				// _obj.payeeName = that.dataDetails.payeeName
 				_obj.id = that.dataDetails.id
 				_obj.typeFlag = 2
 				_obj.carCaptainAccountNumber = that.dataDetails.carCaptainAccountNumber
 				_obj.payeeIdCard = that.dataDetails.payeeIdCard
+				
+				if(!this.dataDetails.carCaptainCommonId){  //carCaptainCommonId没有值  证明他没有车队长  （有车队长不传收款账户信息）
+					_obj.bankCard = that.dataDetails.bankCard
+					_obj.bankDeposit = that.dataDetails.bankDeposit
+					_obj.bankDepositBranch = that.dataDetails.bankDepositBranch
+					_obj.payeeName = that.dataDetails.payeeName
+				}
 				uni.canvasToTempFilePath({
 					canvasId: 'handWriting',
 					fileType: 'png',
@@ -566,14 +574,14 @@
 													url: res.data,
 													success: function(res) {
 														var filePath = res.tempFilePath;
-														uni.openDocument({
-															filePath: filePath,
-															showMenu: true,
-															success: function(res) {
+		// 												uni.openDocument({
+		// 													filePath: filePath,
+		// 													showMenu: true,
+		// 													success: function(res) {
 		
-																console.log('打开文档成功');
-															}
-														});
+		// 														console.log('打开文档成功');
+		// 													}
+		// 												});
 													}
 												});
 												if (that.contractCheck) { //提交

pages/public/login.vue

@@ -3,7 +3,7 @@
 		<u-icon class="back-btn" name="arrow-left" color="black" size="20" @click="navBack"></u-icon>
 		<view class="wrapper">
 			<image style='width:38px;height:38px;margin:223rpx 0 20px 0;' src='@/static/logo.png'></image>
-			<h2 class="title Semibold">欢迎使用畅运通司机端</h2>
+			<h2 class="title Semibold">欢迎使用畅运通</h2>
 			<view
 				style='position:relative;width:93%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;align-items: center;'
 				class="flex">

pages/public/loginOther.vue

@@ -4,7 +4,7 @@
 		<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
 		<view class="wrapper">
 			<image style='width:38px;height:38px;margin:223rpx 0 20px 0;' src='@/static/logo.png'></image>
-			<h2 class="title Semibold">欢迎使用畅运通司机端</h2>
+			<h2 class="title Semibold">欢迎使用畅运通</h2>
 			<view style='width:100%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;' class="flex">
 				<view class="phone-before-num NumberMedium">+86</view>
 

pages/public/register.vue

@@ -54,11 +54,12 @@
 					width="17px" height="17px"></u--image>
 				已阅读并同意
 				<navigator
-					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
+					url="/pages/sale/webview?can_share=false&url=http://liangxin.zthymaoyi.com/cytUserAgreement.html"
 					class="path" hover-class="navigator-hover">《服务协议》</navigator>和<navigator
-					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html"
+					url="/pages/sale/webview?can_share=false&url=http://liangxin.zthymaoyi.com/cytScrectAgreement.html"
 					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
 			</view>
+			
 		</view>
 	</view>
 </template>

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>
@@ -97,7 +97,7 @@
 		</chunLei-popups> -->
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="quitShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 1000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 
@@ -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

@@ -16,14 +16,15 @@
 			<view class="flex screen">
 				<view @click="selectAddress(1)" class="screen_item">
 					<view class="screen_sign sign1">装</view>
-					{{title1 ? title1 : "请选择地址"}}
+
+					<text style="font-size: 36rpx; font-weight: 700;">{{title1 ? title1 : "请选择地址"}}</text>
 				</view>
 				<itmister-address-picker ref="addressElone" @confirmChange="confirmChangeOne"></itmister-address-picker>
 				<u--image :showLoading="true" class="exchange" src="../../static/images/riders/exchange.png"
 					width="43px" height="43px" @click="replace"></u--image>
-				<view @click="selectAddress(2)" class="screen_item">
+				<view @click="selectAddress(2)" class="screen_item" style="align-items: flex-end;">
 					<view class="screen_sign sign2">卸</view>
-					{{title2 ? title2 : "请选择地址"}}
+					<text style="font-size: 36rpx; font-weight: 700;">{{title2 ? title2 : "请选择地址"}}</text>
 				</view>
 				<itmister-address-picker-other ref="addressEltwo" :wholeCountry="true"
 					@confirmChange="confirmChangeTwo"></itmister-address-picker-other>
@@ -31,24 +32,19 @@
 			<view class="route">
 				<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback">
 					<view v-for="(item,index) in routeData">
-						<view class="flex route_item">
-							<view style="width: 20%;">
-								<u-avatar :src="item.driverPortrait" size="60"></u-avatar>
+						<view class="flex route_item" style="margin-bottom: 70rpx;">
+							<view style="">
+								<u-avatar :src="item.driverPortrait" size="40"></u-avatar>
 							</view>
-							<view style="width: 80%;">
-								<view class="flex">
+							<view style="">
+								<view class="flex" style="width: 78vw;justify-content: space-between">
 									<view class="driver_name">
 										{{item.driverNickname}}
 									</view>
-									<view class="driver_invite">
-										<view class="route_invite" style="margin-left: 30px;" @click="invitation(item)">
-											<image src="../../static/images/riders/yaoqing.png" mode=""
-												style="width: 26rpx;height: 26rpx;margin-rigth:10rpx;"></image>邀请
-										</view>
+									<view class="route_invite" @click="invitation(item)">
+										<image src="../../static/images/riders/yaoqing.png" mode=""
+											style="width: 26rpx;height: 26rpx;margin-rigth:10rpx;"></image>邀请
 									</view>
-									<u-picker :show="fleetShow" :columns="columns" @cancel="fleetClose"
-										@confirm="invitationCheng">
-									</u-picker>
 								</view>
 								<view class="address" v-for="(items,index) in item.startAdress">
 									<span class="spots spot1"></span>
@@ -74,51 +70,52 @@
 		<view class="riders" v-if="indexbtn == 2">
 			<view class="flex riders_top">
 				<view @click="selectChange" class="riders_city">{{city ? city : province}}</view>
-				
+
 				<u-search placeholder="输入车队信息关键字" bgColor="#ffffff" v-model="searchKeyWord" @search="getList"
-					maxlength="15"></u-search>
+					maxlength="15" :actionStyle="actionStyle" actionText="查询"></u-search>
 			</view>
 			<view class="fleet">
 				<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback">
-				<view v-for="(item,index) in formData" class="flex">
-					<view class="fleet_item">
-						<view class="flex">
-							<u-avatar :src="item.coverUrl" size="45"></u-avatar>
-							<view class="fleet_name" @click="lookfleet(item)">
-								{{item.fleetName}}
-								<view class="fleet_member flex">
-									<u-avatar-group :urls="item.fleetMemberUrl.split(',')" size="24" gap="0.4">
-									</u-avatar-group>
-									<text class="fleet_number">{{item.fleetMemberNum}}人</text>
-									<!-- <image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image> -->
-									<image src="../../static/images/myimg/gengduo1.png" mode=""
-										style="width: 18rpx;height: 20rpx;margin-top:14rpx;"></image>
+					<view v-for="(item,index) in formData" class="flex">
+						<view class="fleet_item">
+							<view class="flex">
+								<u-avatar :src="item.coverUrl" size="45"></u-avatar>
+								<view class="fleet_name" @click="lookfleet(item)">
+									{{item.fleetName}}
+									<view class="fleet_member flex">
+										<u-avatar-group :urls="item.fleetMemberUrl.split(',')" size="24" gap="0.4">
+										</u-avatar-group>
+										<text class="fleet_number">{{item.fleetMemberNum}}人</text>
+										<!-- <image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image> -->
+										<image src="../../static/images/myimg/gengduo1.png" mode=""
+											style="width: 18rpx;height: 20rpx;margin-top:14rpx;"></image>
+									</view>
+								</view>
+								<view class="fleet_invite" v-if="!item.fleetMemberStatus" @click="joinFleet(item)">加入
 								</view>
+								<view class="fleet_invite" v-else>{{item.fleetMemberStatus}}</view>
 							</view>
-							<view class="fleet_invite" v-if="!item.fleetMemberStatus" @click="joinFleet(item)">加入</view>
-							<view class="fleet_invite" v-else>{{item.fleetMemberStatus}}</view>
-						</view>
 
-						<view class="fleet_introduce">
-							<u-read-more ref="uReadMore" :toggle="true" :shadowStyle="shadowStyle" closeText="查看全部"
-								:showHeight="20">
-								<rich-text :nodes="item.fleetProfile"></rich-text>
-							</u-read-more>
+							<view class="fleet_introduce">
+								<u-read-more ref="uReadMore" :toggle="true" :shadowStyle="shadowStyle" closeText="查看全部"
+									:showHeight="20">
+									<rich-text :nodes="item.fleetProfile"></rich-text>
+								</u-read-more>
 
-							<!-- <view class="fleet_text" v-if="item.textShow">{{item.fleetProfile}}</view>
+								<!-- <view class="fleet_text" v-if="item.textShow">{{item.fleetProfile}}</view>
 							<view class="" v-else>{{item.fleetProfile}}</view>
 								<span class="btn_change" @click="textChange(index)">{{switchtext}}</span> -->
 
-						</view>
-						<view class="" v-if="item.img">
-							<u-upload class="uview-upload" :fileList="item.img" :deletable="false" name="1" multiple
-								:maxCount="1">
-							</u-upload>
+							</view>
+							<view class="" v-if="item.img">
+								<u-upload class="uview-upload" :fileList="item.img" :deletable="false" name="1" multiple
+									:maxCount="1">
+								</u-upload>
+							</view>
 						</view>
 					</view>
-				</view>
-				<!-- <u-loadmore :status="status" :nomore-text="nomoreText" /> -->
-					</mescroll-body>
+					<!-- <u-loadmore :status="status" :nomore-text="nomoreText" /> -->
+				</mescroll-body>
 			</view>
 
 			<!-- <view v-if="formData.length == 0" style="background: #FFFFFF;text-align: center;">
@@ -127,6 +124,8 @@
 		</view>
 		<itmister-address-picker ref="addressElthree" :showCheck="false" @confirmChange="confirmChangethree">
 		</itmister-address-picker>
+		<u-picker :show="fleetShow" :columns="columns" @cancel="fleetClose" @confirm="invitationCheng">
+		</u-picker>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
@@ -149,11 +148,19 @@
 		},
 		data() {
 			return {
+				actionStyle: {
+					"background": "#2772FB",
+					"position": "absolute",
+					"right": "30rpx",
+					"borderRadius": "33px",
+					"color": "#fff",
+					"padding": "10rpx"
+				},
 				indexbtn: 1,
 				routeData: [], //列表
 				// show1: false,
 				// show2: false,
-				passOnce:'',
+				passOnce: '',
 				title1: "",
 				title2: "",
 				sendInfo: {
@@ -188,8 +195,8 @@
 				},
 				status: 'loadmore',
 				nomoreText: '实在没有了',
-				mescroll:{},
-				popupShow:false
+				mescroll: {},
+				popupShow: false
 			}
 		},
 		created() {},
@@ -290,7 +297,7 @@
 									this.formData = []
 								}
 								this.routeData = this.routeData.concat(res.data.records); //追加新数据
-								
+
 								for (let i = 0; i < this.routeData.length; i++) {
 									if (this.routeData[i].startAdress) {
 										this.routeData[i].startAdress = this.routeData[i].startAdress.split(",")
@@ -321,7 +328,7 @@
 								this.formData = []
 							}
 							this.formData = this.formData.concat(res.data.records); //追加新数据
-						
+
 							for (let i = 0; i < that.formData.length; i++) {
 								that.formData[i].textShow = false
 								if (that.formData[i].fleetUrl) {
@@ -344,14 +351,14 @@
 				}
 			},
 			lookfleet(item) {
-				uni.$u.route("/pages/riders/fleetSee?fleetId=" + item.id)
+				uni.$u.route("/pages/riders/fleetSee?fleetId=" + item.id+"&tips="+"1")
 			},
 			async getPassOnce() {
-				
+
 				await this.$request.baseRequest('', '/driverInfo/firstAuthentication', {
 						driverPhone: this.userInfo.phone,
 					}).then(res => {
-						if(res.data){
+						if (res.data) {
 							// this.passOnce=res.data.passOnce
 							uni.setStorageSync("firstAuthentication", res.data) //更新缓存数据（解决pc端审核后未及时更新缓存  用于车友判断）
 						}
@@ -367,10 +374,10 @@
 					this.$request.baseRequest('', '/driverInfo/firstAuthentication', {
 							driverPhone: this.userInfo.phone,
 						}).then(res => {
-							if(res.data){
+							if (res.data) {
 								// this.passOnce=res.data.passOnce
 								uni.setStorageSync("firstAuthentication", res.data) //更新缓存数据（解决pc端审核后未及时更新缓存  用于车友判断）
-								if (res.data.passOnce!=1) {
+								if (res.data.passOnce != 1) {
 									uni.setTabBarItem({
 										index: 1,
 										text: '车友',
@@ -398,7 +405,7 @@
 						.catch(res => {
 							uni.$u.toast(res.message);
 						});
-					
+
 				} else if (!uni.getStorageSync("firstAuthentication") && !uni.getStorageSync("userInfo")) { //判断有没有登录
 					this.tipsShow = true
 					this.tipsText = "您尚未登录，请前去登录！"
@@ -502,21 +509,23 @@
 					return
 				}
 				this.sendInfo.sendProvince = address.province ? address.province : ''
-				if(address.city=='天津'||address.city=='北京'||address.city=='上海'||address.city=='重庆'||address.city=='台湾'){
-					this.sendInfo.sendCity=''
-				}else{
+				if (address.city == '天津' || address.city == '北京' || address.city == '上海' || address.city == '重庆' || address
+					.city == '台湾') {
+					this.sendInfo.sendCity = ''
+				} else {
 					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 == '全市') {
-					if(address.city=='天津'||address.city=='北京'||address.city=='上海'||address.city=='重庆'||address.city=='台湾'){
+					if (address.city == '天津' || address.city == '北京' || address.city == '上海' || address.city == '重庆' ||
+						address.city == '台湾') {
 						this.title1 = address.province
-					}else{
+					} else {
 						this.title1 = address.province + address.city
 					}
 					this.sendInfo.sendArea = ""
@@ -528,9 +537,10 @@
 			},
 			confirmChangeTwo(address) {
 				this.unloadInfo.unloadProvince = address.province ? address.province : ''
-				if(address.city=='天津'||address.city=='北京'||address.city=='上海'||address.city=='重庆'||address.city=='台湾'){
-					this.unloadInfo.unloadCity=''
-				}else{
+				if (address.city == '天津' || address.city == '北京' || address.city == '上海' || address.city == '重庆' || address
+					.city == '台湾') {
+					this.unloadInfo.unloadCity = ''
+				} else {
 					this.unloadInfo.unloadCity = address.city ? address.city : ''
 				}
 				// this.unloadCity.unloadCity = address.city ? address.city : ''
@@ -541,9 +551,10 @@
 					this.unloadInfo.unloadCity = ""
 					this.unloadInfo.unloadArea = ""
 				} else if (address.area == '全市') {
-					if(address.city=='天津'||address.city=='北京'||address.city=='上海'||address.city=='重庆'||address.city=='台湾'){
+					if (address.city == '天津' || address.city == '北京' || address.city == '上海' || address.city == '重庆' ||
+						address.city == '台湾') {
 						this.title2 = address.province
-					}else{
+					} else {
 						this.title2 = address.province + address.city
 					}
 					this.unloadInfo.unloadArea = ""
@@ -766,20 +777,21 @@
 			width: 100%;
 
 			.route_invite {
-				width: 146rpx;
-				height: 54rpx;
+				font-size: 26rpx;
+				display: flex;
+				align-items: center;
 				border-radius: 35px;
-				text-align: center;
 				color: #FFFFFF;
-				line-height: 54rpx;
 				background: #2772FB;
+				padding: 10rpx 30rpx;
 			}
 
 			.driver_name {
 				width: 50%;
-				margin: 20rpx 0 0 30rpx;
+				margin: 10rpx 0 0 30rpx;
 				color: #333333;
 				font-size: 30rpx;
+				font-weight: 700;
 			}
 
 			.driver_invite {
@@ -791,6 +803,8 @@
 
 		.address {
 			margin-left: 30rpx;
+			color: #A3A3A3;
+			font-size: 26rpx;
 
 			// line-height: 34rpx;
 			.spots {
@@ -819,22 +833,30 @@
 			border-radius: 20rpx;
 			height: 200rpx;
 			margin: 40rpx auto 30rpx;
-			// margin-top: 60rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 0 34rpx;
+			box-sizing: border-box;
 
 			.screen_item {
-				padding: 60rpx 30rpx;
+				// padding: 60rpx 30rpx;
 				width: 40%;
-				text-align: center;
+				// text-align: center;
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
 
 				.screen_sign {
 					width: 40rpx;
 					height: 40rpx;
 					text-align: center;
-					margin: 0 auto;
+					// margin: 0 auto;
 					border-radius: 6px;
 					color: #FFFFFF;
 					font-size: 22rpx;
 					line-height: 40rpx;
+					margin-bottom: 20rpx;
 				}
 
 				.sign1 {
@@ -847,9 +869,9 @@
 			}
 
 			.exchange {
-				transform: rotate(-90deg);
-				position:relative;
-				left:30px;
+				// transform: rotate(-90deg);
+				// position: relative;
+				// left: 30px;
 				// line-height: 200rpx;
 				// margin-top: 60rpx;
 			}
@@ -859,6 +881,7 @@
 	.riders {
 		.riders_top {
 			margin-top: 40rpx;
+			padding-right: 20rpx;
 
 			.riders_city {
 				margin-top: 10rpx;
@@ -888,10 +911,11 @@
 					text-align: center;
 					background-color: #2772FB;
 					width: 128rpx;
-					height: 66rpx;
-					line-height: 66rpx;
+					height: 60rpx;
+					line-height: 60rpx;
 					border-radius: 35rpx;
 					color: #fff;
+					font-size: 26rpx;
 				}
 
 				.fleet_introduce {
@@ -937,6 +961,7 @@
 		// margin-top: 10rpx;
 
 	}
+
 	.popupShow {
 		overflow: hidden;
 		position: fixed;

pages/riders/report.vue

@@ -19,7 +19,7 @@
 			<u-toast ref="uToast"></u-toast>
 			<u-modal :show="tipsShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 				confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
-			<u-button type="primary" text="提交" class="btn_css" @click="$u.throttle(submit, 5000)"></u-button> 
+			<u-button type="primary" text="提交" class="btn_css" @click="$u.throttle(submit, 1000)"></u-button> 
 	</view>
 </template>
 

pages/sale/webview.vue

@@ -0,0 +1,24 @@
+<template>
+    <web-view :src="url"></web-view>
+</template>
+
+<script>
+	export default {
+        data() {
+            return {
+                url:""
+            }
+        },
+        onLoad(option) {
+            this.url = option.url;
+        },
+        methods: {
+        }
+    }
+</script>
+    
+
+
+<style>
+
+</style>

util/request.js

@@ -6,7 +6,7 @@ const baseRequest = (method, url, data, header) => {
 	if (header) {
 		contentheader = header
 	}
-	console.log(uni.getStorageSync("shiro"))
+	// console.log(uni.getStorageSync("shiro"))
 	let userInfo = uni.getStorageSync('userInfo');
 	let baseDefaultOpts = {
 		url: baseUrl + url,