静态页面

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/"',

src/components/Poster/index.jsx

@@ -91,14 +91,16 @@ export default (props) => {
   return (
     // <Modal title={title} visible={show} onClose={onClose}>
     // eslint-disable-next-line react/jsx-no-undef
-    <page-modal show={show} position='bottom' onClickOverlay={onClose} height="60vh">
+    <page-modal show={show} position='bottom' onClickOverlay={onClose} height='70vh'>
       <View className='modal-poster'>
         <View className='modal-poster-img-box'>
-        {/* {
-          !processing
-            ? <Image src={img} mode='scaleToFill' onClick={handleImage} />
-            : <Spin2 spinning={processing} size={32} />
-        } */}
+          <view>
+            {
+              !processing
+                ? <Image src={img} mode='scaleToFill' className='centerLabel' onClick={handleImage} />
+                : <Spin2 className='centerLabel' spinning={processing} size={32} />
+            }
+          </view>
         </View>
         <Button className='modal-poster-action' onClick={handleSave} disabled={!img} loading={loading}>
           {btnText}

src/components/Poster/style.scss

@@ -7,19 +7,24 @@
   padding: 40rpx;
 
   &-img-box {
-    height: calc(100% - 92rpx - 40rpx);
-    margin: 0 auto;
-    background: #fff;
-    box-shadow: 0 14rpx 24rpx 0 rgba(0, 0, 0, 0.2);
+    width: 100%;
     position: relative;
+    >view {
+      width: 300px;
+      position: relative;
+      margin: 0 auto;
+      height: 648px;
+      background: #fff;
+      box-shadow: 0 14rpx 24rpx 0 rgba(0, 0, 0, 0.2);
 
-    .empty-poster {
-      width: auto;
-      height: 100%;
+      image {
+        width: 100%;
+        height: 100%;
+      }
     }
 
-    image {
-      width: 100%;
+    .empty-poster {
+      width: auto;
       height: 100%;
     }
   }

src/pages/index/activityDetail/index.jsx

@@ -16,15 +16,16 @@ import { useSelector } from 'react-redux';
 import {
   signupActivity,
   queryActivityDetail,
-<<<<<<< HEAD
-} 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 { times } from '@/utils/tools';
-import './index.scss';
+} 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 { times } from "@/utils/tools";
+import useStatus from './useStatus'
+
+import "./index.scss";
 
 const activityStatusDict = {
   0: {
@@ -49,19 +50,6 @@ 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;
@@ -135,7 +123,7 @@ export default withLayout((props) => {
   useEffect(() => {
     if(detail.title) {
       const CountsTime = new Date(detail.enlistEnd).getTime() - Date.now()
-      if(CountsTime) {
+      if(CountsTime > 0) {
         SetCountsDown(CountsTime)
       }
     }
@@ -430,10 +418,10 @@ export default withLayout((props) => {
           </view>
           {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'
@@ -443,9 +431,9 @@ export default withLayout((props) => {
               </view>
               <view className='flex-item'></view>
 
-              <button disabled={btnDisabled} className='Post' onClick={handleSignup}>
+              <Button disabled={btnDisabled} className='Post' onClick={handleSignup}>
                 {btnText}
-              </button>
+              </Button>
             </view>
           )}
         </view>