dev2 #1

Open
panjunjie wants to merge 174 commits from dev2 into main
12 changed files with 2817 additions and 40 deletions
Showing only changes of commit e3844d6d11 - Show all commits

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

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}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,6 @@
import request from '@/utils/request'
import { URL } from '@/config'
/**
* @name 获取商品分类列表下拉框
* @api
@ -28,8 +27,6 @@ export function getList(params) {
})
}
export function doEdit(data) {
return request({
url: URL.shop.product.base.doEdit,

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']

View File

@ -675,6 +675,7 @@
return item.spec_id
})
.join(',')
},
//
brandDefaultSelected(brandIds) {

View File

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

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,6 +1968,7 @@
},
async getType(type_id) {
const { data } = await get({ type_id: type_id })
if(data){
this.brands = data.brands
this.assists = data.assists
this.specs = data.specs
@ -1976,6 +1978,8 @@
// vue
this.initAssistArr(this.assists)
this.initCheckSpecArr(this.specs)
}
},
// vue assistArr
initAssistArr(assists) {

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,6 +2317,7 @@ export default {
},
async getType(type_id, productId) {
const { data } = await get({ type_id: type_id, product_id: productId })
if(data){
this.brands = data.brands
this.assists = data.assists
this.specs = data.specs
@ -2326,6 +2326,8 @@ export default {
// // vue
this.initAssistArr(this.assists)
this.initCheckSpecArr(this.specs)
}
},
// vue assistArr
initAssistArr(assists) {