添加空占位图、添加未认证货主不能点击

pages/mine/company/addcompany.vue

@@ -332,6 +332,7 @@
 			}
 		},
 		onShow() {
+			debugger
 			console.log(uni.getStorageSync("videoSrc"))
 			var viderSrc = uni.getStorageSync("videoSrc")
 			if (viderSrc) {
@@ -340,8 +341,11 @@
 
 		},
 		onLoad(options) {
+			debugger
 			this.dataDetails.videoAddressUrl = options.videoSrc
+			// #ifdef APP-PLUS
 			this.get_camera_permission()
+			//#endif
 			this.getName()
 		},
 		computed: {
@@ -450,7 +454,7 @@
 								return
 							}
 							this.dataDetails.businessTermDate = e.value[0]
-							
+
 						} else {
 							var date = new Date()
 							if (e.value[0] < date.getFullYear()) {

pages/mine/index.vue

@@ -17,102 +17,107 @@
 						<view class='flex items-center'>
 							<view v-if='userName' class='username'>{{userName}} {{cargoCall}}</view>
 							<view v-else class='username'>{{userInfo.userName}} </view>
-							<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner')" v-if='status' class='currectstatus'>已认证</view>
-							<view@click="goDetailPage('/pages/mine/cargoowner/cargoowner')" v-if='!status' class='currectstatus1'>{{CargoOwner.authenticationStatus?CargoOwner.authenticationStatus:'未认证'}}</view>
+							<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner')" v-if='status'
+								class='currectstatus'>已认证</view>
+							<view@click="goDetailPage(' /pages/mine/cargoowner/cargoowner')" v-if='!status'
+								class='currectstatus1'>
+								{{CargoOwner.authenticationStatus?CargoOwner.authenticationStatus:'未认证'}}
 						</view>
-						<view class='phone'>{{starUserphone}}</view>
 					</view>
-					<view class='information' v-else @click="toLogin">立即登录</view>
+					<view class='phone'>{{starUserphone}}</view>
 				</view>
-				<view v-if='hasLogin&&!status1' class='authentication flex flex-space-between'>
-					<view>
-						<view style='font-size:14px;'>货主身份认证</view>
-						<view style='color:#DDA558;font-size:12px;'>您还没有完成货主认证哦~</view>
-					</view>
-					<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner')" class='promptlyAuthentication'>立即认证
-					</view>
+				<view class='information' v-else @click="toLogin">立即登录</view>
+			</view>
+			<view v-if='hasLogin&&!status1' class='authentication flex flex-space-between'>
+				<view>
+					<view style='font-size:14px;'>货主身份认证</view>
+					<view style='color:#DDA558;font-size:12px;'>您还没有完成货主认证哦~</view>
+				</view>
+				<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner')" class='promptlyAuthentication'>立即认证
 				</view>
 			</view>
+		</view>
 
-			<view class='flex operate flex-space-around'>
-				<view style='font-size:14px;' class='flex items-center' @click="toMyRelease">
-					<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true"
-						src="../../static/mine/wodefabu.png" width="42px" height="42px"></u--image>我的发布
+		<view class='flex operate flex-space-around'>
+			<view style='font-size:14px;' class='flex items-center' @click="toMyRelease">
+				<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true"
+					src="../../static/mine/wodefabu.png" width="42px" height="42px"></u--image>我的发布
+			</view>
+			<view style='font-size:14px;' class='flex items-center' @click="goDetailPage('/pages/mine/evaluate')">
+				<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true"
+					src="../../static/mine/pingjia.png" width="42px" height="42px"></u--image>
+				司机评价
+			</view>
+		</view>
+		<view class="content1">
+			<view class="flex flex-space-between content1-item"
+				@click="goDetailPage('/pages/mine/myAccount/index',false)">
+				<view class='flex items-center'>
+					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/zhanghu.png"
+						width="20px" height="20px"></u--image>我的账户
 				</view>
-				<view style='font-size:14px;' class='flex items-center' @click="goDetailPage('/pages/mine/evaluate')">
-					<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true"
-						src="../../static/mine/pingjia.png" width="42px" height="42px"></u--image>
-					司机评价
+				<view>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
 				</view>
 			</view>
-			<view class="content1">
-				<view class="flex flex-space-between content1-item"
-					@click="goDetailPage('/pages/mine/myAccount/index')">
-					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/zhanghu.png"
-							width="20px" height="20px"></u--image>我的账户
-					</view>
-					<view>
-						<image class='right' src="@/static/mine/right.png" mode=""></image>
-						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
-					</view>
+			<view class="flex flex-space-between content1-item"
+				@click="goDetailPage('/pages/mine/company/index',false)">
+				<view class='flex items-center'>
+					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/wodegongsi.png"
+						width="20px" height="20px"></u--image>我的公司
 				</view>
-				<view class="flex flex-space-between content1-item" @click="goDetailPage('/pages/mine/company/index')">
-					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/wodegongsi.png"
-							width="20px" height="20px"></u--image>我的公司
-					</view>
-					<view class='flex'>
-						<image class='right' src="@/static/mine/right.png" mode=""></image>
-						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
-					</view>
+				<view class='flex'>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
 				</view>
-				<view class="flex flex-space-between content1-item"
-					@click="goDetailPage('/pages/mine/manageBankCards/index')">
-					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/yinhangka.png"
-							width="20px" height="20px"></u--image>我的银行卡
-					</view>
-					<view>
-						<image class='right' src="@/static/mine/right.png" mode=""></image>
-						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
-					</view>
+			</view>
+			<view class="flex flex-space-between content1-item"
+				@click="goDetailPage('/pages/mine/manageBankCards/index',false)">
+				<view class='flex items-center'>
+					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/yinhangka.png"
+						width="20px" height="20px"></u--image>我的银行卡
 				</view>
-				<view class="flex flex-space-between content1-item"
-					@click="goDetailPage('/pages/mine/cargoowner/cargoowner')">
-					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/huozhu.png"
-							width="20px" height="20px"></u--image>货主认证
-					</view>
-					<view class='flex'>
-						<image class='right' src="@/static/mine/right.png" mode=""></image>
-						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
-					</view>
+				<view>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
 				</view>
-				<view class="flex flex-space-between content1-item"
-					@click="goDetailPage('/pages/mine/agentCargoOwner')">
-					<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>
-					<view>
-						<image class='right' src="@/static/mine/right.png" mode=""></image>
-						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
-					</view>
+			</view>
+			<view class="flex flex-space-between content1-item"
+				@click="goDetailPage('/pages/mine/cargoowner/cargoowner',true)">
+				<view class='flex items-center'>
+					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/huozhu.png"
+						width="20px" height="20px"></u--image>货主认证
 				</view>
-				<view class="flex flex-space-between content1-item"
-					@click="goDetailPage('/pages/mine/helpDescription')">
-					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true"
-							src="../../static/mine/bangzhushuoming.png" width="20px" height="20px"></u--image>帮助说明
-					</view>
-					<view>
-						<image class='right' src="@/static/mine/right.png" mode=""></image>
-						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
-					</view>
+				<view class='flex'>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
+				</view>
+			</view>
+			<view class="flex flex-space-between content1-item"
+				@click="goDetailPage('/pages/mine/agentCargoOwner',false)">
+				<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>
+				<view>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
+				</view>
+			</view>
+			<view class="flex flex-space-between content1-item"
+				@click="goDetailPage('/pages/mine/helpDescription',true)">
+				<view class='flex items-center'>
+					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/bangzhushuoming.png"
+						width="20px" height="20px"></u--image>帮助说明
 				</view>
+				<view>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
+				</view>
+			</view>
 
-				<!-- 		<view class="flex flex-space-between content1-item"
+			<!-- 		<view class="flex flex-space-between content1-item"
 					@click="goDetailPage('/pages/mine/driverEvaluation')">
 					<view class='flex items-center'>
 						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
@@ -122,7 +127,7 @@
 						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 					</view>
 				</view> -->
-				<!-- <view class="flex flex-space-between content1-item" @click="goDetailPage('/pages/mine/set')">
+			<!-- <view class="flex flex-space-between content1-item" @click="goDetailPage('/pages/mine/set')">
 					<view class='flex items-center'>
 						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
 							width="20px" height="20px"></u--image>设置
@@ -132,12 +137,12 @@
 					</view>
 				</view> -->
 
-			</view>
 		</view>
-		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
-			@cancel="cancelClick"></u-modal>
-		<u-toast ref="uToast"></u-toast>
+	</view>
+	<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
+		:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+		@cancel="cancelClick"></u-modal>
+	<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -156,7 +161,7 @@
 				userName: '',
 				phone: '',
 				status: false,
-				status1:false,
+				status1: false,
 				alertContent: '您尚未登录，是否立即登录？',
 				cargoCall: "",
 			};
@@ -174,12 +179,12 @@
 						if (res.data) {
 							this.CargoOwner = res.data
 							if (res.data.authenticationStatus == '审核中' || res.data.authenticationStatus == '已驳回' || res
-								.data.authenticationStatus == '未认证'|| res.data.authenticationStatus == '已过期') {
-									if(res.data.authenticationStatus == '未认证'){
-										this.status1 = false
-									}else{
-										this.status1 = true
-									}
+								.data.authenticationStatus == '未认证' || res.data.authenticationStatus == '已过期') {
+								if (res.data.authenticationStatus == '未认证') {
+									this.status1 = false
+								} else {
+									this.status1 = true
+								}
 								this.status = false
 							} else {
 								this.status = true
@@ -205,7 +210,7 @@
 					uni.setStorageSync("firstAuthentication", res.data)
 					if (res.data) {
 						this.userName = res.data.call
-						if(res.data.sex){
+						if (res.data.sex) {
 							if (res.data.sex == '男') {
 								this.cargoCall = "先生"
 							} else {
@@ -287,19 +292,28 @@
 			toMyRelease() {
 				if (!this.hasLogin || !this.userInfo || this.userName == "立即登录") {
 					uni.$u.route('/pages/public/login');
-				} else {uni.$u.route('/pages/release/record');}
-				
+				} else {
+					uni.$u.route('/pages/release/record');
+				}
+
 			},
-			goDetailPage(src) {
+			goDetailPage(src, isClick) {
 				if (!this.hasLogin || !this.userInfo || this.userName == "立即登录") {
-					if(src!='/pages/mine/helpDescription'){
-						uni.$u.route('/pages/public/login');
-					}else{
+					// if(src!='/pages/mine/helpDescription'){
+					uni.$u.route('/pages/public/login');
+					// }else{
+					// 	uni.$u.route(src);
+					// }
+				} else {
+					if (isClick) {
 						uni.$u.route(src);
+					} else {
+						uni.$u.toast('请先完成货主认证！')
 					}
-					
-				} else {uni.$u.route(src);}
-				
+
+
+				}
+
 			},
 			toLogin() {
 				console.log("userInfo", this.userInfo)
@@ -420,7 +434,9 @@
 	.items-center {
 		align-items: center;
 	}
-	.right{
-		width:10px;height:10px;
+
+	.right {
+		width: 10px;
+		height: 10px;
 	}
 </style>

pages/order/index.vue

@@ -14,11 +14,10 @@
 							}"></u-tabs>
 			</view> -->
 		<view class="top-content">
-			
-				<view class="fixed1"></view>
+
+			<view class="fixed1"></view>
 			<view class="fix-content">
-				<u-search placeholder="搜索订单" 
-				v-model="searchKeyWord" bgColor='white' :actionStyle='searchStyle'
+				<u-search placeholder="搜索订单" v-model="searchKeyWord" bgColor='white' :actionStyle='searchStyle'
 					@custom="getSearch" @search="getSearch" :clearabled="true"></u-search>
 				<view class="tab-content">
 					<u-tabs :list="tabList" @click="clickTab" lineColor='transparent' :current='tabIndex'
@@ -39,7 +38,7 @@
 					</view>
 				</view>
 			</view>
-		
+
 		</view>
 		<view class="all-menu">
 			<u-transition :show="showMenu" mode="fade">
@@ -50,71 +49,79 @@
 					</view>
 				</view>
 			</u-transition>
-			<view @touchmove.stop.prevent="moveHandle" class="modal-black" v-show="showMenu" ></view>
+			<view @touchmove.stop.prevent="moveHandle" class="modal-black" v-show="showMenu"></view>
 		</view>
-		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" @down="downCallback" @up="upCallback" class="mescroll">
-			<view class="evaluatePage flex flex-space-between" v-show="tabIndex == 10"  @click="evaluationRecord">
-			<view class="left flex flex-space-between">
-				<!-- <u-icon size="20" name="edit-pen"></u-icon> -->
-				<image class="pingjia" src="@/static/images/order/pingjia.png"></image>
-				<view style="margin-left: 20prx;">我的评价</view>
-			</view>
-			<view class="right">
-				<image style='width:12px;height:12px;' src="@/static/images/order/right.png"></image>
+		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" @down="downCallback" @up="upCallback"
+			class="mescroll">
+			<view class="evaluatePage flex flex-space-between" v-show="tabIndex == 10" @click="evaluationRecord">
+				<view class="left flex flex-space-between">
+					<!-- <u-icon size="20" name="edit-pen"></u-icon> -->
+					<image class="pingjia" src="@/static/images/order/pingjia.png"></image>
+					<view style="margin-left: 20prx;">我的评价</view>
+				</view>
+				<view class="right">
+					<image style='width:12px;height:12px;' src="@/static/images/order/right.png"></image>
 					<!-- <u-icon size="20" name="arrow-right"></u-icon> -->
+				</view>
 			</view>
-			</view>
-				<view :id="'good'+good.id" class="good-list" v-for="good in goods" :key="good.id"
-					@click="toDetail(good.id)">
-					<view style="padding: 0 35rpx 20rpx 35rpx;">
-						<view class="flex flex-space-between row1">
-							<view class="item1">
-								{{good.orderNo}}
-								<!-- {{good.goodsName}} -->
-							</view>
-							<view class="item2">
-								{{good.cargoOwnerStatus}}
-							</view>
+			<view :id="'good'+good.id" class="good-list" v-for="good in goods" :key="good.id"
+				@click="toDetail(good.id)">
+				<view style="padding: 0 35rpx 20rpx 35rpx;">
+					<view class="flex flex-space-between row1">
+						<view class="item1">
+							{{good.orderNo}}
+							<!-- {{good.goodsName}} -->
+						</view>
+						<view class="item2">
+							{{good.cargoOwnerStatus}}
 						</view>
-						<view class="flex row2">
-							<view class="left">
-								<view class="top">
-									<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}</view>
-									<view class="level2-title">{{$helper.filterUrban(good.sendCity)}}</view>
+					</view>
+					<view class="flex row2">
+						<view class="left">
+							<view class="top">
+								<view class="ssx">
+									{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}
 								</view>
-								<view class="bottom">{{$helper.filterArea(good.sendArea)}}</view>
-							</view>
-							<view class="jt-image">
-								<image class="jt-icon" src="@/static/images/order/jt.png" mode='widthFix'>
-								</image>
+								<view class="level2-title">{{$helper.filterUrban(good.sendCity)}}</view>
 							</view>
+							<view class="bottom">{{$helper.filterArea(good.sendArea)}}</view>
+						</view>
+						<view class="jt-image">
+							<image class="jt-icon" src="@/static/images/order/jt.png" mode='widthFix'>
+							</image>
+						</view>
 
-							<view class="right">
-								<view class="top">
-									<view class="ssx">
-										{{$helper.getProvinceAbbreviation(good.unloadPrivate?good.unloadPrivate:good.unloadCity)}}
-									</view>
-									<view class="level2-title">{{$helper.filterUrban(good.unloadCity)}}</view>
-								</view>
-								<view class="bottom">
-									{{$helper.filterArea(good.unloadArea)}}
+						<view class="right">
+							<view class="top">
+								<view class="ssx">
+									{{$helper.getProvinceAbbreviation(good.unloadPrivate?good.unloadPrivate:good.unloadCity)}}
 								</view>
+								<view class="level2-title">{{$helper.filterUrban(good.unloadCity)}}</view>
+							</view>
+							<view class="bottom">
+								{{$helper.filterArea(good.unloadArea)}}
 							</view>
 						</view>
-						<view class="flex row3 s-row">
-							<view class="flex align-center">
-								<image class="hz" src="@/static/images/news/sj.png"></image>
-								<view style="margin-right: 20rpx;" @click.stop="goTodriverDetail(good)">{{good.driverName}}</view>
-								<!-- <view style="margin-right: 20rpx;">{{good.driverCall}}</view> -->
-								<image class="hz-good" src="@/static/images/order/good-img.png"></image>
-								<view>{{good.goodsName}}</view>
+					</view>
+					<view class="flex row3 s-row">
+						<view class="flex align-center">
+							<image class="hz" src="@/static/images/news/sj.png"></image>
+							<view style="margin-right: 20rpx;" @click.stop="goTodriverDetail(good)">{{good.driverName}}
 							</view>
-							<view class="flex align-center">
-								<view style="margin-right: 20rpx;">运距 {{good.distance}}km</view>
-								<view v-if="good.cargoOwnerStatus!='已完结'" class="car">{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}</view>
-								<view v-else class="car">{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}</view>
+							<!-- <view style="margin-right: 20rpx;">{{good.driverCall}}</view> -->
+							<image class="hz-good" src="@/static/images/order/good-img.png"></image>
+							<view>{{good.goodsName}}</view>
+						</view>
+						<view class="flex align-center">
+							<view style="margin-right: 20rpx;">运距 {{good.distance}}km</view>
+							<view v-if="good.cargoOwnerStatus!='已完结'" class="car">
+								{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
 							</view>
-							<!-- 		<view class="right">
+							<view v-else class="car">
+								{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
+							</view>
+						</view>
+						<!-- 		<view class="right">
 								<view class="flex fontsize-26 row">
 									<view>{{good.compName}}</view>
 									<view class="sline"></view>
@@ -124,47 +131,52 @@
 									<view class="fontsize-26 ">运距 {{good.distance}}km</view>
 								</view>
 							</view> -->
-						</view>
-						<view class="row4 flex align-center">
-							<view class="time">{{good.updateDate}}</view>
+					</view>
+					<view class="row4 flex align-center">
+						<view class="time">{{good.updateDate}}</view>
 
-						</view>
-						<view class="row5 flex flex-end">
-							<!-- <image class="jt-icon" src="@/static/images/order/position.png" mode='widthFix'
+					</view>
+					<view class="row5 flex flex-end">
+						<!-- <image class="jt-icon" src="@/static/images/order/position.png" mode='widthFix'
 								@click.stop="toMap(good)">
 							</image> -->
-							<view v-if="good.cargoOwnerStatus=='运输中'||good.cargoOwnerStatus=='已完结'" class="start normal look-map" @click.stop="toMap(good)">
-								查看轨迹</view>
-							<view class="stop" @click.stop="accept(good,1)" v-if="good.cargoOwnerStatus=='待接单'">接受
-							</view>
-							<!-- <view class="stop active" @click.stop="accept(good,1)">接受</view> -->
-							<view class="normal" @click.stop="accept(good,2)" v-if="good.cargoOwnerStatus=='待接单'">拒绝
-							</view>
-							<view class="normal" @click.stop="stop(good)" v-if="good.cargoOwnerStatus=='未装车'">终止</view>
-							<!-- <view class="stop active" @click.stop="stop(good)">终止</view> -->
-
-							<!-- confirmLoading(good,3) -->
-							<view v-if="good.cargoOwnerStatus=='待确认装车'" class="start normal" @click.stop="toDetail(good.id)"
-								>确认装车</view>
-							<view v-if="good.cargoOwnerStatus=='司机驳回运费信息'" class="start normal" @click.stop="toDetail(good.id)">确认运费</view>
-							<!-- <view class="start normal" @click.stop="confirmLoading(good,1)">确认装车</view> -->
-							<view class="start normal" v-if="good.cargoOwnerStatus!='待接单'&&good.cargoOwnerStatus!='未装车'" @click.stop="$helper.contactCustomerService()">
-								联系客服</view>
-								<view class="start normal" @click.stop="toDetail(good.id)"
-									v-if="good.cargoOwnerStatus=='待收货'">确认卸车</view>
-							<!-- <view class="start normal" @click.stop="confirmLoading(good,4)"
+						<view v-if="good.cargoOwnerStatus=='运输中'||good.cargoOwnerStatus=='已完结'"
+							class="start normal look-map" @click.stop="toMap(good)">
+							查看轨迹</view>
+						<view class="stop" @click.stop="accept(good,1)" v-if="good.cargoOwnerStatus=='待接单'">接受
+						</view>
+						<!-- <view class="stop active" @click.stop="accept(good,1)">接受</view> -->
+						<view class="normal" @click.stop="accept(good,2)" v-if="good.cargoOwnerStatus=='待接单'">拒绝
+						</view>
+						<view class="normal" @click.stop="stop(good)" v-if="good.cargoOwnerStatus=='未装车'">终止</view>
+						<!-- <view class="stop active" @click.stop="stop(good)">终止</view> -->
+
+						<!-- confirmLoading(good,3) -->
+						<view v-if="good.cargoOwnerStatus=='待确认装车'" class="start normal"
+							@click.stop="toDetail(good.id)">确认装车</view>
+						<view v-if="good.cargoOwnerStatus=='司机驳回运费信息'" class="start normal"
+							@click.stop="toDetail(good.id)">确认运费</view>
+						<!-- <view class="start normal" @click.stop="confirmLoading(good,1)">确认装车</view> -->
+						<view class="start normal" v-if="good.cargoOwnerStatus!='待接单'&&good.cargoOwnerStatus!='未装车'"
+							@click.stop="$helper.contactCustomerService()">
+							联系客服</view>
+						<view class="start normal" @click.stop="toDetail(good.id)" v-if="good.cargoOwnerStatus=='待收货'">
+							确认卸车</view>
+						<!-- <view class="start normal" @click.stop="confirmLoading(good,4)"
 								v-if="good.cargoOwnerStatus=='待收货'">确认卸车</view> -->
-							<!-- <view class="start normal" @click.stop="confirmLoading(good,2)">确认卸车</view> -->
-							<!-- <view class="normal" @click.stop="stop(good)" v-if="good.cargoOwnerStatus=='已结算'">付款</view> -->
-							<!-- <view class="normal" @click.stop="stop(good)"
+						<!-- <view class="start normal" @click.stop="confirmLoading(good,2)">确认卸车</view> -->
+						<!-- <view class="normal" @click.stop="stop(good)" v-if="good.cargoOwnerStatus=='已结算'">付款</view> -->
+						<!-- <view class="normal" @click.stop="stop(good)"
 								v-if="good.cargoOwnerStatus=='待还款'||good.cargoOwnerStatus=='已还款'">还款</view> -->
 
-							<!-- <view class="start normal" @click.stop="addevaluation(good)"  v-if="good.cargoOwnerStatus=='已完结'">评价</view> --><!-- driverEvaluated 为1是已评价过-->
-							<view class="start normal" @click.stop="addevaluation(good)" v-if="good.cargoOwnerStatus=='已完结' && good.ownerEvaluated != 1"  >评价</view>
-						</view>
+						<!-- <view class="start normal" @click.stop="addevaluation(good)"  v-if="good.cargoOwnerStatus=='已完结'">评价</view> -->
+						<!-- driverEvaluated 为1是已评价过-->
+						<view class="start normal" @click.stop="addevaluation(good)"
+							v-if="good.cargoOwnerStatus=='已完结' && good.ownerEvaluated != 1">评价</view>
 					</view>
 				</view>
-			</mescroll-body>
+			</view>
+		</mescroll-body>
 		<!-- </view> -->
 		<!-- 		<view v-else class="search-view">
 			<view class="flex">
@@ -192,26 +204,28 @@
 		</u-modal>
 		<u-popup :show="show" mode="bottom" @close="close" @open="open">
 			<view class="u-popup-wrap">
-				<view >
-					<image style='width:12px;height:12px;' @click='closepopup' class='close'  src="../../static/images/order/guanbi@3x.png" mode=""></image>
+				<view>
+					<image style='width:12px;height:12px;' @click='closepopup' class='close'
+						src="../../static/images/order/guanbi@3x.png" mode=""></image>
 					<!-- <u-icon @click="closepopup" class='close' name="close" size="20"></u-icon> -->
 				</view>
-				
+
 				<view style='fon-size:34rpx;margin-bottom:20px;text-align:center;font-weight: 600;'>确认终止订单</view>
 				<view style="margin: 0 auto;">
-		           	<u-radio-group iconPlacement="right" v-model="radiovalue1" placement="" >
-		           	<u-radio  :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
-		           		:label="item.name" :name="item.name" @change="radioChange" >
-		           	</u-radio>
-		           </u-radio-group>
-		           </view>
-				   <view style='border-top:10px solid #F2F4F7;position:absolute;left:0;height:0;width:100%;'></view>
-		           <view style='padding:40rpx 0 30rpx;'>终止原因描述</view>
-		           <u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'>
-		           </u--textarea>
-				   <view class='termination' :class="{'active':value2.length>0}" @click='$u.throttle(termination, 5000)'>终止</view>
+					<u-radio-group iconPlacement="right" v-model="radiovalue1" placement="">
+						<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
+							:label="item.name" :name="item.name" @change="radioChange">
+						</u-radio>
+					</u-radio-group>
+				</view>
+				<view style='border-top:10px solid #F2F4F7;position:absolute;left:0;height:0;width:100%;'></view>
+				<view style='padding:40rpx 0 30rpx;'>终止原因描述</view>
+				<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'>
+				</u--textarea>
+				<view class='termination' :class="{'active':value2.length>0}" @click='$u.throttle(termination, 5000)'>终止
+				</view>
 			</view>
-		           
+
 		</u-popup>
 		<u-toast ref="uToast"></u-toast>
 	</view>
@@ -228,14 +242,14 @@
 		apiGoods
 	} from "@/api/mock.js"
 	export default {
-		components:{
+		components: {
 			uniPopup
 		},
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
 				confirmText: '',
-				show:false,
+				show: false,
 				showCancelButton: true,
 				type: null,
 				objData: {},
@@ -246,16 +260,16 @@
 					position: "absolute",
 					right: "30rpx",
 					padding: "6rpx 20rpx",
-					margin:'0 20rpx 0 0',
+					margin: '0 20rpx 0 0',
 					"border-radius": '30rpx'
 				},
 				upOption: {
 					page: {
-												size: 10 // 每页数据的数量,默认10
-											},
-											noMoreSize: 0, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+						size: 10 // 每页数据的数量,默认10
+					},
+					noMoreSize: 0, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						tip: '暂无相关数据'
+						tip: '没有更多记录啦！'
 					}
 				},
 				searchKeyWord: '',
@@ -345,7 +359,7 @@
 			//#endif
 		},
 		onLoad() {
-			
+
 			// that = this
 			// // #ifdef APP-PLUS
 			// let _status = await that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
@@ -354,7 +368,7 @@
 			// 	if(res.data){
 			// 		return res.data.authenticationStatus
 			// 	}
-				
+
 			// })
 			// if (_status == '已禁用') {
 			// 	this.isShowAlert = true
@@ -375,7 +389,7 @@
 			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) {
@@ -417,28 +431,30 @@
 
 		// },
 		methods: {
-			closepopup(){
-				this.show=false
+			closepopup() {
+				this.show = false
 			},
-			moveHandle(){
+			moveHandle() {
 				// console.log(1111)
 			},
 			open() {
-			          // console.log('open');
+				// console.log('open');
 			},
 			close() {
 				this.show = false
-			          // console.log('close');
+				// console.log('close');
 			},
-			goTodriverDetail(val){
-				uni.$u.route('/pages/order/driverDetail',{
-					driver:JSON.stringify(val)
+			goTodriverDetail(val) {
+				uni.$u.route('/pages/order/driverDetail', {
+					driver: JSON.stringify(val)
 				});
 			},
-			addevaluation(val){
-					uni.$u.route('/pages/order/addEvaluation',{val:JSON.stringify(val)});
+			addevaluation(val) {
+				uni.$u.route('/pages/order/addEvaluation', {
+					val: JSON.stringify(val)
+				});
 			},
-			evaluationRecord(){
+			evaluationRecord() {
 				uni.$u.route('/pages/order/evaluationRecord');
 			},
 			toMap(val) {
@@ -519,7 +535,7 @@
 				// } else {
 				// 	this.isShowTerminationReason = true
 				// }
-					// this.alertTitle = '确定终止订单？'
+				// this.alertTitle = '确定终止订单？'
 				this.id = item.id
 				this.show = true
 			},
@@ -529,8 +545,8 @@
 			del() {
 				this.isShowAlert = true
 			},
-			termination(){
-				var that=this
+			termination() {
+				var that = this
 				let _terminationReason = ''
 				if (this.radiovalue1 == '已与司机协商') {
 					_terminationReason = 1
@@ -541,33 +557,33 @@
 				} else if (this.radiovalue1 == '其他') {
 					_terminationReason = 4
 				}
-					this.$request.baseRequest('post', '/orderInfo/api/end', {
-							id: this.id,
-							terminator: 2,
-							terminationReason: _terminationReason,
-							terminationReasonDescription: this.value2
-						}).then(res => {
-							if (res.code == 200) {
-								this.show=false
-								this.value2=''
-								this.$refs.uToast.show({
-									type: 'success',
-									message: '终止订单成功',
-								})
-							} else {
-								this.$refs.uToast.show({
-									type: 'success',
-									message: '终止订单失败',
-								})
-							}
-							that.mescroll.resetUpScroll()
-						})
-						.catch(res => {
-							uni.$u.toast(res.message);
-						});
+				this.$request.baseRequest('post', '/orderInfo/api/end', {
+						id: this.id,
+						terminator: 2,
+						terminationReason: _terminationReason,
+						terminationReasonDescription: this.value2
+					}).then(res => {
+						if (res.code == 200) {
+							this.show = false
+							this.value2 = ''
+							this.$refs.uToast.show({
+								type: 'success',
+								message: '终止订单成功',
+							})
+						} else {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: '终止订单失败',
+							})
+						}
+						that.mescroll.resetUpScroll()
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
 			},
 			confirmClick() {
-				var that =this
+				var that = this
 				// // #ifdef APP-PLUS
 				// if (this.alertTitle == '账号审核中') {
 				// 	if (uni.getSystemInfoSync().platform == 'ios') {
@@ -595,7 +611,10 @@
 									type: 'success',
 									message: _title,
 									complete() {
-										that.upCallback({size: 10,num: 1})
+										that.upCallback({
+											size: 10,
+											num: 1
+										})
 										that.mescroll.resetUpScroll()
 									}
 								})
@@ -609,7 +628,10 @@
 									type: 'success',
 									message: _title,
 									complete() {
-										that.upCallback({size: 10,num: 1})
+										that.upCallback({
+											size: 10,
+											num: 1
+										})
 										that.mescroll.resetUpScroll()
 									}
 								})
@@ -644,7 +666,7 @@
 						.catch(res => {
 							uni.$u.toast(res.message);
 						});
-				} 
+				}
 			},
 			cancelClick() {
 				this.isShowAlert = false
@@ -709,12 +731,15 @@
 </script>
 
 <style scoped lang="scss">
-	.content{
+	.content {
 		padding-bottom: 160px;
 	}
-	.ssx{
-		position:relative;top:3rpx;
+
+	.ssx {
+		position: relative;
+		top: 3rpx;
 	}
+
 	.top-content {
 		background: url(../../static/images/order/bg.png) no-repeat;
 		background-size: cover;
@@ -725,7 +750,8 @@
 		// margin-top: var(--status-bar-height);
 		// padding-bottom: 320rpx;
 	}
-	.fix-content{
+
+	.fix-content {
 		// width: 96%;
 		margin-right: 20rpx;
 	}
@@ -1081,48 +1107,57 @@
 
 	.look-map {
 		background: #2772FB;
-		border:1px solid #2772FB;
+		border: 1px solid #2772FB;
 		color: white;
 	}
-	.evaluatePage{
+
+	.evaluatePage {
 		background: white;
 		margin: 20rpx;
 		padding: 20rpx;
 		border-radius: 20rpx;
 	}
-	/deep/.u-popup__content{
+
+	/deep/.u-popup__content {
 		border-radius: 10px;
 		// padding:20px;
 	}
-	/deep/.u-radio{
-		margin:40rpx 0;
+
+	/deep/.u-radio {
+		margin: 40rpx 0;
 	}
-	.close{
-		position:absolute;
-		right:20px;
-		top:26px;
+
+	.close {
+		position: absolute;
+		right: 20px;
+		top: 26px;
 	}
-	.termination{
-		background:#F1F3F6;
-		color:#C5CAD4;
-		padding:10px;
-		border-radius:30px;
+
+	.termination {
+		background: #F1F3F6;
+		color: #C5CAD4;
+		padding: 10px;
+		border-radius: 30px;
 		text-align: center;
-		margin-top:30rpx;
+		margin-top: 30rpx;
 	}
-	.termination.active{
+
+	.termination.active {
 		background: #2772FB;
 		color: white;
 	}
-	.quanbu{
-		width:16px;
-		height:16px;
+
+	.quanbu {
+		width: 16px;
+		height: 16px;
 	}
-	.pingjia{
-		width:14px;
-		height:14px;
+
+	.pingjia {
+		width: 14px;
+		height: 14px;
 	}
-	.u-popup-wrap{
-		padding:20px;
+
+	.u-popup-wrap {
+		padding: 20px;
 	}
 </style>

uni_modules/mescroll-uni/components/mescroll-diy/beibei/mescroll-uni-option.js

@@ -29,7 +29,7 @@ const GlobalOption = {
 				textLoading: '加载中 ...', // 加载中的提示文本
 				textNoMore: ' 没有更多了~ ', // 没有更多数据的提示文本
 				empty: {
-					tip: '~ 暂无相关数据 ~' // 空提示
+					tip: '~ 没有更多记录啦！ ~' // 空提示
 				}
 			}
 		},

uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty.vue

@@ -3,114 +3,118 @@
 <mescroll-empty v-if="isShowEmpty" :option="optEmpty" @emptyclick="emptyClick"></mescroll-empty>
 -->
 <template>
-	<view class="mescroll-empty" :class="{ 'empty-fixed': option.fixed }" :style="{ 'z-index': option.zIndex, top: option.top }">
-		<view> <image v-if="icon" class="empty-icon" :src="icon" mode="widthFix" /> </view>
+	<view class="mescroll-empty" :class="{ 'empty-fixed': option.fixed }"
+		:style="{ 'z-index': option.zIndex, top: option.top }">
+		<view>
+			<image v-if="icon" class="empty-icon" :src="icon" mode="widthFix" />
+		</view>
 		<view v-if="tip" class="empty-tip">{{ tip }}</view>
 		<view v-if="btnText" class="empty-btn" @click="emptyClick">{{ btnText }}</view>
 	</view>
 </template>
 
 <script>
-// 引入全局配置
-import GlobalOption from '../mescroll-uni/mescroll-uni-option.js';
-// 引入国际化工具类
-import mescrollI18n from '../mescroll-uni/mescroll-i18n.js';
-export default {
-	props: {
-		// empty的配置项: 默认为GlobalOption.up.empty
-		option: {
-			type: Object,
-			default() {
-				return {};
-			}
-		}
-	},
-	// 使用computed获取配置,用于支持option的动态配置
-	computed: {
-		// 图标
-		icon() {
-			if (this.option.icon != null) { // 此处不使用短路求值, 用于支持传空串不显示图标
-				return this.option.icon
-			} else{
-				let i18nType = mescrollI18n.getType() // 国际化配置
-				if (this.option.i18n) {
-					return this.option.i18n[i18nType].icon
-				} else{
-					return GlobalOption.i18n[i18nType].up.empty.icon || GlobalOption.up.empty.icon
+	// 引入全局配置
+	import GlobalOption from '../mescroll-uni/mescroll-uni-option.js';
+	// 引入国际化工具类
+	import mescrollI18n from '../mescroll-uni/mescroll-i18n.js';
+	export default {
+		props: {
+			// empty的配置项: 默认为GlobalOption.up.empty
+			option: {
+				type: Object,
+				default () {
+					return {};
 				}
 			}
 		},
-		// 文本提示
-		tip() {
-			if (this.option.tip != null) { // 支持传空串不显示文本提示
-				return this.option.tip
-			} else{
-				let i18nType = mescrollI18n.getType() // 国际化配置
+		// 使用computed获取配置,用于支持option的动态配置
+		computed: {
+			// 图标
+			icon() {
+				if (this.option.icon != null) { // 此处不使用短路求值, 用于支持传空串不显示图标
+					return this.option.icon
+				} else {
+					let i18nType = mescrollI18n.getType() // 国际化配置
+					if (this.option.i18n) {
+						return this.option.i18n[i18nType].icon
+					} else {
+						return GlobalOption.i18n[i18nType].up.empty.icon || GlobalOption.up.empty.icon
+					}
+				}
+			},
+			// 文本提示
+			tip() {
+				if (this.option.tip != null) { // 支持传空串不显示文本提示
+					return this.option.tip
+				} else {
+					let i18nType = mescrollI18n.getType() // 国际化配置
+					if (this.option.i18n) {
+						return this.option.i18n[i18nType].tip
+					} else {
+						return GlobalOption.i18n[i18nType].up.empty.tip || GlobalOption.up.empty.tip
+					}
+				}
+			},
+			// 按钮文本
+			btnText() {
 				if (this.option.i18n) {
-					return this.option.i18n[i18nType].tip
-				} else{
-					return GlobalOption.i18n[i18nType].up.empty.tip || GlobalOption.up.empty.tip
+					let i18nType = mescrollI18n.getType() // 国际化配置
+					return this.option.i18n[i18nType].btnText
+				} else {
+					return this.option.btnText
 				}
 			}
 		},
-		// 按钮文本
-		btnText() {
-			if (this.option.i18n) {
-				let i18nType = mescrollI18n.getType() // 国际化配置
-				return this.option.i18n[i18nType].btnText
-			} else{
-				return this.option.btnText
+		methods: {
+			// 点击按钮
+			emptyClick() {
+				this.$emit('emptyclick');
 			}
 		}
-	},
-	methods: {
-		// 点击按钮
-		emptyClick() {
-			this.$emit('emptyclick');
-		}
-	}
-};
+	};
 </script>
 
 <style>
-/* 无任何数据的空布局 */
-.mescroll-empty {
-	box-sizing: border-box;
-	width: 100%;
-	padding: 100rpx 50rpx;
-	text-align: center;
-}
+	/* 无任何数据的空布局 */
+	.mescroll-empty {
+		box-sizing: border-box;
+		width: 100%;
+		padding: 100rpx 50rpx;
+		text-align: center;
+	}
 
-.mescroll-empty.empty-fixed {
-	z-index: 99;
-	position: absolute; /*transform会使fixed失效,最终会降级为absolute */
-	top: 100rpx;
-	left: 0;
-}
+	.mescroll-empty.empty-fixed {
+		z-index: 99;
+		position: absolute;
+		/*transform会使fixed失效,最终会降级为absolute */
+		top: 100rpx;
+		left: 0;
+	}
 
-.mescroll-empty .empty-icon {
-	width: 280rpx;
-	height: 280rpx;
-}
+	.mescroll-empty .empty-icon {
+		width: 496rpx;
+		height: 308rpx;
+	}
 
-.mescroll-empty .empty-tip {
-	margin-top: 20rpx;
-	font-size: 24rpx;
-	color: gray;
-}
+	.mescroll-empty .empty-tip {
+		margin-top: 20rpx;
+		font-size: 26rpx;
+		color: #333;
+	}
 
-.mescroll-empty .empty-btn {
-	display: inline-block;
-	margin-top: 40rpx;
-	min-width: 200rpx;
-	padding: 18rpx;
-	font-size: 28rpx;
-	border: 1rpx solid #e04b28;
-	border-radius: 60rpx;
-	color: #e04b28;
-}
+	.mescroll-empty .empty-btn {
+		display: inline-block;
+		margin-top: 40rpx;
+		min-width: 200rpx;
+		padding: 18rpx;
+		font-size: 28rpx;
+		border: 1rpx solid #e04b28;
+		border-radius: 60rpx;
+		color: #e04b28;
+	}
 
-.mescroll-empty .empty-btn:active {
-	opacity: 0.75;
-}
+	.mescroll-empty .empty-btn:active {
+		opacity: 0.75;
+	}
 </style>

uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.js

@@ -30,10 +30,11 @@ export default function MeScroll(options, isScrollBody) {
 			}
 		}
 		// 自动触发上拉加载
-		if(!me.isUpAutoLoad){ // 部分小程序(头条小程序)emit是异步, 会导致isUpAutoLoad判断有误, 先延时确保先执行down的callback,再执行up的callback
-			setTimeout(function(){
+		if (!me
+			.isUpAutoLoad) { // 部分小程序(头条小程序)emit是异步, 会导致isUpAutoLoad判断有误, 先延时确保先执行down的callback,再执行up的callback
+			setTimeout(function() {
 				me.optUp.use && me.optUp.auto && !me.isUpAutoLoad && me.triggerUpScroll();
-			},100)
+			}, 100)
 		}
 	}, 30); // 需让me.optDown.inited和me.optUp.inited先执行
 }
@@ -121,7 +122,7 @@ MeScroll.prototype.extendUpScroll = function(optUp) {
 		empty: {
 			use: true, // 是否显示空布局
 			icon: null, // 图标路径
-			tip: '~ 暂无相关数据 ~', // 提示
+			tip: '~ 没有更多记录啦！ ~', // 提示
 			btnText: '', // 按钮
 			btnClick: null, // 点击按钮的回调
 			onShow: null, // 是否显示的回调
@@ -153,7 +154,7 @@ MeScroll.extend = function(userOption, defaultOption) {
 
 /* 简单判断是否配置了颜色 (非透明,非白色) */
 MeScroll.prototype.hasColor = function(color) {
-	if(!color) return false;
+	if (!color) return false;
 	let c = color.toLowerCase();
 	return c != "#fff" && c != "#ffffff" && c != "transparent" && c != "white"
 }
@@ -163,16 +164,17 @@ MeScroll.prototype.initDownScroll = function() {
 	let me = this;
 	// 配置参数
 	me.optDown = me.options.down || {};
-	if(!me.optDown.textColor && me.hasColor(me.optDown.bgColor)) me.optDown.textColor = "#fff"; // 当bgColor有值且textColor未设置,则textColor默认白色
+	if (!me.optDown.textColor && me.hasColor(me.optDown.bgColor)) me.optDown.textColor =
+	"#fff"; // 当bgColor有值且textColor未设置,则textColor默认白色
 	me.extendDownScroll(me.optDown);
-	
+
 	// 如果是mescroll-body且配置了native,则禁止自定义的下拉刷新
-	if(me.isScrollBody && me.optDown.native){
+	if (me.isScrollBody && me.optDown.native) {
 		me.optDown.use = false
-	}else{
+	} else {
 		me.optDown.native = false // 仅mescroll-body支持,mescroll-uni不支持
 	}
-	
+
 	me.downHight = 0; // 下拉区域的高度
 
 	// 在页面中加入下拉布局
@@ -211,16 +213,17 @@ MeScroll.prototype.touchmoveEvent = function(e) {
 	// scroll-view在滚动时不会触发touchmove,当触顶/底/左/右时,才会触发touchmove
 	// scroll-view滚动到顶部时,scrollTop不一定为0,也有可能大于0; 在iOS的APP中scrollTop可能为负数,不一定和startTop相等
 	if (moveY > 0 && (
-			(me.isScrollBody && scrollTop <= 0)
-			||
-			(!me.isScrollBody && (scrollTop <= 0 || (scrollTop <= me.optDown.startTop && scrollTop === me.startTop)) )
+			(me.isScrollBody && scrollTop <= 0) ||
+			(!me.isScrollBody && (scrollTop <= 0 || (scrollTop <= me.optDown.startTop && scrollTop === me
+				.startTop)))
 		)) {
 		// 可下拉的条件
-		if (!me.inTouchend && !me.isDownScrolling && !me.optDown.isLock && (!me.isUpScrolling || (me.isUpScrolling &&
+		if (!me.inTouchend && !me.isDownScrolling && !me.optDown.isLock && (!me.isUpScrolling || (me
+				.isUpScrolling &&
 				me.optUp.isBoth))) {
 
 			// 下拉的初始角度是否在配置的范围内
-			if(!me.startAngle) me.startAngle = me.getAngle(me.lastPoint, curPoint); // 两点之间的角度,区间 [0,90]
+			if (!me.startAngle) me.startAngle = me.getAngle(me.lastPoint, curPoint); // 两点之间的角度,区间 [0,90]
 			if (me.startAngle < me.optDown.minAngle) return; // 如果小于配置的角度,则不往下执行下拉刷新
 
 			// 如果手指的位置超过配置的距离,则提前结束下拉,避免Webview嵌套导致touchend无法触发
@@ -229,7 +232,7 @@ MeScroll.prototype.touchmoveEvent = function(e) {
 				me.touchendEvent(); // 提前触发touchend
 				return;
 			}
-			
+
 			me.preventDefault(e); // 阻止默认事件
 
 			let diff = curPoint.y - me.lastPoint.y; // 和上次比,移动的距离 (大于0向下,小于0向上)
@@ -257,7 +260,7 @@ MeScroll.prototype.touchmoveEvent = function(e) {
 					me.downHight += diff; // 向上收回高度,则向上滑多少收多少高度
 				}
 			}
-			
+
 			me.downHight = Math.round(me.downHight) // 取整
 			let rate = me.downHight / me.optDown.offset; // 下拉区域当前高度与指定距离的比值
 			me.optDown.onMoving && me.optDown.onMoving(me, rate, me.downHight); // 下拉过程中的回调,一直在执行
@@ -350,7 +353,7 @@ MeScroll.prototype.showDownScroll = function() {
 	if (this.optDown.native) {
 		uni.startPullDownRefresh(); // 系统自带的下拉刷新
 		this.showDownLoadingCall(0); // 仍触发showLoading,因为上拉加载用到
-	} else{
+	} else {
 		this.downHight = this.optDown.offset; // 更新下拉区域高度
 		this.showDownLoadingCall(this.downHight); // 下拉刷新中...
 	}
@@ -382,16 +385,16 @@ MeScroll.prototype.endDownScroll = function() {
 		me.downHight = 0;
 		me.isDownScrolling = false;
 		me.endDownScrollCall(me);
-		if(!me.isScrollBody){
+		if (!me.isScrollBody) {
 			me.setScrollHeight(0) // scroll-view重置滚动区域,使数据不满屏时仍可检查触发翻页
-			me.scrollTo(0,0) // scroll-view需重置滚动条到顶部,避免startTop大于0时,对下拉刷新的影响
+			me.scrollTo(0, 0) // scroll-view需重置滚动条到顶部,避免startTop大于0时,对下拉刷新的影响
 		}
 	}
 	// 结束下拉刷新时的回调
 	let delay = 0;
 	if (me.optDown.beforeEndDownScroll) {
 		delay = me.optDown.beforeEndDownScroll(me); // 结束下拉刷新的延时,单位ms
-		if(me.isDownEndSuccess == null) delay = 0; // 没有执行加载中,则不延时
+		if (me.isDownEndSuccess == null) delay = 0; // 没有执行加载中,则不延时
 	}
 	if (typeof delay === 'number' && delay > 0) {
 		setTimeout(endScroll, delay);
@@ -421,8 +424,11 @@ MeScroll.prototype.lockUpScroll = function(isLock) {
 MeScroll.prototype.initUpScroll = function() {
 	let me = this;
 	// 配置参数
-	me.optUp = me.options.up || {use: false}
-	if(!me.optUp.textColor && me.hasColor(me.optUp.bgColor)) me.optUp.textColor = "#fff"; // 当bgColor有值且textColor未设置,则textColor默认白色
+	me.optUp = me.options.up || {
+		use: false
+	}
+	if (!me.optUp.textColor && me.hasColor(me.optUp.bgColor)) me.optUp.textColor =
+	"#fff"; // 当bgColor有值且textColor未设置,则textColor默认白色
 	me.extendUpScroll(me.optUp);
 
 	if (me.optUp.use === false) return; // 配置不使用上拉加载时,则不初始化上拉布局
@@ -449,7 +455,7 @@ MeScroll.prototype.onReachBottom = function() {
 /*列表滚动事件 (仅mescroll-body生效)*/
 MeScroll.prototype.onPageScroll = function(e) {
 	if (!this.isScrollBody) return;
-	
+
 	// 更新滚动条的位置 (主要用于判断下拉刷新时,滚动条是否在顶部)
 	this.setScrollTop(e.scrollTop);
 
@@ -674,8 +680,8 @@ MeScroll.prototype.endErr = function(errDistance) {
 		this.optUp.page.num--;
 		this.endUpScroll(false);
 		// 如果是mescroll-body,则需往回滚一定距离
-		if(this.isScrollBody && errDistance !== 0){ // 不处理0
-			if(!errDistance) errDistance = this.optUp.errDistance; // 不传,则取默认
+		if (this.isScrollBody && errDistance !== 0) { // 不处理0
+			if (!errDistance) errDistance = this.optUp.errDistance; // 不传,则取默认
 			this.scrollTo(this.getScrollTop() - errDistance, 0) // 往上回滚的距离
 		}
 	}
@@ -796,4 +802,4 @@ MeScroll.prototype.preventDefault = function(e) {
 	// app的bounce只能通过配置pages.json的style.app-plus.bounce为"none"来禁止, 或使用renderjs禁止
 	// cancelable:是否可以被禁用; defaultPrevented:是否已经被禁用
 	if (e && e.cancelable && !e.defaultPrevented) e.preventDefault()
-}
+}