Alsmile 1 vuosi sitten
vanhempi
sitoutus
94392d9759

+ 0 - 5
.env.base

@@ -1,5 +0,0 @@
-BASE_URL=/v/
-VITE_ROUTER_BASE=/v/
-VITE_BASEURL=1
-VITE_TRIAL=0
-THREED_BASE_URL=/3d/

+ 0 - 3
.env.trial

@@ -1,4 +1 @@
-BASE_URL=/v/
-VITE_ROUTER_BASE=/v/
-VITE_BASEURL=1
 VITE_TRIAL=1

+ 1 - 1
package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "start": "vite --host --open --port 80",
     "prod": "vue-tsc --noEmit && vite build --base=https://assets.le5lecdn.com/v/",
-    "build": "vue-tsc --noEmit && vite build --mode base --base=/v/",
+    "build": "vue-tsc --noEmit && vite build --base=/v/",
     "trial": "vue-tsc --noEmit && vite build --mode trial --base=/v/",
     "preview": "vite preview"
   },

+ 1 - 1
src/global.d.ts

@@ -5,7 +5,7 @@ declare global {
   var C2S: any;
   var folderJson: any;
   var fileJson: any;
-  // var Meta3D: any;
+  var url3D: string;
 }
 
 declare interface Window {

+ 8 - 4
src/router/index.ts

@@ -1,12 +1,16 @@
-import { createRouter, createWebHistory } from "vue-router";
+import { createRouter, createWebHistory } from 'vue-router';
 
 const routes = [
-  { path: "/", component: () => import("@/views/Index.vue") },
-  { path: "/preview", component: () => import("@/views/Preview.vue") },
+  { path: '/', component: () => import('@/views/Index.vue') },
+  { path: '/preview', component: () => import('@/views/Preview.vue') },
 ];
 
+console.log(import.meta.env.BASE_URL, import.meta.env);
+
 const router = createRouter({
-  history: createWebHistory(import.meta.env.VITE_ROUTER_BASE),
+  history: createWebHistory(
+    import.meta.env.BASE_URL[0] === '/' ? import.meta.env.BASE_URL : '/'
+  ),
   routes,
 });
 

+ 5 - 6
src/services/api.ts

@@ -1,12 +1,11 @@
 //所有的接口请求
 import axios from 'axios';
-export const cdn = import.meta.env.VITE_ROUTER_BASE
-  ? ''
-  : 'https://assets.le5lecdn.com';
 
-export const upCdn = import.meta.env.VITE_ROUTER_BASE
-  ? ''
-  : 'https://drive.le5lecdn.com';
+const isProd =
+  import.meta.env.BASE_URL.indexOf('https://assets.le5lecdn.com') === 0;
+
+export const cdn = isProd ? 'https://assets.le5lecdn.com' : '';
+export const upCdn = isProd ? 'https://drive.le5lecdn.com' : '';
 
 export async function delImage(image: string) {
   if (image.startsWith(upCdn)) {

+ 1 - 4
src/services/common.ts

@@ -50,10 +50,7 @@ const assets = reactive({
 export const useAssets = () => {
   const getAssets = async () => {
     // 官网或安装包版本
-    if (
-      import.meta.env.VITE_TRIAL == undefined ||
-      import.meta.env.VITE_TRIAL == 1
-    ) {
+    if (import.meta.env.VITE_TRIAL != 1) {
       return;
     }
 

+ 5 - 6
src/services/user.ts

@@ -96,8 +96,7 @@ export const useUser = () => {
     data.created = dayjs(data.createdAt).format('YYYY-MM-DD HH:mm:ss');
 
     if (data.token) {
-      let baseUrl = import.meta.env.BASE_URL;
-      if (baseUrl && baseUrl !== '/') {
+      if (import.meta.env.BASE_URL[0] === '/') {
         localStorage.setItem('token', data.token);
       } else {
         setCookie('token', data.token, {
@@ -127,7 +126,7 @@ export const useUser = () => {
 
   const getRootDomain = () => {
     let domain = '';
-    const domainItems = document.domain.split('.');
+    const domainItems = location.hostname.split('.');
     if (
       domainItems.length < 3 ||
       (domainItems.length === 4 &&
@@ -136,10 +135,10 @@ export const useUser = () => {
         +domainItems[2] > 0 &&
         +domainItems[3] > 0)
     ) {
-      domain = '';
+      domain = location.hostname;
     } else if (
-      document.domain.endsWith('.com.cn') ||
-      document.domain.endsWith('.org.cn')
+      location.hostname.endsWith('.com.cn') ||
+      location.hostname.endsWith('.org.cn')
     ) {
       domain = domainItems.slice(-3).join('.');
     } else {

+ 1 - 2
src/services/utils.ts

@@ -1,7 +1,6 @@
 import { Pen, Meta2dData } from '@meta2d/core';
 import { MessagePlugin, NotifyPlugin, Button } from 'tdesign-vue-next';
 import { h, ref } from 'vue';
-const market = import.meta.env.VITE_BASEURL;
 
 export const noLoginTip = '请先登录,否则无法保存!';
 export const localStorageName = 'le5leV';
@@ -111,7 +110,7 @@ export function gotoAccount() {
     duration: 3,
   });
   setTimeout(() => {
-    if (market) {
+    if (import.meta.env.BASE_URL[0] === '/') {
       window.open('/account?unVip=true');
     } else {
       let arr = location.host.split('.');

+ 2 - 2
src/views/components/Graphics.vue

@@ -809,8 +809,8 @@ const onMenu = async (val: string) => {
         });
       } else {
         let url = 'https://3d.le5le.com/?id=';
-        if (import.meta.env.VITE_TRIAL == 0 && (window as any).url3D) {
-          url = (window as any).url3D;
+        if (window.url3D) {
+          url = window.url3D;
         }
         window.open(url + id, '_blank');
       }