fix
This commit is contained in:
1 parent
5b5849744b
commit
5ad3f87323
4 files changed
+7
-6
No files matched your search
+1
-3
@@ -26,8 +26,7 @@ import config from "../miaoShareConfig.json"
|
||||
|
||||
const settingData = useSettingStore();
|
||||
const serverPort = settingData.serverPort;
|
||||
const baseUrl =
|
||||
location.protocol + "//" + location.hostname + ":" + serverPort + "/";
|
||||
const baseUrl = settingData.baseUrl
|
||||
const tokenExpiresIn = config.tokenExpiresIn
|
||||
|
||||
|
||||
@@ -46,7 +45,6 @@ const menuOptions = ref([
|
||||
key: 'upload',
|
||||
icon: renderIcon(uploadIcon),
|
||||
disabled: computed(() => {
|
||||
// console.log(settingData)
|
||||
return settingData.token === null
|
||||
})
|
||||
},
|
||||
|
||||
@@ -70,7 +70,7 @@ const _toClipboard = async (text) => {
|
||||
}
|
||||
const setting = useSettingStore();
|
||||
const serverPort = setting.serverPort;
|
||||
const baseUrl = location.protocol + "//" + location.hostname + ":" + serverPort + "/";
|
||||
const baseUrl = setting.baseUrl
|
||||
const props = defineProps({
|
||||
messages: {
|
||||
type: Array,
|
||||
|
||||
@@ -36,6 +36,8 @@ const serverPort =
|
||||
const baseUrl =
|
||||
location.protocol + '//' + location.hostname + ':' + serverPort + '/'
|
||||
|
||||
const wsBaseUrl = 'ws' + '://' + location.hostname + ':' + serverPort
|
||||
|
||||
// console.log(process.env.NODE_ENV,config.DEVPORT,location.port,serverPort)
|
||||
export const useSettingStore = defineStore('setting', {
|
||||
state: () => ({
|
||||
|
||||
+3
-2
@@ -105,10 +105,11 @@ const _toClipboard = async (text) => {
|
||||
|
||||
const setting = useSettingStore();
|
||||
const serverPort = setting.serverPort;
|
||||
const wsBaseUrl = 'ws' + "://" + location.hostname + ":" + serverPort;
|
||||
// const wsBaseUrl = 'ws' + "://" + location.hostname + ":" + serverPort;
|
||||
const wsBaseUrl = setting.wsBaseUrl
|
||||
// const baseUrl = location.protocol + "//" + location.hostname + ":" + serverPort + "/";
|
||||
const baseUrl = setting.baseUrl
|
||||
const QRIconUrl = ref(location.protocol + "//" + location.hostname + ":" + serverPort + "/favicon.ico")
|
||||
const QRIconUrl = ref(baseUrl + "favicon.ico")
|
||||
|
||||
const columns = [
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user