diff --git a/src/api/base/config.js b/src/api/base/config.js index d5b25ee..d512e40 100644 --- a/src/api/base/config.js +++ b/src/api/base/config.js @@ -64,10 +64,11 @@ export function getSmsRecord(params) { params, }) } -export function getReportList(){ +export function getReportList(params){ return request({ url:URL.account.base.config.report_list, method:'get', + params:params }) } export function dealReport(data){ diff --git a/src/api/goodsTool.js b/src/api/goodsTool.js index b146b66..615ffbb 100644 --- a/src/api/goodsTool.js +++ b/src/api/goodsTool.js @@ -126,7 +126,23 @@ export async function syncShopImages(data) { method: 'post', }) } - +export async function getImgList(data) { + data = stringify(data) + return request({ + url: `/admin/shop/libraryProduct/list?${data}`, + method:'get', + }) +} +export async function saveBatchBarcode(data) { + return request({ + url:'/admin/shop/libraryProduct/saveBatch', + method:'put', + data, + headers: { + 'Content-Type': 'application/json;charset=UTF-8' + } + }) +} export default { getProductMapperList, getShopList, @@ -141,4 +157,6 @@ export default { syncProductMaping, importGoodsData, syncShopImages, + getImgList, + saveBatchBarcode } diff --git a/src/utils/routes.js b/src/utils/routes.js index 5ad9050..0fd2588 100644 --- a/src/utils/routes.js +++ b/src/utils/routes.js @@ -30,7 +30,22 @@ export function convertRouter(asyncRoutes) { route.children.push(obj) } - + if (route.meta.title == '商品' && route.name == 'Vab320') { + const obj = { + path: '/goodsImgs', + component: '@/views/product/goodsImg/goodsImgs', + name: 'Vab88000', + redirect: null, + meta: { + title: '商品图库管理', + icon: '', + noClosable: 0, + hidden: null, + }, + menuHidden: false, + } + route.children.push(obj) + } if (route.meta.title == '店铺' && route.name == 'Vab330') { const obj = { path: '/storeConf', diff --git a/src/views/product/goodsImg/batchEditBarcode.vue b/src/views/product/goodsImg/batchEditBarcode.vue new file mode 100644 index 0000000..9c04c35 --- /dev/null +++ b/src/views/product/goodsImg/batchEditBarcode.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/src/views/product/goodsImg/editGoodsImgs.vue b/src/views/product/goodsImg/editGoodsImgs.vue new file mode 100644 index 0000000..3c305d9 --- /dev/null +++ b/src/views/product/goodsImg/editGoodsImgs.vue @@ -0,0 +1,158 @@ + + + + diff --git a/src/views/product/goodsImg/goodsImgs.vue b/src/views/product/goodsImg/goodsImgs.vue new file mode 100644 index 0000000..918de91 --- /dev/null +++ b/src/views/product/goodsImg/goodsImgs.vue @@ -0,0 +1,301 @@ + + + + + diff --git a/src/views/settings/config/report.vue b/src/views/settings/config/report.vue index 5d1f6f2..1025ae1 100644 --- a/src/views/settings/config/report.vue +++ b/src/views/settings/config/report.vue @@ -2,14 +2,14 @@
- - + + + + + + + - + - - + + + + - - - - + + + + + + + + + @@ -95,158 +148,216 @@ @size-change="handleSizeChange" /> +
+ diff --git a/src/views/settings/config/reportDeal.vue b/src/views/settings/config/reportDeal.vue index a157e5a..20dfd29 100644 --- a/src/views/settings/config/reportDeal.vue +++ b/src/views/settings/config/reportDeal.vue @@ -1,22 +1,27 @@ + +::v-deep .el-image-viewer__mask { + background: rgba(0, 0, 0, 0.7) !important; +} +.el-upload__tip { + color: #666 !important; + font-size: 12px !important; +} + \ No newline at end of file diff --git a/src/views/settings/config/reportDetail.vue b/src/views/settings/config/reportDetail.vue new file mode 100644 index 0000000..7eef059 --- /dev/null +++ b/src/views/settings/config/reportDetail.vue @@ -0,0 +1,75 @@ + + + + +