Merge branch 'dev_zyh' of United_Software/k_online_ui into dev

.env

@@ -1 +1,2 @@
-VITE_API_HOST = 'http://localhost/api'
+VITE_API_HOST = 'http://localhost/api'
+VITE_BASE_URL = '/k_new_online/'

.env.development

@@ -1 +1,2 @@
-VITE_API_HOST = 'http://192.168.0.161'
+VITE_API_HOST = 'http://192.168.0.161/Customer_Service_Online'
+VITE_BASE_URL = 'k_new_online'

.env.test

@@ -1 +1,2 @@
-VITE_API_HOST = 'https://ra.kerryapex.com/'
+VITE_API_HOST = 'https://ra.kerryapex.com/online_backend'
+VITE_BASE_URL = 'new'

src/api/module/booking.ts

@@ -1,7 +1,7 @@
 import HttpAxios from '@/utils/axios'
 
 const base = import.meta.env.VITE_API_HOST
-const baseUrl = `${base}/Customer_Service_Online/main_new_version.php`
+const baseUrl = `${base}/main_new_version.php`
 
 /**
  * Booking首页表格列数据

src/api/module/common.ts

@@ -1,7 +1,7 @@
 import HttpAxios from '@/utils/axios'
 
 const base = import.meta.env.VITE_API_HOST
-const baseUrl = `${base}/Customer_Service_Online/main_new_version.php`
+const baseUrl = `${base}/main_new_version.php`
 
 /**
  * 获取表格定制列功能数据

src/api/module/login.ts

@@ -1,7 +1,7 @@
 import HttpAxios from '@/utils/axios'
 
 const base = import.meta.env.VITE_API_HOST
-const baseUrl = `${base}/Customer_Service_Online/login.php`
+const baseUrl = `${base}/login.php`
 
 /**
  * 获取验证码

src/api/module/tracking.ts

@@ -1,7 +1,7 @@
 import HttpAxios from '@/utils/axios'
 
 const base = import.meta.env.VITE_API_HOST
-const baseUrl = `${base}/Customer_Service_Online/main_new_version.php`
+const baseUrl = `${base}/main_new_version.php`
 
 /**
  * Tracking首页表格列数据

src/auto-imports.d.ts

@@ -3,6 +3,7 @@
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
+// biome-ignore lint: disable
 export {}
 declare global {
   const $api: typeof import('@/api/index')['default']
@@ -68,6 +69,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

src/router/index.ts

@@ -2,7 +2,7 @@ import { createRouter, createWebHistory } from 'vue-router'
 import { useUserStore } from '@/stores/modules/user'
 
 const router = createRouter({
-  history: createWebHistory('/k_new_online/'),
+  history: createWebHistory(`/${import.meta.env.VITE_BASE_URL}/`),
   routes: [
     {
       path: '/',

src/utils/axios.ts

@@ -45,8 +45,9 @@ class HttpAxios {
   }
 
   _requestInterceptors = (config: AxiosRequestConfig) => {
-    const _config = { timeout: this.timeout }
-    return { ...config, ..._config }
+    // const _config = { timeout: this.timeout }
+    // return { ...config, ..._config }
+    return config
   }
   /**
    * 返回拦截

src/views/Tracking/src/TrackingView.vue

@@ -239,7 +239,7 @@ const TagsList = ref<ListItem[]>([])
 const filterTag = ref(['All'])
 onMounted(() => {
   if (
-    sessionStorage.getItem('clickParams') != null ||
+    sessionStorage.getItem('clickParams') != null &&
     sessionStorage.getItem('clickParams') != ''
   ) {
     const data = JSON.parse(sessionStorage.getItem('tagsList') as string) || {}

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -6,7 +6,6 @@ import dayjs from 'dayjs'
 import { useRouter } from 'vue-router'
 import { transportationMode } from '@/components/TransportationMode'
 import { useHeaderSearch } from '@/stores/modules/headerSearch'
-import { fa } from 'element-plus/es/locales.mjs'
 
 const router = useRouter()
 const headerSearch = useHeaderSearch()
@@ -24,7 +23,7 @@ const props = defineProps({
 // 表格展示列的原始字段
 const tableOriginColumnsField = ref()
 const handleColumns = (columns: any, status?: string) => {
-  const newColumns = columns.map((item: any) => {
+  const newColumns = columns?.map((item: any) => {
     let curColumn: any = {
       title: item.title,
       field: item.field,
@@ -133,7 +132,7 @@ const getTableData = async (isInit: boolean, isPageChange?: boolean) => {
   const rc = isPageChange ? pageInfo.value.total : -1
   tableLoading.value = true
   if (
-    sessionStorage.getItem('clickParams') != null ||
+    sessionStorage.getItem('clickParams') != null &&
     sessionStorage.getItem('clickParams') != ''
   ) {
     const data = JSON.parse(sessionStorage.getItem('clickParams') as string) || {}

vite.config.ts

@@ -9,7 +9,7 @@ import IconsResolver from 'unplugin-icons/resolver'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: '/k_new_online/',
+  base: `/${process.env.VITE_BASE_URL}/`,
   resolve: {
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url))
@@ -60,4 +60,14 @@ export default defineConfig({
       }
     }
   }
+  // build: {
+  //   assetsDir: 'assets',
+  //   rollupOptions: {
+  //     output: {
+  //       entryFileNames: `assets/[name].[hash].js`,
+  //       chunkFileNames: `assets/[name].[hash].js`,
+  //       assetFileNames: `assets/[name].[hash].[ext]`
+  //     }
+  //   }
+  // }
 })