Compare commits
2 Commits
f30a749f65
...
12233b952b
| Author | SHA1 | Date | |
|---|---|---|---|
| 12233b952b | |||
| 4b8554f41e |
2
.env.dev
2
.env.dev
@@ -9,6 +9,6 @@ VITE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
|
|||||||
# VITE_APP_BASE_URL = 'http://192.168.31.118:5567'
|
# VITE_APP_BASE_URL = 'http://192.168.31.118:5567'
|
||||||
# 李天祥
|
# 李天祥
|
||||||
# VITE_APP_BASE_URL = 'http://192.168.31.82:5567'
|
# VITE_APP_BASE_URL = 'http://192.168.31.82:5567'
|
||||||
VITE_APP_BASE_URL = 'http://192.168.31.82:5569'
|
# VITE_APP_BASE_URL = 'http://192.168.31.82:5569'
|
||||||
# 海波
|
# 海波
|
||||||
# VITE_APP_BASE_URL = 'http://192.168.31.34:5567'
|
# VITE_APP_BASE_URL = 'http://192.168.31.34:5567'
|
||||||
|
|||||||
@@ -1009,7 +1009,8 @@ const openEdit = (record: SubscriptionPlan) => {
|
|||||||
if (record.organizationId) {
|
if (record.organizationId) {
|
||||||
const orgExists = organizationOptions.value.some(
|
const orgExists = organizationOptions.value.some(
|
||||||
(org: any) =>
|
(org: any) =>
|
||||||
org.id === record.organizationId || String(org.id) === String(record.organizationId)
|
org.id === record.organizationId ||
|
||||||
|
String(org.id) === String(record.organizationId)
|
||||||
)
|
)
|
||||||
if (!orgExists) {
|
if (!orgExists) {
|
||||||
const orgName = (record as any).organizationName
|
const orgName = (record as any).organizationName
|
||||||
@@ -1262,7 +1263,7 @@ const filterOption = (input: string, option: any) => {
|
|||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
.subscription-plan {
|
.subscription-plan {
|
||||||
padding: 2rem 2.4rem 3.2rem 0;
|
padding: 2rem 2.4rem 0 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
@@ -1285,7 +1286,7 @@ const filterOption = (input: string, option: any) => {
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
padding: 2.4rem;
|
padding: 2.4rem 2.4rem 0;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -60,9 +60,9 @@ const seller: Module<Seller, RootState> = {
|
|||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
get_isSeller({ commit }) {
|
get_isSeller({ commit }) {
|
||||||
Https.axiosGet(Https.httpUrls.checkSellerDesigner).then(rv => {
|
// Https.axiosGet(Https.httpUrls.checkSellerDesigner).then(rv => {
|
||||||
commit('set_isSeller', !!rv)
|
// commit('set_isSeller', !!rv)
|
||||||
})
|
// })
|
||||||
},
|
},
|
||||||
async get_designerInfo({ commit }) {
|
async get_designerInfo({ commit }) {
|
||||||
const rv = await Https.axiosGet(Https.httpUrls.getDesignerInfo)
|
const rv = await Https.axiosGet(Https.httpUrls.getDesignerInfo)
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import store from '@/store'
|
|||||||
// httpIp = ''
|
// httpIp = ''
|
||||||
// }
|
// }
|
||||||
const isDev = import.meta.env.VITE_USER_NODE_ENV == 'development'
|
const isDev = import.meta.env.VITE_USER_NODE_ENV == 'development'
|
||||||
const baseURL = isDev ? '' : import.meta.env.VITE_APP_BASE_URL
|
const baseURL = import.meta.env.VITE_APP_BASE_URL
|
||||||
axios.defaults.baseURL = baseURL; // isDev ? '' : import.meta.env.VITE_APP_BASE_URL; //配置接口地址
|
axios.defaults.baseURL = baseURL; // isDev ? '' : import.meta.env.VITE_APP_BASE_URL; //配置接口地址
|
||||||
console.log(import.meta.env.VITE_APP_BASE_URL, baseURL)
|
console.log(import.meta.env.VITE_APP_BASE_URL, baseURL)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user