diff --git a/.env.base b/.env.base index fdb26d8..ffab0b7 100644 --- a/.env.base +++ b/.env.base @@ -4,10 +4,10 @@ NODE_ENV=development 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 diff --git a/.env.front b/.env.front index 2f81036..199f242 100644 --- a/.env.front +++ b/.env.front @@ -4,10 +4,10 @@ NODE_ENV=development 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 diff --git a/.env.pro b/.env.pro index 8348e02..ca85016 100644 --- a/.env.pro +++ b/.env.pro @@ -4,10 +4,10 @@ NODE_ENV=production 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= diff --git a/.env.static b/.env.static index 034a7f4..15d5c74 100644 --- a/.env.static +++ b/.env.static @@ -4,10 +4,10 @@ NODE_ENV=production 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= diff --git a/.env.test b/.env.test index 0793af2..871616a 100644 --- a/.env.test +++ b/.env.test @@ -4,10 +4,10 @@ NODE_ENV=production 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= diff --git a/src/components/Materials/src/Materials.vue b/src/components/Materials/src/Materials.vue index 6c18e3b..f1f1b68 100644 --- a/src/components/Materials/src/Materials.vue +++ b/src/components/Materials/src/Materials.vue @@ -244,6 +244,9 @@ const urls = ref([]) const value = computed({ get() { + if(!props.modelValue || props.modelValue.length == 0){ + return [] + } if (Array.isArray(props.modelValue)) { return props.modelValue } @@ -470,10 +473,10 @@ function sureUrls() { value.value[value.value.length] = item }) listDialogVisible.value = false - if (urls.value.length > 1) { - emit('update:modelValue', urls.value) + if (urls.value.length > 1 || props.num > 1) { + emit('update:modelValue', value.value) } else { - emit('update:modelValue', urls.value[0]) + emit('update:modelValue', value.value[0]) } diff --git a/src/views/mall/product/storeProduct/StoreProductForm.vue b/src/views/mall/product/storeProduct/StoreProductForm.vue index 6bfcaa7..f03cff8 100644 --- a/src/views/mall/product/storeProduct/StoreProductForm.vue +++ b/src/views/mall/product/storeProduct/StoreProductForm.vue @@ -633,10 +633,14 @@ const getInfo = (id) => { attrs.value = data.items || []; formValidate.value = data; formValidate.value.cate_id = data.cate_id; - oneFormValidate.value = [data.attr]; + if (data.attr) { + oneFormValidate.value = [data.attr]; + } formValidate.value.header = []; generate(); - manyFormValidate.value = data.attrs; + if (data.attrs) { + manyFormValidate.value = data.attrs; + } console.log('data2:',formValidate.value.spec_type) if(data.spec_type === 0){ manyFormValidate.value = [];