front/java-mall-admin
7
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

update 修复

Browse Source
This commit is contained in:
qijq 2025-08-11 22:49:19 +08:00
parent 255e0a1a0e
commit e3844d6d11
12 changed files with 2817 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2690
admin/precache-manifest.838c85544ead4a909842fc2e60bc3ea8.js Normal file
View File

File diff suppressed because it is too large Load Diff

9
admin/static/css/app.e5461e79.css Normal file
View File

File diff suppressed because one or more lines are too long

8
admin/static/css/chunk-13d398e8.96736c07.css Normal file
View File

File diff suppressed because one or more lines are too long

5
admin/static/css/vab-extra.d8e19143.css Normal file
View File

@ -0,0 +1,5 @@
/*!
* build: xiaofa-admin
* copyright: https://www.lancerdt.com
* time: 2025-7-3 10:33:05
*/[data-v-28093814]:export{menu-color:#fff;menu-color-active:#fff;menu-background:#282c34;column-second-menu-background:#fff}.vab-avatar-list[data-v-28093814] .el-avatar{display:inline-block;margin-left:-15px;cursor:pointer;border:3px solid #fff}.echarts{width:600px;height:400px}[data-v-7f7baab5]:export{menu-color:#fff;menu-color-active:#fff;menu-background:#282c34;column-second-menu-background:#fff}@media only screen and (max-width:767px){[data-v-7f7baab5] .vab-cropper-canvas{display:block;float:none;margin:0 auto}[data-v-7f7baab5] .vab-cropper-preview{display:none}}[data-v-7f7baab5] .el-textarea{margin-top:20px}[data-v-7f7baab5] .el-dialog__footer{height:72px}[data-v-7f7baab5] .el-dialog__footer:before{display:block;clear:both;content:""}[data-v-7f7baab5] .el-dialog__footer>div>div{display:inline}[data-v-7f7baab5] .el-dialog__footer>div>div .el-upload-list{display:none}[data-v-7f7baab5] .el-dialog__footer>div>div .el-upload--picture-card{float:right;width:auto;height:32px;line-height:32px;vertical-align:middle;background-color:transparent;border:0;border-radius:0}[data-v-7f7baab5] .el-dialog__footer>div .el-button{float:right;margin-left:10px}.icon-selector-popper .el-card__body{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;height:20px;cursor:pointer}.icon-selector-popper .el-card__body i{font-size:28px;color:rgba(0,0,0,.65);text-align:center;vertical-align:middle;pointer-events:none;cursor:pointer}.icon-selector-popper .el-pagination{margin:0}[data-v-3aef4cea]:export{menu-color:#fff;menu-color-active:#fff;menu-background:#282c34;column-second-menu-background:#fff}.upload[data-v-3aef4cea]{height:500px}.upload .upload-content .el-upload__tip[data-v-3aef4cea]{display:block;height:30px;line-height:30px}.upload .upload-content[data-v-3aef4cea] .el-upload--picture-card{width:128px;height:128px;margin:3px 8px 8px 8px;border:2px dashed #c0ccda}.upload .upload-content[data-v-3aef4cea] .el-upload-list--picture{margin-bottom:20px}.upload .upload-content[data-v-3aef4cea] .el-upload-list--picture-card .el-upload-list__item{width:128px;height:128px;margin:3px 8px 8px 8px}

55
admin/static/js/app.51010ec1.js Normal file
View File

File diff suppressed because one or more lines are too long

6
admin/static/js/chunk-13d398e8.8cf7eb94.js Normal file
View File

File diff suppressed because one or more lines are too long

27
src/api/product/base.js
View File

@ -1,23 +1,22 @@
import request from '@/utils/request'
import { URL } from '@/config'
/**
* @name 获取商品分类列表（下拉框）
* @api
* @returns {
* "id": 256, 1级分类ID
* "label": "安防监控", 分类名称
* "children": [ 二级分类数组
* {
* "id": 257, 二级分类ID
* "label": "室内摄像机", 分类名称
* "children": [], 三级分类数组
* "pid": null
* },
* ],
* "pid": null
*}
* "id": 256, 1级分类ID
* "label": "安防监控", 分类名称
* "children": [ 二级分类数组
* {
* "id": 257, 二级分类ID
* "label": "室内摄像机", 分类名称
* "children": [], 三级分类数组
* "pid": null
* },
* ],
* "pid": null
*}
*/
export function getList(params) {
@ -28,8 +27,6 @@ export function getList(params) {
})
}
export function doEdit(data) {
return request({
url: URL.shop.product.base.doEdit,

1
src/utils/request.js
View File

@ -59,7 +59,6 @@ const requestConf = (config) => {
let source_lang_json = JSON.parse(value)
source_lang = source_lang_json.language
}
config.params['source_lang'] = source_lang
const token = store.getters['user/token']

1
src/views/base/product/type/components/BaseProductTypeEdit.vue
View File

@ -675,6 +675,7 @@
return item.spec_id
})
.join(',')
},
// 品牌默认选中
brandDefaultSelected(brandIds) {

1
src/views/order/sellerReturn/components/OrderReturnItem.vue
View File

@ -361,6 +361,7 @@ export default {
// 统计申请总额
getSummaries(param) {
const { columns, data } = param
const sums = []
sums[0] = '申请总额'
columns.forEach((column, index) => {

22
src/views/product/addProduct/components/addProductEdit.vue
View File

@ -1295,7 +1295,6 @@
}
const unitIndex = this.virtualHead.findIndex(item => item.property === 'item_unit_price');
if (unitIndex !== -1) {
this.virtualHead[unitIndex].label = this.__('成本价');
@ -1766,6 +1765,7 @@
this.row = Object.assign({}, row)
if (row != null) {
this.categoryId = row.category_id
this.productForm.category_id = row.category_id
this.productForm.text_category_id = row.category_name
@ -1888,6 +1888,7 @@
productSpec: this.getProductSpec(),
valid: validForm ? validForm : '',
}
const specData = this.specData
for (let i = 0; i < specData.length; i++) {
if (specData[i].item_unit_price <= 0 && specData[i].item_unit_points <= 0) {
@ -1967,15 +1968,18 @@
},
async getType(type_id) {
const { data } = await get({ type_id: type_id })
this.brands = data.brands
this.assists = data.assists
this.specs = data.specs
if(data){
this.brands = data.brands
this.assists = data.assists
this.specs = data.specs
// 维护image类型的spec
// this.initSpecImageList()
// 动态添加vue 属性
this.initAssistArr(this.assists)
this.initCheckSpecArr(this.specs)
}
// 维护image类型的spec
// this.initSpecImageList()
// 动态添加vue 属性
this.initAssistArr(this.assists)
this.initCheckSpecArr(this.specs)
},
// 初始化vue属性 assistArr
initAssistArr(assists) {

30
src/views/product/productList/components/addProductEdit.vue
View File

@ -137,12 +137,7 @@
<el-checkbox
v-for="item in spec.specItems"
:key="item.spec_item_id"
:disabled="
!configs.config.product_spec_edit &&
((newSpecItemIdRow.indexOf(item.spec_item_id) > -1 &&
checkSpec[spec.spec_id].indexOf(item) > -1) ||
!(allowCheckSpecRow.indexOf(spec.spec_id) > -1))
"
:label="item"
>
{{ item.spec_item_name }}
@ -1387,6 +1382,7 @@ export default {
let checkSpecElement = checkSpec[spec_id]
return checkSpecElement.length > 0 && spec.spec_format === 'image'
})
return sp ? sp.spec_id : null
},
// 四舍五入返回四位有效数字
@ -1953,6 +1949,7 @@ export default {
const strSpecs = this.shop_product_info
? this.shop_product_info.product_spec
: '{}'
const specs = JSON.parse(strSpecs)
console.info('+++++++++++++++++')
console.info(specs)
@ -1966,11 +1963,13 @@ export default {
const items = this.getSpecItemByIds(spec_id, idsArr)
// 设置spec 勾选数据
this.$set(this.checkSpec, spec_id, items)
console.info(items)
items.forEach((item, index) => {
that.newSpecItemIdRow.push(item.spec_item_id)
})
})
},
initTableHead() {
const checkSpec = this.checkSpec
@ -2318,14 +2317,17 @@ export default {
},
async getType(type_id, productId) {
const { data } = await get({ type_id: type_id, product_id: productId })
this.brands = data.brands
this.assists = data.assists
this.specs = data.specs
// 维护image类型的spec
// this.initSpecImageList()
// // 动态添加vue 属性
this.initAssistArr(this.assists)
this.initCheckSpecArr(this.specs)
if(data){
this.brands = data.brands
this.assists = data.assists
this.specs = data.specs
// 维护image类型的spec
// this.initSpecImageList()
// // 动态添加vue 属性
this.initAssistArr(this.assists)
this.initCheckSpecArr(this.specs)
}
},
// 初始化vue属性 assistArr
initAssistArr(assists) {