From 50cd3081e6beba6a661b3784f5f9a31dfbada71f Mon Sep 17 00:00:00 2001
From: jing <1683105490@qq.com>
Date: Mon, 7 Sep 2026 09:56:03 +0800
Subject: [PATCH] =?UTF-8?q?chore=EF=BC=9A=E5=8A=A0=E8=B4=AD=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=97=B6=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=A8=E9=A1=B5=E9=9D=A2=E4=B8=8B=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components-diy/diy-category-item.vue | 11 ++++++-----
 components-diy/diy-category.vue      | 23 +++++++++++++----------
 components-diy/minx.js               | 17 +++++++++++++++++
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/components-diy/diy-category-item.vue b/components-diy/diy-category-item.vue
index da193f1..5421fee 100644
--- a/components-diy/diy-category-item.vue
+++ b/components-diy/diy-category-item.vue
@@ -559,12 +559,13 @@ export default {
 		};
 	},
 	computed: {
-		// 后台新增开关：加购按钮；未下发时兼容旧字段 quickBuy
+		// 后台新增开关：加购按钮
+		// 后台开启就显示, 关闭就不显示; 未下发新字段时兼容旧字段 quickBuy
 		showAddCart() {
-			const v = this.value;
-			if (v.showAddCart !== undefined) return v.showAddCart;
-			if (v.show_add_cart !== undefined) return v.show_add_cart;
-			return v.quickBuy;
+			const t = this.getDiyToggle(['showAddCart', 'show_add_cart']);
+			if (t !== undefined) return t;
+			const legacy = this.getDiyToggle(['quickBuy', 'quick_buy']);
+			return legacy !== undefined ? legacy : false;
 		},
 		/**
 		 * 当前分类层级 (参考 template 2 的 goodsLevel 模式)
diff --git a/components-diy/diy-category.vue b/components-diy/diy-category.vue
index af98eca..942d1a5 100644
--- a/components-diy/diy-category.vue
+++ b/components-diy/diy-category.vue
@@ -1,6 +1,8 @@
 <template>
 	<view data-component-name="diy-category" :class="['category-page-wrap', 'category-template-' + value.template]"
-		:style="{ height: 'calc(100vh - ' + tabBarHeight + ')' }">
+		:style="{ height: 'calc(100vh - var(--window-top, 0px) - ' + tabBarHeight + ')' }">
+		<!-- 高度说明: 100vh - H5顶部导航栏(--window-top, 小程序为0) - 底部导航高度(tabBarHeight),
+		     保证底部购物车结算栏始终落在可视区内, 点击加购后无需向下翻即可看到 -->
 		<!-- 模板4: 顶部搜索框(图片样式) -->
 		<view class="search-box search-box-template-4" v-if="value.template == 4 && value.search"
 			@tap.stop="onClickSearch()">
@@ -324,18 +326,19 @@ export default {
 			let money = parseFloat(this.cartMoney).toFixed(2);
 			return money.split('.');
 		},
-		// 后台新增开关：显示购物车及结算按钮 / 加购按钮；未下发时兼容旧字段 quickBuy
+		// 后台新增开关：快捷购买(显示购物车及结算按钮) / 加购按钮
+		// 后台开启哪个就显示哪个, 关闭哪个就不显示哪个; 未下发新字段时兼容旧字段 quickBuy
 		showCartSettlement() {
-			const v = this.value;
-			if (v.showCartSettlement !== undefined) return v.showCartSettlement;
-			if (v.show_cart_settlement !== undefined) return v.show_cart_settlement;
-			return v.quickBuy;
+			const t = this.getDiyToggle(['showCartSettlement', 'show_cart_settlement']);
+			if (t !== undefined) return t;
+			const legacy = this.getDiyToggle(['quickBuy', 'quick_buy']);
+			return legacy !== undefined ? legacy : false;
 		},
 		showAddCart() {
-			const v = this.value;
-			if (v.showAddCart !== undefined) return v.showAddCart;
-			if (v.show_add_cart !== undefined) return v.show_add_cart;
-			return v.quickBuy;
+			const t = this.getDiyToggle(['showAddCart', 'show_add_cart']);
+			if (t !== undefined) return t;
+			const legacy = this.getDiyToggle(['quickBuy', 'quick_buy']);
+			return legacy !== undefined ? legacy : false;
 		},
 		// 转换字符数值为真正的数值
 		navbarHeight() {
diff --git a/components-diy/minx.js b/components-diy/minx.js
index 337015c..107eb7d 100644
--- a/components-diy/minx.js
+++ b/components-diy/minx.js
@@ -1,5 +1,22 @@
 export default {
     methods: {
+        /**
+         * 读取后台装修下发的布尔开关
+         * 依次取 names 中的字段, 兼容 1/0、"1"/"0"、true/false、"true"/"false" 等值类型
+         * 命中返回 true/false; 所有字段都未下发时返回 undefined (由调用方决定兜底)
+         */
+        getDiyToggle(names) {
+            const v = this.value || {};
+            for (let i = 0; i < names.length; i++) {
+                const val = v[names[i]];
+                if (val === undefined || val === null || val === '') continue;
+                if (val === true || val === 1 || val === '1' || val === 'true') return true;
+                if (val === false || val === 0 || val === '0' || val === 'false') return false;
+                return !!val;
+            }
+            return undefined;
+        },
+
         // 异步触发事件
         async __$emitEvent(payload = {eventName: '__unnamedEvent', data: {}, promiseCallback: null}) {
             await this.$eventBus.emit(payload.eventName, payload.data, payload.promiseCallback)