From 263a27c6a40de68d2d2242e69512ae2e3dfd7b60 Mon Sep 17 00:00:00 2001 From: yuhawu <15545526+yuhawu@user.noreply.gitee.com> Date: Mon, 25 Aug 2025 09:48:12 +0800 Subject: [PATCH] newadmin --- src/api/index.js | 5 +- src/api/interceptors/response.js | 5 + src/api/modules/Image.js | 4 +- src/api/modules/depot.js | 10 +- src/api/modules/district.js | 6 + src/api/modules/shop.js | 8 +- src/api/modules/task.js | 14 +- src/components/index.js | 8 +- src/layout/Sidebar.vue | 38 + src/router/index.js | 30 + src/views/ShopGoodsPublished/index.vue | 5 +- src/views/Task/List.vue | 5 +- src/views/UserRecharge/index.vue | 5 +- src/views/logistics/index.vue | 5 +- src/views/onlineProducts/index.vue | 571 ++-- src/views/redirectUrl/index.vue | 2 +- src/views/shopGoods/index.vue | 3362 ++++++++++++------------ 17 files changed, 2049 insertions(+), 2034 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 236fd29..55ab1f6 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -14,4 +14,7 @@ export { userApi } from './modules/user' export { userLoginApi } from './modules/userLogin' export { priceTemplateApi } from './modules/priceTemplate' export { filterSetApi } from './modules/filterSet' -export { shopGoodsPublishedApi } from './modules/shopGoodsPublished' \ No newline at end of file +export { shopGoodsPublishedApi } from './modules/shopGoodsPublished' + +// 导出店铺订单接口 +export * as shopOrderApi from './modules/shopOrder' \ No newline at end of file diff --git a/src/api/interceptors/response.js b/src/api/interceptors/response.js index 10fea85..ea1ce43 100644 --- a/src/api/interceptors/response.js +++ b/src/api/interceptors/response.js @@ -28,6 +28,11 @@ export function setupResponseInterceptors(instance) { return response; } + // 如果是获取图片接口，直接返回字符串数据 + if (config.url && config.url.includes('/zhishu/image/getImage')) { + return data; + } + // 对于普通的JSON响应，进行业务逻辑检查 if (data.code != 200) { const error = new Error(data.message || '业务逻辑错误'); diff --git a/src/api/modules/Image.js b/src/api/modules/Image.js index a48822a..453a932 100644 --- a/src/api/modules/Image.js +++ b/src/api/modules/Image.js @@ -4,7 +4,7 @@ const ImageApi = { /** * 获取商品标准类目接口 */ - getImage: (data) => instance.get('/zhishu/image/getImage', data), + getImage: (params) => instance.get('/zhishu/image/getImage', { params }), /** * 用户上传图片接口 @@ -22,4 +22,4 @@ const ImageApi = { } // 导出 pdd API 对象 -export { ImageApi }; \ No newline at end of file +export { ImageApi }; \ No newline at end of file diff --git a/src/api/modules/depot.js b/src/api/modules/depot.js index 7f98abe..13b7df9 100644 --- a/src/api/modules/depot.js +++ b/src/api/modules/depot.js @@ -65,8 +65,14 @@ const depotApi = { * @param {Number|String} id - 二级货架ID * @returns {Promise} - 请求Promise */ - getFreightByShelveId: (id) => instance.get(`/depot/freight/${id}`) + getFreightByShelveId: (id) => instance.get(`/depot/freight/${id}`), + + /** + * 获取仓库名称列表 + * @returns {Promise} - 请求Promise + */ + getDepotNameList: () => instance.get('/depot/nameList') } // 导出模块 -export { depotApi } \ No newline at end of file +export { depotApi } \ No newline at end of file diff --git a/src/api/modules/district.js b/src/api/modules/district.js index cb7a5ac..b42fe47 100644 --- a/src/api/modules/district.js +++ b/src/api/modules/district.js @@ -9,9 +9,15 @@ export const getProvinces = () => { return instance.get('/district/provinces'); }; +// 获取运费信息 +export const getFreInfo = (templateId) => { + return instance.get(`/district/freInfo/${templateId}`); +}; + // 为了向后兼容，也导出整个对象 export const districtApi = { getProvinces, + getFreInfo }; export default districtApi; \ No newline at end of file diff --git a/src/api/modules/shop.js b/src/api/modules/shop.js index 52ba5b82..7997d91 100644 --- a/src/api/modules/shop.js +++ b/src/api/modules/shop.js @@ -57,6 +57,11 @@ export const updateSyncOrderStatus = (id, isSynOrder) => { }); }; +// 加密URL方法 +export const encrypUrlMenthod = (data) => { + return instance.post('/shop/encrypUrl', data); +}; + // 为了向后兼容，也导出整个对象 export const shopApi = { getShopList, @@ -66,5 +71,6 @@ export const shopApi = { updateShop, deleteShop, batchDeleteShop, - updateSyncOrderStatus + updateSyncOrderStatus, + encrypUrlMenthod }; diff --git a/src/api/modules/task.js b/src/api/modules/task.js index 6b420a1..0b6730c 100644 --- a/src/api/modules/task.js +++ b/src/api/modules/task.js @@ -92,8 +92,18 @@ const taskApi = { // 中心图书接口 centerBooks: (jsonStr) => instance.post('/task/centerBooks', `jsonStr=${jsonStr}`, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } - }) + }), + + // 获取重复数据 + getRepeatData: (shopId, pageNum, pageSize) => instance.get(`/task/getRepeatData?shopId=${shopId}&pageNum=${pageNum}&pageSize=${pageSize}`), + + // 根据任务类型查询任务状态 + selectTaskStatusByTaskType: (shopId, taskType) => instance.get(`/task/selectTaskStatusByTaskType?shopId=${shopId}&taskType=${taskType}`), + + // 获取店铺任务总数 + getShopTaskAllNum: (shopId, taskType) => instance.get(`/task/getShopTaskAllNum?shopId=${shopId}&taskType=${taskType}`), + }; // 导出模块 -export { taskApi }; \ No newline at end of file +export { taskApi }; \ No newline at end of file diff --git a/src/components/index.js b/src/components/index.js index 86e57da..1e48558 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,10 +1,14 @@ import RefreshButton from './RefreshButton.vue' import ActionBar from './ActionBar.vue' +import RightToolbar from './RightToolbar.vue' +import Pagination from './Pagination.vue' // 全局组件列表 const components = [ RefreshButton, - ActionBar + ActionBar, + RightToolbar, + Pagination ] // 全局注册方法 @@ -14,4 +18,4 @@ export default { app.component(component.name || component.__name, component) }) } -} \ No newline at end of file +} \ No newline at end of file diff --git a/src/layout/Sidebar.vue b/src/layout/Sidebar.vue index f5deb26..bcef535 100644 --- a/src/layout/Sidebar.vue +++ b/src/layout/Sidebar.vue @@ -79,6 +79,14 @@ const menuData = shallowRef([ { title: '价格模板', path: '/shop/priceTemplate' + }, + { + title: '发布商品数据', + path: '/shop/shopPublishedData' + },, + { + title: '店铺商品', + path: '/shop/pddGoods' } ] }, @@ -111,6 +119,10 @@ const menuData = shallowRef([ title: '已发布书品管理', path: '/book/shopGoodsPublished' // permission: 'book:shopGoodsPublished:view' + }, + { + title: '书品导入任务列表', + path: '/book/excelTask' } ] }, @@ -130,6 +142,18 @@ const menuData = shallowRef([ } ] }, + { + title: '订单中心', + path: '/order', + icon: Box, + children: [ + { + title: '订单信息', + path: '/order/shopOrder' + // 移除权限要求，让所有用户都能看到 + } + ] + }, { title: '工具管理', path: '/tools', @@ -154,6 +178,10 @@ const menuData = shallowRef([ { title: '违规列表', path: '/examine/violation/list' + }, + { + title: '图书审核管理', + path: '/bookAudit' } ] }, @@ -192,6 +220,16 @@ const menuData = shallowRef([ } ] }, + { + title: '申请入驻', + path: '/audit', + children: [ + { + title: '审核', + path: '/audit/audit', + } + ] + }, { title: '升级完整版', path: '/NewUser', diff --git a/src/router/index.js b/src/router/index.js index bb21693..b7b26e4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -82,6 +82,11 @@ const routes = [{ component: () => import('@/views/Examine/Violation/List.vue'), meta: { title: '违规列表' } }, + { + path: '/bookAudit', + component: () => import('@/views/bookAudit/index.vue'), + meta: { title: '图书审核管理' } + }, // 日志管理 { path: '/log/runningLog/list', @@ -153,6 +158,31 @@ const routes = [{ path: '/purse/userRecharge', component: () => import('@/views/UserRecharge/index.vue'), meta: { title: '用户充值' } + }, + { + path: '/shop/shopPublishedData', + component: () => import('@/views/onlineProducts/index.vue'), + meta: { title: '发布商品数据' } + }, + { + path: '/order/shopOrder', + component: () => import('@/views/shopOrder/index.vue'), + meta: { title: '订单信息' } + }, + { + path: '/book/excelTask', + component: () => import('@/views/excelTask/index.vue'), + meta: { title: '书品导入任务列表' } + }, + { + path: '/audit/audit', + component: () => import('@/views/Audit/index.vue'), + meta: { title: '审核' } + }, + { + path: '/shop/pddGoods', + component: () => import('@/views/pddGoods/index.vue'), + meta: { title: '店铺商品' } } ] diff --git a/src/views/ShopGoodsPublished/index.vue b/src/views/ShopGoodsPublished/index.vue index 5c8fc19..7234b56 100644 --- a/src/views/ShopGoodsPublished/index.vue +++ b/src/views/ShopGoodsPublished/index.vue @@ -175,7 +175,10 @@ - - - \ No newline at end of file +} + +onMounted(() => { + getList(); + // getShopList(); +}); + + + \ No newline at end of file diff --git a/src/views/redirectUrl/index.vue b/src/views/redirectUrl/index.vue index 0121cbe..44d2578 100644 --- a/src/views/redirectUrl/index.vue +++ b/src/views/redirectUrl/index.vue @@ -74,7 +74,7 @@

后台管理系统地址：

- https://erp.buzhiyushu.cn/ + https://erp.buzhiyushu.cn/ 复制链接 diff --git a/src/views/shopGoods/index.vue b/src/views/shopGoods/index.vue index 424ce54..73b7236 100644 --- a/src/views/shopGoods/index.vue +++ b/src/views/shopGoods/index.vue @@ -1,197 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + 同步所有 + 不同步 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 套装 + 非套装 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 礼盒装 + 普通包装 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
点击上传
- - - -
-

已上传图片（共 {{ fileList.length }} 张）：

-
-
- - - -
- {{ file.name }} - - - - - + + + +
+

已上传图片（共 {{ fileList.length }} 张）：

+
+
+ + + +
+ {{ file.name }} + + + +
+
+ +
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - {{ item.label }} - - - - - - - - {{ item.label }} - - - - - - - - - - - -
- - - - 按重量 - 按标准本数（图书专用） - 按件数 - 单独设置运费 - - - - - - - - - - - + + + + + + + + + + + + + -
- - - - - - -
- - - - 是否同步线上 - - 是 - 否 - -
- - - -
- - - - - \ No newline at end of file + + + + \ No newline at end of file