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

pages/goodSource/index.vue

@@ -541,11 +541,7 @@
 							message: "请先完成司机认证！",
 						})
 					}
-				
 				})
-				
-				
-
 			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {

pages/mine/settings/editPassword.vue

@@ -143,11 +143,18 @@
 			},
 			reset(){
 				var that = this
+				if (this.password.length < 6) {
+					uni.showToast({
+						title: '密码请输入6-16字符格式',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
 				uni.showLoading({
 					title: '重置密码中'
 				})
 				this.$request.baseRequest('post','/commonUser/resetPassword',{phone:this.phone,password:this.password,verifyCode:this.verifyCode,identification:1}).then(res => {
-				    console.log("重置密码",res)
 					// 获得数据
 					if(res.code==200){
 						if(this.isPhone){//判断是否是在个人首页进来的（若是退出重进）
@@ -186,7 +193,6 @@
 					uni.hideLoading()
 				})
 				.catch(res => {
-					console.log("重置密码",res)
 				    uni.showToast({
 				    	title: "系统异常，请联系管理员",
 				    	icon:'none',

pages/news/index.vue

@@ -1,39 +1,39 @@
 <template>
 	<!-- <mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
 		style="background-color: #F5F6FA;"> -->
-		<view>
+	<view>
 		<u-navbar title="消息中心" leftIconSize='0' :bgColor="bgColor" :placeholder='true' leftIconColor="#fff"
 			titleStyle='color:#fff' rightText='全部已读' @rightClick="rightClick">
 		</u-navbar>
 		<view class="top-bgc"></view>
-		        <mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-		            style="background-color: #F5F6FA;">
-		<view class="content">
-			<view class="info-item flex" v-for="(item,index) in news" :key="index" @click="read(item)">
-				<view class="left">
-					<image src="@/static/images/news/cy.png" class="img" v-if="item.newsType=='承运通知'">
-					</image>
-					<image src="@/static/images/news/xt.png" class="img" v-else>
-					</image>
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+			style="background-color: #F5F6FA;">
+			<view class="content">
+				<view class="info-item flex" v-for="(item,index) in news" :key="index" @click="read(item)">
+					<view class="left">
+						<image src="@/static/images/news/cy.png" class="img" v-if="item.newsType=='承运通知'">
+						</image>
+						<image src="@/static/images/news/xt.png" class="img" v-else>
+						</image>
 
-				</view>
-				<view class="right">
-					<view class="row1 flex flex-space-between">
-						<view class="title">
-							{{item.newsType}}
-						</view>
-						<view class="time">
-							{{item.createDate}}
-						</view>
 					</view>
-					<view class="row2 flex flex-space-between align-center">
-						<view class="text point1">
-							{{item.newsContent}}
+					<view class="right">
+						<view class="row1 flex flex-space-between">
+							<view class="title">
+								{{item.newsType}}
+							</view>
+							<view class="time">
+								{{item.createDate}}
+							</view>
+						</view>
+						<view class="row2 flex flex-space-between align-center">
+							<view class="text point1">
+								{{item.newsContent}}
+							</view>
+							<view class="red-point" v-if="item.newsFlag==0"></view>
 						</view>
-						<view class="red-point" v-if="item.newsFlag==0"></view>
 					</view>
-				</view>
-				<!-- 	<view class="flex flex-space-between">
+					<!-- 	<view class="flex flex-space-between">
 					<view class="left">
 						<view>系统消息</view>
 						<u-badge :isDot="true" bgColor='red' :absolute='true' :offset='badgeOffset'></u-badge>
@@ -45,12 +45,12 @@
 				<view class="flex flex-space-between">
 					您的驾驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。
 				</view> -->
-				<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true'
-					:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick"
-					@close="cancelClick" @cancel="cancelClick"></u-modal>
+					<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true'
+						:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick"
+						@close="cancelClick" @cancel="cancelClick"></u-modal>
+				</view>
 			</view>
-		</view>
-	</mescroll-body>
+		</mescroll-body>
 	</view>
 </template>
 
@@ -64,7 +64,7 @@
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
-					confirmText: '确定',
+				confirmText: '确定',
 				showCancelButton: true,
 				isShowAlert: false,
 				alertTitle: '',
@@ -98,19 +98,19 @@
 		onShow() {
 			this.newsNumber()
 			this.upCallback({
-				size:10,
-				num:1
+				size: 10,
+				num: 1
 			})
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		methods: {
-			newsNumber(){
+			newsNumber() {
 				that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 					reCommonId: this.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) {
@@ -157,7 +157,7 @@
 						uni.removeTabBarBadge({
 							index: 2
 						})
-						this.newsNumber()//消息气泡
+						this.newsNumber() //消息气泡
 
 					})
 					.catch(res => {
@@ -165,7 +165,7 @@
 					});
 			},
 			read(val) {
-					uni.$u.route("/pages/news/newsSee?_obj="+JSON.stringify(val))
+				uni.$u.route("/pages/news/newsSee?_obj=" + JSON.stringify(val))
 				uni.showLoading({
 					title: '加载中',
 					mask: true
@@ -176,7 +176,7 @@
 						this.mescroll.resetUpScroll()
 						this.look()
 						uni.hideLoading()
-						this.newsNumber()//查询消息气泡
+						this.newsNumber() //查询消息气泡
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);
@@ -217,16 +217,16 @@
 				this.mescroll = mescroll;
 			},
 			downCallback() {
-			                // 第2种: 下拉刷新和上拉加载调同样的接口, 则不用第1种, 直接mescroll.resetUpScroll()即可
-			                // 重置列表为第一页 (自动执行 page.num=1, 再触发upCallback方法 )     
-			                this.mescroll.resetUpScroll()
-			            },
+				// 第2种: 下拉刷新和上拉加载调同样的接口, 则不用第1种, 直接mescroll.resetUpScroll()即可
+				// 重置列表为第一页 (自动执行 page.num=1, 再触发upCallback方法 )     
+				this.mescroll.resetUpScroll()
+			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {
 				console.log(page)
 				// 此处可以继续请求其他接口
-				if(page.num == 1){
-					this.news=[]
+				if (page.num == 1) {
+					this.news = []
 					// 请求其他接口...
 				}
 
@@ -247,7 +247,9 @@
 						pageSize: page.size,
 						currentPage: page.num,
 					}).then(res => {
-						if(page.num==1){this.news=[]}
+						if (page.num == 1) {
+							this.news = []
+						}
 						this.news = this.news.concat(res.data.records); //追加新数据
 						this.$forceUpdate()
 						this.mescroll.endBySize(res.data.records.length, res.data.total);
@@ -265,14 +267,15 @@
 		font-size: 26rpx;
 		color: #FFFFFF;
 	}
+
 	/deep/.point1 {
-	    text-overflow: ellipsis;
-	    overflow: hidden;
-	    /* white-space: nowrap; */
-	    display: -webkit-box;
-	    -webkit-line-clamp: 3;
-	    -webkit-box-orient: vertical;
-	    text-overflow: ellipsis;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		/* white-space: nowrap; */
+		display: -webkit-box;
+		-webkit-line-clamp: 3;
+		-webkit-box-orient: vertical;
+		text-overflow: ellipsis;
 	}
 
 	.top-bgc {
@@ -342,4 +345,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/public/register.vue

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

pages/riders/index.vue

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