style: botton处理

2022-11-19 22:30:58 +08:00
parent 4f0a73864c
commit 5e6c468105
19 changed files with 122 additions and 70 deletions
--- a/dist/common.js
+++ b/dist/common.js
@@ -1,2 +1,2 @@
 /*! For license information please see common.js.LICENSE.txt */
-"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([["common"],{"./src/pages/components/ActiveCard/index.tsx":function(e,n,a){var t=a("./node_modules/@antmjs/vantui/es/button/index.js"),s=a("./node_modules/@antmjs/vantui/es/tag/index.js"),i=a("./node_modules/@antmjs/vantui/es/image/index.js"),o=a("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),l=a("webpack/container/remote/react/jsx-runtime");n.default=function ActiveCard(){return(0,l.jsxs)(o.View,{className:"activeCard",children:[(0,l.jsx)(o.View,{className:"left",children:(0,l.jsx)(i.default,{width:"100%",height:"100px",fit:"cover",src:"cloud://cloud1-5g5xrgza12a0dd6d.636c-cloud1-5g5xrgza12a0dd6d-1253665791/images/v4-460px-Climb-a-Mountain-Step-9.jpg"})}),(0,l.jsxs)(o.View,{className:"middle",children:[(0,l.jsxs)(o.View,{className:"title",children:[(0,l.jsx)(s.default,{round:!0,type:"warning",style:{marginRight:"5px"},children:"标签"}),(0,l.jsx)(o.Text,{children:"这是标题这是标题这是标题这是标题这是标题"})]}),(0,l.jsxs)(o.View,{className:"down",children:[(0,l.jsxs)(o.View,{className:"date",children:[(0,l.jsx)(o.View,{className:"21",children:"莲花山公园"}),(0,l.jsx)(o.View,{className:"11",children:"2022年11月17日"})]}),(0,l.jsxs)(o.View,{className:"btn",children:[" ",(0,l.jsx)(t.default,{plain:!0,hairline:!0,type:"primary",children:"立即报名"})]})]})]})]})}},"./src/pages/components/TabbarCom/index.tsx":function(e,n,a){var t=a("./node_modules/@antmjs/vantui/es/tabbar/index.js"),s=a("./node_modules/@antmjs/vantui/es/tabbar-item/index.js"),i=a("./node_modules/@babel/runtime/helpers/esm/slicedToArray.js"),o=a("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),l=a("webpack/container/remote/@tarojs/taro"),d=a.n(l),r=a("webpack/container/remote/react"),c=a.n(r),u=a("webpack/container/remote/react/jsx-runtime");n.default=function TabbarCom(e){var n,a=c().useState(null!==(n=null==e?void 0:e.active)&&void 0!==n?n:0),l=(0,i.default)(a,2),r=l[0],m=l[1];return(0,u.jsx)(o.View,{style:{marginTop:"40px"},children:(0,u.jsxs)(t.default,{active:r,onChange:function onChange(e){console.log("e",e),m(null==e?void 0:e.detail),0===(null==e?void 0:e.detail)&&d().redirectTo({url:"/pages/home/index"}),1===(null==e?void 0:e.detail)&&d().redirectTo({url:"/pages/activityList/index"}),2===(null==e?void 0:e.detail)&&d().redirectTo({url:"/pages/my/index"})},safeAreaInsetBottom:!0,children:[(0,u.jsx)(s.default,{icon:"home-o",children:"首页"}),(0,u.jsx)(s.default,{icon:"friends-o",children:"活动"}),(0,u.jsx)(s.default,{icon:"setting-o",children:"我的"})]})})}},"./src/utils/index.ts":function(e,n,a){a.d(n,{getTable:function(){return i}});var t=a("webpack/container/remote/@tarojs/taro"),s=a.n(t),i=function getTable(e){var n=e.env,a=e.tableName,t=e.okFun,i=s().cloud.database({env:n}),o=null==i?void 0:i.collection(a);null==o||o.get({success:function success(e){t(e)}})}}}]);
+"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([["common"],{"./src/pages/components/ActiveCard/index.tsx":function(e,n,a){var t=a("./node_modules/@antmjs/vantui/es/button/index.js"),s=a("./node_modules/@antmjs/vantui/es/tag/index.js"),i=a("./node_modules/@antmjs/vantui/es/image/index.js"),o=a("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),l=a("webpack/container/remote/react/jsx-runtime");n.default=function ActiveCard(){return(0,l.jsxs)(o.View,{className:"activeCard",children:[(0,l.jsx)(o.View,{className:"left",children:(0,l.jsx)(i.default,{width:"100%",height:"100px",fit:"cover",src:"cloud://cloud1-5g5xrgza12a0dd6d.636c-cloud1-5g5xrgza12a0dd6d-1253665791/images/v4-460px-Climb-a-Mountain-Step-9.jpg"})}),(0,l.jsxs)(o.View,{className:"middle",children:[(0,l.jsxs)(o.View,{className:"title",children:[(0,l.jsx)(s.default,{round:!0,type:"warning",style:{marginRight:"5px"},children:"标签"}),(0,l.jsx)(o.Text,{children:"这是标题这是标题这是标题这是标题这是标题"})]}),(0,l.jsxs)(o.View,{className:"down",children:[(0,l.jsxs)(o.View,{className:"date",children:[(0,l.jsx)(o.View,{className:"21",children:"莲花山公园"}),(0,l.jsx)(o.View,{className:"11",children:"2022年11月17日"})]}),(0,l.jsx)(o.View,{className:"btn",children:(0,l.jsx)(t.default,{plain:!0,hairline:!0,type:"primary",children:"立即报名"})})]})]})]})}},"./src/pages/components/TabbarCom/index.tsx":function(e,n,a){var t=a("./node_modules/@antmjs/vantui/es/tabbar/index.js"),s=a("./node_modules/@antmjs/vantui/es/tabbar-item/index.js"),i=a("./node_modules/@babel/runtime/helpers/esm/slicedToArray.js"),o=a("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),l=a("webpack/container/remote/@tarojs/taro"),d=a.n(l),r=a("webpack/container/remote/react"),c=a.n(r),u=a("webpack/container/remote/react/jsx-runtime");n.default=function TabbarCom(e){var n,a=c().useState(null!==(n=null==e?void 0:e.active)&&void 0!==n?n:0),l=(0,i.default)(a,2),r=l[0],m=l[1];return(0,u.jsx)(o.View,{style:{marginTop:"40px"},children:(0,u.jsxs)(t.default,{active:r,onChange:function onChange(e){console.log("e",e),m(null==e?void 0:e.detail),0===(null==e?void 0:e.detail)&&d().redirectTo({url:"/pages/home/index"}),1===(null==e?void 0:e.detail)&&d().redirectTo({url:"/pages/activityList/index"}),2===(null==e?void 0:e.detail)&&d().redirectTo({url:"/pages/my/index"})},safeAreaInsetBottom:!0,children:[(0,u.jsx)(s.default,{icon:"home-o",children:"首页"}),(0,u.jsx)(s.default,{icon:"friends-o",children:"活动"}),(0,u.jsx)(s.default,{icon:"setting-o",children:"我的"})]})})}},"./src/utils/index.ts":function(e,n,a){a.d(n,{getTable:function(){return i}});var t=a("webpack/container/remote/@tarojs/taro"),s=a.n(t),i=function getTable(e){var n=e.env,a=e.tableName,t=e.okFun,i=s().cloud.database({env:n}),o=null==i?void 0:i.collection(a);null==o||o.get({success:function success(e){t(e)}})}}}]);
--- a/dist/pages/activityList/components/details/index.js
+++ b/dist/pages/activityList/components/details/index.js
@@ -1,2 +1,2 @@
 /*! For license information please see index.js.LICENSE.txt */
-"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([["pages/activityList/components/details/index"],{"./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./src/pages/activityList/components/details/index.tsx":function(e,t,n){var s=n("./node_modules/@antmjs/vantui/es/button/index.js"),i=n("./node_modules/@babel/runtime/helpers/esm/slicedToArray.js"),o=n("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),a=n("webpack/container/remote/@tarojs/taro"),l=n.n(a),c=n("webpack/container/remote/react"),d=n("./src/utils/index.ts"),r=n("webpack/container/remote/react/jsx-runtime");t.default=function details(){var e,t,n=(0,c.useState)([]),a=(0,i.default)(n,2),u=a[0],m=a[1],p=(0,c.useState)(0),x=(0,i.default)(p,2),f=x[0],v=x[1];return(0,c.useEffect)((function(){}),[]),(0,c.useEffect)((function(){var e,t=l().getSystemInfoSync(),n=t.screenHeight,s=t.safeArea,i=void 0===s?{}:s,o=null!==(e=n-(null==i?void 0:i.bottom))&&void 0!==e?e:0;v(o);var a={tableName:"cityNew",id:"80516fb66370bcf300b8f43c5f4dd52b",okFun:function okFun(e){var t;console.log("res",e),m(null!==(t=null==e?void 0:e.data)&&void 0!==t?t:[])}};(0,d.getTable)(a)}),[]),(0,r.jsxs)(o.View,{className:"detailContent",children:[(0,r.jsxs)(o.View,{onClick:function onClick(){},children:[(0,r.jsx)(o.View,{children:null==u||null===(e=u[0])||void 0===e?void 0:e.actTitle}),(0,r.jsx)(o.RichText,{nodes:null==u||null===(t=u[0])||void 0===t?void 0:t.richText})]}),(0,r.jsx)(o.View,{className:"detailBtn",style:{bottom:"".concat(null!=f?f:0,"px")},children:(0,r.jsx)(s.default,{type:"primary",block:!0,children:"立即参加"})})]})}},"./src/pages/activityList/components/details/index.tsx":function(e,t,n){var s=n("webpack/container/remote/@tarojs/runtime"),i=n("./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./src/pages/activityList/components/details/index.tsx");Page((0,s.createPageConfig)(i.default,"pages/activityList/components/details/index",{root:{cn:[]}},{navigationBarTitleText:"活动详情"}||{}))}},function(e){e.O(0,["taro","vendors","common"],(function(){return t="./src/pages/activityList/components/details/index.tsx",e(e.s=t);var t}));e.O()}]);
+"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([["pages/activityList/components/details/index"],{"./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./src/pages/activityList/components/details/index.tsx":function(e,t,n){var s=n("./node_modules/@antmjs/vantui/es/button/index.js"),i=n("./node_modules/@antmjs/vantui/es/image/index.js"),a=n("./node_modules/@babel/runtime/helpers/esm/slicedToArray.js"),o=n("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),c=n("webpack/container/remote/@tarojs/taro"),d=n.n(c),l=n("webpack/container/remote/react"),r=n("./src/utils/index.ts"),u=n("webpack/container/remote/react/jsx-runtime");t.default=function details(){var e,t=(0,l.useState)([]),n=(0,a.default)(t,2),c=n[0],m=n[1],p=(0,l.useState)(0),x=(0,a.default)(p,2),f=x[0],j=x[1];return(0,l.useEffect)((function(){}),[]),(0,l.useEffect)((function(){var e,t=d().getSystemInfoSync(),n=t.screenHeight,s=t.safeArea,i=void 0===s?{}:s,a=null!==(e=n-(null==i?void 0:i.bottom))&&void 0!==e?e:0;j(a);var o={tableName:"cityNew",id:"80516fb66370bcf300b8f43c5f4dd52b",okFun:function okFun(e){var t;console.log("res",e),m(null!==(t=null==e?void 0:e.data)&&void 0!==t?t:[])}};(0,r.getTable)(o)}),[]),(0,u.jsxs)(o.View,{className:"detailContent",children:[(0,u.jsxs)(o.View,{children:[(0,u.jsx)(o.View,{children:"活动标题活动标题活动标题活动标题活动标题活动标题活动标题"}),(0,u.jsx)(i.default,{width:"100%",height:"120px",fit:"cover",src:"https://img.yzcdn.cn/vant/cat.jpeg"}),[1,2,3,4].map((function(e){return(0,u.jsx)(i.default,{round:!0,width:"30px",height:"30px",src:"https://img.yzcdn.cn/vant/cat.jpeg"})}))]}),(0,u.jsx)(o.View,{onClick:function onClick(){},className:"RichText",children:(0,u.jsx)(o.RichText,{nodes:null==c||null===(e=c[0])||void 0===e?void 0:e.richText})}),(0,u.jsx)(o.View,{className:"detailBtn",style:{bottom:"".concat(null!=f?f:0,"px")},children:(0,u.jsx)(s.default,{type:"primary",block:!0,children:"立即参加"})})]})}},"./src/pages/activityList/components/details/index.tsx":function(e,t,n){var s=n("webpack/container/remote/@tarojs/runtime"),i=n("./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./src/pages/activityList/components/details/index.tsx");Page((0,s.createPageConfig)(i.default,"pages/activityList/components/details/index",{root:{cn:[]}},{navigationBarTitleText:"活动详情"}||{}))}},function(e){e.O(0,["taro","vendors","common"],(function(){return t="./src/pages/activityList/components/details/index.tsx",e(e.s=t);var t}));e.O()}]);
--- a/dist/pages/activityList/components/details/index.js.LICENSE.txt
+++ b/dist/pages/activityList/components/details/index.js.LICENSE.txt
@@ -6,6 +6,8 @@

 /*! @antmjs/vantui/es/button */

+/*! @antmjs/vantui/es/image */
+
 /*! @tarojs/components */

 /*! @tarojs/runtime */
--- a/dist/pages/activityList/components/details/index.wxss
+++ b/dist/pages/activityList/components/details/index.wxss
@@ -1,6 +1,14 @@
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** css ./node_modules/cache-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[2]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[3]!./node_modules/resolve-url-loader/index.js!./node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[5]!./src/pages/activityList/components/details/index.scss ***!
  \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.detailContent {
+  padding: 20rpx;
+  background-color: #fafafa;
+}
+.detailContent .RichText {
+  margin-top: 20rpx;
+  background-color: #fafafa;
+}
 .detailContent .detailBtn {
  display: -webkit-flex;
  display: -ms-flexbox;
@@ -14,6 +22,6 @@
  -webkit-justify-content: center;
      -ms-flex-pack: center;
          justify-content: center;
-  width: 100%;
+  width: 95%;
  position: fixed;
 }
--- a/dist/pages/activityList/index.js
+++ b/dist/pages/activityList/index.js
--- a/dist/pages/home/index.js
+++ b/dist/pages/home/index.js
--- a/dist/pages/home/index.wxss
+++ b/dist/pages/home/index.wxss
@@ -35,6 +35,7 @@
  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 .homeContent {
  padding: 20rpx;
+  padding-bottom: 150rpx;
 }
 .homeContent .tagStyle {
  font-size: 18rpx;
--- a/dist/pages/my/index.js
+++ b/dist/pages/my/index.js
--- a/dist/pages/my/index.js.LICENSE.txt
+++ b/dist/pages/my/index.js.LICENSE.txt
@@ -1,19 +1,17 @@
 /*! ../../../node_modules/thread-loader/dist/cjs.js!../../../node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./index.tsx */

-/*! ../common/jumpLink */
-
 /*! ../common/utils */

 /*! ../common/validator */

+/*! ../components/ActiveCard */
+
 /*! ../components/TabbarCom */

 /*! ../info/index */

 /*! ../sticky/index */

-/*! ../tag */
-
 /*! ../wxs/style */

 /*! ../wxs/utils */
@@ -22,8 +20,6 @@

 /*! ./wxs */

-/*! @antmjs/vantui/es/card */
-
 /*! @antmjs/vantui/es/cell */

 /*! @antmjs/vantui/es/image */
@@ -66,10 +62,6 @@
  !*** ./node_modules/@antmjs/vantui/es/tab/index.js ***!
  \*****************************************************/

-/*!******************************************************!*\
-  !*** ./node_modules/@antmjs/vantui/es/card/index.js ***!
-  \******************************************************/
-
 /*!******************************************************!*\
  !*** ./node_modules/@antmjs/vantui/es/sticky/wxs.js ***!
  \******************************************************/
--- a/dist/pages/my/index.wxss
+++ b/dist/pages/my/index.wxss
@@ -10,13 +10,13 @@
  !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[4].oneOf[0].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[4].oneOf[0].use[2]!./node_modules/@antmjs/vantui/es/tab/index.css ***!
  \********************************************************************************************************************************************************************************************************************/
 .van-tab__pane{box-sizing:border-box;overflow-y:auto;-webkit-overflow-scrolling:touch;-webkit-flex-shrink:0;flex-shrink:0;width:100%}.van-tab__pane--active{height:auto}.van-tab__pane--inactive{height:0;overflow:visible}
-/*!*********************************************************************************************************************************************************************************************************************!*\
-  !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[4].oneOf[0].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[4].oneOf[0].use[2]!./node_modules/@antmjs/vantui/es/card/index.css ***!
-  \*********************************************************************************************************************************************************************************************************************/
-.van-card{position:relative;box-sizing:border-box;padding:16rpx 32rpx;padding:var(--card-padding,16rpx 32rpx);font-size:24rpx;font-size:var(--card-font-size, 24rpx);color:#323233;color:var(--card-text-color,#323233);background-color:#fafafa;background-color:var(--card-background-color,#fafafa)}.van-card__header{display:-webkit-flex;display:flex}.van-card__header--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-card__thumb{position:relative;-webkit-flex:none;flex:none;width:176rpx;width:var(--card-thumb-size,176rpx);height:176rpx;height:var(--card-thumb-size,176rpx);margin-right:16rpx;margin-right:var(--padding-xs,16rpx)}.van-card__thumb:empty{display:none}.van-card__img{width:100%;height:100%;border-radius:16rpx;border-radius:var(--border-radius-lg,16rpx)}.van-card__content{position:relative;display:-webkit-flex;display:flex;-webkit-flex:1;flex:1;-webkit-flex-direction:column;flex-direction:column;-webkit-justify-content:space-between;justify-content:space-between;min-width:0;min-height:176rpx;min-height:var(--card-thumb-size,176rpx)}.van-card__content--center{-webkit-justify-content:center;justify-content:center}.van-card__desc,.van-card__title{word-wrap:break-word}.van-card__title{font-weight:700;line-height:32rpx;line-height:var(--card-title-line-height, 32rpx)}.van-card__desc{line-height:40rpx;line-height:var(--card-desc-line-height, 40rpx);color:#646566;color:var(--card-desc-color,#646566)}.van-card__bottom{line-height:40rpx}.van-card__price{display:inline-block;font-weight:700;color:#ee0a24;color:var(--card-price-color,#ee0a24);font-size:24rpx;font-size:var(--card-price-font-size, 24rpx)}.van-card__price-integer{font-size:32rpx;font-size:var(--card-price-integer-font-size, 32rpx);font-family:Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif;font-family:var(--card-price-font-family, Avenir-Heavy, PingFang SC, Helvetica Neue, Arial, sans-serif)}.van-card__price-decimal{font-family:Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif;font-family:var(--card-price-font-family, Avenir-Heavy, PingFang SC, Helvetica Neue, Arial, sans-serif)}.van-card__origin-price{display:inline-block;margin-left:10rpx;text-decoration:line-through;font-size:20rpx;font-size:var(--card-origin-price-font-size, 20rpx);color:#646566;color:var(--card-origin-price-color,#646566)}.van-card__num{float:right}.van-card__tag{position:absolute!important;top:4rpx;left:0}.van-card__footer{-webkit-flex:none;flex:none;width:100%;text-align:right}
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** css ./node_modules/cache-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[2]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[3]!./node_modules/resolve-url-loader/index.js!./node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[5]!./src/pages/my/index.module.scss ***!
  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.myContentDiv {
+  padding: 20rpx;
+}
+
 .myContent {
  display: -webkit-flex;
  display: -ms-flexbox;
--- a/dist/vendors.js
+++ b/dist/vendors.js
--- a/src/pages/activityList/components/details/index.scss
+++ b/src/pages/activityList/components/details/index.scss
@@ -1,13 +1,22 @@
 .detailContent {
-//   background-color: yellow;
+  // background-color: yellow;
+  padding: 20px;
+  background-color: #fafafa;
+
+
+  .RichText{
+    margin-top: 20px;
+    background-color: #fafafa;
+  }

  .detailBtn {
    display: flex;
    flex-direction: row;
    align-items: center;
    justify-content: center;
-    width: 100%;
+    width: 95%;
    position: fixed;
    // bottom: 0px;
+    // background-color: yellow;
  }
 }
--- a/src/pages/activityList/components/details/index.tsx
+++ b/src/pages/activityList/components/details/index.tsx
@@ -4,10 +4,11 @@ import Taro from "@tarojs/taro";
 import react, { useEffect, useState } from "react";
 import { getTable } from "../../../../utils/index";
 import "./index.scss";
+import { Image } from "@antmjs/vantui";

 const details = () => {
  const [dataSource, setdataSource] = useState<any>([]);
-  const [bottomheight,setbottomheight]=useState(0)
+  const [bottomheight, setbottomheight] = useState(0);

  useEffect(() => {
    // 设置标题
@@ -17,10 +18,10 @@ const details = () => {
  }, []);

  useEffect(() => {
-    const {screenHeight,safeArea={}}=Taro.getSystemInfoSync()
+    const { screenHeight, safeArea = {} } = Taro.getSystemInfoSync();
    // @ts-ignore
-    let newBottom=screenHeight -safeArea?.bottom??0
-    setbottomheight(newBottom)
+    let newBottom = screenHeight - safeArea?.bottom ?? 0;
+    setbottomheight(newBottom);

    let objParams = {
      tableName: "cityNew",
@@ -38,17 +39,42 @@ const details = () => {

  return (
    <View className={`detailContent`}>
+      <View>
+       <View>{`活动标题活动标题活动标题活动标题活动标题活动标题活动标题`}</View>
+       <Image
+          width="100%"
+          height="120px"
+          fit="cover"
+          src="https://img.yzcdn.cn/vant/cat.jpeg"
+        />
+
+        {/* 头像列表 */}
+        {[1, 2, 3, 4].map((item: any) => {
+          return (
+            <Image
+              round
+              width="30px"
+              height="30px"
+              src="https://img.yzcdn.cn/vant/cat.jpeg"
+            />
+          );
+        })}
+      </View>
      {/* 富文本 */}
-      <View onClick={() => {}}>
-        <View>{dataSource?.[0]?.actTitle}</View>
+      <View onClick={() => {}} className='RichText'>
+        {/* <View>{dataSource?.[0]?.actTitle}</View> */}
+
        <RichText nodes={dataSource?.[0]?.richText} />
      </View>

-      <View className={`detailBtn`} style={{bottom:`${bottomheight??0}px`}}>
-      {/* style={{width:'375px'}} */}
-          <Button  type="primary" block>
-            立即参加
-          </Button>
+      <View
+        className={`detailBtn`}
+        style={{ bottom: `${bottomheight ?? 0}px` }}
+      >
+        {/* style={{width:'375px'}} */}
+        <Button type="primary" block>
+          立即参加
+        </Button>
      </View>
    </View>
  );
--- a/src/pages/activityList/index.tsx
+++ b/src/pages/activityList/index.tsx
@@ -77,7 +77,7 @@ const activityList = () => {
          </View>
        );
      })}
-      <TabbarCom active={1} />;
+      <TabbarCom active={1} />
    </View>
  );
 };
--- a/src/pages/components/ActiveCard/index.tsx
+++ b/src/pages/components/ActiveCard/index.tsx
@@ -33,7 +33,6 @@ const ActiveCard = () => {
         

          <View className="btn">
-            {" "}
            <Button plain hairline type="primary">
              立即报名
            </Button>
--- a/src/pages/home/index.scss
+++ b/src/pages/home/index.scss
@@ -1,5 +1,6 @@
 .homeContent{
    padding: 20px;
+    padding-bottom: 150px;
    .tagStyle{
        font-size: 18px;
    }
--- a/src/pages/home/index.tsx
+++ b/src/pages/home/index.tsx
@@ -157,7 +157,7 @@ const Home = () => {
        <Divider />
      </View>

-      {[1, 2].map((item: any) => {
+      {[1, 2,3,4].map((item: any) => {
        return (
          <View
            onClick={() => {
--- a/src/pages/my/index.module.scss
+++ b/src/pages/my/index.module.scss
@@ -1,3 +1,7 @@
+.myContentDiv{
+    padding: 20px;
+}
+
 .myContent{
    // background-color: yellow;
    display: flex;
--- a/src/pages/my/index.tsx
+++ b/src/pages/my/index.tsx
@@ -4,11 +4,10 @@ import react, { useEffect } from "react";
 import TabbarCom from "../components/TabbarCom";
 import { Image } from "@antmjs/vantui";
 // import styles from './index.module.scss'
-import './index.module.scss'
-import { Tab, Tabs } from '@antmjs/vantui'
+import "./index.module.scss";
+import { Tab, Tabs } from "@antmjs/vantui";
 import Taro from "@tarojs/taro";
-
-
+import ActiveCard from "../components/ActiveCard";

 const my = (props: any) => {
  //   const [active, setActive] = react.useState(props?.active ?? 0);
@@ -20,21 +19,25 @@ const my = (props: any) => {
    });
  }, []);

-  const CardCom=()=>{
-    return   <Card
-    num=""
-    price=""
-    desc="活动描述信息"
-    title="活动标题"
-    thumb="cloud://cloud1-5g5xrgza12a0dd6d.636c-cloud1-5g5xrgza12a0dd6d-1253665791/images.jpg"
-  />
-  }
+  const CardCom = () => {
+    return (
+      <ActiveCard />
+
+      // <Card
+      //   num=""
+      //   price=""
+      //   desc="活动描述信息"
+      //   title="活动标题"
+      //   thumb="cloud://cloud1-5g5xrgza12a0dd6d.636c-cloud1-5g5xrgza12a0dd6d-1253665791/images.jpg"
+      // />
+    );
+  };
  return (
-    <View>
+    <View  className="myContentDiv">
      {/* <View className={styles?.myContent}>  */}

      {/* 头像 */}
-      <View className={`myContent`}> 
+      <View className={`myContent`}>
        <Image
          round
          width="100px"
@@ -44,26 +47,33 @@ const my = (props: any) => {
      </View>

      <View>
-      <Tabs sticky={true}>
-        <Tab title="待审核">{CardCom()}</Tab>
-        <Tab title="已报名">{CardCom()}</Tab>
-        <Tab title="待参加">{CardCom()}</Tab>
-        <Tab title="已结束">{CardCom()}</Tab>
-      </Tabs>
-    </View>
+        <Tabs sticky={true}>
+          <Tab title="待审核">{CardCom()}</Tab>
+          <Tab title="已报名">{CardCom()}</Tab>
+          <Tab title="待参加">{CardCom()}</Tab>
+          <Tab title="已结束">{CardCom()}</Tab>
+        </Tabs>
+      </View>

      <View>
-      <Cell title="个人资料" isLink />
-      {/* <Cell title="收藏" isLink /> */}
-      <Cell title="微信客服" isLink value=""  onClick={()=>{
-        Taro.openCustomerServiceChat({
-          corpId:'wwb04af9a97514271c', //企业id
-          extInfo: {url: 'https://work.weixin.qq.com/kfid/kfc70f3f112c97a54c5'},
-          success: function (res) { }
-        })
-      }}/>
-      {/* <Cell title="单元格" isLink value="内容" arrowDirection="down" /> */}
-    </View>
+        <Cell title="个人资料" isLink />
+        {/* <Cell title="收藏" isLink /> */}
+        <Cell
+          title="微信客服"
+          isLink
+          value=""
+          onClick={() => {
+            Taro.openCustomerServiceChat({
+              corpId: "wwb04af9a97514271c", //企业id
+              extInfo: {
+                url: "https://work.weixin.qq.com/kfid/kfc70f3f112c97a54c5",
+              },
+              success: function (res) {},
+            });
+          }}
+        />
+        {/* <Cell title="单元格" isLink value="内容" arrowDirection="down" /> */}
+      </View>

      <TabbarCom active={2} />
    </View>