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

common/helper.js

@@ -95,7 +95,7 @@ const setAudit = (item) => {
 const contactCustomerService = (phone) => {
 	console.log(phone)
 	if (!phone) {
-		phone = '400123123'
+		phone = '13304979986'
 	}
 	const res = uni.getSystemInfoSync();
 	// ios系统默认有个模态框

manifest.json

@@ -111,7 +111,22 @@
                 }
             }
         },
-        "nativePlugins" : {}
+        "nativePlugins" : {
+            "KJ-Camera" : {
+                "__plugin_info__" : {
+                    "name" : "相机自定义拍照录像，可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏 - [试用版，仅用于自定义调试基座]",
+                    "description" : "相机自定义拍照录像，可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏、相机切换前后摄像头 QQ群：863776189 可接单 离线包：单价*10  源码：单价*15",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=3404",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 0,
+                    "pid" : "3404",
+                    "parameters" : {}
+                }
+            }
+        }
     },
     /* 快应用特有相关 */
     "quickapp" : {},

pages.json

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

pages/carSource/index.vue

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

pages/mine/company/addcompany.vue

@@ -166,10 +166,10 @@
 			</view>
 			<view class="title">{{dataDetails.landOwnership=='自有'?'上传房产证':'上传租赁合同（扫描件或图片）'}}</view>
 			<view style='position:relative;'>
-				<view v-if='!dataDetails.propertyAddressUrl' @click="uploadImg(2)" class="picture">
+				<view v-if='!dataDetails.propertyAddressUrl' @click="uploadImg(4)" class="picture">
 					<image class="xj-image" src="@/static/mine/company/tianjiazhaopian@3x.png"></image>
 				</view>
-				<view v-if='dataDetails.propertyAddressUrl' @click.stop="uploadImg(2)" style='position:relative;'
+				<view v-if='dataDetails.propertyAddressUrl' @click.stop="uploadImg(4)" style='position:relative;'
 					class="preview-card-img picture">
 					<view @click.stop="delCard(2)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
@@ -586,6 +586,7 @@
 						// sourceType: ,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
+						
 							uploadImage('image', res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
@@ -660,6 +661,9 @@
 												});
 												_this.$forceUpdate()
 											break;
+											case 4:
+											   _this.dataDetails.propertyAddressUrl = result
+											break;
 									}
 								}
 							)

pages/mine/company/index.vue

@@ -140,8 +140,9 @@
 		height: 42px;
 		margin: 36px auto 0;
 		color: #fff;
-
-		background: url(../../../static/mine/company/Mask@3x.png);
+		// background: url(../../../static/mine/company/Mask@3x.png);
+		background: #2772FB ;
+		border-radius: 44rpx;
 		background-size: 100%;
 		line-height: 42px;
 	}

pages/mine/myAccount/bill.vue

@@ -1,23 +1,32 @@
 <template>
 	<view class="center">
-		<view style='border-bottom:1px solid #ccc;' class="" @click="dataShow = true">{{data}}</view>
+		<view @click="dataShow = true" class="data_top">{{data}} 年
+			<image src="../../../static/images/myimg/gengduo1@3x.png" mode=""
+				style="width:12rpx ;height: 20rpx;margin-left: 20rpx;"></image>
+		</view>
 		<u-picker :show="dataShow" :columns="columns" @confirm="dataChange" @cancel="dataShow = false"
 			@close="dataShow = false"></u-picker>
-			<view v-if='formlist.length>0'>
-				<view class="formData" v-for="(item,index) in formlist">
-					<view class="flex row">
-						<view class="left-text">{{item.types}}</view>
-						<view class="flex right-text">
-							{{item.amountMoney}}
-						</view>
+		<view v-if='formlist.length>0' class="dataInfo_css">
+			<view class="formData" v-for="(item,index) in formlist">
+				<view class="flex row">
+					<view class="left-text">{{item.types}}</view>
+					<view class="flex right-text">
+						{{item.amountMoney}}
+					</view>
+				</view>
+				<view class="flex">
+					<view class="order_no">
+						{{item.orderNo?item.orderNo:""}}
 					</view>
 					<view class="date_css">
 						{{item.createDate}}
 					</view>
 
 				</view>
+
 			</view>
-		<view v-else style='text-align:center;padding:10px;'>暂无账单</view>
+		</view>
+		<view v-else class="noBill">暂无账单</view>
 
 	</view>
 </template>
@@ -94,43 +103,68 @@
 
 <style lang="scss" scoped>
 	.center {
-		padding: 20rpx;
-
-		.formData {
-			.tips {
-				text-align: right;
-				border-bottom: 2rpx solid #e6e6e6;
-				height: 60rpx;
-			}
-
-			.row {
-				margin: 30rpx 0;
-			}
-
-			.left-text {
-				// background: red;
-				width: 40%;
-				color: #333333;
-				display: flex;
-				align-items: center;
-			}
-
-			.right-text {
-				width: 60%;
-				justify-content: flex-end;
-			}
-
-			.date_css {
-				text-align: right;
+		// padding:0 20rpx;
+		background: #F5F6FA;
+		height: calc(100vh - 9.9vh);
+		.data_top{
+			padding: 20rpx 30rpx 0;
+			background: #ffffff;
+			height: 80rpx;
+		}
+		.dataInfo_css{
+			padding: 10rpx 30rpx 20px;
+			background: #ffffff;
+			width: 85%;
+			border-radius: 20rpx;
+			margin: 20rpx auto;
+			
+			.formData {
+				height: 140rpx;
+				border-bottom: 2rpx solid #EEEEEE ;
+				.tips {
+					text-align: right;
+					border-bottom: 2rpx solid #e6e6e6;
+					height: 60rpx;
+				}
+			
+				.row {
+					margin: 30rpx 0;
+				}
+			
+				.left-text {
+					// background: red;
+					width: 40%;
+					color: #333333;
+					display: flex;
+					align-items: center;
+				}
+			
+				.right-text {
+					width: 60%;
+					justify-content: flex-end;
+				}
+			
+				.order_no {
+					width: 50%;
+					color: #999999 ;
+					font-size: 28rpx;
+				}
+			
+				.date_css {
+					width: 50%;
+					text-align: right;
+					color: #999999 ;
+					font-size: 28rpx;
+				}
 			}
 		}
+		.noBill{
+			text-align:center;padding:10px;
+			background: #FFFFFF;
+			width: 90%;
+			margin: 20rpx auto;
+			border-radius: 20rpx;
+			height: 70rpx;
+		}
 	}
 </style>
-uni.setStorageSync('userInfo', res.data)
-helper.getListByUserId()
-that.$store.commit('login', res.data)
-// that.liangxinLogin()
-uni.switchTab({
-url: '/pages/order/index'
-});
-uni.hideLoading()

pages/mine/myAccount/index.vue

@@ -1,24 +1,30 @@
 <template>
 	<view class="center">
-		<view class="" v-if="accountType == '2'">
-			{{dataInfo.companyName}}
-		</view>
-		<view class="flex account">
-			<view class="account_info">
-				可用余额
-				<view class="money">
-					{{dataInfo.accountBalance?dataInfo.accountBalance:0}}元
-				</view>
+		<view v-if="accountType == 1">
+			<view class="account">
+				<image src="../../../static/images/myAccount/qian.png" mode="" class="account_img"></image>
+			</view>
+			<view class="money">可用余额</view>
+			<view class="money_number">{{dataInfo.accountBalance?dataInfo.accountBalance:0}}<span class="yuan">元</span>
+			</view>
+			<view class="money_no">(已冻结：<span class="number">{{dataInfo.frozenAmount?dataInfo.frozenAmount:0}}</span>元)
 			</view>
-			<view class="account_info">
-				已冻结
-				<view class="money">
-					{{dataInfo.frozenAmount?dataInfo.frozenAmount:0}}元
+			<view class="next_btn" @click="withdrawal">提现</view>
+		</view>
+		<view v-else>
+			<view class="company_account">
+				<view class="company_money">可用余额（元）</view>
+				<view class="flex company_center">
+					<view class="company_money_number">{{dataInfo.accountBalance?dataInfo.accountBalance:0}}</view>
+					<view class="company_next" @click="withdrawal">
+						<view class="btn">
+							提现
+						</view>
+					</view>
 				</view>
+				<view class="company_money_no">(已冻结：{{dataInfo.frozenAmount?dataInfo.frozenAmount:0}} 元)</view>
 			</view>
 		</view>
-		<u-button type="primary" text="提现" @click="withdrawal"></u-button>
-
 	</view>
 </template>
 
@@ -28,50 +34,45 @@
 			return {
 				dataInfo: {},
 				accountType: '', //accountType  1个人 2企业
-				id:"",//如果是企业  公司id
-
+				id: "", //如果是企业  公司id
 			}
 		},
 		onLoad(options) {
 			if (options.id) { //我的企业进来的
 				this.accountType = '2'
 				this.id = options.id
-				console.log(this.dataInfo)
-			} else {  //个人账户
+			} else { //个人账户
 				this.accountType = '1'
 			}
 		},
 		onShow() {
-			
-				this.getList()
-			
-
+			this.getList()
 		},
 		onNavigationBarButtonTap(e) {
-			uni.$u.route('/pages/mine/myAccount/bill?type=' + this.accountType+'&id='+this.id)
+			uni.$u.route('/pages/mine/myAccount/bill?type=' + this.accountType + '&id=' + this.id)
 		},
 		methods: {
 			getList() {
-				if(this.accountType == '1'){
+				if (this.accountType == '1') {
 					this.$request.baseRequest('get', '/cargoOwnerInfo/selectAccount', {
 						commonId: uni.getStorageSync("userInfo").id
 					}).then(res => {
 						this.dataInfo = res.data
 					})
-				}else if(this.accountType == '2'){
+				} else if (this.accountType == '2') {
 					this.$request.baseRequest('get', '/cargoOwnerInfo/selectAccountBalance', {
-						id:this.id,
-						flag:this.accountType
+						id: this.id,
+						flag: this.accountType
 					}).then(res => {
 						this.dataInfo = res.data
 					})
 				}
 			},
 			withdrawal() {
-				if(this.accountType == '1'){
-					uni.$u.route("/pages/mine/myAccount/withdrawal?id=" + this.dataInfo.id +"&flag=" + this.accountType)
-				}else if(this.accountType == '2'){
-					uni.$u.route("/pages/mine/myAccount/withdrawal?id=" + this.id +"&flag=" + this.accountType)
+				if (this.accountType == '1') {
+					uni.$u.route("/pages/mine/myAccount/withdrawal?id=" + this.dataInfo.id + "&flag=" + this.accountType)
+				} else if (this.accountType == '2') {
+					uni.$u.route("/pages/mine/myAccount/withdrawal?id=" + this.id + "&flag=" + this.accountType)
 				}
 			},
 		}
@@ -81,20 +82,99 @@
 <style lang="scss" scoped>
 	.center {
 		padding: 20rpx;
+		text-align: center;
 
 		.account {
+			width: 100%;
+			height: 250rpx;
 			margin-top: 30rpx;
+			margin: 0 auto;
+			text-align: center;
 
-			.account_info {
-				width: 50%;
-				text-align: center;
+			.account_img {
+				width: 100rpx;
+				height: 100rpx;
+				margin-top: 200rpx;
 			}
+		}
+
+		.money {
+			margin-top: 90rpx;
+			font-size: 32rpx;
+			// margin: 40rpx;
+		}
+
+		.money_number {
+			font-size: 68rpx;
+			font-weight: 500;
+			margin-top: 20rpx;
 
-			.money {
-				margin: 40rpx;
+			.yuan {
+				font-size: 36rpx;
+				margin-left: 6rpx;
 			}
 		}
 
+		.money_no {
+			margin-top: 20rpx;
+			color: #999999;
+			font-size: 28rpx;
+
+			.number {
+				color: #2a74fb;
+				margin: 0 10rpx;
+			}
+		}
 
+		.next_btn {
+			background: #2772FB;
+			color: #FFFFFF;
+			padding: 25rpx 0;
+			border-radius: 60rpx;
+			margin-top: 100rpx;
+		}
+
+		// 公司账户
+		.company_account {
+			padding-top: 60rpx;
+			text-align: left;
+			color: #FFFFFF;
+			height: 280rpx;
+			border-radius: 10rpx;
+			background: linear-gradient(45deg, #2873fb, #4385fd, #5f98ff);
+
+			.company_money {
+				margin-left: 40rpx;
+				font-size: 30rpx;
+			}
+
+			.company_center {
+				margin: 20rpx;
+
+				.company_money_number {
+					width: 50%;
+					font-size: 70rpx;
+					margin-left: 20rpx;
+				}
+
+				.company_next {
+					width: 50%;
+					text-align: center;
+					line-height: 60rpx;
+					color: #2772FB;
+				}
+
+				.btn {
+					padding: 12rpx 0;
+					width: 180rpx;
+					background: #ffffff;
+					margin: 0 auto;
+					border-radius: 30px;
+				}
+			}
+			.company_money_no {
+				margin-left: 40rpx;
+			}
+		}
 	}
 </style>

pages/mine/myAccount/withdrawal.vue

@@ -1,18 +1,26 @@
 <template>
 	<view class="center">
 		<view class="formData">
-			<view class="flex row">
-				<view class="left-text">提现金额</view>
-				<view class="flex right-text">
-					<u--input placeholder="输入提现金额" inputAlign='right' border="none" clearable
-						v-model="formInfo.amountMoney" type="number">
-					</u--input>
+			<view class="formData_top">
+				<view class="flex row">
+					<view class="left-text">提现金额</view>
+					<view class="flex right-text">
+						<u--input placeholder="输入提现金额" inputAlign='right' border="none" clearable
+							v-model="formInfo.amountMoney" type="number">
+						</u--input>
+					</view>
+				</view>
+				<view class="tips flex">
+					
+					<view style="width: 60%;">
+						<span class="qian">￥</span>
+						可提现{{usableMoney}}元
+					</view>
+					<view style="color: #007AFF;text-align: right;width: 40%;margin-top: 30rpx;" @click="writeIn">全部提现</view>
 				</view>
 			</view>
-			<view class="tips">
-				可提现金额{{usableMoney}}元,<span style="color: #007AFF;" @click="writeIn">全部提现</span>
-			</view>
-			<view class="flex row">
+			<view class="formData_bottom">
+				<view class="flex row">
 				<view class="left-text">提现到银行卡</view>
 				<view class="flex right-text" @click="bankChange">
 					{{formInfo.bankDeposit?formInfo.bankDeposit:"请选择收款账户"}} {{bankNo}}
@@ -51,12 +59,15 @@
 					</u--input>
 				</view>
 			</view>
+			</view>
+
+			
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
 			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
-		<u-button type="primary" text="提交" @click="submit"></u-button>
+		<u-button type="primary" text="提交" @click="submit" class="btn_css"></u-button>
 	</view>
 </template>
 
@@ -121,7 +132,7 @@
 					id: this.id,
 					flag: this.flag
 				}).then(res => {
-					this.usableMoney = Number(res.data.accountBalance) 
+					this.usableMoney = Number(res.data.accountBalance)
 				})
 			},
 			writeIn() {
@@ -212,17 +223,37 @@
 <style lang="scss" scoped>
 	.center {
 		padding: 20rpx;
+		background: #F5F6FA;
+		height: calc(100vh - 9.9vh);
 
-		// .row {
-		// 	margin: 30rpx;
-		// }
+		.btn_css{
+			margin-top: 45rpx;
+		}
 		.formData {
-			.tips {
-				text-align: right;
-				border-bottom: 2rpx solid #e6e6e6;
-				height: 60rpx;
+			.formData_top {
+				background: #ffffff;
+				height: 200rpx;
+				padding: 10rpx 30rpx;
+				border-radius: 20rpx;
+
+				.tips {
+					width: 100%;
+					height: 60rpx;
+					color: #C6CBD5 ;
+					.qian {
+						font-size: 62rpx;
+						color: #333333 ;
+					}
+				}
+			}
+			.formData_bottom{
+					background: #ffffff;
+					padding: 10rpx 30rpx;
+					border-radius: 20rpx;
+					margin-top: 20rpx;
 			}
 
+
 			.row {
 				margin: 30rpx 0;
 			}

pages/mine/settings/editAvatar.vue

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

pages/news/index.vue

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

pages/news/newsSee.vue

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

pages/order/index.vue

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

pages/order/orderDetails.vue

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

pages/release/record.vue

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

pages/release/release.vue

@@ -143,7 +143,7 @@
 			<view class="row">
 				<view class="left">重量（吨）</view>
 				<view class="right flex">
-					<input type="text" value="" placeholder="输入预计发运重量" class="number" v-model="dataObj.weight"
+					<input type="number" value="" placeholder="输入预计发运重量" class="number" v-model="dataObj.weight"
 						style="text-align: right;" />
 				</view>
 			</view>
@@ -600,7 +600,7 @@
 							duration: 2000,
 							icon: "none",
 						});
-						return
+						return true
 					}
 				}
 				if (this.dataObj.carLength) {
@@ -665,8 +665,6 @@
 					});
 					return true
 				}
-
-
 			},
 			confirmClick() {
 				// #ifdef APP-PLUS