Merge branch 'dev/1.0' of http://git.aigc-quickapp.com/Uniapp/lucky_shop into yuanlaide3

chore：模板4的二级分类按钮正常
chore:二级分类按钮显示正常
2026-07-18 11:55:51 +08:00 · 2026-07-18 11:26:27 +08:00 · 2026-07-18 11:15:58 +08:00 · 2026-07-18 11:13:34 +08:00 · 2026-07-18 10:31:35 +08:00 · 2026-07-18 10:15:27 +08:00
4 changed files with 1210 additions and 278 deletions
--- a/.local.config.js
+++ b/.local.config.js
@@ -127,23 +127,23 @@ const localDevConfig = ({
 	    uniacid: 2821,
 	    domain: 'https://xcx.aigc-quickapp.com/',
 	},
-	'18': { // 测试平台
-	    uniacid: 18,
+	'54': { // 测试平台
+	    uniacid: 54,
 	    domain: 'https://test.aigc-quickapp.com',
 	},
 	'2': { // 测试平台
 	    uniacid: 2,
 	    domain: 'https://test.aigc-quickapp.com',
 	},
-	'48': { // 测试平台
-	    uniacid: 48,
+	'54': { // 测试平台
+	    uniacid: 54,
 	    domain: 'https://test.aigc-quickapp.com',
 	},
 // })['5g-237']; // 商品分类，没有立即咨询文字
 // })['5g-97']; // 大宗商品贸易，支持自定义字体大小、颜色
 // })['5g-50']; // 燃气安全产品机器人，购物车无反应
 // })['2821']; // 离型纸硅油纸
-})['2482']; // 低空经济
+})['54']; // 低空经济
 // })['48']; // 离型纸硅油纸
 // })['2485']; // 验证电子表单前后端数据一致性
 // })['5g-11']; // 数码
--- a/components-diy/diy-category-item.vue
+++ b/components-diy/diy-category-item.vue
--- a/components-diy/diy-category.vue
+++ b/components-diy/diy-category.vue
@@ -1,6 +1,15 @@
 <template>
 	<view data-component-name="diy-category" :class="['category-page-wrap', 'category-template-' + value.template]"
 		:style="{ height: 'calc(100vh - ' + tabBarHeight + ')' }">
+		<!-- 模板4: 顶部搜索框(图片样式) -->
+		<view class="search-box search-box-template-4" v-if="value.template == 4 && value.search"
+			@tap.stop="onClickSearch()">
+			<view class="search-content">
+				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('components-diy.diy-search.searchBtn')"
+					confirm-type="search" @tap.stop="onClickSearch()" disabled="true" />
+				<text class="iconfont icon-sousuo3"></text>
+			</view>
+		</view>
 		<!-- #ifdef MP-WEIXIN -->
 		<!-- <block v-if="value.template == 4">
 			<view class="search-box" v-if="value.search" @tap.stop="$util.redirectTo('/pages_tool/goods/search')" :style="navbarInnerStyle">
@@ -28,7 +37,7 @@
 		<!-- #endif -->
 		<!-- #ifdef H5 || MP-HARMONY -->

-		<view class="search-box" v-if="value.search" @tap.stop="onClickSearch()">
+		<view class="search-box" v-if="value.search && value.template != 4" @tap.stop="onClickSearch()">
 			<view class="search-content">
 				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('components-diy.diy-search.searchBtn')" confirm-type="search"
 					@tap.stop="onClickSearch()" disabled="true" />
@@ -81,12 +90,25 @@
 			<block v-if="categoryTree.length">
 				<scroll-view scroll-y="true" class="tree-wrap">
 					<view class="category-item-wrap">
-						<view class="category-item" v-for="(item, index) in categoryTree" :key="index" :class="[
-							{ select: select == index },
-							{ 'border-bottom': value.template == 4 && select + 1 === index },
-							{ 'border-top': value.template == 4 && select - 1 === index }
-						]" @tap.stop="switchOneCategory(index)">
-							<view class="">{{ item.category_name }}</view>
+						<!-- 模板4: 左侧显示一级分类(顶部轮播中的分类) -->
+						<view v-if="value.template == 4">
+							<view class="category-item" v-for="(item, index) in templateFourData" :key="'one-' + index" :class="[
+								{ select: oneCategorySelect == index },
+								{ 'border-bottom': oneCategorySelect + 1 === index },
+								{ 'border-top': oneCategorySelect - 1 === index }
+							]" @tap.stop="templateFourOneFn(index)">
+								<view class="">{{ item.category_name }}</view>
+							</view>
+						</view>
+						<!-- 其他模板: 左侧显示二级分类 -->
+						<view v-else>
+							<view class="category-item" v-for="(item, index) in categoryTree" :key="index" :class="[
+								{ select: select == index },
+								{ 'border-bottom': value.template == 4 && select + 1 === index },
+								{ 'border-top': value.template == 4 && select - 1 === index }
+							]" @tap.stop="switchOneCategory(index)">
+								<view class="">{{ item.category_name }}</view>
+							</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -102,23 +124,36 @@
 							:lastSecondCategoryName="lastSecondCategoryName"
 							@tologin="toLogin" @selectsku="selectSku($event, 0)" @addCart="addCartPoint"
 							@saveSecondCategory="saveSecondCategoryName"></diy-category-item>
-					</scroll-view>
+				</scroll-view>

-					<scroll-view scroll-y="true" class="content-wrap" v-else-if="value.template == 1 || value.template == 99 || loadType == 'all'"
-						ref="contentWrap" :scroll-into-view="categoryId" :scroll-with-animation="true"
-						@scroll="listenScroll" @touchstart="touchStart" :refresher-enabled="true"
-						refresher-default-style="none" :refresher-triggered="triggered" @refresherrefresh="onRefresh"
-						@refresherrestore="onRestore">
-						<view class="child-category" v-for="(item, index) in categoryTree" :key="index"
-							:id="'category-' + index" :style="{ display: value.template == 99 && select != index ? 'none' : 'block' }">
-							<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
-								:select="select" :oneCategorySelect="oneCategorySelect" :isList="isList"
-								:lastSecondCategoryName="value.template == 99 ? lastSecondCategoryName : ''"
-								@tologin="toLogin" @selectsku="selectSku($event, index)" @addCart="addCartPoint"
-								@loadfinish="getHeightArea" @saveSecondCategory="saveSecondCategoryName"></diy-category-item>
-						</view>
-						<view class="end-tips" ref="endTips" :style="{ opacity: endTips }">{{ $lang('components-diy.diy-category.reachedBottom') }}</view>
-					</scroll-view>
+				<!-- 模板1: 仿京东/淘宝商品分类 - 按 template 2 的 part-load 逻辑, 切换一级分类时只渲染选中分类的子分类网格 -->
+				<scroll-view scroll-y="true" class="content-wrap" v-else-if="value.template == 1"
+					:refresher-enabled="true" refresher-default-style="none"
+					:refresher-triggered="triggered" @refresherrefresh="onRefresh" @refresherrestore="onRestore">
+					<view class="child-category-wrap" v-for="(item, index) in categoryTree" :key="index"
+						:id="'category-' + index" :style="{ display: select == index ? 'block' : 'none' }">
+						<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
+							:select="select" :oneCategorySelect="oneCategorySelect" :isList="isList"
+							@tologin="toLogin" @selectsku="selectSku($event, index)" @addCart="addCartPoint"
+							@saveSecondCategory="saveSecondCategoryName"></diy-category-item>
+					</view>
+				</scroll-view>
+
+				<scroll-view scroll-y="true" class="content-wrap" v-else-if="value.template == 99 || loadType == 'all'"
+					ref="contentWrap" :scroll-into-view="categoryId" :scroll-with-animation="true"
+					@scroll="listenScroll" @touchstart="touchStart" :refresher-enabled="true"
+					refresher-default-style="none" :refresher-triggered="triggered" @refresherrefresh="onRefresh"
+					@refresherrestore="onRestore">
+					<view class="child-category" v-for="(item, index) in categoryTree" :key="index"
+						:id="'category-' + index" :style="{ display: value.template == 99 && select != index ? 'none' : 'block' }">
+						<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
+							:select="select" :oneCategorySelect="oneCategorySelect" :isList="isList"
+							:lastSecondCategoryName="value.template == 99 ? lastSecondCategoryName : ''"
+							@tologin="toLogin" @selectsku="selectSku($event, index)" @addCart="addCartPoint"
+							@loadfinish="getHeightArea" @saveSecondCategory="saveSecondCategoryName"></diy-category-item>
+					</view>
+					<view class="end-tips" ref="endTips" :style="{ opacity: endTips }">{{ $lang('components-diy.diy-category.reachedBottom') }}</view>
+				</scroll-view>

 					<view class="content-wrap"
 						v-if="(value.template == 2 || value.template == 3 || value.template == 4) && loadType == 'part'">
@@ -127,6 +162,7 @@
 							<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
 								:last="index == categoryTree.length - 1 ? true : false" :select="select"
 								:oneCategorySelect="oneCategorySelect" :isList="isList" @tologin="toLogin"
+								:currentOneCategory="value.template == 4 && templateFourData[oneCategorySelect] ? templateFourData[oneCategorySelect] : null"
 								@selectsku="selectSku($event, index)" @addCart="addCartPoint"
 								@switch="switchOneCategory"></diy-category-item>
 						</view>
@@ -143,9 +179,12 @@
 			<view class="tips">{{ $lang('components-diy.diy-category.noCategory') }}</view>
 		</view>

-		<!-- 	<view class="cart-box" v-if="(value.template == 2 || value.template == 4) && value.quickBuy && storeToken && categoryTree && categoryTree.length">
+		<!-- 模板4: 底部购物车栏 -->
+		<view class="cart-box cart-box-template-4"
+			v-if="value.template == 4 && value.quickBuy && storeToken && categoryTree && categoryTree.length">
 			<view class="left-wrap">
-				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation" @tap.stop="$util.redirectTo('/pages_goods/cart')">
+				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation"
+					@tap.stop="$util.redirectTo('/pages_goods/cart')">
 					<text class="iconfont icon-ziyuan1"></text>
 					<view class="num" v-if="cartNumber">{{ cartNumber < 99 ? cartNumber : '99+' }}</view>
 				</view>
@@ -156,9 +195,10 @@
 					<text class="unit font-size-tag price-font">.{{ cartTotalMoney[1] ? cartTotalMoney[1] : '00' }}</text>
 				</view>
 			</view>
-			<view class="right-wrap"><button type="primary" class="settlement-btn" @tap.stop="settlement">去结算</button>
+			<view class="right-wrap"><button type="primary" class="settlement-btn"
+					@tap.stop="settlement">去结算</button>
 			</view>
-		</view> -->
+		</view>

 		<view class="cart-point" :style="{ left: item.left + 'px', top: item.top + 'px' }" :key="index"
 			v-for="(item, index) in carIconList"></view>
@@ -215,6 +255,10 @@ export default {
 	created() {
 		this.getCategoryTree();
 		this.loadType = this.value.goodsLevel == 1 && this.value.loadType == 'all' ? 'all' : 'part';
+		// 模板4: 默认单列列表布局(图片样式)
+		if (this.value.template == 4) {
+			this.isList = true;
+		}
 	},
 	mounted() {
 		query = uni.createSelectorQuery().in(this);
@@ -908,6 +952,137 @@ export default {

 // 风格四
 .category-template-4 {
+	// 模板4 顶部搜索框(图片样式)
+	.search-box-template-4 {
+		padding: 20rpx 30rpx 16rpx;
+		background: #fff;
+
+		.search-content {
+			height: 64rpx;
+			background-color: #f5f5f5;
+			border-radius: 40rpx;
+
+			input {
+				height: 64rpx;
+				line-height: 64rpx;
+				padding: 0 30rpx 0 30rpx;
+				background: #f5f5f5;
+				border-radius: 40rpx;
+				font-size: 26rpx;
+				color: #333;
+			}
+
+			.iconfont {
+				font-size: 32rpx;
+				color: #89899a;
+				width: 70rpx;
+				text-align: center;
+				right: 10rpx;
+			}
+		}
+	}
+
+	// 模板4 底部购物车栏(图片样式)
+	.cart-box-template-4 {
+		height: 110rpx;
+		padding: 0 30rpx;
+		background: #fff;
+		border-top: 1rpx solid #f0f0f0;
+		position: relative;
+		z-index: 10;
+		box-shadow: 0 -4rpx 12rpx rgba(0, 0, 0, 0.04);
+
+		.left-wrap {
+			display: flex;
+			align-items: center;
+		}
+
+		.cart-icon {
+			width: 90rpx;
+			height: 90rpx;
+			position: relative;
+			margin-top: -10rpx;
+
+			.iconfont {
+				color: var(--btn-text-color, #fff);
+				width: 80rpx;
+				height: 80rpx;
+				background-color: $base-color;
+				border-radius: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 40rpx;
+				box-shadow: 0 4rpx 12rpx rgba(255, 107, 53, 0.35);
+			}
+
+			.num {
+				position: absolute;
+				top: 0;
+				right: 0;
+				transform: translate(20%, 0);
+				display: inline-block;
+				box-sizing: border-box;
+				color: #fff;
+				line-height: 1.2;
+				text-align: center;
+				font-size: 24rpx;
+				padding: 0 8rpx;
+				min-width: 32rpx;
+				border-radius: 18rpx;
+				background-color: var(--price-color, #FF6B35);
+				border: 2rpx solid #fff;
+			}
+		}
+
+		.price {
+			margin-left: 16rpx;
+			display: flex;
+			align-items: baseline;
+			line-height: 1;
+
+			.title {
+				color: #333;
+				font-size: 28rpx;
+			}
+
+			.unit,
+			.money {
+				color: var(--price-color, #FF6B35);
+				font-weight: bold;
+			}
+
+			.unit {
+				font-size: 24rpx;
+			}
+
+			.money {
+				font-size: 36rpx;
+			}
+		}
+
+		.right-wrap {
+			display: flex;
+			align-items: center;
+		}
+
+		.settlement-btn {
+			margin: 0;
+			width: 220rpx;
+			font-weight: bold;
+			border-radius: 50rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			font-size: 30rpx;
+			background: $base-color;
+			color: var(--btn-text-color, #fff);
+
+			&::after {
+				border: none;
+			}
+		}
+	}
+
 	.search-box {
 		.search-content input {
 			background-color: #f1f1f1;
@@ -1135,6 +1310,125 @@ export default {
 	}
 }

+// ===================== 模板1 仿京东/淘宝商品分类样式 =====================
+.category-template-1 {
+	.search-box {
+		padding: 20rpx 24rpx;
+		background: #fff;
+
+		.search-content {
+			background-color: #f5f5f5;
+			border-radius: 40rpx;
+
+			input {
+				background: #f5f5f5;
+				border-radius: 40rpx;
+				padding: 0 30rpx;
+				font-size: 26rpx;
+				color: #333;
+			}
+
+			.iconfont {
+				right: 16rpx;
+				color: #89899a;
+				font-size: 32rpx;
+			}
+		}
+	}
+
+	.content-box {
+		background: #fff;
+
+		.tree-wrap {
+			width: 170rpx;
+			background-color: #fff;
+		}
+
+		.right-flex-wrap {
+			background: #fff;
+
+			.content-wrap {
+				background: #fff;
+			}
+		}
+	}
+
+	// 穿透到子组件 diy-category-item: 调整 banner 横向内边距 + 分类网格容器为透明
+	::v-deep .category-adv {
+		padding: 0 20rpx;
+		margin-top: 0;
+	}
+
+	::v-deep .category-list {
+		margin: 0 20rpx;
+		border-radius: 0;
+		background: transparent;
+		padding: 0;
+	}
+
+	::v-deep .category-title-with-lines {
+		padding: 30rpx 0 20rpx;
+	}
+
+	// 穿透修复: 图片不需要灰色背景框,与目标图保持一致
+	::v-deep .img-box {
+		background: transparent !important;
+		border-radius: 0 !important;
+		width: 70% !important;
+		padding-bottom: 70% !important;
+		margin-bottom: 16rpx !important;
+	}
+
+	::v-deep .img-box image {
+		width: 100% !important;
+		height: 100% !important;
+		left: 0 !important;
+		top: 0 !important;
+		transform: none !important;
+	}
+
+	// 左侧分类栏样式
+	.tree-wrap .category-item {
+		padding: 28rpx 16rpx;
+		background-color: #fff;
+		border-radius: 0;
+
+		view {
+			color: #666;
+			font-size: 26rpx;
+			line-height: 1.3;
+		}
+
+		&.border-top,
+		&.border-bottom {
+			border-radius: 0;
+		}
+
+		&.select {
+			background: #fff;
+
+			view {
+				color: var(--base-color, #FF6B35);
+				font-weight: bold;
+				font-size: 28rpx;
+			}
+
+			&::before {
+				content: ' ';
+				width: 6rpx;
+				height: 32rpx;
+				background: var(--base-color, #FF6B35);
+				display: block;
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+				border-radius: 0 6rpx 6rpx 0;
+			}
+		}
+	}
+}
+
 // ===================== 模板99 商品分类样式 =====================
 .category-template-99 {
 	.search-box {
--- a/pages.json
+++ b/pages.json
@@ -4,7 +4,6 @@
 			"path": "pages/index/index",
 			"style": {
 				// "navigationStyle": "custom",
-				"navigationBarTitleText": "",
 				"enablePullDownRefresh": true,
 				"componentPlaceholder": {
 					"diy-article": "view",
@@ -67,7 +66,6 @@
 		{
 			"path": "pages/empty/index",
 			"style": {
-				"navigationBarTitleText": "",
 				"enablePullDownRefresh": true
 			}
 		}
@@ -147,13 +145,13 @@
 							"diy-store-label": "view",
 							"diy-tab": "view",
 							"diy-text": "view",
-						"diy-video": "view",
-						"diy-video-list": "view"
+							"diy-video": "view",
+							"diy-video-list": "view"
+						}
 					}
-				}
-			},
-			{
-				"path": "cart",
+				},				
+				{
+					"path": "cart",
 					"style": {
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
@@ -353,7 +351,6 @@
 				{
 					"path": "payment",
 					"style": {
-						"navigationBarTitleText": "",
 						"navigationStyle": "custom"
 					}
 				},
@@ -363,7 +360,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",						
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
@@ -426,27 +422,24 @@
 					"path": "detail",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "detail_local_delivery",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "detail_pickup",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				//积分订单详情
@@ -454,9 +447,8 @@
 					"path": "detail_point",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				}
 			]
@@ -469,10 +461,7 @@
 				{
 					"path": "point/list",
 					"style": {
-						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
-						// #endif
-						"navigationBarTitleText": "",
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
@@ -537,7 +526,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
@@ -600,42 +588,36 @@
 					"path": "point/detail",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "point/payment",
 					"style": {
-						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
-						// #endif
-						"navigationBarTitleText": ""
+						"navigationStyle": "custom"
 					}
 				},
 				{
 					"path": "point/order_list",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "point/result",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				//****************** 商户 ******************
 				{
 					"path": "merch/merchcategory",
-					"style": {						
+					"style": {
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
@@ -770,7 +752,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
@@ -833,18 +814,16 @@
 					"path": "fenxiao/promote",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "fenxiao/apply",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -853,7 +832,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
@@ -916,53 +894,47 @@
 					"path": "fenxiao/relation",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "fenxiao/order_detail",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "fenxiao/team",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "fenxiao/withdraw_apply",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "fenxiao/withdraw_list",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "fenxiao/withdrawal_detail",
 					"style": {
-						"navigationBarTitleText": ""
 						// #ifdef APP-PLUS
-						,"navigationStyle": "custom"
+						"navigationStyle": "custom"
 						// #endif
 					}
 				},
@@ -970,18 +942,16 @@
 					"path": "fenxiao/promote_code",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "fenxiao/level",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -990,7 +960,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
@@ -1053,9 +1022,8 @@
 					"path": "fenxiao/bill",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -1166,18 +1134,16 @@
 					"path": "webview/webview",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "index/diy",
 					"style": {
-						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						// #ifdef  MP-WEIXIN
+						// "navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"enablePullDownRefresh": true,
 						"componentPlaceholder": {
 							"diy-article": "view",
@@ -1244,8 +1210,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
-						"enablePullDownRefresh": true,
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
@@ -1308,63 +1272,54 @@
 					"path": "member/modify_face",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/account",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/account_edit",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/apply_withdrawal",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/balance",
 					"style": {
-						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
-						// #endif
-						"navigationBarTitleText": ""
+						"navigationStyle": "custom"
 					}
 				},
 				{
 					"path": "member/balance_detail",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/collection",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -1373,17 +1328,13 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"disableScroll": true
 					}
 				},
 				{
 					"path": "member/contact",
 					"style": {
-						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
-						// #endif
-						"navigationBarTitleText": "",
 						"enablePullDownRefresh": true
 					}
 				},
@@ -1391,162 +1342,142 @@
 					"path": "member/footprint",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/level",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/card",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/card_buy",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/card_agreement",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/level_growth_rules",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/point",
 					"style": {
-						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
-						// #endif
-						"navigationBarTitleText": ""
+						"navigationStyle": "custom"
 					}
 				},
 				{
 					"path": "member/point_detail",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/withdrawal",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/withdrawal_detail",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/address",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/address_edit",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/pay_password",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/cancellation",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/assets",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/cancelstatus",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/cancelsuccess",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "member/cancelrefuse",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -1562,9 +1493,8 @@
 					"path": "member/info_edit",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				//******************登录模块******************
@@ -1572,9 +1502,8 @@
 					"path": "login/find",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				//******************商品模块******************
@@ -1584,7 +1513,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
@@ -1647,18 +1575,16 @@
 					"path": "goods/coupon_receive",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "goods/evaluate",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -1667,7 +1593,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
@@ -1732,7 +1657,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
@@ -1795,9 +1719,8 @@
 					"path": "goods/not_exist",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				//******************CMS模块（6）******************
@@ -1805,18 +1728,16 @@
 					"path": "help/list",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "help/detail",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -1825,7 +1746,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
@@ -1888,9 +1808,8 @@
 					"path": "notice/detail",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -1899,7 +1818,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
@@ -1962,9 +1880,8 @@
 					"path": "article/detail",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				//******************会员充值（4）******************
@@ -1974,7 +1891,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"disableScroll": false
 					}
 				},
@@ -1982,9 +1898,8 @@
 					"path": "recharge/order_list",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				//******************邀请******************
@@ -1992,9 +1907,8 @@
 					"path": "member/invite_friends",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				//******************支付模块（2）******************
@@ -2002,45 +1916,40 @@
 					"path": "pay/index",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "pay/wx_pay",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "pay/result",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "pay/cashier",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "storeclose/storeclose",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				//******************订单模块（2）******************
@@ -2048,63 +1957,56 @@
 					"path": "order/logistics",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "order/evaluate",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "order/refund",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "order/refund_goods_select",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "order/refund_type_select",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "order/refund_batch",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
 					"path": "order/refund_detail",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -2120,9 +2022,8 @@
 					"path": "order/detail_virtual",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				//******************登录模块（3）******************
@@ -2139,9 +2040,8 @@
 					"path": "form/form",
 					"style": {
 						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+						"navigationStyle": "custom"
 						// #endif
-						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -2150,7 +2050,6 @@
 						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "",
 						"componentPlaceholder": {
 							"diy-article": "view",
 							"diy-audio": "view",
Author	SHA1	Message	Date
jinhhanhan	a137f3533c	Merge branch 'dev/1.0' of http://git.aigc-quickapp.com/Uniapp/lucky_shop into yuanlaide3	2026-07-18 11:55:51 +08:00
jinhhanhan	8e31b9e327	chore：模板4的二级分类按钮正常	2026-07-18 11:26:27 +08:00
jinhhanhan	460dbcb447	chore:二级分类按钮显示正常	2026-07-18 11:15:58 +08:00
jinhhanhan	81ecd45de4	chore：二级分类按钮显示	2026-07-18 11:13:34 +08:00
jinhhanhan	d8816bbe42	chore：还原到模板3二级分类按钮正常	2026-07-18 10:31:35 +08:00
jinhhanhan	b410597d9c	chore	2026-07-18 10:15:27 +08:00
jinhhanhan	987e75c65a	Merge branch 'dev/1.0' of http://git.aigc-quickapp.com/Uniapp/lucky_shop into yuanlaide3	2026-07-18 09:07:28 +08:00
jinhhanhan	ac8c461546	chore：二级分类按钮点击一会能切一会不能切	2026-07-18 08:58:52 +08:00
jinhhanhan	a4d8023e1f	chore：二级分类按钮正常	2026-07-17 18:17:45 +08:00
jinhhanhan	a4c218fecc	chore：	2026-07-17 16:06:07 +08:00
jinhhanhan	0d820b04f7	chore：template == 4页面后台选择二级分类正常	2026-07-17 15:53:09 +08:00
jinhhanhan	6d1bdb5d8b	chore：删除右侧上面的和一级标题一样的字	2026-07-17 15:07:19 +08:00
jinhhanhan	73b7b2a8df	chore：template == 3的模板正常	2026-07-17 14:54:44 +08:00
jinhhanhan	b2063418fb	chore：template == 1的模板正常	2026-07-17 14:01:40 +08:00
jinhhanhan	21c342e389	chore：	2026-07-17 11:56:44 +08:00
jinhhanhan	185d4914a6	chore:页面显示正常1模板	2026-07-17 10:21:40 +08:00
jinhhanhan	e3bbb7c77a	chore：商品分类页面符合template==1	2026-07-17 09:58:25 +08:00