静态页面

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"http://127.0.0.1:8081"',
+    // HOST: '"https://xlk.njyz.tech"',
+    HOST: '"http://127.0.0.1:8081"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

config/index.js

@@ -24,11 +24,12 @@ const config = {
     '@/store': path.resolve(__dirname, '..', 'src/store'),
     '@/services': path.resolve(__dirname, '..', 'src/services'),
     '@/utils': path.resolve(__dirname, '..', 'src/utils'),
+    '@/native': path.resolve(__dirname, '..', 'src/native'),
     '@/pages': path.resolve(__dirname, '..', 'src/pages'),
   },
   copy: {
     patterns: [
-      { from: 'src/native/', to: 'dist/native/' },
+      // { from: 'src/native/', to: 'dist/native/' },
     ],
     options: {
     }

src/components/Poster/Poster.jsx

@@ -39,32 +39,60 @@ export default (props) => {
         }
       })
 
-      Promise.all([
-        sdk.getImage(poster),
-        sdk.getImage(miniCode),
-        sdk.getImage(avatar),
-      ]).then((res) => {
-        const [posterImg, miniCodeImg, avatarImg] = res
+      // 名称
+      sdk.darwText(name, conf.name)
+      // 小程序码
+      sdk.darwText(desc, conf.desc)
 
-        // 封面
+      let cnt = 0
+      // 封面
+      sdk.getImage(poster).then((posterImg) => {
         sdk.drawImage(posterImg, conf.poster)
-        // 头像
+        cnt += 1
+      }).catch(() => cnt += 1)
+      // 头像
+      sdk.getImage(avatar).then((avatarImg) => {
         sdk.drawImage(avatarImg, conf.avatar)
-        // 小程序码
+        cnt += 1
+      }).catch(() => cnt += 1)
+      // 小程序码
+      sdk.getImage(miniCode).then((miniCodeImg) => {
         sdk.drawImage(miniCodeImg, conf.miniCode)
-        // 名称
-        sdk.darwText(name, conf.name)
-        // 小程序码
-        sdk.darwText(desc, conf.desc)
+        cnt += 1
+      }).catch(() => cnt += 1)
 
-        //
-        const image = sdk.toDataURL()
-        onEnd(image, sdk)
-      }).catch(([e1, e2, e3]) => {
-        if (onError) {
-          onError([e1, e2, e3])
+      const ticker = setInterval(() => {
+        if (cnt >= 3) {
+          // 图片全部处理完
+          const image = sdk.toDataURL()
+          onEnd(image, sdk)
+          clearInterval(ticker)
         }
-      })
+      }, 200);
+
+
+      // Promise.all([
+      //   // sdk.getImage(poster),
+      //   sdk.getImage(miniCode),
+      //   // sdk.getImage(avatar),
+      // ]).then((res) => {
+      //   const [posterImg, miniCodeImg, avatarImg] = res
+
+      //   // 封面
+      //   sdk.drawImage(posterImg, conf.poster)
+      //   // 头像
+      //   sdk.drawImage(avatarImg, conf.avatar)
+      //   // 小程序码
+      //   sdk.drawImage(miniCodeImg, conf.miniCode)
+
+      //   //
+      //   const image = sdk.toDataURL()
+      //   onEnd(image, sdk)
+      // }).catch(([e1, e2, e3]) => {
+      //   if (onError) {
+      //     onError([e1, e2, e3])
+      //   }
+      // })
     }
   }, [sdk, dataSource, onStart, onEnd, onError])
 

src/components/Poster/index.jsx

@@ -84,23 +84,27 @@ export default (props) => {
     })
   }
 
+  const handleImage = (e) => {
+    Taro.previewImage({ current: img, urls: [img] })
+  }
+
   return (
     // <Modal title={title} visible={show} onClose={onClose}>
     // eslint-disable-next-line react/jsx-no-undef
-    <page-container show={show} position='bottom' onClickOverlay={onClose}>
-      <View className='modal-poster' onClick={onClose}>
+    <page-modal show={show} position='bottom' onClickOverlay={onClose} height="60vh">
+      <View className='modal-poster'>
         <View className='modal-poster-img-box'>
-        {
+        {/* {
           !processing
-            ? <Image src={img} mode='scaleToFill' onClick={() => Taro.previewImage({ current: img, urls: [img] })} />
+            ? <Image src={img} mode='scaleToFill' onClick={handleImage} />
             : <Spin2 spinning={processing} size={32} />
-        }
+        } */}
         </View>
         <Button className='modal-poster-action' onClick={handleSave} disabled={!img} loading={loading}>
           {btnText}
         </Button>
       </View>
       <Poster dataSource={dataSource} onStart={() => setProcessing(true)} onEnd={handlePoster} />
-    </page-container>
+    </page-modal>
   )
 }

src/components/Poster/style.scss

@@ -1,19 +1,23 @@
 .modal-poster {
-  width: 100vw;
-  height: 100vh;
+  // width: 100vw;
+  // height: 100vh;
   // height: calc(100vh - 62rpx);
+  height: 100%;
   box-sizing: border-box;
   padding: 40rpx;
 
   &-img-box {
-    flex: auto;
-    width: 70%;
     height: calc(100% - 92rpx - 40rpx);
     margin: 0 auto;
     background: #fff;
     box-shadow: 0 14rpx 24rpx 0 rgba(0, 0, 0, 0.2);
     position: relative;
 
+    .empty-poster {
+      width: auto;
+      height: 100%;
+    }
+
     image {
       width: 100%;
       height: 100%;

src/pages/index/activityDetail/index.jsx

@@ -16,6 +16,7 @@ import { useSelector } from 'react-redux';
 import {
   signupActivity,
   queryActivityDetail,
+<<<<<<< HEAD
 } from '@/services/activity';
 import { getImgURL } from '@/utils/image';
 import getDateFormat from '@/utils/chatDate';
@@ -48,6 +49,19 @@ const activityStatusDict = {
   },
 };
 
+=======
+} from "@/services/activity";
+import { getImgURL } from "@/utils/image";
+import getDateFormat from "@/utils/chatDate";
+import useParams from "@/utils/hooks/useParams";
+import useShare from "@/utils/hooks/useShare";
+import useFavor from "@/utils/hooks/useFavor";
+import useStatus from './useStatus'
+
+import { getDownloadURL, times, transferImage } from "@/utils/tools";
+import "./index.scss";
+
+>>>>>>> 9b71da79c5db94acce0d9ed188d5664b36c36c8c
 export default withLayout((props) => {
   const { router, shareContent, trackData, person, page } = props;
   const { id } = router.params;
@@ -62,14 +76,18 @@ export default withLayout((props) => {
 
   const buildingId = detail?.buildingId;
 
+  const [btnText, btnDisabled] = useStatus(detail)
+
   const getDetail = (params) => {
     Taro.showLoading();
 
     queryActivityDetail(params).then((res) => {
-      const maxperson =
-        res.maxEnlistByPerson < 100 ? res.maxEnlistByPerson : 100;
+      // const maxperson =
+      //   res.maxEnlistByPerson < 100 ? res.maxEnlistByPerson : 100;
 
-      setSelector(times(maxperson || 1).map((_, i) => `${i + 1}`));
+      const maxperson = 10
+
+      setSelector(times(maxperson).map((_, i) => `${i + 1}`));
 
       setDetail(res);
       Taro.hideLoading();
@@ -155,16 +173,7 @@ export default withLayout((props) => {
   }
 
   const handleSignup = () => {
-    const { isSign } = detail;
-
-    if (isSign) {
-      Taro.showToast({
-        icon: 'none',
-        title: '你已报名成功',
-      });
-      return;
-    }
-    setCanChoose('block');
+    setCanChoose("block");
   };
 
   const comfire = () => {
@@ -188,9 +197,9 @@ export default withLayout((props) => {
 
     signupActivity(payload).then(() => {
       Taro.showToast({
-        title: '报名成功',
-      })
-      setSelector('none')
+        title: "报名成功",
+      });
+      setCanChoose('none')
       setTimeout(() => {
         getDetail(id)
       }, 500)
@@ -405,8 +414,8 @@ export default withLayout((props) => {
                     ></Image>
                   </view>
 
-                  {detail.type == 'dymic' && dymic()}
-                  {detail.type == 'house' && house()}
+                  {detail.type == "dymic" && dymic()}
+                  {detail.type == "house" && house()}
                   <view className='ActivityIntro'>
                     <view className='Title'>
                       <text>活动介绍</text>
@@ -419,24 +428,24 @@ export default withLayout((props) => {
               </ScrollView>
             </view>
           </view>
-          {detail.type == 'dymic' && (
+          {detail.type == "dymic" && (
             <view className='PageBottom flex-h'>
-              <Button className='Share' open-type='share'>
+              <button className='Share' open-type='share'>
                 <text className='iconfont icon-fenxiang'></text>
                 <text>分享</text>
-              </Button>
+              </button>
               <view className='Collect' onClick={handleFavor}>
                 <text
                   className='iconfont icon-shoucang'
-                  style={isSaved ? { color: 'red' } : undefined}
+                  style={isSaved ? { color: "red" } : undefined}
                 ></text>
                 <text>{isSaved ? '已收藏' : '收藏'}</text>
               </view>
               <view className='flex-item'></view>
 
-              <text className='Post' onClick={handleSignup}>
-                {activityStatusDict[detail.activityStatus]?.text}
-              </text>
+              <button disabled={btnDisabled} className='Post' onClick={handleSignup}>
+                {btnText}
+              </button>
             </view>
           )}
         </view>

src/pages/index/activityDetail/useStatus.js

@@ -0,0 +1,58 @@
+import { useEffect, useState } from 'react'
+
+const ACT_GAMEOVER = 2
+const ACT_ENLIST_FULL = 2
+const ACT_SIGNED = 1
+
+export default function useStatus(info) {
+  const { dynamicId, isSign, activityStatus, isEnlist, enlistStart, enlistEnd } = info || {}
+
+  const [disabled, setDisabled] = useState(false)
+  const [btnText, setBtnText] = useState('立即报名')
+
+  useEffect(() => {
+    if (!dynamicId) return;
+
+    // 活动结束
+    if (activityStatus === ACT_GAMEOVER) {
+      setBtnText('活动已结束')
+      setDisabled(true)
+      return;
+    }
+
+    // 报名人数已满
+    if (isEnlist === ACT_ENLIST_FULL) {
+      setBtnText('人数已满')
+      setDisabled(true)
+      return;
+    }
+
+    // 已报名
+    if (isSign === ACT_SIGNED) {
+      setBtnText('已报名')
+      setDisabled(true)
+      return;
+    }
+
+    // 报名时间
+    const now = new Date()
+    const start = new Date(enlistStart)
+    const end = new Date(enlistEnd)
+    if (now < start) {
+      setBtnText('报名未开始')
+      setDisabled(true)
+      return;
+    }
+
+    if (now > end) {
+      setBtnText('报名已结束')
+      setDisabled(true)
+      return;
+    }
+
+    setBtnText('立即报名')
+    setDisabled(false)
+  },[dynamicId])
+
+  return [btnText, disabled]
+}

src/pages/index/buildingDetail/index.config.js

@@ -2,6 +2,6 @@ export default {
   navigationBarTitleText: '楼盘详情',
   enableShareAppMessage: true,
   usingComponents: {
-    'page-container': '/native/PageContainer/index'
+    'page-modal': '@/native/PageContainer/index'
   }
 }

src/utils/hooks/usePoster.js

@@ -16,6 +16,13 @@ export default function usePoster(person, poster, router, paramsRef) {
           name: person.name || person.nickname,
           avatar: person.avatarurl,
         })
+      }).catch(() => {
+        setPosterData({
+          poster,
+          miniCode: undefined,
+          name: person.name || person.nickname,
+          avatar: person.avatarurl,
+        })
       })
     }
   // eslint-disable-next-line react-hooks/exhaustive-deps