feat: 增加默认H5处理

config/dev.js

@@ -9,7 +9,7 @@ module.exports = {
     MAPHOST: '"/api2"',
     QMAP_WEBSERVICE_KEY: '"HTPBZ-HHJA7-XD2XD-PRS37-H3HVJ-U5BAA"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
-    DEFAULT_POS: '"116.34761502876347,31.40974743425614"', // 霍山县人民政府 gcj02
+    DEFAULT_POS: '"101.718514,26.582455"', // 攀枝花市人民政府 gcj02
     VERSION: '"1.1.13-20230325"',
   },
   // isWatch:true,

config/prod.js

@@ -9,7 +9,7 @@ module.exports = {
     MAPHOST: '"http://api.wmcj.ycjcjy.com/api2"',
     QMAP_WEBSERVICE_KEY: '"HTPBZ-HHJA7-XD2XD-PRS37-H3HVJ-U5BAA"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
-    DEFAULT_POS: '"116.34761502876347,31.40974743425614"', // 霍山县人民政府 gcj02
+    DEFAULT_POS: '"101.718514,26.582455"', // 攀枝花市人民政府 gcj02
     VERSION: '"1.1.29-20240224"',
   },
   mini: {},

src/components/Uploader/index.jsx

@@ -18,47 +18,50 @@ export default (props) => {
     e.stopPropagation();
 
     if (disabled) return;
-
+    
     setLoading(true);
 
     // eslint-disable-next-line no-undef
-    SmartCity.chooseImage({
-      count : 1 // 图片张数
-    },function(res){
-        console.log("--------上传图片---------", res);
-        const base64 = res[0].imageData;
-        const fileName = res[0].name;
-        const fileType = res[0].type;
-
-        uploadFileBase64(base64, fileName, fileType).then(resp => {
-          setLoading(false);
-          onChange((value || []).concat(resp));
-        }).catch((err) => {
+    if (IS_APP_CLIENT) {  
+      // eslint-disable-next-line no-undef
+      SmartCity.chooseImage({
+        count : 1 // 图片张数
+      },function(res){
+          console.log("--------上传图片---------", res);
+          const base64 = res[0].imageData;
+          const fileName = res[0].name;
+          const fileType = res[0].type;
+  
+          uploadFileBase64(base64, fileName, fileType).then(resp => {
+            setLoading(false);
+            onChange((value || []).concat(resp));
+          }).catch((err) => {
+            console.error(err);
+            setLoading(false);
+          });
+      });
+    } else {
+      Taro.chooseMedia({
+        maxDuration: 60,
+        // sizeType: "compressed",
+        success: (res) => {
+          const { tempFiles } = res;
+          uploadFiles(tempFiles)
+            .then((resp) => {
+              setLoading(false);
+              onChange((value || []).concat(resp));
+            })
+            .catch((err) => {
+              console.error(err);
+              setLoading(false);
+            });
+        },
+        fail: (err) => {
           console.error(err);
           setLoading(false);
-        });
-    });
-
-    // Taro.chooseMedia({
-    //   maxDuration: 60,
-    //   // sizeType: "compressed",
-    //   success: (res) => {
-    //     const { tempFiles } = res;
-    //     uploadFiles(tempFiles)
-    //       .then((resp) => {
-    //         setLoading(false);
-    //         onChange((value || []).concat(resp));
-    //       })
-    //       .catch((err) => {
-    //         console.error(err);
-    //         setLoading(false);
-    //       });
-    //   },
-    //   fail: (err) => {
-    //     console.error(err);
-    //     setLoading(false);
-    //   },
-    // });
+        },
+      });
+    }
   };
 
   const onDelete = (item) => {

src/index.html

@@ -24,6 +24,11 @@
       // var vConsole = new window.VConsole();
     </script>
 
+    <script>
+      // 是否 app 端打开
+      var IS_APP_CLIENT = SmartCity.isSmartCityApp();
+    </script>
+
     <title>文明城市</title>
     <script>
       <%= htmlWebpackPlugin.options.script %>

src/pages/login/index.jsx

@@ -3,13 +3,13 @@ import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
 import Page from '@/layouts/index';
 import Head from "./components/Head";
-// import Form1 from "./components/Form1";
 import Bottom from "./components/Bottom";
-import './index.less'
-import Forms from './components/Forms';
 import Form1 from './components/Form1';
+import './index.less'
 
 export default (props) => {
+  // eslint-disable-next-line no-undef
+  const isApp = IS_APP_CLIENT;
 
   const onSuccess = () => {
     Taro.reLaunch({
@@ -23,7 +23,7 @@ export default (props) => {
         <Head />
         <Form1 onSuccess={onSuccess} />
         {/* H5此无功能 */}
-        <Bottom onSuccess={onSuccess} />
+        {isApp && <Bottom onSuccess={onSuccess} />}
       </View>
     </Page>
   )

src/utils/authorize.js

@@ -27,6 +27,19 @@ export default function getAuthorize(scope) {
 }
 
 export const getLocation = () => {
+  // eslint-disable-next-line no-undef
+  if (!IS_APP_CLIENT) {
+    // 非 app 端, 直接使用默认位置
+    // eslint-disable-next-line no-undef
+    const parts = DEFAULT_POS.split(',')
+    return Promise.resolve({
+      location: {
+        lat: parts[1],
+        lng: parts[0],
+      },
+    });
+  }
+
   return new Promise((resolve, reject) => {
     // eslint-disable-next-line no-undef
     SmartCity.getLocation(function(res){