更新

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	// baseUrlNew: 'https://api.changyuntong56.com',
-	baseUrlNew: 'https://apitest.changyuntong56.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	// baseUrlNew: 'https://apitest.changyuntong56.com',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
 	// baseUrlNew: 'http://192.168.110.67:8999/',
 	h5Appid: 'wxb66b599f7f61b46f',

pages/mine/company/addcompany.vue

@@ -133,7 +133,6 @@
 						</image>
 					</view>
 				</view>
-
 			</view>
 			<view class="flex row border-bottom mt20 flex-space-between">
 				<view class="left-text">开户行</view>
@@ -156,7 +155,6 @@
 					</view>
 					<view @click="manualInput" class="type">手动输入</view>
 				</view>
-
 			</view>
 			<!-- 	<view class="flex row noborder">
 					<view class="left-text">身份证截止日期</view>
@@ -165,14 +163,14 @@
 					</view>
 				</view> -->
 		</view>
-		<view class='content3' v-if="!dataDetails.videoAddressUrl"
+		<!-- <view class='content3' v-if="!dataDetails.videoAddressUrl"
 			@click="goDetailPage('/pages/mine/company/companyvideo')">
 			<view class="left-text">视频验证（打开摄像头并阅读提示文字）</view>
 			<view class="video-icon">
 				<u-icon size="40" name="camera-fill"></u-icon>
 			</view>
-		</view>
-		<view class='content3' v-if="dataDetails.videoAddressUrl">
+		</view> -->
+		<!-- <view class='content3' v-if="dataDetails.videoAddressUrl">
 			<view class="flex row noborder mt20 flex-space-between">
 				<view class="left-text">视频验证（点击按钮播放视频）</view>
 				<view>
@@ -181,15 +179,12 @@
 					</u-button>
 				</view>
 			</view>
-			<!-- <video class="myVideo" :src="dataDetails.videoAddressUrl" controls></video> -->
 			<view>
 				<view class="video-icon">
 					<u-icon size="40" name="play-circle-fill" @click="videoShow()"></u-icon>
 				</view>
 			</view>
-
-		</view>
-
+		</view> -->
 		<view class='content3'>
 			<view class="flex row noborder flex-space-between">
 				<view class="left-text">申请开通平台垫付运费业务</view>
@@ -704,13 +699,13 @@
 				// 		return true
 				// 	}
 				// }
-				if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "视频认证不能为空！",
-					})
-					return true
-				}
+				// if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "视频认证不能为空！",
+				// 	})
+				// 	return true
+				// }
 			},
 			submit() {
 				if (this.validate()) return

pages/mine/company/editcompany.vue

@@ -161,14 +161,14 @@
 		</view>
 		<!-- http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4 -->
 		<!-- dataDetails.videoAddressUrl -->
-		<view class='content3' v-if="!dataDetails.videoAddressUrl"
+		<!-- <view class='content3' v-if="!dataDetails.videoAddressUrl"
 			@click="goDetailPage('/pages/mine/company/companyvideo')">
 			<view class="left-text">视频验证（打开摄像头并阅读提示文字）</view>
 			<view class="video-icon">
 				<u-icon size="40" name="camera-fill"></u-icon>
 			</view>
-		</view>
-		<view class='content3' v-if="dataDetails.videoAddressUrl">
+		</view> -->
+		<!-- <view class='content3' v-if="dataDetails.videoAddressUrl">
 			<view class="flex row noborder mt20 flex-space-between">
 				<view class="left-text">视频验证（点击按钮播放视频）</view>
 				<view>
@@ -176,15 +176,15 @@
 						size="mini">重新上传
 					</u-button>
 				</view>
-			</view>
+			</view> -->
 			<!-- <video class="myVideo" :src="dataDetails.videoAddressUrl" controls></video> -->
-			<view>
+			<!-- <view>
 				<view class="video-icon">
 					<u-icon size="40" name="play-circle-fill" @click="videoShow()"></u-icon>
 				</view>
 			</view>
 
-		</view>
+		</view> -->
 
 		<view class='content3'>
 			<view class="flex row noborder mt20 flex-space-between">
@@ -644,13 +644,13 @@
 				// 		return true
 				// 	}
 				// }
-				if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "视频认证不能为空！",
-					})
-					return true
-				}
+				// if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "视频认证不能为空！",
+				// 	})
+				// 	return true
+				// }
 			},
 			companyNamechange(e) {
 				console.log(e)

pages/mine/index.vue

@@ -291,7 +291,6 @@
 					uni.navigateTo({
 						url: `./confirm?token=${this.token}`
 					});
-
 				})
 			},
 			confirmClick() {

pages/mine/settings/editPassword.vue

@@ -13,7 +13,15 @@
 					<button :disabled="disabled1" class="code-style code-small" @tap="getCode">{{tips}}</button>
 				</u-form-item>
 				<u-form-item label="新密码" prop="password" borderBottom>
-					<u--input v-model="registerData.password" border="none" placeholder="请输入新密码，6-16位字符"></u--input>
+					<!-- <u--input v-model="registerData.password" border="none" suffixIcon="eye" @suffix="textChange" placeholder="请输入新密码，6-16位字符"></u--input> -->
+					<input class='password' v-model='registerData.password' v-if="isShowPassword=='password'"
+						placeholder="请输入密码" type="password">
+					<input maxlength='16' class='password' v-model='registerData.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>
 				</u-form-item>
 
 				<u-code ref="uCode" @change="codeChange" seconds="60" @start="disabled1 = true"
@@ -55,7 +63,8 @@
 						message: '请填写6位验证码',
 						trigger: ['blur']
 					},
-				}
+				},
+				isShowPassword: 'password',
 			}
 		},
 		computed: {
@@ -77,6 +86,13 @@
 			this.registerData.phone = this.userInfo.phone
 		},
 		methods: {
+			passWordStatus(type) {
+				if (type == 1) {
+					this.isShowPassword = 'text'
+				} else {
+					this.isShowPassword = 'password'
+				}
+			},
 			navBack() {
 				uni.navigateBack();
 			},

pages/public/register.vue

@@ -26,11 +26,23 @@
 				<button :class='codestatus?"activeCode":""' @click='getcode'
 					class='getcode Regular'>{{sendText}}</button>
 			</view>
-			<view style='border-bottom:1px solid #E8E9ED;padding:10px 0;position:relative;'>
+			<view style='border-bottom:1px solid #E8E9ED;padding:10px 0;position:relative;display: flex;'>
 				<!-- <u-input border="none" maxlength='16' class='Regular input-style' style='height:30px;'
 					v-model='password' placeholder="请输入密码，6-16位字符" :type="type" /> -->
-				<input placeholder-style="color:#AFB3BF" border="none" maxlength="16" v-model='password' style=''
-					placeholder="请输入密码，6-16位字符" :type="type" class="Regular input-style" />
+				<!-- <u-input placeholder-style="color:#AFB3BF" border="none" maxlength="16" v-model='password' style=''
+					placeholder="请输入密码，6-16位字符" :type="isShowPassword" class="Regular input-style" /> -->
+				<input placeholder-style="color:#AFB3BF" v-model='password' v-if="isShowPassword=='password'"
+					placeholder="请输入密码" type="password">
+				<input maxlength='16' placeholder-style="color:#AFB3BF" class='password Regular' v-model='password'
+					v-else type="text" placeholder="请输入密码">
+				<view style="width: 50%;text-align: right;">
+					<image class='yanjingicon' style='width:22px;height:22px;margin-right: 20rpx;'
+						@click="passWordStatus(1)" v-if="isShowPassword=='password'" src="../../static/yioncang.png"
+						mode=""></image>
+					<image class='yanjingicon' style='width:22px;height:22px;margin-right: 20rpx;'
+						@click="passWordStatus(2)" v-else src="../../static/xianshi.png" mode=""></image>
+				</view>
+
 				<!-- 				<input maxlength='16' class='password Regular input-style' style='height:30px;' v-model='password' placeholder="请输入密码，6-16位字符" :type="type"> -->
 				<!-- <image v-if='password!=""' @click='password=""' class='close2' src='../../static/img/login/guanbi@2x.png'></image> -->
 				<!-- <view @click='switchover' style='position:absolute;right:0;top:38%;z-index:10;cursor:pointer;' class="iconfont " :class='type=="password"?"icon-yanjing-biyan":"icon-yanjing-zhengyan"'></view> -->
@@ -100,7 +112,8 @@
 				sendDisabled: false,
 				system: '',
 				platform: '',
-				canIUseProfile: false
+				canIUseProfile: false,
+				isShowPassword: 'password'
 			}
 		},
 
@@ -128,6 +141,13 @@
 			// })
 		},
 		methods: {
+			passWordStatus(type) {
+				if (type == 1) {
+					this.isShowPassword = 'text'
+				} else {
+					this.isShowPassword = 'password'
+				}
+			},
 			// 随机数
 			randomAccess(min, max) {
 				return Math.floor(Math.random() * (min - max) + max)

pages/release/addAddress.vue

@@ -14,21 +14,28 @@
 			<view class="">
 				<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: 12px;height: 12px;margin-top: 2px;"></image>
-							<view>{{addressInfo.area?(addressInfo.province+addressInfo.city+addressInfo.area):'选择所属区域 '}}</view>
+						<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: 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>
@@ -60,7 +67,8 @@
 					contacts: "",
 					contactPhone: "",
 					longitude: "",
-					latitude: ""
+					latitude: "",
+					adCode:"",
 				},
 				// rules: {
 				// 	// 'addressInfo.name': {
@@ -120,10 +128,10 @@
 				// this.isShowMap = true
 				uni.getLocation({
 					type: 'gcj02',
-					geocode:true,
-					altitude:true,
-					isHighAccuracy:true,
-					success: function (res) {
+					geocode: true,
+					altitude: true,
+					isHighAccuracy: true,
+					success: function(res) {
 						console.log('当前位置的经度：' + res.longitude);
 						console.log('当前位置的纬度：' + res.latitude);
 						uni.chooseLocation({
@@ -136,8 +144,6 @@
 								console.log('纬度：' + res.latitude);
 								console.log('经度：' + res.longitude);
 								let _address = that.$helper.formatLocation(res.address)
-								console.log('----------------------------')
-								console.log(_address)
 								that.addressInfo.latitude = res.latitude
 								that.addressInfo.longitude = res.longitude
 								that.addressInfo.detailedAddress = _address.Village
@@ -145,6 +151,18 @@
 								that.addressInfo.city = _address.City
 								that.addressInfo.area = _address.Country
 								that.addressInfo.commonId = that.userInfo.id
+								uni.request({
+									url: 'https://restapi.amap.com/v3/config/district?key=d29a9d10160efaca0dd616bbec936d7f&subdistrict=1&keywords=' +
+										_address.City,
+									success: (res) => {
+									  for(let i = 0 ; i < res.data.districts[0].districts.length ; i++){
+										  if(res.data.districts[0].districts[i].name == _address.Country){
+											  that.addressInfo.adCode = res.data.districts[0].districts[i].adcode
+											  break
+										  } 
+									  }
+									}
+								});
 								that.$forceUpdate()
 							},
 							fail(err) {
@@ -156,21 +174,21 @@
 						});
 					}
 				})
-				
+
 				// console.log(123)
 				// uni.$u.route('/pages/release/map', {
 				// 	id: 1,
 				// });
 			},
 			validate() {
-				if (this.addressInfo.contacts.length<2||this.addressInfo.contacts.length>10) {
+				if (this.addressInfo.contacts.length < 2 || this.addressInfo.contacts.length > 10) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "联系人姓名长度2-10个字符！",
 					})
 					return true
 				}
-				if (this.addressInfo.contactPhone.length<7) {
+				if (this.addressInfo.contactPhone.length < 7) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "联系人电话输入错误！",
@@ -184,7 +202,7 @@
 					})
 					return true
 				}
-				if (this.addressInfo.detailedAddress.length<4||this.addressInfo.detailedAddress.length>15) {
+				if (this.addressInfo.detailedAddress.length < 4 || this.addressInfo.detailedAddress.length > 15) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "详细地址4-15个字符！",
@@ -237,14 +255,17 @@
 		right: 0;
 		margin: auto;
 	}
-	/deep/input{
-		word-break:break-all;
+
+	/deep/input {
+		word-break: break-all;
 	}
-	/deep/.u-textarea{
-		padding:9px 0;
+
+	/deep/.u-textarea {
+		padding: 9px 0;
 	}
-	/deep/.u-textarea__field{
-		color:#000;
-		text-align:right;
+
+	/deep/.u-textarea__field {
+		color: #000;
+		text-align: right;
 	}
 </style>

pages/release/editRelease.vue

@@ -488,6 +488,42 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.dataObj.receiver)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "收货方不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataObj.receiverPhone)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "收货方手机号不能为空！",
+					})
+					return true
+				}
+				if (!this.dataObj.receiverIdcard && !this.dataObj.receiverCreditCode) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "信用代码和身份证号码至少填写一个！",
+						duration:4000
+					})
+					return true
+				}
+				if(this.dataObj.receiverIdcard&&this.dataObj.receiverIdcard.length!=18){
+					this.$refs.uToast.show({
+							type: 'error',
+							message: "身份证号输入错误！",
+						})
+						return true
+				}
+				if(this.dataObj.receiverCreditCode&&this.dataObj.receiverCreditCode.length!=18){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "信用代码输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataObj.freightPrice)) {
 					this.$refs.uToast.show({
 						type: 'error',

pages/release/release.vue

@@ -303,6 +303,8 @@
 					sendLatitude: '',
 					unsendLongitude: '',
 					unsendLatitude: '',
+					sendAdCode:'',
+					unsendAdCode:''
 				},
 				confirmText: '',
 				isShowAlert1: false,
@@ -406,6 +408,7 @@
 			if (_faddress) {
 				this.dataObj.sendCity = _faddress.city
 				this.dataObj.sendArea = _faddress.area
+				this.dataObj.sendAdCode = _faddress.adCode
 				this.dataObj.sendPrivate = _faddress.province
 				this.dataObj.sendDetailedAddress = _faddress.detailedAddress
 				this.dataObj.sendLongitude = _faddress.longitude
@@ -423,6 +426,7 @@
 				this.dataObj.unloadDetailedAddress = _saddress.detailedAddress
 				this.dataObj.unloadCity = _saddress.city
 				this.dataObj.unloadArea = _saddress.area
+				this.dataObj.unsendAdCode = _faddress.adCode
 				this.dataObj.unloadPrivate = _saddress.province
 				this.dataObj.unsendLongitude = _saddress.longitude
 				this.dataObj.unsendLatitude = _saddress.latitude
@@ -612,8 +616,6 @@
 					})
 					return true
 				}
-				console.log(this.dataObj.receiver,"收货方")
-				console.log(this.dataObj.receiverPhone,"收货方手机号")
 				if (uni.$u.test.isEmpty(this.dataObj.receiver)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -640,7 +642,7 @@
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "信用代码和身份证号码至少填写一个！",
-						duration:2000
+						duration:4000
 					})
 					return true
 				}