Merge branch 'main'

.drone.yml

@@ -174,61 +174,6 @@ steps:
         - rollback
       target:
         - prod
-#================================= oem ==========================
-  # - name: upload to oem oss
-  #   commands:
-  #     - python3 /home/devops/python_script/aliyun/upload.py
-  #   pull: never
-  #   image: oss2:latest
-  #   volumes:
-  #     - name: files
-  #       path: /files
-  #     - name: scripts
-  #       path: /scripts
-  #   commands:
-  #     - python3 /scripts/oss.py oem-${DRONE_REPO_NAME} backup
-  #     - python3 /scripts/oss.py oem-${DRONE_REPO_NAME} upload
-  #   when:
-  #     event:
-  #       - promote
-  #     target:
-  #       - oem
-  # - name: restore to oem oss
-  #   pull: never
-  #   image: oss2:latest
-  #   volumes:
-  #     - name: files
-  #       path: /files
-  #     - name: scripts
-  #       path: /scripts
-  #   commands:
-  #     - python3 /scripts/oss.py oem-${DRONE_REPO_NAME} restore
-  #   when:
-  #     event:
-  #       - rollback
-  #     target:
-  #       - oem
-  # - name: flush oem cdn 
-  #   pull: never
-  #   image: oss2:latest
-  #   volumes:
-  #     - name: files
-  #       path: /files
-  #     - name: scripts
-  #       path: /scripts
-  #   commands:
-  #     - sleep 3
-  #       - echo https://web.minimi.studio/ > /scripts/oem
-  #       - echo https://www.sailner.web/ >> /scripts/oem
-  #       - cd /scripts && python3 /scripts/refresh.py -r oem -t clear
-  #   when:
-  #     event:
-  #       - promote
-  #     target:
-  #       - oem
-
-
-#================================= sharewow3d ==========================
 volumes:
   - name: files
     host:

.env.development

@@ -1,7 +1,7 @@
 VITE_APP_PREVIEW=true
 # VITE_APP_API_BASE_URL=http://172.16.20.21:20001/api/web/
 # VITE_APP_API_BASE_URL=http://172.16.0.40:20001/api/web/
-VITE_APP_API_BASE_URL=https://shop.api.suwa3d.com/api/web/
+VITE_APP_API_BASE_URL=https://wechat-test.api.puabadge.com/web/
 # VITE_APP_API_BASE_URL=https://wechat-test.api.puabadge.com/web/
 # VITE_APP_API_BASE_URL=https://wechat.api.puabadge.com/web/
 # VITE_APP_API_WX_URL=https://wechat.api.puabadge.com/web/

src/router/index.ts

@@ -3,10 +3,10 @@ import { createRouter, createWebHashHistory } from 'vue-router'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 // 导入路由组件
-// import * as badgeRouter from './badge'
-import * as cartoonRouter from './cartoon'
-// import badge from '@/views/badge/index.vue'
-import cartoon from '@/views/cartoon/index.vue'
+import * as badgeRouter from './badge'
+// import * as cartoonRouter from './cartoon'
+import badge from '@/views/badge/index.vue'
+// import cartoon from '@/views/cartoon/index.vue'
 import {useStore} from '@/stores'
 import { config } from '@/config/config'
 import { localStorage } from '@/utils/local-storage'
@@ -17,8 +17,8 @@ NProgress.configure({ showSpinner: true, parent: '#app' })
 const routes = [
   {
     path: '/',
-    name: 'cartoon',
-    component: cartoon,
+    name: 'badge',
+    component: badge,
     meta: {
       needGuard: true,
       title: '首页',
@@ -26,8 +26,8 @@ const routes = [
   },
 ]
 
-// badgeRouter.mergeRoutes(routes)
-cartoonRouter.mergeRoutes(routes)
+badgeRouter.mergeRoutes(routes)
+// cartoonRouter.mergeRoutes(routes)
 // 创建路由实例并传递 `routes` 配置
 const router = createRouter({
   history: createWebHashHistory(process.env.VUE_APP_PUBLIC_PATH),
@@ -56,7 +56,7 @@ router.beforeEach((_to, _from, next) => {
   if (code) {
     let url = store.redirectUrl()
 
-    if (_to.path !== '/cartoon') {
+    if (_to.path !== '/badge') {
       if (url) {
         store.setRedirect('')
         next(url)