gjy преди 2 години
родител
ревизия
3b46a42a83
променени са 4 файла, в които са добавени 15 реда и са изтрити 8 реда
  1. 4 1
      pages/mine/cargoowner/editpersonalinformation.vue
  2. 3 3
      pages/mine/index.vue
  3. 4 1
      pages/order/index.vue
  4. 4 3
      pages/order/orderDetails.vue

+ 4 - 1
pages/mine/cargoowner/editpersonalinformation.vue

@@ -413,9 +413,12 @@
 					_this.$request.baseRequest('post', '/cargoOwnerInfo/api/editCargoOwner', _this.dataDetails).then(res => {
 							this.submitstatus=false
 							// console.log(res)
-							uni.$u.route('/pages/mine/cargoowner/cargoowner')
+							// uni.$u.route('/pages/mine/cargoowner/cargoowner')
 							uni.hideLoading()
 							uni.$u.toast('提交成功')
+							uni.navigateBack({
+								delta: 1
+							})
 						})
 						.catch(res => {
 							console.log(res)

+ 3 - 3
pages/mine/index.vue

@@ -17,8 +17,8 @@
 						<view class='flex items-center'>
 							<view v-if='userName' class='username'>{{userName}} {{cargoCall}}</view>
 							<view v-else class='username'>{{userInfo.userName}} </view>
-							<view v-if='status' class='currectstatus'>已认证</view>
-							<view 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>
 						<view class='phone'>{{starUserphone}}</view>
 					</view>
@@ -174,7 +174,7 @@
 						if (res.data) {
 							this.CargoOwner = res.data
 							if (res.data.authenticationStatus == '审核中' || res.data.authenticationStatus == '已驳回' || res
-								.data.authenticationStatus == '未认证') {
+								.data.authenticationStatus == '未认证'|| res.data.authenticationStatus == '已过期') {
 									if(res.data.authenticationStatus == '未认证'){
 										this.status1 = false
 									}else{

+ 4 - 1
pages/order/index.vue

@@ -50,7 +50,7 @@
 					</view>
 				</view>
 			</u-transition>
-			<view class="modal-black" v-show="showMenu" @click="closeMenu"></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">
@@ -420,6 +420,9 @@
 			closepopup(){
 				this.show=false
 			},
+			moveHandle(){
+				// console.log(1111)
+			},
 			open() {
 			          // console.log('open');
 			},

+ 4 - 3
pages/order/orderDetails.vue

@@ -186,7 +186,7 @@
 						v-for="(item,index) in zcImgList" @click='ylImg(zcImgList)'></u--image>
 				</view>
 			</view>
-			<view v-if='dataObj.orderStatus=="待确认卸车"||dataObj.orderStatus=="待平台确认卸车"||dataObj.orderStatus=="货主驳回装车信息"||dataObj.orderStatus=="平台驳回装车信息"||dataObj.orderStatus=="已完结"'>
+			<view v-if='dataObj.orderStatus=="待货主确认卸车"||dataObj.orderStatus=="待平台确认卸车"||dataObj.orderStatus=="货主驳回装车信息"||dataObj.orderStatus=="平台驳回装车信息"||dataObj.orderStatus=="已完结"'>
 				<view class='row-between'>
 					<view class="row-left-text gray">合计应付运费</view>
 					<view class="row-right-text">
@@ -205,9 +205,9 @@
 					</view>
 				</view>
 				<view class='row-between'>
-					<view class=" gray">回单照片</view>
+					<view class="row-left-text gray">回单照片</view>
 					<view class="flex">
-						<u--image @click='ylImg(hdImgList)' :showLoading="true" :src='item' width="40px" height="40px" v-for="(item,index) in hdPhoneList"></u--image>
+						<u--image @click='ylImg(hdImgList)' :showLoading="true" :src='item' width="40px" height="40px" v-for="(item,index) in hdImgList"></u--image>
 					</view>
 				</view>
 			</view>
@@ -884,6 +884,7 @@
 							if (res.data.hyCarrierInfo.receiptImg) {
 								this.hdImgList=[]
 								let _hdList = res.data.hyCarrierInfo.receiptImg.split(',')
+								console.log(_hdList)
 								for (let i = 0; i < _hdList.length; i++) {
 									if (_hdList[i]) this.hdImgList.push(_hdList[i])
 								}