Merge branch 'refs/heads/dev'

.github/workflows/readme.yml

@@ -1,36 +1,36 @@
-name: Translate README
-
-on:
-  push:
-    branches:
-      - master
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-      # ISO Langusge Codes: https://cloud.google.com/translate/docs/languages
-      - name: Adding README - English
-        uses: dephraiim/translate-readme@main
-        with:
-          LANG: en
-      - name: Adding README - Japanese
-        uses: dephraiim/translate-readme@main
-        with:
-          LANG: ja
-      - name: Adding README - German
-        uses: dephraiim/translate-readme@main
-        with:
-          LANG: de
-      - name: Adding README - French
-        uses: dephraiim/translate-readme@main
-        with:
-          LANG: fr
-      - name: Adding README - Spanish
-        uses: dephraiim/translate-readme@main
-        with:
-          LANG: es
+#name: Translate README
+#
+#on:
+#  push:
+#    branches:
+#      - master
+#jobs:
+#  build:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v2
+#      - name: Setup Node.js
+#        uses: actions/setup-node@v1
+#        with:
+#          node-version: 12.x
+#      # ISO Langusge Codes: https://cloud.google.com/translate/docs/languages
+#      - name: Adding README - English
+#        uses: dephraiim/translate-readme@main
+#        with:
+#          LANG: en
+#      - name: Adding README - Japanese
+#        uses: dephraiim/translate-readme@main
+#        with:
+#          LANG: ja
+#      - name: Adding README - German
+#        uses: dephraiim/translate-readme@main
+#        with:
+#          LANG: de
+#      - name: Adding README - French
+#        uses: dephraiim/translate-readme@main
+#        with:
+#          LANG: fr
+#      - name: Adding README - Spanish
+#        uses: dephraiim/translate-readme@main
+#        with:
+#          LANG: es

src/config/index.ts

@@ -7,9 +7,11 @@ const BASE_URL_MAP = {
   DEV: '',
   PROD: '',
   GP_PAGES: '/dist',
+  // GP_PAGES: '/douyin',
   UNI: 'https://dy.ttentau.top'
 }
 
+export const IS_GP_PAGES = import.meta.env.VITE_ENV === 'GP_PAGES'
 export const BASE_URL = BASE_URL_MAP[import.meta.env.VITE_ENV]
 export const IMG_URL = BASE_URL + '/images/'
 export const FILE_URL = BASE_URL + '/data/'

src/router/index.ts

@@ -1,9 +1,10 @@
-import { createRouter, createWebHistory } from 'vue-router'
+import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
 import routes from './routes'
 import { useBaseStore } from '@/store/pinia'
+import { IS_GP_PAGES } from '@/config'
 
 const router = createRouter({
-  history: createWebHistory(),
+  history: IS_GP_PAGES ? createWebHashHistory() : createWebHistory(),
   routes,
   scrollBehavior(to, from, savedPosition) {
     // console.log('savedPosition', savedPosition)