From 1d9c68d6597a17f5a16344bcab197f6eb434b359 Mon Sep 17 00:00:00 2001
From: hehaibing-1996 <hehaibing1996@qq.com>
Date: Thu, 27 Feb 2025 19:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PDA/PDA/pages/bindSelectMat/bindSelectMat.vue | 28 +++++++++++------
 .../dist/dev/app-plus/app-service.js          | 31 +++++++++++--------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/PDA/PDA/pages/bindSelectMat/bindSelectMat.vue b/PDA/PDA/pages/bindSelectMat/bindSelectMat.vue
index ced74f9..9b74c5d 100644
--- a/PDA/PDA/pages/bindSelectMat/bindSelectMat.vue
+++ b/PDA/PDA/pages/bindSelectMat/bindSelectMat.vue
@@ -9,9 +9,8 @@
 					{{ item.matCode }} - {{ item.matName }}
 				</view>
 			</scroll-view>
-			<button style="background-color: darkred;color: white;" @click="handleClose">关&nbsp;&nbsp;&nbsp;&nbsp;闭</button>
 		</view>
-		
+		<button class="button1" @click="handleClose">关&nbsp;&nbsp;&nbsp;&nbsp;闭</button>
 	</view>
 </template>
 
@@ -118,6 +117,11 @@
 				this.$emit('close');
 			},
 			onItemClick(item) {
+				uni.showToast({
+					title: '选择成功',
+					icon: 'none',
+					duration: 1200
+				});
 				this.visible = false;
 				this.$emit('selected', item);
 			},
@@ -146,28 +150,34 @@
 
 	.popup-container {
 		width: 100%;
-		max-height: calc(100vh - 300rpx);
 		z-index: 2;
 		overflow: auto;
 	}
 
 	.popup-content {
+		border: black;
 		border-radius: 10rpx;
+		border: 1rpx solid black;
 		position: absolute;
 		top: 50%;
 		left: 50%;
 		transform: translate(-50%, -50%);
 		width: 650rpx;
-		max-height: calc(100vh - 300rpx);
+		max-height: 600rpx;
 		background-color: white;
 		z-index: 2;
 			overflow: auto;
 	}
 
-	.scroll-Y {
-		border-radius: 5rpx;
-		height: calc(100vh - 600rpx);
-		z-index: 4;
-			overflow: auto;
+	.button1 {
+		background-color: darkred;
+		color: white;
+		bottom: 0;
+		top: 80%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		height: 80rpx;
+		position: absolute;
+
 	}
 </style>
\ No newline at end of file
diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
index b16d13f..9f5ee52 100644
--- a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
+++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
@@ -591,7 +591,7 @@ if (uni.restoreGlobal) {
       show() {
         this.visible = true;
         this.matCodeCondition = getConfig("matCodeCondition", "");
-        formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:46", "scroll - view height:", this.matCodeCondition);
+        formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:45", "scroll - view height:", this.matCodeCondition);
         this.userName = getConfig("userName", "");
         var serverIPAndPort = getServerIPAndPort();
         uni.request({
@@ -618,7 +618,7 @@ if (uni.restoreGlobal) {
               if (res.data.code == 200) {
                 if (res.data.data.lists != null && res.data.data.lists.length > 0) {
                   this.matBaseInfoList = res.data.data.lists;
-                  formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:75", "matBaseInfoList:", this.matBaseInfoList);
+                  formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:74", "matBaseInfoList:", this.matBaseInfoList);
                 } else {
                   this.visible = false;
                   this.matBaseInfoList = null;
@@ -653,7 +653,7 @@ if (uni.restoreGlobal) {
             });
           },
           complete: (event) => {
-            formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:112", "请求完成", event);
+            formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:111", "请求完成", event);
           }
         });
       },
@@ -662,20 +662,25 @@ if (uni.restoreGlobal) {
         this.$emit("close");
       },
       onItemClick(item) {
+        uni.showToast({
+          title: "选择成功",
+          icon: "none",
+          duration: 1200
+        });
         this.visible = false;
         this.$emit("selected", item);
       },
       upper() {
-        formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:125", "scrolltoupper");
+        formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:129", "scrolltoupper");
       },
       lower() {
-        formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:128", "scrolltolower");
+        formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:132", "scrolltolower");
       },
       scroll() {
-        formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:131", "scroll");
+        formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:135", "scroll");
       },
       end() {
-        formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:134", "scrollend");
+        formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:138", "scrollend");
       }
     }
   };
@@ -709,12 +714,12 @@ if (uni.restoreGlobal) {
             128
             /* KEYED_FRAGMENT */
           ))
-        ], 40, ["scroll-top", "show-scrollbar"]),
-        vue.createElementVNode("button", {
-          style: { "background-color": "darkred", "color": "white" },
-          onClick: _cache[4] || (_cache[4] = (...args) => $options.handleClose && $options.handleClose(...args))
-        }, "关    闭")
-      ])
+        ], 40, ["scroll-top", "show-scrollbar"])
+      ]),
+      vue.createElementVNode("button", {
+        class: "button1",
+        onClick: _cache[4] || (_cache[4] = (...args) => $options.handleClose && $options.handleClose(...args))
+      }, "关    闭")
     ])) : vue.createCommentVNode("v-if", true);
   }
   const PagesBindSelectMatBindSelectMat = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["render", _sfc_render$d], ["__scopeId", "data-v-68e7b952"], ["__file", "D:/代码/赛特制冷WCS/PDA/PDA/pages/bindSelectMat/bindSelectMat.vue"]]);