fix(h5 complier): fix h5 build problem

innocces · Jul 21, 2021 · 17dcc4e · 17dcc4e
1 parent df904e0
commit 17dcc4e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/packages/app/src/pages/about/index.less b/packages/app/src/pages/about/index.less
@@ -1,6 +1,6 @@
 .start-button {
   position: fixed;
   right: 32px;
-  bottom: 32px;
+  bottom: 102px;
   z-index: 1100;
 }
diff --git a/packages/app/src/pages/index/index.tsx b/packages/app/src/pages/index/index.tsx
@@ -2,8 +2,8 @@ import React, { useCallback, useState } from 'react';
 import { AtIcon, AtToast } from 'taro-ui';
 import { Image, View } from '@tarojs/components';
 
-import Taro, { ENV_TYPE } from '@tarojs/taro';
-import { useEnv } from 'taro-hooks';
+import { ENV_TYPE } from '@tarojs/taro';
+import { useEnv, useRouter } from 'taro-hooks';
 
 import './index.less';
 
@@ -14,18 +14,18 @@ import { List } from '../../constant';
 const Index = () => {
   const env = useEnv();
   const [visible, changeVisible] = useState(false);
+  const [routerInfo, { navigateTo }] = useRouter();
+  console.log(routerInfo);
 
   const handleLocation = useCallback(
     (route: string) => {
-      if (env === ENV_TYPE.WEB) {
+      if (!routerInfo && env === ENV_TYPE.WEB) {
         changeVisible(true);
       } else {
-        Taro.navigateTo({
-          url: '/pages/panel/index?id=' + route.toLowerCase(),
-        });
+        navigateTo('/pages/panel/index?id=' + route.toLowerCase());
       }
     },
-    [env],
+    [env, routerInfo, navigateTo],
   );
 
   return (

diff --git a/packages/app/src/pages/panel/index.config.ts b/packages/app/src/pages/panel/index.config.ts
@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: 'taro-hooks',
+};
diff --git a/packages/app/src/pages/useEnv/index.tsx b/packages/app/src/pages/useEnv/index.tsx
@@ -4,11 +4,20 @@ import DocPage from '@components/DocPage';
 
 import { useEnv } from 'taro-hooks';
 import Taro, { ENV_TYPE } from '@tarojs/taro';
-
 import 'taro-ui/dist/style/components/icon.scss';
 
+const ENVTYPE = [
+  ['WEAPP', 'WEAPP'],
+  ['WEB', 'WEB'],
+  ['RN', 'RN'],
+  ['SWAN', 'SWAN'],
+  ['ALIPAY', 'ALIPAY'],
+  ['TT ', 'TT'],
+  ['QQ', 'QQ'],
+  ['JD', 'JD'],
+];
 const radioOptions = (env: ENV_TYPE) =>
-  Object.entries(ENV_TYPE).map(([label, value]) => ({
+  ENVTYPE.map(([label, value]) => ({
     label,
     value,
     desc: `环境: ${label}`,

diff --git a/packages/hooks/src/useClipboardData/index.ts b/packages/hooks/src/useClipboardData/index.ts
@@ -16,10 +16,6 @@ export type Result = [string, clipboardAction];
 function useClipboardData(): Result {
   const [clipboardData, changeClipborardData] = useState<string>('');
 
-  useEffect(() => {
-    getClipboard();
-  }, []);
-
   const setClipboard = useCallback<setClipboard>((text: any) => {
     if (!text) {
       console.warn('please enter a text');