From f2aa6f75d70cc7df54bfd0cf33af46fe96401856 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 12 十月 2023 15:33:04 +0800
Subject: [PATCH] 放空逻辑修改 提煤单状态显示字段修改

---
 pages/driver-page/drvier-my/drvier-my.vue |   62 ++++++++++++++++++++++++++----
 1 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 8420aa9..f369ae6 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -12,7 +12,6 @@
 					<view class="edit-button"><u-button type="primary"
 							@click="editBtnClick"
 							shape="circle"
-							:disabled="userInfo.isRegister!==2"
 							plain>缂栬緫涓汉璧勬枡</u-button></view>
 				</view>
 			</view>
@@ -125,18 +124,36 @@
 			</view>
 		</view>
 		<view class="loginout">
-			<view class="loginout-main"><u-button text="閲嶇疆瀵嗙爜"
+			<!-- <view class="loginout-main"><u-button text="閲嶇疆瀵嗙爜"
 					type="primary"
 					@click="initPwd"
 					shape="circle"
-					plain></u-button></view>
+					plain></u-button></view> -->
 			<view class="loginout-main"><u-button text="閫�鍑虹櫥褰�"
 					type="primary"
 					@click="logout"
 					shape="circle"
 					plain></u-button></view>
 		</view>
-
+		<!-- 寮曞椤� -->
+		<view class="noob-tour"
+			style="margin-top: 80rpx;">
+			<combined-title title="鎿嶄綔鎸囧紩"></combined-title>
+			<u-cell-group>
+				<u-cell title="鏂版墜鎸囧紩"
+					name='1'
+					:clickable="true"
+					@click="noobTour">
+					<u-badge type="primary"
+						value="01"
+						slot='icon'></u-badge>
+					<u-icon slot="value"
+						name="arrow-right"
+						size="30"
+						color="#b8b8b8"></u-icon>
+				</u-cell>
+			</u-cell-group>
+		</view>
 		<!-- 鍥剧墖棰勮寮瑰嚭妗� -->
 		<view class="previewImage-container">
 			<u-popup :show="previewImageShow"
@@ -148,7 +165,12 @@
 					height="400px"></u--image>
 			</u-popup>
 		</view>
-
+		<!-- 寮曞鍥剧墖寮瑰嚭 -->
+		<view class="previewImage-container">
+			<previewImage ref="previewImage"
+				:imgs="driverTourImgList"
+				:saveBtn='false'></previewImage>
+		</view>
 		<!-- 淇敼寮瑰嚭妗� -->
 		<view class="editDriverPopup-container">
 			<u-popup :show="editDriverPopupShow"
@@ -279,8 +301,16 @@
 <script>
 	import { redirectLogin } from '@/utils/status';
 	import { BaseUrl } from '@/api/publicInterface.js';
-	import { mapMutations } from 'vuex';
+	import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
+	import { mapMutations, mapState } from 'vuex';
 	export default {
+		components: { previewImage },
+		computed: {
+			...mapState(['driverTourImgList']),
+			roleType() {
+				return uni.getStorageSync('roleType');
+			},
+		},
 		data() {
 			return {
 				// 鑾峰彇鐨勫徃鏈鸿鎯�
@@ -341,8 +371,19 @@
 					weight: {
 						type: 'number',
 						required: true,
-						message: '璇峰~鍐欎綋閲�',
-						trigger: ['blur', 'change']
+						trigger: ['blur', 'change'],
+						transform(value) {
+							return Number(value);
+						},
+						validator: (rule, value, callback) => {
+							if (!value) {
+								callback(new Error('璇峰~鍐欎綋閲�'))
+							} else if (value > 200) {
+								callback(new Error('璇峰~鍐欏悎鐞嗕綋閲�'))
+							} else {
+								callback()
+							}
+						}
 					},
 					carNo: [{
 							type: 'string',
@@ -606,7 +647,10 @@
 				uni.navigateTo({
 					url: '/pages/customer-page/customer-my/faYunstatistics/faYunstatistics'
 				});
-			}
+			},
+			noobTour() {
+				this.$refs.previewImage.open('https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj1.png')
+			},
 		}
 	};
 </script>

--
Gitblit v1.9.1