From e2dc715852ba9846664755616bc16a5145bfced9 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期二, 04 十一月 2025 13:25:04 +0800
Subject: [PATCH] 样式调整
---
components/machine.vue | 150 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 110 insertions(+), 40 deletions(-)
diff --git a/components/machine.vue b/components/machine.vue
index 9e4da4d..09087bd 100644
--- a/components/machine.vue
+++ b/components/machine.vue
@@ -177,13 +177,31 @@
if (res && res.data && res.data.tbBillList) {
this.$showMessage("鍛煎彨鎴愬姛");
- //鎴栬�呮柟娉�3锛氫娇鐢� uni.navigateBack 鍐嶈烦杞洖鏉ワ紙濡傛灉鏄粠鍏朵粬椤甸潰璺宠浆杩囨潵鐨勶級
- uni.navigateBack({
- delta: 1,
- success: () => {
- // 鍙互鍦ㄨ繖閲岄噸鏂拌烦杞埌褰撳墠椤甸潰
- }
- });
+ // 鍏抽敭淇敼锛氭竻绌� flag 鐨勫��
+ this.flag = -1; // 鎴栬�呮牴鎹笟鍔￠渶姹傝缃负鍏朵粬鍒濆鍊�
+
+ // 鏂规1锛氫娇鐢╱ni-app鐨勯〉闈㈠埛鏂版柟娉�
+ // 鏂规硶1锛氳Е鍙戜笅鎷夊埛鏂帮紙濡傛灉椤甸潰鏀寔锛�
+ if (uni.startPullDownRefresh) {
+ uni.startPullDownRefresh();
+ // 2绉掑悗鍋滄鍒锋柊
+ setTimeout(() => {
+ uni.stopPullDownRefresh();
+ }, 2000);
+ }
+
+ // 鏂规硶2锛氶噸鏂拌皟鐢ㄩ〉闈㈢殑onLoad鏂规硶锛堟帹鑽愶級
+ const pages = getCurrentPages();
+ const currentPage = pages[pages.length - 1];
+ if (currentPage && currentPage.onLoad) {
+ // 淇濆瓨褰撳墠椤甸潰鍙傛暟
+ const pageOptions = currentPage.options || {};
+ // 閲嶆柊鍔犺浇椤甸潰鏁版嵁
+ currentPage.onLoad(pageOptions);
+ }
+
+ // 鏂规硶3锛氬悓鏃跺埛鏂扮粍浠舵暟鎹�
+ this.findByOrderId();
} else {
this.$showMessage("鍛煎彨澶辫触");
@@ -255,7 +273,7 @@
<style scoped>
/* 椤甸潰鏁翠綋甯冨眬 */
.page {
- padding: 2vh;
+ padding: 8px;
display: flex;
flex-direction: column;
justify-content: space-between;
@@ -266,54 +284,56 @@
/* 鍙充笂瑙掑埛鏂版寜閽� */
.top-right {
position: absolute;
- top: 10px;
- right: 50px;
+ top: 8px;
+ right: 40px;
+ width: 200px;
z-index: 1000;
}
.refresh-btn {
- padding: 10px;
+ padding: 8px 16px;
background-color: #00A2E9;
color: white;
border: none;
- font-size: 1.5vw;
+ font-size: 16px;
border-radius: 5px;
}
label {
- margin-right: 1vw;
- font-size: 1.6vw;
- }
-
- input {
- padding: 1vh;
- font-size: 1.5vw;
- border: 1px solid #ccc;
- width: 100%;
- margin-top: 1vh;
- box-sizing: border-box;
+ margin-right: 10px;
+ font-size: 16px;
}
/* 涓棿鐘舵�侀儴鍒嗗竷灞� */
.middle-section {
display: flex;
flex-direction: column;
- margin-bottom: 4vh;
+ margin-bottom: 8px;
}
.item {
display: flex;
flex-direction: row;
- align-items: flex-start;
- margin-bottom: 2vh;
+ align-items: center;
+ margin-bottom: 10px;
+ gap: 10px;
+ }
+
+ .item h4 {
+ font-size: 14px;
+ line-height: 1.4;
+ margin: 0;
+ padding: 5px 0;
}
button {
- width: 100%;
- padding: 1.5vh;
- font-size: 1.5vw;
+ width: 50%;
+ flex-shrink: 0;
+ padding: 10px;
+ font-size: 16px;
border: none;
text-align: center;
+ min-height: 40px;
}
.btn-disabled {
@@ -327,36 +347,86 @@
}
input {
- margin-top: 10px;
- padding: 10px;
- font-size: 14px;
+ margin-top: 0;
+ padding: 8px;
+ font-size: 15px;
border: 1px solid #ccc;
- width: 100%;
+ width: 50%;
+ flex-grow: 1;
+ box-sizing: border-box;
}
/* 搴曢儴淇濆瓨/鍙栨秷鎸夐挳甯冨眬 */
.bottom-section {
display: flex;
justify-content: space-between;
- margin-top: 4vh;
+ margin-top: 10px;
+ padding-top: 10px;
}
.save-btn,
.cancel-btn {
width: 48%;
- padding: 1.5vh;
+ padding: 12px;
background-color: #00A2E9;
color: white;
- font-size: 1.6vw;
+ font-size: 18px;
border: none;
text-align: center;
+ min-height: 45px;
}
.txt-inp {
- height: 8vh;
- padding: 1vh;
- font-size: 1.5vw;
- width: 100%;
+ height: 40px;
+ padding: 8px;
+ font-size: 15px;
+ width: 50%;
+ flex-grow: 1;
box-sizing: border-box;
+ margin-top: 0;
+ }
+
+ /* 閽堝1280*717灞忓箷鐨勭壒瀹氫紭鍖� */
+ @media screen and (max-width: 1280px) and (max-height: 800px) {
+ .page {
+ padding: 6px;
+ }
+
+ .middle-section {
+ margin-bottom: 6px;
+ }
+
+ .item {
+ margin-bottom: 8px;
+ }
+
+ .item h4 {
+ font-size: 13px;
+ padding: 3px 0;
+ }
+
+ button {
+ padding: 8px;
+ font-size: 15px;
+ min-height: 38px;
+ }
+
+ .txt-inp {
+ height: 38px;
+ padding: 6px;
+ font-size: 14px;
+ }
+
+ .bottom-section {
+ margin-top: 8px;
+ padding-top: 8px;
+ }
+
+ .save-btn,
+ .cancel-btn {
+ padding: 10px;
+ font-size: 17px;
+ min-height: 42px;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3