cxc/yshop-pro-vue3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

素材修复

Browse Source
This commit is contained in:
hupeng
2023-08-29 22:10:17 +08:00
parent e927265108
commit 3cc906b67b
7 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.base
View File

@ -4,10 +4,10 @@ NODE_ENV=development
VITE_DEV=true VITE_DEV=true
# 请求路径 # 请求路径
VITE_BASE_URL='http://localhost:48080' VITE_BASE_URL='http://localhost:48082'
# 上传路径 # 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' VITE_UPLOAD_URL='http://localhost:48082/admin-api/infra/file/upload'
# 接口前缀 # 接口前缀
VITE_API_BASEPATH=/dev-api VITE_API_BASEPATH=/dev-api

4
.env.front
View File

@ -4,10 +4,10 @@ NODE_ENV=development
VITE_DEV=true VITE_DEV=true
# 请求路径 # 请求路径
VITE_BASE_URL='http://localhost:48080' VITE_BASE_URL='http://localhost:48082'
# 上传路径 # 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' VITE_UPLOAD_URL='http://localhost:48082/admin-api/infra/file/upload'
# 接口前缀 # 接口前缀
VITE_API_BASEPATH=/dev-api VITE_API_BASEPATH=/dev-api

4
.env.pro
View File

@ -4,10 +4,10 @@ NODE_ENV=production
VITE_DEV=false VITE_DEV=false
# 请求路径 # 请求路径
VITE_BASE_URL='http://localhost:48080' VITE_BASE_URL='http://localhost:48082'
# 上传路径 # 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' VITE_UPLOAD_URL='http://localhost:48082/admin-api/infra/file/upload'
# 接口前缀 # 接口前缀
VITE_API_BASEPATH= VITE_API_BASEPATH=

4
.env.static
View File

@ -4,10 +4,10 @@ NODE_ENV=production
VITE_DEV=false VITE_DEV=false
# 请求路径 # 请求路径
VITE_BASE_URL='http://localhost:48080' VITE_BASE_URL='http://localhost:48082'
# 上传路径 # 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' VITE_UPLOAD_URL='http://localhost:48082/admin-api/infra/file/upload'
# 接口前缀 # 接口前缀
VITE_API_BASEPATH= VITE_API_BASEPATH=

4
.env.test
View File

@ -4,10 +4,10 @@ NODE_ENV=production
VITE_DEV=false VITE_DEV=false
# 请求路径 # 请求路径
VITE_BASE_URL='http://localhost:48080' VITE_BASE_URL='http://localhost:48082'
# 上传路径 # 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' VITE_UPLOAD_URL='http://localhost:48082/admin-api/infra/file/upload'
# 接口前缀 # 接口前缀
VITE_API_BASEPATH= VITE_API_BASEPATH=

9
src/components/Materials/src/Materials.vue
View File

@ -244,6 +244,9 @@ const urls = ref([])
const value = computed({ const value = computed({
get() { get() {
if(!props.modelValue || props.modelValue.length == 0){
return []
}
if (Array.isArray(props.modelValue)) { if (Array.isArray(props.modelValue)) {
return props.modelValue return props.modelValue
} }
@ -470,10 +473,10 @@ function sureUrls() {
value.value[value.value.length] = item value.value[value.value.length] = item
}) })
listDialogVisible.value = false listDialogVisible.value = false
if (urls.value.length > 1) { if (urls.value.length > 1 || props.num > 1) {
emit('update:modelValue', urls.value) emit('update:modelValue', value.value)
} else { } else {
emit('update:modelValue', urls.value[0]) emit('update:modelValue', value.value[0])
} }

8
src/views/mall/product/storeProduct/StoreProductForm.vue
View File

@ -633,10 +633,14 @@ const getInfo = (id) => {
attrs.value = data.items || []; attrs.value = data.items || [];
formValidate.value = data; formValidate.value = data;
formValidate.value.cate_id = data.cate_id; formValidate.value.cate_id = data.cate_id;
oneFormValidate.value = [data.attr]; if (data.attr) {
oneFormValidate.value = [data.attr];
}
formValidate.value.header = []; formValidate.value.header = [];
generate(); generate();
manyFormValidate.value = data.attrs; if (data.attrs) {
manyFormValidate.value = data.attrs;
}
console.log('data2:',formValidate.value.spec_type) console.log('data2:',formValidate.value.spec_type)
if(data.spec_type === 0){ if(data.spec_type === 0){
manyFormValidate.value = []; manyFormValidate.value = [];