Merge branch 'YuzeTT:main' into main

YuzeTT · Nov 13, 2023 · eff2a08 · eff2a08
2 parents 1965117 + b6831a3
commit eff2a08
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 20 deletions.
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -1,33 +1,35 @@
-import { Modal, message } from 'antd'
+import { message } from 'antd'
 // import { Button } from '@chakra-ui/react'
 import { useNavigate } from 'react-router-dom';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import list from '../utils/router'
-import FollowMe from '../components/FollowMe';
+// import FollowMe from '../components/FollowMe';
 import isVip from '../utils/isVip';
 
 export default function index() {
   const navigate = useNavigate();
 
   const jumpBefore = (url: string) => {
-    if(localStorage.getItem("isFollowMe")!=='true'){
-      Modal.info({
-        title: '使用必读',
-        icon: null,
-        content: (
-          <div>
-            <FollowMe />
-          </div>
-        ),
-        onOk() {
-          localStorage.setItem("isFollowMe", 'true')
-          jump(url)
-        },
-        okText: '已关注且不再弹出',
-      });
-    } else {
-      jump(url)
-    }
+    // if(localStorage.getItem("isFollowMe")!=='true'){
+    //   Modal.info({
+    //     title: '使用必读',
+    //     icon: null,
+    //     content: (
+    //       <div>
+    //         <FollowMe />
+    //       </div>
+    //     ),
+    //     onOk() {
+    //       localStorage.setItem("isFollowMe", 'true')
+    //       jump(url)
+    //     },
+    //     okText: '已关注且不再弹出',
+    //   });
+    // } else {
+
+    // }
+
+    jump(url)
 
   }
 

diff --git a/src/pages/tools.tsx b/src/pages/tools.tsx
@@ -138,6 +138,19 @@ export default function Heytea() {
       </div>
       <div font-sans className='relative'>
         <Collapse in={status === 2} animateOpacity className='pt-4' unmountOnExit>
+          <div className='mb-4'>
+            {!isVip().is_vip?
+              <div className='card px-2.5 py-1.5 bg-orange-50 text-orange-600 flex items-center'>
+                <div className="i-ri-creative-commons-nc-fill mr-2 text-lg" />
+                <div className='text-sm flex-1'>未获得商用授权 仅允许个人使用</div>
+                <Button size='xs' colorScheme='orange' onClick={()=>{navigate('/user')}}>获取授权</Button>
+              </div>:
+              <div className='card px-2.5 py-1.5 bg-green-50 text-green-600 flex items-center'>
+                <div className="i-ri-money-dollar-circle-fill mr-2 text-lg" />
+                <div className='text-sm flex-1'>已获得商用授权（不包含第三方Logo）</div>
+              </div>
+            }
+          </div>
           <ExportList imageSrc={imageSrc} />
         </Collapse>
         <Collapse in={status !== 2} animateOpacity className='pt-4'>

diff --git a/src/pages/user.tsx b/src/pages/user.tsx
@@ -306,6 +306,10 @@ export default function User() {
                       <div className='w-2 h-2 bg-blue-500 rounded-full'></div>
                       <div className='text-sm op80 ml-2'>去广告</div>
                     </div>
+                    <div flex='~ items-center'>
+                      <div className='w-2 h-2 bg-blue-500 rounded-full'></div>
+                      <div className='text-sm op80 ml-2'>商用授权（不包含第三方Logo）</div>
+                    </div>
                   </div>
                   <div className='absolute top-4 right-4 text-xs text-white rounded-full px-2 py-0.2 bg-red-500'>建站特惠</div>
                 </div>