From ff97e4b3acbfbc626db1856aeada0c441bf4b257 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 03 六月 2025 21:09:45 +0800
Subject: [PATCH] 12

---
 pages/basics/order.vue |   24 ++++++++++++++----------
 pages/index/index.vue  |   12 ++++++------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/pages/basics/order.vue b/pages/basics/order.vue
index 1da5f29..26361c5 100644
--- a/pages/basics/order.vue
+++ b/pages/basics/order.vue
@@ -26,7 +26,7 @@
 				</view>
 				<view class="square-content">
 					<view class="content-input">
-						<input v-model="order" type="text" placeholder="鎵爜 / 杈撳叆" @input="findOrder()" :focus="focus"
+						<input v-model="order" type="text" disabled="true"
 							placeholder-style="line-height:  85rpx;">
 						<uni-icons type="closeempty" size="20" color="#dadada" @click="removeOrder()"></uni-icons>
 					</view>
@@ -446,14 +446,7 @@
 			},
 			findTiaoMa() {
 				let that = this
-				if (!that.orderNo) {
-					uni.showToast({
-						title: '璇锋壂鎻忓崟鎹彿',
-						icon: "none",
-						position: 'top'
-					});
-					return;
-				}
+				
 				uni.request({
 					url: that.commonUrl + '/mobile/mat/search/auth',
 					data: {
@@ -467,7 +460,18 @@
 						console.log(result)
 						let res = result.data
 						if (res.code === 200 && res.data) {
-							that.checkMat(res.data)
+							if (that.orderNo == res.data.orderNo){
+								that.findOrder()
+								that.checkMat(res.data)
+							}else if (that.orderNo){
+								if (that.orderNo != res.data.orderNo){
+									uni.showToast({
+										title: '涓嶅悓鍗曟嵁涓嶈兘娣峰悎缁勬墭',
+										icon: "none",
+										position: 'top'
+									});
+								}
+							}
 							//this.tiaomas.unshift(that.tiaoma)
 						} else if (res.code == 403) {
 							uni.showToast({
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3f964d1..d88d2e3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -35,12 +35,12 @@
 					// 	color: 'blue',
 					// 	cuIcon: 'copy'
 					// },
-					// {
-					// 	title: '缁勬墭鍏ュ簱',
-					// 	name: 'pakin',
-					// 	color: 'blue',
-					// 	cuIcon: 'copy'
-					// },
+					{
+						title: '缁勬墭鍏ュ簱',
+						name: 'pakin',
+						color: 'blue',
+						cuIcon: 'copy'
+					},
 					// {
 					// 	title: '榻愬鍏ュ簱',
 					// 	name: 'kitting',

--
Gitblit v1.9.1