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

components/bert-suggest/suggest.vue

@@ -6,7 +6,7 @@
 				<view style='position:absolute;right:22px;bottom:16px;font-size:13px;'>{{data.content.length}}/150个字</view>
 			</uni-card>
 			<uni-card class="box contact" :isFull="true" title="联系方式" >
-				<input v-model="data.contact" placeholder="请输入您的手机号，方便我们联系您" />
+				<input v-model="data.contact" placeholder="请输入您的手机号，方便我们联系您" maxlength="11" type="number"/>
 			</uni-card>
 		</view>
 		<button class="submit-btn" @click="submit">提交</button>

pages.json

@@ -580,6 +580,24 @@
             }
             
         }
+        ,{
+            "path" : "pages/public/serviceAgreement/serviceAgreement",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "服务协议",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/public/cytScrectAgreement/cytScrectAgreement",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "隐私声明",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/mine/cargoowner/editpersonalinformation.vue

@@ -450,7 +450,7 @@
 													personImg: result,
 													flag: 1
 												}).then(res => {
-												if(!that.dataDetails.id){
+												// if(!that.dataDetails.id){
 													if (res.data.recPersonNo) {
 														that.dataDetails.cardNumber = res.data.recPersonNo
 														if(that.dataDetails.cardNumber[16]%2==0){
@@ -463,7 +463,7 @@
 														that.dataDetails.name = res.data.recPerson
 														that.dataDetails.call=that.dataDetails.name[0]
 													}
-												}
+												// }
 												
 												
 												that.$forceUpdate()

pages/mine/company/addcompany.vue

@@ -820,8 +820,8 @@
 														}
 														_this.dataDetails.unifiedSocialCreditCode = res
 															.data.regNum
-														_this.dataDetails.legalPersonName = res.data
-															.licensePerson
+														// _this.dataDetails.legalPersonName = res.data
+														// 	.licensePerson
 														_this.dataDetails.companyName = res.data
 															.licenseName
 														_this.dataDetails.corporateAccount = _this

pages/mine/index.vue

@@ -99,7 +99,7 @@
 				<view  class='flex'>
 					<view class='flex items-center'><u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
 						width="20px" height="20px"></u--image>代理货主</view>
-					<u-badge v-if='redDotPrompt==0' :isDot="true" type="error"></u-badge>
+					<u-badge v-if='redDotPrompt==0 && hasLogin' :isDot="true" type="error"></u-badge>
 				</view>
 				<view >
 					<image class='right' src="@/static/mine/right.png" mode=""></image>

pages/mine/manageBankCards/addBankCard.vue

@@ -467,7 +467,8 @@
 	}
 
 	.content {
-		padding: 20rpx 20rpx 140rpx 20rpx;
+		padding: 20rpx ;
+		height: calc(100vh - 23vh);
 	}
 
 	.content3 {

pages/mine/manageBankCards/editBankCard.vue

@@ -237,6 +237,7 @@
 
 	.content {
 		padding: 20rpx;
+		height: calc(100vh - 23vh);
 	}
 
 	.content3 {

pages/mine/set.vue

@@ -227,6 +227,7 @@
 	}
 	.content{
 		padding:0 20px;
+		height: calc(100vh - 7vh);
 	}
 
 	.pictures {

pages/mine/settings/editPassword.vue

@@ -94,15 +94,16 @@
 						})
 						_this.$request.baseRequest('get', '/commonUser/sendVerifyCode', {
 								phone: this.registerData.phone,
-								identification:2,flag:2
+								identification: 2,
+								flag: 2
 							}).then(res => {
-								if(res.code==200){
+								if (res.code == 200) {
 									uni.hideLoading();
 									// 这里此提示会被this.start()方法中的提示覆盖
 									uni.$u.toast('验证码已发送');
 									// 通知验证码组件内部开始倒计时
 									this.$refs.uCode.start();
-								}else{
+								} else {
 									uni.showToast({
 										title: res.message,
 										icon: 'none',
@@ -146,8 +147,7 @@
 								// 获得数据
 								if (res.code == 200) {
 									uni.clearStorageSync();
-									this.$request.baseRequest('post', '/auth/api/logout').then(res => {
-									})
+									this.$request.baseRequest('post', '/auth/api/logout').then(res => {})
 									this.$store.commit('logout')
 									// this.$api.logout()
 									uni.showToast({
@@ -185,6 +185,7 @@
 		height: 100vh;
 		padding-top: 85px;
 		position: relative;
+		box-sizing: border-box;
 	}
 
 	.back-btn {

pages/order/index.vue

@@ -1177,6 +1177,8 @@
 	.pingjia {
 		width: 14px;
 		height: 14px;
+		margin-right: 10rpx;
+		top: 2rpx;
 	}
 
 	.u-popup-wrap {

pages/public/code.vue

@@ -35,8 +35,8 @@
 		<view class="top_four">
 			<input type="number" class="input_show" maxlength="6" @input='submit' v-model="inputList" focus="true" />
 		</view>
-		<!-- 重新获取 -->
-		<view class="top_five" @click='regain' :class="!status ? 'active' : '' "><text v-if="!status">重新发送</text><text
+		<!-- 重新获取 regain-->
+		<view class="top_five" @click='judge' :class="!status ? 'active' : '' "><text v-if="!status">重新发送</text><text
 				v-if="status">{{count_down}}秒后重新发送</text></view>
 	</view>
 </template>
@@ -73,8 +73,15 @@
 			navBack() {
 				uni.navigateBack();
 			},
+			judge(){
+				if(this.count_down > 0){
+					return
+				}else{
+					this.regain()
+				}
+			},
 			regain() {
-				console.log("regain", this.phone);
+				this.count_down = 60
 				this.status = true
 				// console.log(e)150500
 				// 设定一个定时器 1000是1秒的意思

pages/public/cytScrectAgreement/cytScrectAgreement.vue

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

pages/public/login.vue

@@ -9,15 +9,19 @@
 				class="flex">
 				<view class="phone-before-num NumberMedium">+86</view>
 				<view style='width:85%;'>
-					<input class='phone' maxlength='11' v-model='phone'  placeholder="请输入手机号码" type="number">
+					<input class='phone' maxlength='11' v-model='phone' placeholder="请输入手机号码" type="number">
 				</view>
 			</view>
 			<view style='margin-top:20px;border-bottom:1px solid #E8E9ED;position:relative;height:40px'>
 				<view style='position:relative;'>
-					<input class='password' v-model='password' v-if="isShowPassword=='password'" placeholder="请输入密码" type="password">
-					<input class='password' v-model='password' v-else type="text" placeholder="请输入密码">
-						<image class='yanjingicon' style='width:22px;height:22px;' @click="passWordStatus(1)" v-if="isShowPassword=='password'" src="../../static/yioncang.png" mode=""></image>
-						<image class='yanjingicon' style='width:22px;height:22px;' @click="passWordStatus(2)" v-else src="../../static/xianshi.png" mode=""></image>
+					<input class='password' v-model='password' v-if="isShowPassword=='password'" placeholder="请输入密码"
+						type="password" @input="check">
+					<input maxlength='16' class='password' v-model='password' v-else type="text" placeholder="请输入密码"
+						@input="check">
+					<image class='yanjingicon' style='width:22px;height:22px;' @click="passWordStatus(1)"
+						v-if="isShowPassword=='password'" src="../../static/yioncang.png" mode=""></image>
+					<image class='yanjingicon' style='width:22px;height:22px;' @click="passWordStatus(2)" v-else
+						src="../../static/xianshi.png" mode=""></image>
 				</view>
 			</view>
 			<button :class='phone!=""&&password!=""?"active":""' @click='passlogin'
@@ -31,7 +35,7 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 	</view>
-	
+
 	</view>
 </template>
 
@@ -117,6 +121,17 @@
 			// })
 		},
 		methods: {
+			check(val) {
+				console.log(val)
+				if (!uni.$u.test.enOrNum(val.detail.value)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "密码只能是字母或数字！"
+					})
+					this.password = ''
+					return
+				}
+			},
 			passWordStatus(type) {
 				if (type == 1) {
 					this.isShowPassword = 'text'
@@ -126,22 +141,28 @@
 			},
 			passlogin(e) {
 				var that = this
-				if(this.phone==''){
+				if (this.phone == '') {
 					that.$refs.uToast.show({
 						type: 'error',
 						message: "请输入手机号！"
 					})
 					return
 				}
-				if(this.password==''){
+				if (this.password == '') {
 					that.$refs.uToast.show({
 						type: 'error',
 						message: "请输入密码！"
 					})
 					return
 				}
-				
-				
+				if (!uni.$u.test.enOrNum(this.password)) {
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "密码只能是字母或数字！"
+					})
+					return
+				}
+
 				that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
 					phone: this.phone,
 				}).then(res => {
@@ -150,7 +171,7 @@
 							type: 'error',
 							message: "账号审核中！"
 						})
-						
+
 					} else {
 						uni.showLoading({
 							title: '登录中',
@@ -160,14 +181,14 @@
 								phone: that.phone,
 								password: that.password,
 								loginFlag: 1,
-								identification:2
+								identification: 2
 							}).then(res => {
 								if (res.code == 200) {
 									uni.setStorageSync('userInfo', res.data)
 									that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 										reCommonId: that.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) {
@@ -187,7 +208,7 @@
 											}
 										}
 									})
-									
+
 									that.$store.commit('login', res.data)
 									var name = 'userInfo';
 									var value = res.data;
@@ -253,22 +274,26 @@
 	page {
 		background: #fff;
 	}
-	.phone{
-		padding:20rpx;
-		font-size:28rpx;
+
+	.phone {
+		padding: 20rpx;
+		font-size: 28rpx;
 	}
+
 	.close {
 		width: 20px;
 		height: 20px;
 		position: absolute;
 		right: 0px;
 	}
-	.yanjingicon{
-		position:absolute;
-		right:0;
-		top:50%;
-		transform: translate(-50%,-50%);
+
+	.yanjingicon {
+		position: absolute;
+		right: 0;
+		top: 50%;
+		transform: translate(-50%, -50%);
 	}
+
 	.close1 {
 		width: 20px;
 		height: 20px;
@@ -289,7 +314,7 @@
 	.password {
 		border: none;
 		outline: none;
-		font-size:28rpx;
+		font-size: 28rpx;
 	}
 
 	.cuIcon-weixin {
@@ -375,7 +400,8 @@
 		font-weight: 500;
 		color: #333333;
 	}
+
 	/deep/.uni-input-input:disabled {
-	    background:#fff;
+		background: #fff;
 	}
 </style>

pages/public/register.vue

@@ -22,6 +22,7 @@
 					<input placeholder-style="color:#AFB3BF" border="none" maxlength="6" v-model='verifyCode' style=''
 						placeholder="请输入验证码" type="number" class="Regular" />
 				</view>
+				<!--  -->
 				<button :class='codestatus?"activeCode":""' @click='getcode'
 					class='getcode Regular'>{{sendText}}</button>
 			</view>
@@ -43,9 +44,9 @@
 					width="17px" height="17px"></u--image>
 				已阅读并同意
 				<navigator
-					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
+					url="/pages/public/serviceAgreement/serviceAgreement?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/public/cytScrectAgreement/cytScrectAgreement?url=http://liangxin.zthymaoyi.com/cytScrectAgreement.html"
 					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
 			</view>
 		</view>
@@ -163,9 +164,13 @@
 			},
 			getcode() {
 				var that = this
+				if (this.sendText != "获取验证码") {
+					return
+				}
 				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.phone)) {
 					that.$request.baseRequest('get', '/commonUser/sendVerifyCode', {
-							phone: this.phone
+							phone: this.phone,
+							flag: 3
 						}).then(res => {
 							if (res.code == 200) {
 								that.codestatus = false
@@ -176,6 +181,7 @@
 									if (sec <= 0) {
 										that.sendDisabled = true
 										that.sendText = "获取验证码"
+										that.codestatus = true
 										clearInterval(interval)
 									}
 								}, 1000)
@@ -247,7 +253,7 @@
 				}
 				if (this.password.length < 6) {
 					uni.showToast({
-						title: '密码请输入6-16字符格式',
+						title: '密码输入错误',
 						icon: 'none',
 						duration: 2000
 					})
@@ -407,10 +413,10 @@
 		padding-top: 85px;
 		position: relative;
 		width: 100vw;
-		height: calc(100vh - 85px);
+		height: calc(100vh - 13vh);
 		overflow: hidden;
 		background: url('~@/static/images/mine/bg@2x.png');
-		background-size: 100%;
+		/* background-size: 100%; */
 	}
 
 	.close {

pages/public/serviceAgreement/serviceAgreement.vue

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

pages/release/addAddress.vue

@@ -15,20 +15,20 @@
 				<u--form labelPosition="left" :model="addressInfo" ref="form1" labelWidth='100'>
 					<u-form-item label="所属区域" ref="item1" borderBottom>
 						<view style='width:100%;flex-direction:row-reverse;' class='flex align-center' @click='toMap' :class="addressInfo.area?'':'select-color'">
-							<image src="../../static/right.png" style="width: 22rpx;height: 22rpx;"></image>
+							<image src="../../static/right.png" style="width: 12px;height: 12px;margin-top: 2px;"></image>
 							<view>{{addressInfo.area?(addressInfo.province+addressInfo.city+addressInfo.area):'选择所属区域 '}}</view>
 						</view>
 					</u-form-item>
 					<u-form-item label="详细地址" prop="addressInfo.detailedAddress" ref="item1" borderBottom>
 						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" inputAlign="left"  placeholder="详细地址"></u--input> -->
-						<u--textarea v-model="addressInfo.detailedAddress" border="none" inputAlign="left" placeholder="详细地址" autoHeight  maxlength="15"></u--textarea>
+						<u--textarea v-model="addressInfo.detailedAddress" border="none" inputAlign="left" placeholder="请输入详细地址" autoHeight  maxlength="15"></u--textarea>
 						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input> -->
 					</u-form-item>
 					<u-form-item label="联系人" prop="addressInfo.contacts" ref="item1" borderBottom>
-						<u--input v-model="addressInfo.contacts"  maxlength="10" inputAlign="right" border="none" placeholder="联系人">></u--input>
+						<u--input v-model="addressInfo.contacts"  maxlength="10" inputAlign="right" border="none" placeholder="请输入联系人">></u--input>
 					</u-form-item>
 					<u-form-item label="联系电话" prop="addressInfo.contactPhone" ref="item1">
-						<u--input v-model="addressInfo.contactPhone" inputAlign="right" border="none" placeholder="联系电话" maxlength="11">>
+						<u--input v-model="addressInfo.contactPhone" inputAlign="right" border="none" placeholder="请输入联系电话" maxlength="11">>
 						</u--input>
 					</u-form-item>
 				</u--form>
@@ -170,6 +170,13 @@
 					})
 					return true
 				}
+				if (this.addressInfo.contactPhone.length<7) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "联系人电话输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.addressInfo.contactPhone)) {
 					this.$refs.uToast.show({
 						type: 'error',

pages/release/editRelease.vue

@@ -10,7 +10,7 @@
 		<view class="content1">
 			<view class="row" @click="selectCargoOwner">
 				<view class="left select-sf">{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}</view>
-				<view class="right">></view>
+				<image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image>
 			</view>
 			<!-- 		<view class="row" @click="selectCargoOwner" v-if="dataObj.cargoOwner">
 				<view class="left">{{dataObj.cargoOwner}}</view>
@@ -23,7 +23,7 @@
 			<view class="row1">
 				<view class="left">
 					<view class="top" @click="selectAddress(0)">
-						<view class="send">寄</view>
+						<view class="send">发</view>
 						<view class="title">
 							{{dataObj.sendArea?((dataObj.sendPrivate?dataObj.sendPrivate:'' )+ dataObj.sendCity+dataObj.sendArea):'选择发货地区'}}
 						</view>
@@ -32,8 +32,9 @@
 						<input type="text" value="" placeholder="输入详细地址" v-model="dataObj.sendDetailedAddress" />
 					</view>
 				</view>
-				<view class="right" @click="selectAddress(0)" v-if="!dataObj.sendArea">
-					<view class="right">{{dataObj.sendArea?'':'>'}}</view>
+				<view v-if='dataObj.sendArea' class="right"></view>
+				<view class="right" @click="selectAddress(0)" v-else>
+					<image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image>
 				</view>
 			</view>
 			<view class="row2">
@@ -48,16 +49,17 @@
 						<input type="text" value="" placeholder="输入详细地址" v-model="dataObj.unloadDetailedAddress" />
 					</view>
 				</view>
-				<view class="right" @click="selectAddress(1)" v-if="!dataObj.unloadArea">
-					<view class="right">{{dataObj.unloadArea?(dataObj.unloadCity+dataObj.unloadArea):'>'}}</view>
+				<view v-if='dataObj.unloadPrivate' class="right"></view>
+				<view class="right" @click="selectAddress(1)" v-else>
+					<image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image>
 				</view>
 			</view>
 		</view>
 		<view class="content3">
 			<view class="row">
 				<view class="left">距离</view>
-				<input type="text" value="" class="input" placeholder="自动计算" v-model="dataObj.distance" disabled="" />
-				<view>Km</view>
+				<!-- <input type="text" class="input" placeholder="自动计算" v-model="dataObj.distance" disabled /> -->
+				<view class="input">{{dataObj.distance?dataObj.distance:"自动计算"}} km</view>
 			</view>
 			<view class="row">
 				<view class="left">货物类别</view>
@@ -82,14 +84,14 @@
 				</view>
 			</view>
 			<view class="row">
-				<view class="left">收货方身份证号</view>
+				<view class="left" style="width: 240rpx;">收货方身份证号（选填）</view>
 				<view class="right flex">
 					<input type="number" maxlength="18" placeholder="输入收货人身份证号" class="input"
 						v-model="dataObj.receiverIdcard" />
 				</view>
 			</view>
 			<view class="row">
-				<view class="left">收货方信用代码（选填）</view>
+				<view class="left" style="width: 240rpx;">收货方信用代码（选填）</view>
 				<view class="right flex">
 					<input maxlength="18" placeholder="统一社会信用代码" class="input" v-model="dataObj.receiverCreditCode" />
 				</view>

pages/release/lookRelease.vue

@@ -73,7 +73,7 @@
 				<view class="right">{{dataObj.billingMethod=='0'?'元/吨':'元/车'}}</view>
 			</view>
 			<view class="row">
-				<view class="left">运费单价（元/车）</view>
+				<view class="left">运费单价（{{dataObj.billingMethod=='0'?'元/吨':'元/车'}}）</view>
 				<view class="right">{{dataObj.freightPrice}}</view>
 			</view>
 			<view class="row">
@@ -124,11 +124,11 @@
 			</view>
 			<view class="row">
 				<view class="left">车长要求（米）</view>
-				<view class="right">{{dataObj.carLengthSmall}}-{{dataObj.carLength}}</view>
+				<view class="right">{{dataObj.carLengthSmall}}~{{dataObj.carLength}}</view>
 			</view>
 			<view class="row">
 				<view class="left">载重要求（吨）</view>
-				<view class="right">{{dataObj.loadWeightSmall}}-{{dataObj.loadWeight}}</view>
+				<view class="right">{{dataObj.loadWeightSmall}}~{{dataObj.loadWeight}}</view>
 			</view>
 			<view class="row">
 				<view class="left">车型要求</view>

pages/release/record.vue

@@ -195,13 +195,13 @@
 					_val = ''
 				} else {
 					if (good.carModel && good.carModel.includes(2)) {
-						_val += '高栏/'
+						_val += '高栏'
 					}
 					if (good.carModel && good.carModel.includes(3)) {
-						_val += '集装箱/'
+						_val += '/集装箱'
 					}
 					if (good.carModel && good.carModel.includes(4)) {
-						_val += '自卸车'
+						_val += '/自卸车'
 					}
 				}
 				return _val