From a0fd8492948062ea95e83f4977efbf36f68789ff Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Fri, 15 Apr 2022 18:08:38 +0800
Subject: [PATCH] 商品分组、服务卡项分组自定义模版分类标题置顶

---
 components/diy_goodsGroup/diy_goodsGroup.js     | 20 +++++++++++++++-----
 components/diy_goodsGroup/diy_goodsGroup.json   |  3 ++-
 components/diy_goodsGroup/diy_goodsGroup.wxml   | 16 ++++++++++++++++
 components/diy_serviceCard/diy_serviceCard.js   |  7 ++-----
 components/diy_serviceCard/diy_serviceCard.wxml |  2 +-
 pages/index/index/index.js                      |  6 ------
 pages/index/index/index.wxml                    |  4 ++--
 7 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 4680b26..98a58b1 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -14,7 +14,14 @@ Component({
 			type: Object,
 			value: null,
 		},
-
+		sticky: {
+			type: Number,
+			value: 0,
+		},
+		container: {
+		 type: Function,
+			value: null,
+		},
 	},
 	data: {
 		// 这里是一些组件内部数据
@@ -47,14 +54,17 @@ Component({
 		swiper_hei: 0,
 		title_class: "",
 		is_no_plus: 1,
+		container: null,
 	},
 
-	ready: function () { },
-
 	lifetimes: {
+		ready: function () {
+			this.setData({
+			  container: () => wx.createSelectorQuery().select('#container')
+			})
+		},
+		
 		attached: function () {
-
-
 			//要兼容性的写法，因为有些商家都还未更新商品分组的最新的效果~~3.0公众号的html页面所以不用兼容写法	
 			var nav_item = this.data.object;
 			var nav_list = this.data.object.nav_list;
diff --git a/components/diy_goodsGroup/diy_goodsGroup.json b/components/diy_goodsGroup/diy_goodsGroup.json
index c886449..184585e 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.json
+++ b/components/diy_goodsGroup/diy_goodsGroup.json
@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "mp-loading": "weui-miniprogram/loading/loading"
+    "mp-loading": "weui-miniprogram/loading/loading",
+		"mp-sticky": "../mp-sticky/mp-sticky"
   }
 }
\ No newline at end of file
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index ddd463f..0f19b5d 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -4,13 +4,27 @@
 
 <!-- 要不要顶部标题 -->
 <mp-loading show ="{{goods_array.length== 0}}" type="circle"></mp-loading>
+
+<view id="container">
+	
+
 <block wx:if="{{is_nav}}">
+	<mp-sticky wx:if="{{sticky == 1}}" container="{{container}}">
     <view class="flex gr_title_list" style="overflow-x: auto;">
         <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}">
             <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text>
         </view>
     </view>
+	</mp-sticky>
+	
+	<view class="flex gr_title_list" style="overflow-x: auto;" wx:else>
+	    <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}">
+	        <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text>
+	    </view>
+	</view>
 </block>
+
+
 <view style="background-color: {{bg_color}};">
     <!--1个列表的时候-->
     <view class="zs_goods_wai" wx:if='{{object.column==1}}'>
@@ -885,4 +899,6 @@
         </view>
     </swiper>
 
+</view>
+
 </view>
\ No newline at end of file
diff --git a/components/diy_serviceCard/diy_serviceCard.js b/components/diy_serviceCard/diy_serviceCard.js
index 375573b..6eca56d 100644
--- a/components/diy_serviceCard/diy_serviceCard.js
+++ b/components/diy_serviceCard/diy_serviceCard.js
@@ -19,9 +19,10 @@ Component({
 		},
 		sticky: {
 			type: Number,
+			value: 0,
 		},
 		container: {
-			type: Object,
+		 type: Function,
 			value: null,
 		},
 	},
@@ -185,10 +186,6 @@ Component({
 		show: function() {
 			//--初始化卡类--
 			// this.card_init();
-			// this.setData({
-			//   container: () => wx.createSelectorQuery().select('#container')
-			// });
-			console.log('onshow');
 		},
 	},
 
diff --git a/components/diy_serviceCard/diy_serviceCard.wxml b/components/diy_serviceCard/diy_serviceCard.wxml
index f4afde4..4d6a906 100644
--- a/components/diy_serviceCard/diy_serviceCard.wxml
+++ b/components/diy_serviceCard/diy_serviceCard.wxml
@@ -12,7 +12,7 @@
 </block> -->
 <view id="container">
 	
-	<mp-sticky wx:if="{{sticky == 1}}">
+	<mp-sticky wx:if="{{sticky == 1}}" container="{{container}}">
 		<scroll-view scroll-x="true" enhanced="true" fast-deceleration="true" show-scrollbar="false" wx:if="{{is_nav}}">
 			<view class="flex" style="{{myStyle}};">
 				<view
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 5a97b31..dac0d27 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -88,12 +88,6 @@ Page({
 		container: null,
 	},
 	
-	onReady() {
-	    this.setData({
-	      container: () => wx.createSelectorQuery().select('#container')
-	    })
-			console.log('container', this.data.container);
-	},
 
 	onLoad: async function (tt) {
 		wx.showShareMenu({
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 9f6e410..d57483c 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -469,7 +469,7 @@
       </block>
       <!--商品分组-->
       <block wx:if="{{item.ename=='goodsGroup'}}">
-        <goodsGroup object="{{item.content}}"></goodsGroup>
+        <goodsGroup object="{{item.content}}" sticky="{{template_arr[0].content.is_top}}"></goodsGroup>
 				
       </block>
       <!--通知-->
@@ -536,7 +536,7 @@
 		
 		<!-- 服务卡项 -->
 		<block wx:if="{{item.ename=='servicecategory'}}">
-			 <serviceCard object="{{item.content}}" sticky="{{template_arr[0].content.is_top}}" id="container"></serviceCard>
+			 <serviceCard object="{{item.content}}" sticky="{{template_arr[0].content.is_top}}"></serviceCard>
 		</block>
 		
 
--
libgit2 0.21.4