前端

App.vue

@@ -185,6 +185,7 @@
 								};
 								const native = uni.requireNativePlugin('AJ-Alert');
 								native.showAction(options, result => {
+									
 									uni.switchTab({
 										url: '/pages/mine/index'
 									})
@@ -194,6 +195,12 @@
 								});
 							}
 						}else{
+							uni.setTabBarItem({
+								index: 0,
+								text: '订单',
+								iconPath: 'static/images/common/dingdan@2x(1).png',
+								selectedIconPath: 'static/images/common/dingdan@2x.png'
+							})
 							uni.navigateTo({
 								url: '/pages/release/release'
 							});

pages/carSource/index.vue

@@ -189,6 +189,12 @@
 		},
 		created() {},
 		onShow() {
+			uni.setTabBarItem({
+				index: 0,
+				text: '订单',
+				iconPath: 'static/images/common/dingdan@2x(1).png',
+				selectedIconPath: 'static/images/common/dingdan@2x.png'
+			})
 			if (uni.getStorageSync("sendInfo")) { //从缓存中获取  上一次的装车地 卸车地
 				this.sendInfo = uni.getStorageSync("sendInfo")
 				this.title1 = this.sendInfo.sendProvince + this.sendInfo.sendCity + this.sendInfo.sendArea

pages/mine/cargoowner/editpersonalinformation.vue

@@ -71,7 +71,7 @@
 			</view>
 			<view style='padding-right:10px;margin-top:10px;padding-bottom:11px;' class="flex row">
 				<view class="left-text">身份证号</view>
-				<u--input :disabled='dataDetails.id?true:false' placeholder="请输入身份证号" inputAlign='right' border="none"
+				<u--input :disabled='dataDetails.id&&firstAuthentication.passOnce?true:false' placeholder="请输入身份证号" inputAlign='right' border="none"
 					v-model="dataDetails.cardNumber" maxlength="18">
 				</u--input>
 			</view>
@@ -165,6 +165,7 @@
 				validityPeriod: [],
 				isShowimgType: false,
 				index: '',
+				firstAuthentication:{}
 			};
 		},
 		onLoad(options) {
@@ -178,6 +179,14 @@
 			this.dataDetails.phone = this.userInfo.phone
 			this.dataDetails.commonId = this.userInfo.id
 		},
+		onShow() {
+			this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+				phone: this.userInfo.phone
+			}).then(res => {
+				uni.setStorageSync("firstAuthentication", res.data)
+				this.firstAuthentication=res.data
+			})
+		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
@@ -377,6 +386,13 @@
 					return true
 				}
 				
+				if (uni.$u.test.isEmpty(this.dataDetails.cardValidityDate)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请选择身份证截止日期！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.cardNumber)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -384,7 +400,6 @@
 					})
 					return true
 				}
-				
 				if (uni.$u.test.isEmpty(this.dataDetails.cardAddressUrl)) {
 					this.$refs.uToast.show({
 						type: 'error',

pages/mine/index.vue

@@ -167,6 +167,12 @@
 			};
 		},
 		onShow() {
+			uni.setTabBarItem({
+				index: 0,
+				text: '订单',
+				iconPath: 'static/images/common/dingdan@2x(1).png',
+				selectedIconPath: 'static/images/common/dingdan@2x.png'
+			})
 			if (this.hasLogin) {
 				uni.showLoading({
 					title: '加载中',
@@ -343,7 +349,7 @@
 
 <style lang="scss" scoped>
 	.container {
-		padding-top: 85px;
+		// padding-top: 85px;
 		padding-top: 35px;
 		background-color: #F5F6FA;
 		position: relative;
@@ -352,8 +358,7 @@
 		background: url('~@/static/mine/bg@3x.png');
 		background-size: 100% 100%;
 		margin: 0 auto;
-		height: calc(100vh - 85px);
-
+		height: calc(100vh - 35px);
 		.container_content {
 			padding: 18px;
 		}

pages/news/index.vue

@@ -100,6 +100,12 @@
 
 		},
 		onShow() {
+			uni.setTabBarItem({
+				index: 0,
+				text: '订单',
+				iconPath: 'static/images/common/dingdan@2x(1).png',
+				selectedIconPath: 'static/images/common/dingdan@2x.png'
+			})
 			var that = this
 			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 				reCommonId: this.userInfo.id,

pages/order/index.vue

@@ -263,6 +263,7 @@
 					margin: '0 20rpx 0 0',
 					"border-radius": '30rpx'
 				},
+				isdblclick:0,
 				upOption: {
 					page: {
 						size: 10 // 每页数据的数量,默认10
@@ -270,6 +271,9 @@
 					noMoreSize: 0, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
 						tip: '暂无记录！'
+					},
+					toTop:{
+						src:''
 					}
 				},
 				searchKeyWord: '',
@@ -347,11 +351,20 @@
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		onTabItemTap(e) {
+			this.isdblclick++
 			// tab 点击时执行，此处直接接收单击事件
-			uni.pageScrollTo({
-				scrollTop: 0,
-				duration: 300
-			});
+			if(this.scrollTop>1200){
+				if(this.isdblclick>1){
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: 300
+					});
+				}
+				
+			}
+		},
+		onHide(){
+			this.isdblclick=0
 		},
 		created() {
 			//#ifdef APP-PLUS
@@ -382,6 +395,14 @@
 
 		},
 		onShow() {
+			if (this.scrollTop > 1200) {
+				uni.setTabBarItem({
+					index: 0,
+					text: '返回顶部',
+					iconPath: 'static/images/common/top@2x.png',
+					selectedIconPath: 'static/images/common/top@2x.png'
+				})
+			}
 			this.upCallback({
 				size: 10,
 				num: 1
@@ -410,26 +431,26 @@
 				}
 			})
 		},
-		// onPageScroll(res) {
-		// 	this.scrollTop = res.scrollTop
-		// 	console.log("页面滚动了", res.scrollTop)
-		// 	if (this.scrollTop > 1200) {
-		// 		uni.setTabBarItem({
-		// 			index: 1,
-		// 			text: '返回顶部',
-		// 			iconPath: 'static/images/common/top@2x.png',
-		// 			selectedIconPath: 'static/images/common/top@2x.png'
-		// 		})
-		// 	} else {
-		// 		uni.setTabBarItem({
-		// 			index: 1,
-		// 			text: '订单',
-		// 			iconPath: 'static/images/common/dingdan@2x(1).png',
-		// 			selectedIconPath: 'static/images/common/dingdan@2x.png'
-		// 		})
-		// 	}
-
-		// },
+		onPageScroll(res) {
+			this.scrollTop = res.scrollTop
+			console.log("页面滚动了", res.scrollTop)
+			if (this.scrollTop > 1200) {
+				uni.setTabBarItem({
+					index: 0,
+					text: '返回顶部',
+					iconPath: 'static/images/common/top@2x.png',
+					selectedIconPath: 'static/images/common/top@2x.png'
+				})
+			} else {
+				uni.setTabBarItem({
+					index: 0,
+					text: '订单',
+					iconPath: 'static/images/common/dingdan@2x(1).png',
+					selectedIconPath: 'static/images/common/dingdan@2x.png'
+				})
+			}
+
+		},
 		methods: {
 			closepopup() {
 				this.show = false

pages/order/signContract.vue

@@ -250,7 +250,7 @@
 				//设置线条粗细
 				this.ctx.setLineWidth(this.lineSize)
 				//设置线条的结束端点样式
-				this.ctx.setLineCap("round") //'butt'、'round'、'square'
+				this.ctx.setLineCap("round")//'butt'、'round'、'square'
 				//开始画笔
 				this.ctx.beginPath()
 			},

pages/release/addAddress.vue

@@ -21,7 +21,7 @@
 					</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="30"></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>
@@ -177,7 +177,13 @@
 					})
 					return true
 				}
-				
+				if (this.addressInfo.detailedAddress.length<4||this.addressInfo.detailedAddress.length>15) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "详细地址4-15个字符！",
+					})
+					return true
+				}
 			},
 			submit() {
 				if (this.validate()) return

pages/release/editAddress.vue

@@ -172,6 +172,13 @@
 					})
 					return true
 				}
+				if (this.addressInfo.detailedAddress.length<4||this.addressInfo.detailedAddress.length>15) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "详细地址4-15个字符！",
+					})
+					return true
+				}
 			},
 			submit() {
 				if (this.validate()) return

pages/release/editRelease.vue

@@ -71,7 +71,7 @@
 			<view class="row">
 				<view class="left">收货方</view>
 				<view class="right flex">
-					<input type="text" value="" placeholder="输入收货人姓名或企业名称" class="input" v-model="dataObj.receiver" />
+					<input type="text" value="" placeholder="输入收货方姓名或企业名称" class="input" v-model="dataObj.receiver" />
 				</view>
 			</view>
 			<view class="row">
@@ -82,7 +82,7 @@
 				</view>
 			</view>
 			<view class="row">
-				<view class="left">收货人身份证号</view>
+				<view class="left">收货方身份证号</view>
 				<view class="right flex">
 					<input type="number" maxlength="18" placeholder="输入收货人身份证号" class="input"
 						v-model="dataObj.receiverIdcard" />
@@ -126,7 +126,7 @@
 				</view>
 			</view>
 			<view class="row">
-				<view class="left">发货联系人电话</view>
+				<view class="left">发货人手机号</view>
 				<view class="right flex">
 					<input type="number" maxlength="11" value="" placeholder="输入发货联系人手机号" class="input"
 						v-model="dataObj.senderPhone" />

pages/release/lookRelease.vue

@@ -61,7 +61,7 @@
 				<view class="right">{{dataObj.unloadDetailedAddress}}</view>
 			</view>
 			<view class="row">
-				<view class="left">距离</view>
+				<view class="left">距离（km）</view>
 				<view class="right">{{dataObj.distance}}</view>
 			</view>
 			<view class="row">
@@ -73,7 +73,7 @@
 				<view class="right">{{dataObj.billingMethod=='0'?'元/吨':'元/车'}}</view>
 			</view>
 			<view class="row">
-				<view class="left">运费单价</view>
+				<view class="left">运费单价（元/车）</view>
 				<view class="right">{{dataObj.freightPrice}}</view>
 			</view>
 			<view class="row">
@@ -87,17 +87,29 @@
 				<view class="right">{{dataObj.sender}}</view>
 			</view>
 			<view class="row">
-				<view class="left">发货联系人电话</view>
+				<view class="left">发货人手机号</view>
 				<view class="right">{{dataObj.senderPhone}}</view>
 			</view>
 			<view class="row">
-				<view class="left">收货联系人</view>
+				<view class="left">收货方</view>
 				<view class="right">{{dataObj.receiver}}</view>
 			</view>
 			<view class="row">
-				<view class="left">收货联系人电话</view>
+				<view class="left">收货方手机号</view>
 				<view class="right">{{dataObj.receiverPhone}}</view>
 			</view>
+			<view class="row">
+				<view class="left">收货方身份证号</view>
+				<view class="flex">
+					{{dataObj.receiverIdcard}}
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">收货方信用代码</view>
+				<view class="right flex">
+					{{dataObj.receiverCreditCode}}
+				</view>
+			</view>
 			<view class="row">
 				<view class="left">重量（吨）</view>
 				<view class="right">{{dataObj.weight}}</view>

pages/release/release.vue

@@ -141,7 +141,7 @@
 				</view>
 			</view>
 			<view class="row">
-				<view class="left">发货联系人电话</view>
+				<view class="left">发货人手机号</view>
 				<view class="right flex">
 					<input type="number" maxlength="11" value="" placeholder="输入发货联系人手机号" class="input"
 						v-model="dataObj.senderPhone" />