1

pages/carSource/index.vue

@@ -513,7 +513,8 @@
 				this.show = false
 			},
 			replace() {
-				if (this.unloadInfo.unloadProvince == "全国") {
+				// this.unloadInfo.unloadProvince == "全国"
+				if (this.title2 == "全国") {
 					uni.$u.toast("发货地不可以是全国")
 					return
 				}

pages/mine/settings/editPassword.vue

@@ -115,12 +115,17 @@
 				} else {
 					uni.$u.toast('请输入正确手机号');
 				}
-
 			},
-
-
 			//修改密码
 			reset() {
+				if (this.registerData.password.length < 6) {
+					uni.showToast({
+						title: '密码请输入6-16字符格式',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
 				uni.showLoading({
 					title: '加载中'
 				})

pages/order/driverDetail.vue

@@ -65,9 +65,9 @@
 				</view>
 			</view>
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-				class="mescroll">
+				class="mescroll" style="min-height:350px">
 				<view class="flex flex-space-between">
-					<view :class="haoType == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{ping.haoPing+ping.chaPing}}})</view>
+					<view :class="haoType == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{ping.haoPing+ping.chaPing}})</view>
 					<!-- <view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">最新(1)</view> -->
 					<view :class="haoType == 1 ? 'btn-active':'btn'" @click="btnChange(1)">好评({{ping.haoPing}})</view>
 					<view :class="haoType == 2 ? 'btn-active':'btn'" @click="btnChange(2)">差评({{ping.chaPing}})</view>
@@ -314,7 +314,7 @@
 
 <style lang="scss">
 	.content {
-		height: 100vh;
+		// height: 100vh;
 	}
 	.carMessage{
 		background:#fff;border-radius: 20rpx;

pages/public/register.vue

@@ -223,7 +223,7 @@
 				}
 				if (this.password.length < 6) {
 					uni.showToast({
-						title: '请输入正确的密码格式',
+						title: '密码请输入6-16字符格式',
 						icon: 'none',
 						duration: 2000
 					})