From eafebed867bc3af214523537f090e8d65ff46f7d Mon Sep 17 00:00:00 2001
From: eric <xiaoshuang.eric@gmail.com>
Date: Sun, 13 Nov 2022 22:29:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20ios=E5=AE=89=E5=85=A8=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/pages/activityList/components/details/index.js   |  2 +-
 dist/pages/activityList/components/details/index.wxss |  1 -
 src/pages/activityList/components/details/index.scss  |  2 +-
 src/pages/activityList/components/details/index.tsx   | 11 ++++++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dist/pages/activityList/components/details/index.js b/dist/pages/activityList/components/details/index.js
index 9e4184e..1171d86 100644
--- 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/@antmjs/vantui/es/button/index.js":function(e,n,t){var o=t("./node_modules/@babel/runtime/helpers/esm/defineProperty.js"),s=t("./node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js"),i=t("webpack/container/remote/@tarojs/taro"),a=t("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),r=t("./node_modules/@antmjs/vantui/es/wxs/utils.js"),l=t("./node_modules/@antmjs/vantui/es/icon/index.js"),c=t("./node_modules/@antmjs/vantui/es/loading/index.js"),d=t("./node_modules/@antmjs/vantui/es/button/wxs.js"),u=t("webpack/container/remote/react/jsx-runtime"),p=["type","size","block","round","plain","square","loading","disabled","hairline","color","loadingSize","loadingType","loadingText","icon","classPrefix","onClick","children","style","className"];function ownKeys(e,n){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);n&&(o=o.filter((function(n){return Object.getOwnPropertyDescriptor(e,n).enumerable}))),t.push.apply(t,o)}return t}function _objectSpread(e){for(var n=1;n<arguments.length;n++){var t=null!=arguments[n]?arguments[n]:{};n%2?ownKeys(Object(t),!0).forEach((function(n){(0,o.default)(e,n,t[n])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):ownKeys(Object(t)).forEach((function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}))}return e}n.default=function Button(e){var n=e.type,t=void 0===n?"default":n,o=e.size,m=void 0===o?"normal":o,b=e.block,f=e.round,j=e.plain,v=e.square,x=e.loading,y=e.disabled,g=e.hairline,h=e.color,w=e.loadingSize,_=void 0===w?(0,i.pxTransform)(40):w,k=e.loadingType,O=void 0===k?"circular":k,P=e.loadingText,S=e.icon,C=e.classPrefix,T=void 0===C?"van-icon":C,N=e.onClick,L=e.children,V=e.style,z=e.className,B=(0,s.default)(e,p);return(0,u.jsx)(a.Button,_objectSpread(_objectSpread({className:" "+r.bem("button",[t,m,{block:b,round:f,plain:j,square:v,loading:x,disabled:y,hairline:g,unclickable:y||x}])+" "+(g?"van-hairline--surround":"")+" ".concat(z||""),hoverClass:"van-button--active hover-class",style:r.style([d.rootStyle({plain:j,color:h}),V]),onClick:y||x?void 0:N},B),{},{children:x?(0,u.jsxs)(a.View,{style:"display: flex",children:[(0,u.jsx)(c.Loading,{className:"loading-class",size:_,type:O,color:d.loadingColor({type:t,color:h,plain:j})}),P&&(0,u.jsx)(a.View,{className:"van-button__loading-text",children:P})]}):(0,u.jsxs)(u.Fragment,{children:[S&&(0,u.jsx)(l.Icon,{size:"1.2em",name:S,classPrefix:T,className:"van-button__icon",style:"line-height: inherit;"}),(0,u.jsx)(a.View,{className:"van-button__text",children:L})]})}))}},"./node_modules/@antmjs/vantui/es/button/wxs.js":function(e,n,t){t.d(n,{rootStyle:function(){return rootStyle},loadingColor:function(){return loadingColor}});var o=t("./node_modules/@antmjs/vantui/es/wxs/style.js");function rootStyle(e){if(!e.color)return"";var n={color:e.plain?e.color:"#fff",background:e.plain?null:e.color};return-1!==e.color.indexOf("gradient")?n.border=0:n["border-color"]=e.color,(0,o.style)([n])}function loadingColor(e){return e.plain?e.color?e.color:"#c9c9c9":"default"===e.type?"#c9c9c9":"#fff"}},"./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,n,t){var o=t("./node_modules/@antmjs/vantui/es/button/index.js"),s=t("./node_modules/@babel/runtime/helpers/esm/slicedToArray.js"),i=t("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),a=t("webpack/container/remote/react"),r=t("./src/utils/index.ts"),l=t("webpack/container/remote/react/jsx-runtime");n.default=function details(){var e,n,t=(0,a.useState)([]),c=(0,s.default)(t,2),d=c[0],u=c[1];return(0,a.useEffect)((function(){}),[]),(0,a.useEffect)((function(){var e={tableName:"cityNew",id:"80516fb66370bcf300b8f43c5f4dd52b",okFun:function okFun(e){var n;console.log("res",e),u(null!==(n=null==e?void 0:e.data)&&void 0!==n?n:[])}};(0,r.getTable)(e)}),[]),(0,l.jsxs)(i.View,{className:"detailContent",children:[(0,l.jsxs)(i.View,{onClick:function onClick(){},children:[(0,l.jsx)(i.View,{children:null==d||null===(e=d[0])||void 0===e?void 0:e.actTitle}),(0,l.jsx)(i.RichText,{nodes:null==d||null===(n=d[0])||void 0===n?void 0:n.richText})]}),(0,l.jsx)(i.View,{className:"detailBtn",children:(0,l.jsx)(o.default,{type:"primary",block:!0,children:"立即参加"})})]})}},"./src/pages/activityList/components/details/index.tsx":function(e,n,t){var o=t("webpack/container/remote/@tarojs/runtime"),s=t("./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,o.createPageConfig)(s.default,"pages/activityList/components/details/index",{root:{cn:[]}},{navigationBarTitleText:"活动详情"}||{}))}},function(e){e.O(0,["taro","vendors","common"],(function(){return n="./src/pages/activityList/components/details/index.tsx",e(e.s=n);var n}));e.O()}]);
\ No newline at end of file
+"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([["pages/activityList/components/details/index"],{"./node_modules/@antmjs/vantui/es/button/index.js":function(e,t,n){var o=n("./node_modules/@babel/runtime/helpers/esm/defineProperty.js"),s=n("./node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js"),i=n("webpack/container/remote/@tarojs/taro"),a=n("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),r=n("./node_modules/@antmjs/vantui/es/wxs/utils.js"),l=n("./node_modules/@antmjs/vantui/es/icon/index.js"),c=n("./node_modules/@antmjs/vantui/es/loading/index.js"),d=n("./node_modules/@antmjs/vantui/es/button/wxs.js"),u=n("webpack/container/remote/react/jsx-runtime"),p=["type","size","block","round","plain","square","loading","disabled","hairline","color","loadingSize","loadingType","loadingText","icon","classPrefix","onClick","children","style","className"];function ownKeys(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,o)}return n}function _objectSpread(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?ownKeys(Object(n),!0).forEach((function(t){(0,o.default)(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):ownKeys(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}t.default=function Button(e){var t=e.type,n=void 0===t?"default":t,o=e.size,m=void 0===o?"normal":o,b=e.block,f=e.round,j=e.plain,v=e.square,x=e.loading,y=e.disabled,g=e.hairline,h=e.color,w=e.loadingSize,_=void 0===w?(0,i.pxTransform)(40):w,k=e.loadingType,O=void 0===k?"circular":k,S=e.loadingText,P=e.icon,C=e.classPrefix,T=void 0===C?"van-icon":C,N=e.onClick,L=e.children,V=e.style,z=e.className,B=(0,s.default)(e,p);return(0,u.jsx)(a.Button,_objectSpread(_objectSpread({className:" "+r.bem("button",[n,m,{block:b,round:f,plain:j,square:v,loading:x,disabled:y,hairline:g,unclickable:y||x}])+" "+(g?"van-hairline--surround":"")+" ".concat(z||""),hoverClass:"van-button--active hover-class",style:r.style([d.rootStyle({plain:j,color:h}),V]),onClick:y||x?void 0:N},B),{},{children:x?(0,u.jsxs)(a.View,{style:"display: flex",children:[(0,u.jsx)(c.Loading,{className:"loading-class",size:_,type:O,color:d.loadingColor({type:n,color:h,plain:j})}),S&&(0,u.jsx)(a.View,{className:"van-button__loading-text",children:S})]}):(0,u.jsxs)(u.Fragment,{children:[P&&(0,u.jsx)(l.Icon,{size:"1.2em",name:P,classPrefix:T,className:"van-button__icon",style:"line-height: inherit;"}),(0,u.jsx)(a.View,{className:"van-button__text",children:L})]})}))}},"./node_modules/@antmjs/vantui/es/button/wxs.js":function(e,t,n){n.d(t,{rootStyle:function(){return rootStyle},loadingColor:function(){return loadingColor}});var o=n("./node_modules/@antmjs/vantui/es/wxs/style.js");function rootStyle(e){if(!e.color)return"";var t={color:e.plain?e.color:"#fff",background:e.plain?null:e.color};return-1!==e.color.indexOf("gradient")?t.border=0:t["border-color"]=e.color,(0,o.style)([t])}function loadingColor(e){return e.plain?e.color?e.color:"#c9c9c9":"default"===e.type?"#c9c9c9":"#fff"}},"./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 o=n("./node_modules/@antmjs/vantui/es/button/index.js"),s=n("./node_modules/@babel/runtime/helpers/esm/slicedToArray.js"),i=n("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),a=n("webpack/container/remote/@tarojs/taro"),r=n.n(a),l=n("webpack/container/remote/react"),c=n("./src/utils/index.ts"),d=n("webpack/container/remote/react/jsx-runtime");t.default=function details(){var e,t,n=(0,l.useState)([]),a=(0,s.default)(n,2),u=a[0],p=a[1],m=(0,l.useState)(0),b=(0,s.default)(m,2),f=b[0],j=b[1];return(0,l.useEffect)((function(){}),[]),(0,l.useEffect)((function(){var e,t=r().getSystemInfoSync(),n=t.screenHeight,o=t.safeArea,s=void 0===o?{}:o,i=null!==(e=n-(null==s?void 0:s.bottom))&&void 0!==e?e:0;j(i);var a={tableName:"cityNew",id:"80516fb66370bcf300b8f43c5f4dd52b",okFun:function okFun(e){var t;console.log("res",e),p(null!==(t=null==e?void 0:e.data)&&void 0!==t?t:[])}};(0,c.getTable)(a)}),[]),(0,d.jsxs)(i.View,{className:"detailContent",children:[(0,d.jsxs)(i.View,{onClick:function onClick(){},children:[(0,d.jsx)(i.View,{children:null==u||null===(e=u[0])||void 0===e?void 0:e.actTitle}),(0,d.jsx)(i.RichText,{nodes:null==u||null===(t=u[0])||void 0===t?void 0:t.richText})]}),(0,d.jsx)(i.View,{className:"detailBtn",style:{bottom:"".concat(null!=f?f:0,"px")},children:(0,d.jsx)(o.default,{type:"primary",block:!0,children:"立即参加"})})]})}},"./src/pages/activityList/components/details/index.tsx":function(e,t,n){var o=n("webpack/container/remote/@tarojs/runtime"),s=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,o.createPageConfig)(s.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()}]);
\ No newline at end of file
diff --git a/dist/pages/activityList/components/details/index.wxss b/dist/pages/activityList/components/details/index.wxss
index 6850409..d7f3b8b 100644
--- a/dist/pages/activityList/components/details/index.wxss
+++ b/dist/pages/activityList/components/details/index.wxss
@@ -20,5 +20,4 @@ taro-button-core{position:relative;display:block;margin-left:auto;margin-right:a
           justify-content: center;
   width: 100%;
   position: fixed;
-  bottom: 0rpx;
 }
diff --git a/src/pages/activityList/components/details/index.scss b/src/pages/activityList/components/details/index.scss
index 08b05e2..0fff962 100644
--- a/src/pages/activityList/components/details/index.scss
+++ b/src/pages/activityList/components/details/index.scss
@@ -8,6 +8,6 @@
     justify-content: center;
     width: 100%;
     position: fixed;
-    bottom: 0px;
+    // bottom: 0px;
   }
 }
diff --git a/src/pages/activityList/components/details/index.tsx b/src/pages/activityList/components/details/index.tsx
index 91507c6..ea3954e 100644
--- a/src/pages/activityList/components/details/index.tsx
+++ b/src/pages/activityList/components/details/index.tsx
@@ -1,11 +1,13 @@
 import { Button } from "@antmjs/vantui";
 import { RichText, View } from "@tarojs/components";
+import Taro from "@tarojs/taro";
 import react, { useEffect, useState } from "react";
 import { getTable } from "../../../../utils/index";
 import "./index.scss";
 
 const details = () => {
   const [dataSource, setdataSource] = useState<any>([]);
+  const [bottomheight,setbottomheight]=useState(0)
 
   useEffect(() => {
     // 设置标题
@@ -15,6 +17,11 @@ const details = () => {
   }, []);
 
   useEffect(() => {
+    const {screenHeight,safeArea={}}=Taro.getSystemInfoSync()
+    // @ts-ignore
+    let newBottom=screenHeight -safeArea?.bottom??0
+    setbottomheight(newBottom)
+
     let objParams = {
       tableName: "cityNew",
       id: "80516fb66370bcf300b8f43c5f4dd52b",
@@ -27,6 +34,8 @@ const details = () => {
     getTable(objParams);
   }, []);
 
+  // console.log('SafeAreaResult',Taro.getSystemInfoSync())
+
   return (
     <View className={`detailContent`}>
       {/* 富文本 */}
@@ -35,7 +44,7 @@ const details = () => {
         <RichText nodes={dataSource?.[0]?.richText} />
       </View>
 
-      <View className={`detailBtn`}>
+      <View className={`detailBtn`} style={{bottom:`${bottomheight??0}px`}}>
       {/* style={{width:'375px'}} */}
           <Button  type="primary" block>
             立即参加