From 57cc3aea98c80cae2e7a72ab3abd87ec2f9d3451 Mon Sep 17 00:00:00 2001
From: eric <xiaoshuang.eric@gmail.com>
Date: Fri, 9 Dec 2022 13:48:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=80=91=E5=B8=83=E6=B5=81=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/base.wxml                                | 75 +++++++++++++++++++
 dist/comp.json                                |  2 +-
 .../components/details/index.json             |  2 +-
 dist/pages/activityList/index.json            |  2 +-
 dist/pages/home/index.json                    |  2 +-
 dist/pages/mountainPeak/index.json            |  2 +-
 dist/pages/my/index.json                      |  2 +-
 dist/utils.wxs                                |  2 +-
 src/pages/home/components/InfoCard/index.scss |  0
 src/pages/home/components/InfoCard/index.tsx  | 11 +++
 src/pages/home/index.tsx                      | 16 ++--
 11 files changed, 101 insertions(+), 15 deletions(-)
 create mode 100644 src/pages/home/components/InfoCard/index.scss
 create mode 100644 src/pages/home/components/InfoCard/index.tsx

diff --git a/dist/base.wxml b/dist/base.wxml
index 3c29a28..831f8fd 100644
--- a/dist/base.wxml
+++ b/dist/base.wxml
@@ -137,6 +137,11 @@
   <block>{{i.v}}</block>
 </template>
 
+<template name="tmpl_0_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_0_container">
   <template is="{{xs.a(0, i.nn, l)}}" data="{{i:i,cid:0,l:xs.f(l,i.nn)}}" />
 </template>
@@ -197,6 +202,11 @@
   </scroll-view>
 </template>
 
+<template name="tmpl_1_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_1_container">
   <template is="{{xs.a(1, i.nn, l)}}" data="{{i:i,cid:1,l:xs.f(l,i.nn)}}" />
 </template>
@@ -257,6 +267,11 @@
   </scroll-view>
 </template>
 
+<template name="tmpl_2_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_2_container">
   <template is="{{xs.a(2, i.nn, l)}}" data="{{i:i,cid:2,l:xs.f(l,i.nn)}}" />
 </template>
@@ -317,6 +332,11 @@
   </scroll-view>
 </template>
 
+<template name="tmpl_3_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_3_container">
   <template is="{{xs.a(3, i.nn, l)}}" data="{{i:i,cid:3,l:xs.f(l,i.nn)}}" />
 </template>
@@ -369,6 +389,11 @@
   </text>
 </template>
 
+<template name="tmpl_4_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_4_container">
   <template is="{{xs.a(4, i.nn, l)}}" data="{{i:i,cid:4,l:xs.f(l,i.nn)}}" />
 </template>
@@ -421,6 +446,11 @@
   </text>
 </template>
 
+<template name="tmpl_5_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_5_container">
   <template is="{{xs.a(5, i.nn, l)}}" data="{{i:i,cid:5,l:xs.f(l,i.nn)}}" />
 </template>
@@ -465,6 +495,11 @@
   </text>
 </template>
 
+<template name="tmpl_6_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_6_container">
   <template is="{{xs.a(6, i.nn, l)}}" data="{{i:i,cid:6,l:xs.f(l,i.nn)}}" />
 </template>
@@ -509,6 +544,11 @@
   </text>
 </template>
 
+<template name="tmpl_7_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_7_container">
   <template is="{{xs.a(7, i.nn, l)}}" data="{{i:i,cid:7,l:xs.f(l,i.nn)}}" />
 </template>
@@ -553,6 +593,11 @@
   </text>
 </template>
 
+<template name="tmpl_8_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_8_container">
   <template is="{{xs.a(8, i.nn, l)}}" data="{{i:i,cid:8,l:xs.f(l,i.nn)}}" />
 </template>
@@ -597,6 +642,11 @@
   </text>
 </template>
 
+<template name="tmpl_9_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_9_container">
   <template is="{{xs.a(9, i.nn, l)}}" data="{{i:i,cid:9,l:xs.f(l,i.nn)}}" />
 </template>
@@ -641,6 +691,11 @@
   </text>
 </template>
 
+<template name="tmpl_10_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_10_container">
   <template is="{{xs.a(10, i.nn, l)}}" data="{{i:i,cid:10,l:xs.f(l,i.nn)}}" />
 </template>
@@ -685,6 +740,11 @@
   </text>
 </template>
 
+<template name="tmpl_11_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_11_container">
   <template is="{{xs.a(11, i.nn, l)}}" data="{{i:i,cid:11,l:xs.f(l,i.nn)}}" />
 </template>
@@ -729,6 +789,11 @@
   </text>
 </template>
 
+<template name="tmpl_12_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_12_container">
   <template is="{{xs.a(12, i.nn, l)}}" data="{{i:i,cid:12,l:xs.f(l,i.nn)}}" />
 </template>
@@ -773,6 +838,11 @@
   </text>
 </template>
 
+<template name="tmpl_13_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_13_container">
   <template is="{{xs.a(13, i.nn, l)}}" data="{{i:i,cid:13,l:xs.f(l,i.nn)}}" />
 </template>
@@ -817,6 +887,11 @@
   </text>
 </template>
 
+<template name="tmpl_14_custom-wrapper">
+  <custom-wrapper i="{{i}}" l="{{l}}" id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+  </custom-wrapper>
+</template>
+  
 <template name="tmpl_14_container">
   <template is="{{xs.a(14, i.nn, l)}}" data="{{i:i,cid:14,l:xs.f(l,i.nn)}}" />
 </template>
diff --git a/dist/comp.json b/dist/comp.json
index c159f40..710fbe2 100644
--- a/dist/comp.json
+++ b/dist/comp.json
@@ -1 +1 @@
-{"component":true,"usingComponents":{"comp":"./comp"}}
\ No newline at end of file
+{"component":true,"usingComponents":{"comp":"./comp"},"custom-wrapper":"./custom-wrapper"}
\ No newline at end of file
diff --git a/dist/pages/activityList/components/details/index.json b/dist/pages/activityList/components/details/index.json
index 7a5854c..d4e7041 100644
--- a/dist/pages/activityList/components/details/index.json
+++ b/dist/pages/activityList/components/details/index.json
@@ -1 +1 @@
-{"navigationBarTitleText":"活动详情","usingComponents":{"comp":"../../../../comp"}}
\ No newline at end of file
+{"navigationBarTitleText":"活动详情","usingComponents":{"custom-wrapper":"../../../../custom-wrapper","comp":"../../../../comp"}}
\ No newline at end of file
diff --git a/dist/pages/activityList/index.json b/dist/pages/activityList/index.json
index 2fd3f0f..c4c57ed 100644
--- a/dist/pages/activityList/index.json
+++ b/dist/pages/activityList/index.json
@@ -1 +1 @@
-{"navigationBarTitleText":"活动列表","usingComponents":{"comp":"../../comp"}}
\ No newline at end of file
+{"navigationBarTitleText":"活动列表","usingComponents":{"custom-wrapper":"../../custom-wrapper","comp":"../../comp"}}
\ No newline at end of file
diff --git a/dist/pages/home/index.json b/dist/pages/home/index.json
index 2850048..f825da0 100644
--- a/dist/pages/home/index.json
+++ b/dist/pages/home/index.json
@@ -1 +1 @@
-{"navigationBarTitleText":"首页","usingComponents":{"comp":"../../comp"}}
\ No newline at end of file
+{"navigationBarTitleText":"首页","usingComponents":{"custom-wrapper":"../../custom-wrapper","comp":"../../comp"}}
\ No newline at end of file
diff --git a/dist/pages/mountainPeak/index.json b/dist/pages/mountainPeak/index.json
index 287384f..83e8a87 100644
--- a/dist/pages/mountainPeak/index.json
+++ b/dist/pages/mountainPeak/index.json
@@ -1 +1 @@
-{"navigationBarTitleText":"山峰介绍","usingComponents":{"comp":"../../comp"}}
\ No newline at end of file
+{"navigationBarTitleText":"山峰介绍","usingComponents":{"custom-wrapper":"../../custom-wrapper","comp":"../../comp"}}
\ No newline at end of file
diff --git a/dist/pages/my/index.json b/dist/pages/my/index.json
index 6a71c2d..b55c89c 100644
--- a/dist/pages/my/index.json
+++ b/dist/pages/my/index.json
@@ -1 +1 @@
-{"navigationBarTitleText":"我的","usingComponents":{"comp":"../../comp"}}
\ No newline at end of file
+{"navigationBarTitleText":"我的","usingComponents":{"custom-wrapper":"../../custom-wrapper","comp":"../../comp"}}
\ No newline at end of file
diff --git a/dist/utils.wxs b/dist/utils.wxs
index ebcd294..737889e 100644
--- a/dist/utils.wxs
+++ b/dist/utils.wxs
@@ -1,6 +1,6 @@
 module.exports = {
   a: function (l, n, s) {
-    var a = ["7","0","19","5","2","12","6","4","51","52","26","21","48","53","54"]
+    var a = ["7","0","19","5","2","12","6","4","51","52","26","21","48","53","54","custom-wrapper"]
     var b = ["4","51","52","26","21","48","53","54"]
     if (a.indexOf(n) === -1) {
       l = 0
diff --git a/src/pages/home/components/InfoCard/index.scss b/src/pages/home/components/InfoCard/index.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/home/components/InfoCard/index.tsx b/src/pages/home/components/InfoCard/index.tsx
new file mode 100644
index 0000000..31b726a
--- /dev/null
+++ b/src/pages/home/components/InfoCard/index.tsx
@@ -0,0 +1,11 @@
+import { Button, Checkbox, Form, FormItem, Icon, Image } from "@antmjs/vantui";
+import { Input, View, Text } from "@tarojs/components";
+import react, { useEffect } from "react";
+import "./index.scss";
+import { PowerScrollView } from "@antmjs/vantui";
+
+const InfoCard = () => {
+  return <View>InfoCard</View>;
+};
+
+export default InfoCard;
diff --git a/src/pages/home/index.tsx b/src/pages/home/index.tsx
index 2f4a9d9..aa29c10 100644
--- a/src/pages/home/index.tsx
+++ b/src/pages/home/index.tsx
@@ -32,6 +32,7 @@ import { Search } from "@antmjs/vantui";
 import ActiveCard from "../components/ActiveCard";
 import { Dialog } from "@antmjs/vantui";
 import { Loading } from "@antmjs/vantui";
+import InfoCard from "./components/InfoCard";
 
 const Home = () => {
   // const { images } = COMMON
@@ -50,8 +51,6 @@ const Home = () => {
   const [openid, setopenid] = useState();
   const [isIn, setisIn] = useState(false);
 
-
-
   const onChange = (e) => {};
 
   useEffect(() => {
@@ -60,10 +59,9 @@ const Home = () => {
 
   const getLogin = async () => {
     let isLogin: any = await phoneLogin();
-    console.log('isLogin',isLogin)
+    console.log("isLogin", isLogin);
     setisIn(isLogin);
   };
-  
 
   Taro.useShareAppMessage((res) => {
     if (res.from === "button") {
@@ -138,9 +136,9 @@ const Home = () => {
       okFun: async (res: any) => {
         console.log("systemConfig--", res);
         await setsystemConfig(res?.data ?? []);
-        setTimeout(()=>{
-          getdetails()
-        },500)
+        setTimeout(() => {
+          getdetails();
+        }, 500);
         // await getdetails()
       },
     };
@@ -535,6 +533,9 @@ const Home = () => {
         <Skeleton title={true} row={4} />
       )}
 
+      {/* 瀑布流 */}
+      {/* <InfoCard /> */}
+
       {/* 直播live专区 */}
       {/* <View>视频号直播</View> */}
 
@@ -554,7 +555,6 @@ const Home = () => {
           }}
         ></OfficialAccount>
       </View>
-      
 
       {/* 打开视频号主页-需要开放平台主主体认证 */}
       {/* <View