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

# Conflicts:
#	components/ossutil/uploadFile.js
#	pages/news/index.vue

components/ossutil/uploadFile.js

@@ -14,9 +14,9 @@ const Crypto = require('./crypto.js');
  */
 const uploadFile = function(type, filePath, dir, successc, failc) {
 	console.log('type', type)
-	if (!filePath) {
+	if (!filePath ) {
 		uni.showModal({
-			title: '图片错误',
+			title: '图片上传错误',
 			content: '请重试',
 			showCancel: false,
 		})

pages/goodSource/index.vue

@@ -63,7 +63,7 @@
 						</view>
 						<view class="right gray">
 							<!-- {{good.createDate}} -->
-							{{$helper.changeTime(good.createDate)}}
+							{{$helper.changeTime(good.updateDate)}}
 						</view>
 						<view class="flex flex-space-between yf-style">
 							<view class="left">
@@ -71,10 +71,12 @@
 									<view class="gray mr20">货距 {{good.cargoDistance}}km</view>
 									<view class="gray ">运距 {{good.distance}}km</view>
 								</view>
-								<view class="flex gray row">
+								<view class="u-flex-wrap flex gray row ">
 									<view>{{good.goodsName}} | </view>
 									<!-- <u-line direction="col"></u-line> -->
-									<view>{{carLength(good)}} | {{carType(good)}} | {{carWeight(good)}}</view>
+									<view> {{carLength(good)}} | </view>
+									<view>{{carType(good)}} | </view>
+									<view>{{carWeight(good)}}</view>
 								</view>
 								<view class="flex row">
 									<view class="row-tips">{{good.taskDescription}}</view>
@@ -192,6 +194,9 @@
 				// #ifdef APP-PLUS
 				this.getLngLat();
 				// #endif
+				if(!this.startPlace.selected){
+					this.startPlace.selected = ''
+				}
 			}
 			if (uni.getStorageSync('sPlaceObj')) {
 				this.endPlace = uni.getStorageSync('sPlaceObj');
@@ -442,6 +447,7 @@
 								});
 							}
 							uni.hideLoading()
+							
 						}
 					}
 				});
@@ -606,7 +612,9 @@
 		width: 100%;
 		position: relative;
 	}
-
+.u-flex-wrap{
+	flex-wrap: wrap;
+}
 	.fixed,
 	.fixed1 {
 		background: linear-gradient(97deg, #4FABFD 0%, #2772FB 100%);

pages/mine/editDriverCertification.vue

@@ -374,7 +374,7 @@
 
 			},
 			next(val) {
-				console.log(111111111111)
+				// console.log(111111111111)
 				// if (this.validate()) return
 				uni.$u.route('/pages/mine/editDriverCertificationNext', {
 					data: JSON.stringify(this.dataDetails),
@@ -687,13 +687,12 @@
 		justify-content: center;
 		background: white;
 		padding: 40rpx 20rpx 50rpx 20rpx;
-
 		.next-btn {
-			background: #F1F3F6;
+			background: rgb(39, 114, 251);
 			width: 90%;
 			padding: 20rpx 20rpx;
 			text-align: center;
-			color: #C5CAD4;
+			color: #fff;
 			border-radius: 50rpx;
 		}
 	}
@@ -722,4 +721,7 @@
 		height: 80rpx;
 		z-index: 9;
 	}
+	/deep/.u-radio{
+		margin-right:10px;
+	}
 </style>

pages/mine/manageBankCards/index.vue

@@ -128,7 +128,7 @@
 						driverId: this.userInfo.driverId,
 					}).then(res => {
 						if (res.code == '200') {
-							debugger
+							// debugger
 							console.log('``````````````````````````````')
 							console.log(res.data)
 							this.bankList = res.data

pages/news/index.vue

@@ -2,7 +2,7 @@
 	<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
 		style="background-color: #F5F6FA;">
 		<u-navbar title="消息中心" leftIconSize='0' :bgColor="bgColor" :placeholder='true' leftIconColor="#fff"
-			titleStyle='color:#fff' rightText='一键已读' @rightClick="rightClick">
+			titleStyle='color:#fff' rightText='全部已读' @rightClick="rightClick">
 		</u-navbar>
 		<view class="top-bgc"></view>
 		<view class="content">
@@ -24,9 +24,9 @@
 						</view>
 					</view>
 					<view class="row2 flex flex-space-between align-center">
-						<view class="text point">
+						<view class="text point1">
 							{{item.newsContent}}
-						</view>
+						</view>{{item.newsFlag}}
 						<view class="red-point" v-if="item.newsFlag==0"></view>
 					</view>
 				</view>
@@ -82,7 +82,7 @@
 			})
 			if (_status == '已禁用') {
 				this.isShowAlert = true
-				this.alertTitle = '账号审核中'
+				this.alertTitle == '账号审核中'
 				this.confirmText = '退出APP'
 				this.showCancelButton = false
 			} else {
@@ -123,7 +123,7 @@
 		methods: {
 			confirmClick() {
 				// #ifdef APP-PLUS
-				if (this.alertTitle = '账号审核中') {
+				if (this.alertTitle == '账号审核中') {
 					if (uni.getSystemInfoSync().platform == 'ios') {
 						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 					} else if (uni.getSystemInfoSync().platform == 'android') {
@@ -203,8 +203,14 @@
 				this.mescroll = mescroll;
 			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-			upCallback(page) {debugger
+			upCallback(page) {
+				console.log(page)
 				// 此处可以继续请求其他接口
+				if(page.num == 1){
+					this.news=[]
+					// 请求其他接口...
+				}
+
 				// 如果希望先请求其他接口,再触发upCallback,可参考以下写法
 				// if(!this.isInitxx){
 				// 	apiGetxx().then(res=>{
@@ -222,9 +228,7 @@
 						pageSize: page.size,
 						currentPage: page.num,
 					}).then(res => {
-						if (page.num == 1) this.news = []; //如果是第一页需手动制空列表
 						this.news = this.news.concat(res.data.records); //追加新数据
-						// this.news = res.data.records
 						this.mescroll.endBySize(res.data.records.length, res.data.total);
 					})
 					.catch(res => {
@@ -235,11 +239,20 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	/deep/.u-navbar__content__right__text {
 		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;
+	}
 
 	.top-bgc {
 		position: absolute;

pages/order/confirmLoading.vue

@@ -129,7 +129,7 @@
 		},
 		onLoad(options) {
 			that = this
-			debugger
+			// debugger
 			// #ifdef APP-PLUS
 			this.getLngLat();
 			// #endif
@@ -405,7 +405,8 @@
 				}
 				this.detailData.carrierInfo.statusFlag = this.detailData.statusFlag
 				this.$request.baseRequest('post', '/carrierInfo/loadingAdd', this.detailData.carrierInfo).then(res => {
-						if (res.code == 200) {debugger
+						if (res.code == 200) {
+							// debugger
 							let _title = ''
 							if (this.detailData.statusFlag == 1) {
 								_title = '暂存成功！'