From 5c2decc75ac02ba4409375efc4f793b02c505296 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 23 十月 2023 18:53:10 +0800
Subject: [PATCH] 司机注册增加图片字段 司机首页样式更改

---
 pages/public-page/forward/forward.vue                                                   |    8 +
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   38 ++++----
 pages/register/register.vue                                                             |   68 +++++++++++++++-
 pages/loadUnload-page/selectTarget/selectTarget.vue                                     |   62 ++++++++++++++-
 pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue                           |    5 
 pages/driver-page/driver-index/driver-index.vue                                         |   35 +++++---
 6 files changed, 168 insertions(+), 48 deletions(-)

diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index 0877f51..8f6ff98 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -162,7 +162,7 @@
 				</view>
 			</view>
 		</view>
-		<view v-show="mergeStateShow">
+		<!-- <view v-show="mergeStateShow">
 			<view class="mergeState">
 				<view class="merge-wrap">
 					<view>鏄惁纭鍚堝苟</view>
@@ -181,7 +181,7 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="three">
 			<!-- 鏀剧┖ -->
 			<u-button type="primary"
@@ -194,7 +194,7 @@
 			<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
 			<u-button type="primary"
 				text="纭畾绉伴噸"
-				:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState||globalWarning"
+				:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
 				:loading="isConfirmWeighLoading"
 				loadingText="纭"
 				@click="confirmWeigh"
@@ -385,7 +385,7 @@
 					]
 				},
 				mergeState: true, //鍚堝崱鐘舵�� 
-				mergeStateShow: false, //鍚堝崱寮圭獥
+				// mergeStateShow: false, //鍚堝崱寮圭獥
 				checkboxValue1: [],
 				isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸
 				refreshLoading: false,
@@ -426,7 +426,7 @@
 								.temporaryWeighObj
 								.clean < 0;
 							this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
-							this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
+							// this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
 						}
 					} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
 						.orderType == '杞叆') {
@@ -451,7 +451,7 @@
 								.temporaryWeighObj
 								.clean < 0;
 							this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
-							this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
+							// this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
 						}
 					}
 				}
@@ -699,19 +699,19 @@
 			skinAbnormal() {
 				this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId, tmId: this.weighData.tmId }, 'params')
 			},
-			mergeStateChange(e) {
-				if (e.length !== 0) {
-					this.weighData.isMerge = 1
-					this.MergeState = true
-					this.isweigh = false
-					this.orderSurplusLess = false
-				} else {
-					this.weighData.isMerge = 0
-					this.MergeState = false
-					this.isweigh = true
-					this.orderSurplusLess = true
-				}
-			},
+			// mergeStateChange(e) {
+			// 	if (e.length !== 0) {
+			// 		this.weighData.isMerge = 1
+			// 		this.MergeState = true
+			// 		this.isweigh = false
+			// 		this.orderSurplusLess = false
+			// 	} else {
+			// 		this.weighData.isMerge = 0
+			// 		this.MergeState = false
+			// 		this.isweigh = true
+			// 		this.orderSurplusLess = true
+			// 	}
+			// },
 			confirmWeighConfirm() {
 				this.changeconfirmWeighVisiable(false)
 				this.isConfirmWeighLoading = false
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 88116c4..f60a2e6 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -62,7 +62,9 @@
 						<view class="fourth-line"
 							@click="qiangDanBtn(item)"
 							v-if="item.carNum - item.taskNum !== 0">
-							<view class="button-img">绔嬪嵆鎺ュ崟</view>
+							<!-- <view class="button-img">绔嬪嵆鎺ュ崟</view> -->
+							<u-button type="primary"
+								class="button-img">绔嬪嵆鎺ュ崟</u-button>
 						</view>
 					</view>
 				</view>
@@ -366,7 +368,7 @@
 					.then(() => {
 						setTimeout(() => {
 							this.qiangDanList();
-						}, 1000);
+						}, 1500);
 					}).catch(e => {
 						uni.hideLoading()
 					})
@@ -491,7 +493,6 @@
 		.button-img {
 			width: vww(122);
 			height: vww(41);
-
 			background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
 			background-size: cover;
 			font-size: 28rpx;
@@ -501,6 +502,20 @@
 			line-height: vww(40);
 
 		}
+	}
+
+	/deep/.u-button {
+		width: 100%;
+		height: 28px !important;
+		line-height: 40px;
+		padding: 0 12px;
+		font-size: 28rpx;
+		font-weight: 300;
+		color: #ffffff;
+		background: #497bfb !important;
+		letter-spacing: 4rpx;
+		border-radius: 37rpx 37rpx 37rpx 37rpx !important;
+		box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
 	}
 
 	.exceedHide {
@@ -714,27 +729,17 @@
 						}
 					}
 
+					// 寰呴绾�
 					.fourth-line {
 						width: 30%;
 						height: vww(68);
 						margin-left: vww(15);
+						margin-top: vww(5);
 						display: flex;
 						justify-content: flex-end;
 						position: relative;
 						left: vww(203);
 						bottom: vww(3);
-
-						.button-img {
-							width: 100%;
-							height: 100%;
-							background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
-							background-size: cover;
-							font-size: 28rpx;
-							font-weight: 300;
-							color: #ffffff;
-							text-align: center;
-							line-height: vww(33);
-						}
 					}
 				}
 			}
diff --git a/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue b/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
index ad3cf33..18a1a1f 100644
--- a/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
+++ b/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
@@ -89,6 +89,7 @@
 				coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
 					'杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓'
 				], // 鐘舵��
+				orderType: null
 			}
 		},
 		computed: {
@@ -97,7 +98,7 @@
 			}
 		},
 		onLoad(params) {
-			this.name = params.coalName ? params.coalName : ''
+			this.orderType = params.orderType || ''
 			this.init()
 		},
 		methods: {
@@ -109,7 +110,7 @@
 				uni.showLoading({
 					title: "鍔犺浇涓�"
 				})
-				this.$reqGet('getAccordingCoalNameAll', { coalName: this.name }).then(res => {
+				this.$reqGet('getAccordingCoalNameAll', { orderType: this.orderType }).then(res => {
 					uni.hideLoading()
 					if (res.code === 0) {
 						const errorStatusArr = [0, 1, 2, 3, 6, 11, 12, 13];
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 9b44bae..f21f595 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -23,10 +23,26 @@
 				<u-cell-group>
 					<u-cell :title="dataForm.secondClass"
 						value="璇烽�夋嫨"
-						@click="secondClassSelect">
+						@click="secondClassSelect"
+						:disabled="!dataForm.firstClass">
 						<u-icon name="arrow-right"
 							slot="right-icon"
 							size="30"></u-icon></u-cell>
+				</u-cell-group>
+			</u-form-item>
+			<u-form-item label="纾呭崟"
+				prop="orderType"
+				:borderBottom="false">
+				<u-cell-group>
+					<u-cell :title="dataForm.orderType"
+						:value="isOrderType"
+						@click="orderTypeSelect">
+						<view slot="right-icon"
+							@click.stop="cleanOrderType">
+							<u-icon :name="!dataForm.orderType?'arrow-right':'close-circle'"
+								size="30"></u-icon>
+						</view>
+					</u-cell>
 				</u-cell-group>
 			</u-form-item>
 		</u--form>
@@ -64,6 +80,13 @@
 			:closeOnClickOverlay='true'
 			@close='secondClassClose'
 			@select="secondClassSelectClick"></u-action-sheet>
+		<!--纾呭崟绫诲瀷 -->
+		<u-action-sheet :actions="orderTypeList"
+			:show="orderTypeShow"
+			cancelText='鍙栨秷'
+			:closeOnClickOverlay='true'
+			@close='orderTypeClose'
+			@select="orderTypeSelectClick"></u-action-sheet>
 	</view>
 </template>
 
@@ -74,6 +97,7 @@
 				dataForm: {
 					firstClass: "",
 					secondClass: "",
+					orderType: ''
 				},
 				index: '',
 				// 鐓ゅ満鎿嶄綔鑿滃崟
@@ -86,7 +110,20 @@
 				checkedCoal: [],
 				userInfo: {},
 				filedId: "",
-				selectedCoal: []
+				selectedCoal: [],
+				orderTypeShow: false,
+				orderTypeList: [{
+						name: '澶栭攢',
+						id: Math.floor(Math.random() * 100) + 1,
+					},
+					{
+						name: '澶栬喘',
+						id: Math.floor(Math.random() * 100) + 1,
+					}
+				],
+				isOrderType: '璇烽�夋嫨', //纾呮埧绫诲瀷鏄惁閫夋嫨浜� 閫夋嫨浜嗘竻绌�
+				cleanIconClick: true, //淇敼鐐瑰嚮娓呯┖纾呮埧閫夋嫨浼氬嚭鐜�
+
 			};
 		},
 		methods: {
@@ -146,6 +183,22 @@
 					}
 				})
 			},
+			orderTypeSelect() {
+				this.orderTypeShow = true
+			},
+			orderTypeClose() {
+				this.orderTypeShow = false
+			},
+			orderTypeSelectClick(val) {
+				this.orderTypeShow = false
+				this.dataForm.orderType = val.name
+				this.isOrderType = ''
+			},
+			cleanOrderType() {
+				this.dataForm.orderType = null
+				this.isOrderType = '璇烽�夋嫨'
+				this.orderTypeShow = false
+			},
 			checkboxChange(e) {
 				this.selectedCoal = e
 			},
@@ -154,11 +207,10 @@
 				if (this.selectedCoal.length === 0) return this.$u.toast('璇烽�夋嫨鐓ょ')
 				this.$reqPost('updateUser', Object.assign(this.userInfo, {
 					responsibilityCoal: this.selectedCoal.join(),
-					filedId: this
-						.filedId
+					filedId: this.filedId
 				}), 'json').then(res => {
 					uni.navigateTo({
-						url: `/pages/loadUnload-page/loadUnload-detail/loadUnload-detail`
+						url: `/pages/loadUnload-page/loadUnload-detail/loadUnload-detail?orderType=${this.dataForm.orderType}`
 					})
 				})
 			}
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index 33b3939..76265d2 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -388,10 +388,12 @@
 				}, 0);
 				console.log(total, '鎻愮叅鍗曚竴鍏辩殑鏁版嵁');
 				if (this.roleType == 1) {
-					if (Number(this.cars2) >= total) {
+					if (Number(this.cars2) > total) {
 						this.carNumSurplus1 = Number(this.cars2) - total;
 						this.whetherClick = false;
 						this.whetherClick1 = false;
+					} else if (Number(this.cars2) == total) {
+						this.whetherClick = true;
 					} else {
 						this.carNumSurplus1 = 0;
 						this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�');
@@ -400,10 +402,12 @@
 					}
 				}
 				if (this.roleType == 2) {
-					if (Number(this.carNum) >= total) {
+					if (Number(this.carNum) > total) {
 						this.carNumSurplusHuodai = Number(this.carNum) - total;
 						this.whetherClick = false;
 						this.whetherClick1 = false;
+					} else if (Number(this.carNum) == total) {
+						this.whetherClick = true;
 					} else {
 						this.carNumSurplusHuodai = 0;
 						this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�');
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 5a1fd4e..63160fd 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -100,8 +100,6 @@
 						width="250"
 						height="150"
 						:previewFullImage="true">
-						<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
-						mode="widthFix" style="width: 250px;height: 150px;"></image> -->
 					</u-upload>
 				</u-form-item>
 				<u-form-item prop="drivingImg"
@@ -121,8 +119,44 @@
 						width="250"
 						height="150"
 						:previewFullImage="true">
-						<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
-						mode="widthFix" style="width: 250px;height: 150px;"></image> -->
+					</u-upload>
+				</u-form-item>
+				<u-form-item prop="roadTransportImg"
+					label="閬撹矾杩愯緭璇�"
+					labelWidth="24%"
+					borderBottom
+					v-if="radiovalue1 == '鍙告満'"
+					required
+					@click="beforeRead">
+					<u-upload :fileList="fileList3"
+						deletable
+						@afterRead="afterRead"
+						@delete="deletePic"
+						name="3"
+						multiple
+						:maxCount="1"
+						width="250"
+						height="150"
+						:previewFullImage="true">
+					</u-upload>
+				</u-form-item>
+				<u-form-item prop="tradeQualificationImg"
+					label="浠庝笟璧勬牸璇�"
+					labelWidth="24%"
+					borderBottom
+					v-if="radiovalue1 == '鍙告満'"
+					required
+					@click="beforeRead">
+					<u-upload :fileList="fileList4"
+						deletable
+						@afterRead="afterRead"
+						@delete="deletePic"
+						name="4"
+						multiple
+						:maxCount="1"
+						width="250"
+						height="150"
+						:previewFullImage="true">
 					</u-upload>
 				</u-form-item>
 				<u-form-item label="鎺ㄨ崘浜鸿处鍙�"
@@ -205,10 +239,14 @@
 					carImg: '',
 					drivingImg: '',
 					tuiJianMa: '',
-					confirmPassword: ''
+					confirmPassword: '',
+					tradeQualificationImg: '',
+					roadTransportImg: ''
 				},
 				fileList1: [],
 				fileList2: [],
+				fileList3: [],
+				fileList4: [],
 				rules: {
 					name: {
 						type: 'string',
@@ -296,6 +334,18 @@
 						type: 'string',
 						required: true,
 						message: '璇蜂笂浼犺椹惰瘉鐓х墖',
+						trigger: ['blur', 'change']
+					},
+					roadTransportImg: {
+						type: 'string',
+						required: true,
+						message: '璇蜂笂浼犻亾璺繍杈撹瘉鐓х墖',
+						trigger: ['blur', 'change']
+					},
+					tradeQualificationImg: {
+						type: 'string',
+						required: true,
+						message: '璇蜂笂浼犱粠涓氳祫鏍艰瘉鐓х墖',
 						trigger: ['blur', 'change']
 					}
 				},
@@ -453,6 +503,14 @@
 							} else if (num == 2) {
 								this.registerFormModel.drivingImg = JSON.parse(res.data).data.url;
 								resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+							} else if (num == 3) {
+								this.registerFormModel.roadTransportImg = JSON.parse(res.data).data
+									.url;
+								resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+							} else if (num == 4) {
+								this.registerFormModel.tradeQualificationImg = JSON.parse(res.data)
+									.data.url;
+								resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
 							}
 						}
 					});

--
Gitblit v1.9.1