diff --git a/.env.development b/.env.development index 885391e..4214b50 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ # VITE_APP_URL = http://192.168.31.82:8771 -# VITE_APP_URL = http://18.167.251.121:10095 -VITE_APP_URL = http://192.168.31.118:8080 +VITE_APP_URL = http://18.167.251.121:10015 +# VITE_APP_URL = http://192.168.31.118:8080 VITE_GOOGLE_CLIENT_ID = 216037134725-7q8vqp0ohtmohlosltkfg7bd2v29rm5a.apps.googleusercontent.com diff --git a/.env.production b/.env.production index 54a50e7..1b76a4d 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ -VITE_APP_URL = https://www.lc-api.aida.com.hk -# VITE_APP_URL = http://18.167.251.121:10095 +# VITE_APP_URL = https://www.lc-api.aida.com.hk +VITE_APP_URL = http://18.167.251.121:10015 VITE_GOOGLE_CLIENT_ID = 29310152396-nnsd3h533fld665oguu8ovrt1nukmt46.apps.googleusercontent.com diff --git a/src/App.vue b/src/App.vue index c595bc0..9821271 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,13 +1,13 @@ diff --git a/src/lang/en.ts b/src/lang/en.ts index 35681f3..f270781 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -103,11 +103,12 @@ export default { france: 'France', japan: 'Japan', canada: 'Canada', - germany: 'Germany' + germany: 'Germany', }, agent: { copySuccess: 'Text copied to clipboard', - copyFaild: 'Copy failed. Your browser may be restricting clipboard access. Please try copying manually.' + copyFaild: 'Copy failed. Your browser may be restricting clipboard access. Please try copying manually.', + Download: 'Download' }, // Version Tree @@ -128,6 +129,7 @@ export default { restoreHint:'Once deleted, you won’t be able to view this conversation again.', cancel: 'cancel', Confirm: 'Confirm', + export: 'Export', }, //generateSketch generateSketch: { diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts index 4f31f70..45da035 100644 --- a/src/lang/zh-cn.ts +++ b/src/lang/zh-cn.ts @@ -97,12 +97,13 @@ export default { france: '法国', japan: '日本', canada: '加拿大', - germany: '德国' + germany: '德国', }, agent: { copySuccess: '文本已复制到剪贴板', copyFaild: - '复制失败。您的浏览器可能限制了剪贴板访问,请允许浏览器访问剪贴板或尝试手动复制。' + '复制失败。您的浏览器可能限制了剪贴板访问,请允许浏览器访问剪贴板或尝试手动复制。', + Download: '下载' }, // Version Tree @@ -123,6 +124,7 @@ export default { restoreHint:'恢复后将显示该对话。', cancel: '取消', Confirm: '确认', + export: '导出', }, //generateSketch generateSketch: { diff --git a/src/stores/userInfo.ts b/src/stores/userInfo.ts index 096377e..835d8ae 100644 --- a/src/stores/userInfo.ts +++ b/src/stores/userInfo.ts @@ -1,70 +1,46 @@ // 每一个存储的模块,命名规则use开头,store结尾 +import router from '@/router' import { defineStore } from 'pinia' import { ref, computed } from 'vue' import { removeLocal, setLocal } from '@/utils/local' import MyEvent from '@/utils/myEvent' export const useUserInfoStore = defineStore('userInfo', () => { - const state = ref({ + const state = ref({ userInfo: {}, token: '', - generateParams: { - stylist: '', - sex: '', - stylistImage: '' - } - }) - // getters - const getUserInfo = computed(() => state.value.userInfo) + }) - // actions - const setUserInfo = (data: any) => { - state.value.userInfo = data - } + // getters + const getUserInfo = computed(() => state.value.userInfo) - const setToken = (data: string) => { - state.value.token = data - setLocal(data, 'token') - } + // actions + const setUserInfo = (data: any) => { + state.value.userInfo = data + } - const getGenerateParams = () => { - return state.value.generateParams - } + const setToken = (data: string) => { + state.value.token = data + // setLocal(data, 'token') + } - const setGenerateParams = (data: any) => { - state.value.generateParams = data - } + const logOut = async () => { + // 处理退出登录的一些逻辑 + state.value.token = '' + state.value.userInfo = {} + // removeLocal('token') + // MyEvent.emit('clear-generate-state') + // MyEvent.emit('clear-client-state') + // MyEvent.emit('clearAllCache') + router.push({ name: 'login' }) + return "" + } - const resetGenerateParams = () => { - state.value.generateParams = { - stylist: '', - sex: '', - stylistImage: '' - } - } - - const logOut = () => { - // 处理退出登录的一些逻辑 - return new Promise((resolve) => { - state.value.token = '' - state.value.userInfo = {} - removeLocal('token') - resetGenerateParams() - MyEvent.emit('clear-generate-state') - MyEvent.emit('clear-client-state') - MyEvent.emit('clearAllCache') - resolve('') - }) - } - - return { - state, - getUserInfo, - setToken, - setUserInfo, - setGenerateParams, - getGenerateParams, - resetGenerateParams, - logOut - } + return { + state, + getUserInfo, + setToken, + setUserInfo, + logOut + } }) diff --git a/src/utils/request.ts b/src/utils/request.ts index 7c4b1b1..5bb61f0 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -79,7 +79,7 @@ service.interceptors.response.use( const res = response.data // 处理异常的情况 // console.log(res) - if (res.code != 0) { + if (res.code != 200) { // showToast({ // message: res.errMsg || res.message, // // type: 'fail', diff --git a/src/views/home/VersionTree.vue b/src/views/home/VersionTree.vue index e46372f..55e0670 100644 --- a/src/views/home/VersionTree.vue +++ b/src/views/home/VersionTree.vue @@ -1,6 +1,7 @@