From dcdb0231034810232f2542f3865666ebf72daf11 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 16:45:34 +0800
Subject: [PATCH] sf

---
 h5/pages/index_2/index.vue |   53 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/h5/pages/index_2/index.vue b/h5/pages/index_2/index.vue
index cdcd8ca..13ca13c 100644
--- a/h5/pages/index_2/index.vue
+++ b/h5/pages/index_2/index.vue
@@ -92,6 +92,7 @@
 									<image src="@/static/ic_img@2x.png" mode="widthFix" @click="openImg(index)"></image>
 									<image src="@/static/ic_copy@2x.png" mode="widthFix" @click="copyItem(item)"></image>
 									<image src="@/static/ic_delete@2x.png" mode="widthFix" @click="deleItem(index)"></image>
+									<image src="@/static/ic_pk2@2x.png" mode="widthFix" @click="clickItem(-1, item.categoryId, item.categoryName,2,item)"></image>
 								</view>
 							</view>
 						</view>
@@ -112,9 +113,9 @@
 					class="productCategory_list_item"
 					v-for="(item, index) in category"
 					:key="index"
-					@click="clickItem(index, item.id, item.name)">
+					@click="clickItem(index, item.id, item.name,1)">
 						<image :src="item.imgurl ? item.prefixUrl + item.imgurl : ''" mode="widthFix"></image>
-						<text>{{item.name}}</text>
+						<text :style="{'font-size': !configuration&&!configuration.listname ?'16px':((configuration.listname.fontSize||16)   +'px'),color: !configuration &&!configuration.listname? '#ffffff' : configuration.listname.selType === 1 ? percentage(configuration.listname.selColor, configuration.listname.selAlpha) : '#ffffff'}">{{item.name}}</text>
 					</view>
 					<view class="productCategory_list_zw"></view>
 					<view class="productCategory_list_zw"></view>
@@ -215,7 +216,7 @@
 							<view class="productPage_shop_item_img">
 								<image :src="item.imgurl ? item.prefixUrl + item.imgurl : ''" mode="widthFix"></image>
 							</view>
-							<text>{{item.name}}</text>
+							<text :style="{'font-size': !configuration &&!configuration.listproname?'16px':((configuration.listproname.fontSize||16)   +'px'),color: !configuration&&!configuration.listproname ? '#ffffff' : configuration.listproname.selType === 1 ? percentage(configuration.listproname.selColor, configuration.listproname.selAlpha) : '#ffffff',color: !configuration ? '#ffffff' : configuration.listproname.selType === 1 ? percentage(configuration.listproname.selColor, configuration.listproname.selAlpha) : '#ffffff'}">{{item.name}}</text>
 						</view>
 						<view class="productPage_shop_zw"></view>
 						<view class="productPage_shop_zw"></view>
@@ -225,7 +226,7 @@
 					<view class="productPage_parameter" v-if="isPK && pkcontent">
 						<view class="productPage_parameter_item" v-for="(item, index) in [leftShop, rightShop]" :key="index">
 							<view class="productPage_parameter_item_head" :style="{background: !configuration ? 'rgba(13, 30, 65, 1)' : configuration.header.backgroundType === 2 ? `linear-gradient(180deg, ${percentage(configuration.header.bgColor, configuration.header.bgAlpha)} 0%, ${percentage(configuration.header.bgColor2, configuration.header.bgAlpha2)} 100%)` : percentage(configuration.header.bgColor, configuration.header.bgAlpha), color: !configuration ? 'rgba(255, 255, 255, 1)' : configuration.header.type === 1 ? percentage(configuration.header.color, configuration.header.alpha) : 'rgba(255, 255, 255, 1)'}">
-								{{item.name}}
+								<text>{{item.name}}</text>
 							</view>
 							<view class="productPage_parameter_item_content" :style="{background: !configuration ? 'rgba(137, 159, 197, 1)' : configuration.list.bgType === 1 ? percentage(configuration.list.bgColor, configuration.list.bgAlpha) : 'rgba(137, 159, 197, 1)'}">
 								<view class="productPage_parameter_item_content_price">
@@ -292,7 +293,7 @@
 		data() {
 			return {
 				status: 0,	// 0棣栭〉 1鍟嗗搧鍒楄〃 2pk椤�
-				
+				backPageNum:1,//杩斿洖椤垫暟
 				img: '',
 				
 				opacity: 1,
@@ -513,6 +514,9 @@
 			}
 		},
 		methods: {
+			jumpPKNew(){
+				this.status = 1
+			},
 			aaa(index) {
 				this.fontColorIndex = index
 			},
@@ -677,7 +681,7 @@
 				if (this.status === 0) return
 				this.$refs.search.close()
 				this.$refs.searchShopListRef.close()
-				this.status = this.status - 1
+				this.status = this.status -(this.backPageNum>0?this.backPageNum:1)
 				if (this.status === 0) {
 					this.leftShop = {}
 					this.rightShop = {}
@@ -755,11 +759,12 @@
 			},
 			// 鐐瑰嚮鍔犲叆pk鍟嗗搧
 			openSearch(type) {
-				if (type === 'left') {
+				this.$refs.search.open(type)
+				/* if (type === 'left') {
 					this.$refs.search.open('left')
 				} else if (type === 'right') {
 					this.$refs.search.open('right')
-				}
+				} */
 			},
 			// 鐐瑰嚮鍟嗗搧鍒楄〃椤甸潰鏌ヨ
 			clickShopPageCheck(item, type) {
@@ -983,7 +988,7 @@
 				this.$forceUpdate()
 			},
 			// 鐐瑰嚮绫诲埆
-			clickItem(index, id, name) {
+			clickItem(index, id, name,status,proItem) {
 				this.categoryId = id
 				this.categoryName = name
 				this.isSOU = false
@@ -997,7 +1002,7 @@
 					})
 				
 				this.category.forEach((item, num) => {
-					if (index === num) {
+					if (item.id === id) {
 						item.active = true
 						
 						this.attrSecondList = []
@@ -1055,6 +1060,12 @@
 				this.shopPageData = this.shopData.filter(item => {
 					return item.categoryId === id
 				})
+				if(status ==2){
+					this.leftShop=proItem
+					this.backPageNum =2
+				}else{
+					this.backPageNum=1
+				}
 				console.log(this.shopPageData)
 				// this.shopData.forEach(item => {
 				// 	if (item.categoryId === id) {
@@ -1078,7 +1089,7 @@
 					id: '',
 					name: ''
 				},
-				this.status = 1
+				this.status = status || 1
 			},
 			mousemove(e) {
 				if (e === this.index) return
@@ -1767,16 +1778,17 @@
 					width: 100%;
 					display: flex;
 					align-items: flex-start;
+					justify-content: space-between;
 					margin-bottom: 30px;
 					.productPage_parameter_item {
-						flex: 1;
+						width: 49%;
 						&:first-child {
 							margin-right: 18px;
 						}
 						.productPage_parameter_item_head {
 							width: 100%;
 							height: 40px;
-							background: rgba(0,224,255,0.34) linear-gradient(180deg, rgba(255,255,255,0.35) 0%, rgba(0,0,0,0.21) 100%);
+							// background: rgba(0,224,255,0.34) linear-gradient(180deg, rgba(255,255,255,0.35) 0%, rgba(0,0,0,0.21) 100%);
 							border-radius: 8px 8px 0px 0px;
 							display: flex;
 							align-items: center;
@@ -1784,10 +1796,17 @@
 							overflow: hidden;
 							white-space: nowrap;
 							text-overflow: ellipsis;
-							text-align: center;
-							font-size: 16px;
-							font-weight: 500;
-							color: #FFFFFF;
+							text {
+								width: 100%;
+								text-align: center;
+								font-size: 16px;
+								font-family: SourceHanSansSC-Medium, SourceHanSansSC;
+								font-weight: 500;
+								color: #FFFFFF;
+								overflow: hidden;
+								white-space: nowrap;
+								text-overflow: ellipsis;
+							}
 						}
 						.productPage_parameter_item_content {
 							width: 100%;

--
Gitblit v1.9.3