Merge branch 'master' of gogs.dengtongyu.com:tony/padui-home

config/index.d.ts

@@ -13,3 +13,9 @@ export declare const scriptSrcStr: string;
 export declare let temp: string;
 
 export declare const injectScriptStr: string;
+
+export declare const beianhao: string;
+
+export declare const androidUrl: string;
+
+export declare const iosUrl: string;

config/index.ts

@@ -8,9 +8,6 @@ switch (VITE_APP_ENV) {
     case "test":
         proxyTarget = "https://xxxxxx.com";
         break;
-    case "uat":
-        proxyTarget = "https://xxxxxx.com";
-        break;
     case "prod":
         proxyTarget = "https://xxxxxx.com";
         break;
@@ -19,6 +16,10 @@ switch (VITE_APP_ENV) {
         break;
 }
 
+const beianhao = "鲁ICP备2023011417号-1";
+const androidUrl = "http://img.haloapp.vip/card-release_v1.0.1_2023-04-20_101_jiagu_sign.apk";
+const iosUrl = "https://www.pgyer.com/toupai";
+
 const vconsoleDebug = true;
 const scriptSrcStr = "var src = '/midjs/mjs/vconsole/v3.14.6/vconsole.min.js';document.write('<scr' + 'ipt src=\"' + src + '\"></scr' + 'ipt>');document.write('<scr' + 'ipt>new window.VConsole();</scr' + 'ipt>');";
 let temp = "";
@@ -32,5 +33,8 @@ const injectScriptStr = `<script>;(function () {${temp}})();</script>`;
 export {
     appName,
     proxyTarget,
-    injectScriptStr
+    injectScriptStr,
+    beianhao,
+    androidUrl,
+    iosUrl
 };

package.json

@@ -8,10 +8,8 @@
   "scripts": {
     "dev": "vite",
     "serve:test": "cross-env VITE_APP_ENV=test vite",
-    "serve:uat": "cross-env VITE_APP_ENV=uat vite",
     "serve:prod": "cross-env VITE_APP_ENV=prod vite",
     "build:test": "vue-tsc --noEmit && cross-env VITE_APP_ENV=test vite build",
-    "build:uat": "vue-tsc --noEmit && cross-env VITE_APP_ENV=uat vite build",
     "build:prod": "vue-tsc --noEmit && cross-env VITE_APP_ENV=prod vite build",
     "preview": "vite preview",
     "lint": "eslint --fix config/*.{ts} && eslint --fix src/*.{ts,vue} && eslint --fix src/**/*.{ts,vue}"

src/pages/h5.vue

@@ -1,24 +1,17 @@
 <script setup lang="ts" name="appH5">
-import { ref, computed } from "vue";
+import { computed } from "vue";
+import { beianhao, androidUrl, iosUrl } from "../../config/index";
 import { browser } from "@/lib/util";
 
 const versions = browser.versions;
 
-const androidUrl = "http://img.haloapp.vip/card-release_v1.0.1_2023-04-20_101_jiagu_sign.apk";
-
-const downloadUrl = computed(() => {
-  if(versions.android) return androidUrl;
-  if(versions.ios) return "";
-  return androidUrl;
-});
-
 const downloadName = computed(() => {
-  const name = "card-release_v1.0.1_2023-04-20_101_jiagu_sign.apk";
+  const arr = androidUrl.split("/");
-  if(versions.android) return name;
+  const name = arr[arr.length - 1];
-  if(versions.ios) return false;
   return name;
 });
 
+
 </script>
 
 <template>
@@ -37,17 +30,22 @@ const downloadName = computed(() => {
           <a
             v-if="versions.ios"
             class="h5-main-mask-btnbox-download"
+            :href="iosUrl"
           ></a>
           <a
             v-else
             class="h5-main-mask-btnbox-download"
-            :href="downloadUrl"
+            :href="androidUrl"
             :download="downloadName"
           ></a>
         </div>
 
         <div class="h5-main-mask-text">
-          <p>粤ICP备1000000000号-1 粤公网安备00000000000000</p>
+          <p><a
+            href="https://beian.miit.gov.cn/#/Integrated/index"
+            :title="beianhao"
+            target="_blank"
+          >{{ beianhao }}</a></p>
         </div>
       </div>
 
@@ -104,6 +102,13 @@ const downloadName = computed(() => {
         line-height: 18px;
         text-align: center;
         margin-top: 36px;
+        a {
+          color: #666666;
+          text-decoration: none;
+          &:hover {
+            color: #333;
+          }
+        }
       }
     }
   }

src/pages/web.vue

@@ -1,5 +1,12 @@
 <script setup lang="ts" name="appWeb">
+import { computed } from "vue";
+import { beianhao, androidUrl, iosUrl } from "../../config/index";
 
+const downloadName = computed(() => {
+  const arr = androidUrl.split("/");
+  const name = arr[arr.length - 1];
+  return name;
+});
 </script>
 
 <template>
@@ -9,17 +16,26 @@
 
         <div class="web-main-middle-btnbox">
           <a
-            href="http://img.haloapp.vip/card-release_v1.0.1_2023-04-20_101_jiagu_sign.apk"
             class="web-main-middle-btnbox-andriod"
-            download="card-release_v1.0.1_2023-04-20_101_jiagu_sign.apk"
+            :href="androidUrl"
+            :download="downloadName"
+          ></a>
+          <a
+            class="web-main-middle-btnbox-ios"
+            :href="iosUrl"
           ></a>
-          <a class="web-main-middle-btnbox-ios"></a>
         </div>
       </div>
     </div>
     <div class="web-footer">
       <div class="web-footer-text">
-        <p>粤ICP备1000000000号-1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;粤公网安备00000000000000</p>
+        <p>
+          <a
+            href="https://beian.miit.gov.cn/#/Integrated/index"
+            :title="beianhao"
+            target="_blank"
+          >{{ beianhao }}</a>  
+        </p>
       </div>
     </div>
   </div>
@@ -94,6 +110,13 @@
       color: rgba(255, 255, 255, 0.8);
       line-height: 36px;
       text-align: center;
+      a {
+          color: rgba(255, 255, 255, 0.8);
+          text-decoration: none;
+          &:hover {
+            color: #fff;
+          }
+        }
     }
   }