zhongtianhaoyuan 2 年之前
父節點
當前提交
7e0f02ea0c
共有 4 個文件被更改,包括 33 次插入18 次删除
  1. 2 2
      config/index.js
  2. 17 15
      pages/mine/fleet/carCaptainAuthentication.vue
  3. 1 1
      pages/mine/fleet/fleetManage.vue
  4. 13 0
      pages/order/confirmUnloading.vue

+ 2 - 2
config/index.js

@@ -1,8 +1,8 @@
 const dev = {
-	baseUrlNew: 'https://api.changyuntong56.com',
+	// baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.1.119:8999',
 	h5Appid: 'wxb66b599f7f61b46f',

+ 17 - 15
pages/mine/fleet/carCaptainAuthentication.vue

@@ -108,16 +108,14 @@
 				<u-picker :show="isShowBank" :columns="bankType[index]" :closeOnClickOverlay='true' @close='zhBankClose'
 					@cancel='zhBankClose' @confirm='confirmBank'></u-picker>
 				</u-picker>
-				
-				
 			</view>
 			<view class="content3 flex s-row">
-				<view class="title">道路运输证</view>
+				<view class="title">道路运输许可证</view>
 				<view @click="uploadImg(4)" class="picture picture8" v-if="!dataDetails.operationCertificate">
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
-					<view class="text">上传道路运输证</view>
+					<view class="text">上传道路运输许可证</view>
 				</view>
-				<view v-if="dataDetails.operationCertificate" @click.stop="uploadImg(8)" class="preview-card-img picture">
+				<view v-if="dataDetails.operationCertificate" @click.stop="uploadImg(4)" class="preview-card-img picture">
 					<view @click.stop="delCard(4)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
@@ -125,13 +123,13 @@
 					<image class="" :src="dataDetails.operationCertificate" mode="aspectFit"></image>
 				</view>
 				<view class="flex row">
-					<view class="left-text">道路运输证号</view>
-					<u--input maxlength='12' placeholder="输入道路运输证号" inputAlign='right' border="none"
+					<view class="left-text">许可证编号</view>
+					<u--input maxlength='12' placeholder="输入许可证编号" inputAlign='right' border="none"
 						v-model="dataDetails.operationCertificateNumber">
 					</u--input>
 				</view>
 				<view class="flex row flex-space-between">
-					<view class="left-text">道路运输证有效期</view>
+					<view class="left-text">许可证有效期</view>
 					<view class="" @click="selectValidityPeriod(4)">
 						<view :style="{'color':dataDetails.operationCertificateValidityDate?'#000':'rgb(192, 196, 204)'}">
 							{{dataDetails.operationCertificateValidityDate?dataDetails.operationCertificateValidityDate:'选择有效期'}}
@@ -389,13 +387,13 @@
 					}).then(res => {
 						if (res.code == 200) {
 							this.dataDetails = res.data
-							this.dataDetails.hyDriverPayeeInfoList = [{
-								payeeAddressUrl: '',
-								bankCard: '',
-								bankDeposit: '',
-								bankDepositBranch: '',
-								payeeName: '',
-							}]
+							// this.dataDetails.hyDriverPayeeInfoList = [{
+							// 	payeeAddressUrl: '',
+							// 	bankCard: '',
+							// 	bankDeposit: '',
+							// 	bankDepositBranch: '',
+							// 	payeeName: '',
+							// }]
 							// this.dataDetails.driverName = res.data.driverName
 							// this.dataDetails.driverSex = res.data.driverSex
 							// this.dataDetails.driverCall = res.data.driverCall
@@ -556,6 +554,10 @@
 												uni.$u.toast(res.message);
 											});
 											break;
+											case 4:
+											_this.dataDetails.cardBackAddressUrl = result
+											
+											break;
 									}
 								}
 							)

+ 1 - 1
pages/mine/fleet/fleetManage.vue

@@ -10,7 +10,7 @@
 				<u-button type="primary" text="去认证" @click="operation"></u-button>
 			</view>
 			<view class="btn_item">
-				<u-button type="primary" text="编辑" @click="leave"></u-button>
+				<u-button type="primary" text="编辑" @click="operation"></u-button>
 			</view>
 			
 		</view>

+ 13 - 0
pages/order/confirmUnloading.vue

@@ -43,6 +43,12 @@
 				<view class="row-left-text">车牌号</view>
 				<view class="row-right-text">{{detailData.carNumber}}</view>
 			</view>
+			<view class='row-between'>
+				<view class="row-left-text">卸车净重(吨)</view>
+				<view class="row-right-text">
+				<u--input placeholder="请输入卸车净重" border="none" type="number" v-model="detailData.unloadingWeight" inputAlign='right'
+					clearable></u--input></view>
+			</view>
 			<!-- 	<view class='row-between'>
 				<view class="row-left-text">卸车日期</view>
 				<view class="row-right-text">{{detailData.carrierInfo.unloadingDate}}</view>
@@ -446,6 +452,13 @@
 				if (type == 1) {
 					this.alertContent = '确定暂存卸车信息?'
 				} else {
+					if (!this.detailData.unloadingWeight) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请输入卸车净重!",
+						})
+						return
+					}
 					if (this.fileList1.length == 0) {
 						this.$refs.uToast.show({
 							type: 'error',