cuiyouliang/plus-ui
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商品部分接口联调

Browse Source
This commit is contained in:
cuiyouliang 2025-06-16 15:48:17 +08:00
parent a853cbe51d
commit ce180a5831
14 changed files with 152 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/oms/aftersale.js
View File

@ -21,7 +21,7 @@ export function getOmsAftersale(id) {
// 新增订单售后
export function addOmsAftersale(data) {
return request({
url: '/oms/aftersale',
url: '/oms/aftersale/add',
method: 'post',
data: data
});
@ -30,8 +30,8 @@ export function addOmsAftersale(data) {
// 修改订单售后
export function updateOmsAftersale(data) {
return request({
url: '/oms/aftersale',
method: 'put',
url: '/oms/aftersale/update',
method: 'post',
data: data
});
}

20
src/api/oms/aftersaleItem.js
View File

@ -1,4 +1,4 @@
import request from '@/utils/request'
import request from '@/utils/request';
// 查询订单售后列表
export function listOmsAftersaleItem(query, pageReq) {
@ -7,7 +7,7 @@ export function listOmsAftersaleItem(query, pageReq) {
method: 'post',
data: query,
params: pageReq
})
});
}
// 查询订单售后详细
@ -15,25 +15,25 @@ export function getOmsAftersaleItem(id) {
return request({
url: '/oms/aftersaleItem/' + id,
method: 'get'
})
});
}
// 新增订单售后
export function addOmsAftersaleItem(data) {
return request({
url: '/oms/aftersaleItem',
url: '/oms/aftersaleItem/add',
method: 'post',
data: data
})
});
}
// 修改订单售后
export function updateOmsAftersaleItem(data) {
return request({
url: '/oms/aftersaleItem',
method: 'put',
url: '/oms/aftersaleItem/update',
method: 'post',
data: data
})
});
}
// 删除订单售后
@ -41,7 +41,7 @@ export function delOmsAftersaleItem(id) {
return request({
url: '/oms/aftersaleItem/' + id,
method: 'delete'
})
});
}
// 导出订单售后
@ -50,5 +50,5 @@ export function exportOmsAftersaleItem(query) {
url: '/oms/aftersaleItem/export',
method: 'get',
params: query
})
});
}

6
src/api/oms/order.js
View File

@ -27,7 +27,7 @@ export function getDecryptPhone(id) {
// 新增订单表
export function addOmsOrder(data) {
return request({
url: '/oms/order',
url: '/oms/order/add',
method: 'post',
data: data
});
@ -36,8 +36,8 @@ export function addOmsOrder(data) {
// 修改订单表
export function updateOmsOrder(data) {
return request({
url: '/oms/order',
method: 'put',
url: '/oms/order/update',
method: 'post',
data: data
});
}

20
src/api/oms/orderDeliveryHistory.js
View File

@ -1,4 +1,4 @@
import request from '@/utils/request'
import request from '@/utils/request';
// 查询订单发货记录列表
export function listOmsOrderDeliveryHistory(query, pageReq) {
@ -7,7 +7,7 @@ export function listOmsOrderDeliveryHistory(query, pageReq) {
method: 'post',
data: query,
params: pageReq
})
});
}
// 查询订单发货记录详细
@ -15,25 +15,25 @@ export function getOmsOrderDeliveryHistory(id) {
return request({
url: '/oms/orderDeliveryHistory/' + id,
method: 'get'
})
});
}
// 新增订单发货记录
export function addOmsOrderDeliveryHistory(data) {
return request({
url: '/oms/orderDeliveryHistory',
url: '/oms/orderDeliveryHistory/add',
method: 'post',
data: data
})
});
}
// 修改订单发货记录
export function updateOmsOrderDeliveryHistory(data) {
return request({
url: '/oms/orderDeliveryHistory',
method: 'put',
url: '/oms/orderDeliveryHistory/update',
method: 'post',
data: data
})
});
}
// 删除订单发货记录
@ -41,7 +41,7 @@ export function delOmsOrderDeliveryHistory(id) {
return request({
url: '/oms/orderDeliveryHistory/' + id,
method: 'delete'
})
});
}
// 导出订单发货记录
@ -50,5 +50,5 @@ export function exportOmsOrderDeliveryHistory(query) {
url: '/oms/orderDeliveryHistory/export',
method: 'get',
params: query
})
});
}

20
src/api/oms/orderItem.js
View File

@ -1,4 +1,4 @@
import request from '@/utils/request'
import request from '@/utils/request';
// 查询订单中所包含的商品列表
export function listOmsOrderItem(query, pageReq) {
@ -7,7 +7,7 @@ export function listOmsOrderItem(query, pageReq) {
method: 'post',
data: query,
params: pageReq
})
});
}
// 查询订单中所包含的商品详细
@ -15,25 +15,25 @@ export function getOmsOrderItem(id) {
return request({
url: '/oms/orderItem/' + id,
method: 'get'
})
});
}
// 新增订单中所包含的商品
export function addOmsOrderItem(data) {
return request({
url: '/oms/orderItem',
url: '/oms/orderItem/add',
method: 'post',
data: data
})
});
}
// 修改订单中所包含的商品
export function updateOmsOrderItem(data) {
return request({
url: '/oms/orderItem',
method: 'put',
url: '/oms/orderItem/update',
method: 'post',
data: data
})
});
}
// 删除订单中所包含的商品
@ -41,7 +41,7 @@ export function delOmsOrderItem(id) {
return request({
url: '/oms/orderItem/' + id,
method: 'delete'
})
});
}
// 导出订单中所包含的商品
@ -50,5 +50,5 @@ export function exportOmsOrderItem(query) {
url: '/oms/orderItem/export',
method: 'get',
params: query
})
});
}

20
src/api/oms/orderOperateHistory.js
View File

@ -1,4 +1,4 @@
import request from '@/utils/request'
import request from '@/utils/request';
// 查询订单操作历史记录列表
export function listOmsOrderOperateHistory(query, pageReq) {
@ -7,7 +7,7 @@ export function listOmsOrderOperateHistory(query, pageReq) {
method: 'post',
data: query,
params: pageReq
})
});
}
// 查询订单操作历史记录详细
@ -15,25 +15,25 @@ export function getOmsOrderOperateHistory(id) {
return request({
url: '/oms/orderOperateHistory/' + id,
method: 'get'
})
});
}
// 新增订单操作历史记录
export function addOmsOrderOperateHistory(data) {
return request({
url: '/oms/orderOperateHistory',
url: '/oms/orderOperateHistory/add',
method: 'post',
data: data
})
});
}
// 修改订单操作历史记录
export function updateOmsOrderOperateHistory(data) {
return request({
url: '/oms/orderOperateHistory',
method: 'put',
url: '/oms/orderOperateHistory/update',
method: 'post',
data: data
})
});
}
// 删除订单操作历史记录
@ -41,7 +41,7 @@ export function delOmsOrderOperateHistory(id) {
return request({
url: '/oms/orderOperateHistory/' + id,
method: 'delete'
})
});
}
// 导出订单操作历史记录
@ -50,5 +50,5 @@ export function exportOmsOrderOperateHistory(query) {
url: '/oms/orderOperateHistory/export',
method: 'get',
params: query
})
});
}

20
src/api/oms/wechatPaymentHistory.js
View File

@ -1,4 +1,4 @@
import request from '@/utils/request'
import request from '@/utils/request';
// 查询微信订单表列表
export function listOmsWechatPaymentHistory(query, pageReq) {
@ -7,7 +7,7 @@ export function listOmsWechatPaymentHistory(query, pageReq) {
method: 'post',
data: query,
params: pageReq
})
});
}
// 查询微信订单表详细
@ -15,25 +15,25 @@ export function getOmsWechatPaymentHistory(id) {
return request({
url: '/pms/omsWechatPaymentHistory/' + id,
method: 'get'
})
});
}
// 新增微信订单表
export function addOmsWechatPaymentHistory(data) {
return request({
url: '/pms/omsWechatPaymentHistory',
url: '/pms/omsWechatPaymentHistory/add',
method: 'post',
data: data
})
});
}
// 修改微信订单表
export function updateOmsWechatPaymentHistory(data) {
return request({
url: '/pms/omsWechatPaymentHistory',
method: 'put',
url: '/pms/omsWechatPaymentHistory/update',
method: 'post',
data: data
})
});
}
// 删除微信订单表
@ -41,7 +41,7 @@ export function delOmsWechatPaymentHistory(id) {
return request({
url: '/pms/omsWechatPaymentHistory/' + id,
method: 'delete'
})
});
}
// 导出微信订单表
@ -50,5 +50,5 @@ export function exportOmsWechatPaymentHistory(query) {
url: '/pms/omsWechatPaymentHistory/export',
method: 'get',
params: query
})
});
}

24
src/api/pms/brand.js
View File

@ -1,4 +1,4 @@
import request from '@/utils/request'
import request from '@/utils/request';
// 查询品牌管理列表
export function listPmsBrand(query, pageReq) {
@ -7,15 +7,15 @@ export function listPmsBrand(query, pageReq) {
method: 'post',
data: query,
params: pageReq
})
});
}
export function allBrand(query, pageReq) {
return request({
url: '/pms/brand/all',
url: '/pms/brand/list',
method: 'post',
data: query,
params: pageReq
})
});
}
// 查询品牌管理详细
@ -23,25 +23,25 @@ export function getPmsBrand(id) {
return request({
url: '/pms/brand/' + id,
method: 'get'
})
});
}
// 新增品牌管理
export function addPmsBrand(data) {
return request({
url: '/pms/brand',
url: '/pms/brand/add',
method: 'post',
data: data
})
});
}
// 修改品牌管理
export function updatePmsBrand(data) {
return request({
url: '/pms/brand',
method: 'put',
url: '/pms/brand/update',
method: 'post',
data: data
})
});
}
// 删除品牌管理
@ -49,7 +49,7 @@ export function delPmsBrand(id) {
return request({
url: '/pms/brand/' + id,
method: 'delete'
})
});
}
// 导出品牌管理
@ -58,5 +58,5 @@ export function exportPmsBrand(query) {
url: '/pms/brand/export',
method: 'get',
params: query
})
});
}

18
src/api/pms/product.js
View File

@ -1,4 +1,4 @@
import request from '@/utils/request'
import request from '@/utils/request';
// 查询商品信息列表
export function listPmsProduct(query, pageReq) {
@ -7,7 +7,7 @@ export function listPmsProduct(query, pageReq) {
method: 'post',
data: query,
params: pageReq
})
});
}
// 查询商品信息详细
@ -15,25 +15,25 @@ export function getPmsProduct(id) {
return request({
url: '/pms/product/' + id,
method: 'get'
})
});
}
// 新增商品信息
export function addPmsProduct(data) {
return request({
url: '/pms/product',
url: '/pms/product/add',
method: 'post',
data: data
})
});
}
// 修改商品信息
export function updatePmsProduct(data) {
return request({
url: '/pms/product',
url: '/pms/product/update',
method: 'put',
data: data
})
});
}
// 删除商品信息
@ -41,7 +41,7 @@ export function delPmsProduct(id) {
return request({
url: '/pms/product/' + id,
method: 'delete'
})
});
}
// 导出商品信息
@ -50,5 +50,5 @@ export function exportPmsProduct(query) {
url: '/pms/product/export',
method: 'get',
params: query
})
});
}

20
src/api/pms/productCategory.js
View File

@ -1,4 +1,4 @@
import request from '@/utils/request'
import request from '@/utils/request';
// 查询商品分类列表
export function listPmsProductCategory(query, pageReq) {
@ -7,7 +7,7 @@ export function listPmsProductCategory(query, pageReq) {
method: 'post',
data: query,
params: pageReq
})
});
}
// 查询商品分类详细
@ -15,25 +15,25 @@ export function getPmsProductCategory(id) {
return request({
url: '/pms/productCategory/' + id,
method: 'get'
})
});
}
// 新增商品分类
export function addPmsProductCategory(data) {
return request({
url: '/pms/productCategory',
url: '/pms/productCategory/add',
method: 'post',
data: data
})
});
}
// 修改商品分类
export function updatePmsProductCategory(data) {
return request({
url: '/pms/productCategory',
method: 'put',
url: '/pms/productCategory/update',
method: 'post',
data: data
})
});
}
// 删除商品分类
@ -41,7 +41,7 @@ export function delPmsProductCategory(id) {
return request({
url: '/pms/productCategory/' + id,
method: 'delete'
})
});
}
// 导出商品分类
@ -50,5 +50,5 @@ export function exportPmsProductCategory(query) {
url: '/pms/productCategory/export',
method: 'get',
params: query
})
});
}

20
src/api/pms/sku.js
View File

@ -1,4 +1,4 @@
import request from '@/utils/request'
import request from '@/utils/request';
// 查询sku信息列表
export function listPmsSku(query, pageReq) {
@ -7,7 +7,7 @@ export function listPmsSku(query, pageReq) {
method: 'post',
data: query,
params: pageReq
})
});
}
// 查询sku信息详细
@ -15,25 +15,25 @@ export function getPmsSku(id) {
return request({
url: '/pms/sku/' + id,
method: 'get'
})
});
}
// 新增sku信息
export function addPmsSku(data) {
return request({
url: '/pms/sku',
url: '/pms/sku/add',
method: 'post',
data: data
})
});
}
// 修改sku信息
export function updatePmsSku(data) {
return request({
url: '/pms/sku',
method: 'put',
url: '/pms/sku/update',
method: 'post',
data: data
})
});
}
// 删除sku信息
@ -41,7 +41,7 @@ export function delPmsSku(id) {
return request({
url: '/pms/sku/' + id,
method: 'delete'
})
});
}
// 导出sku信息
@ -50,5 +50,5 @@ export function exportPmsSku(query) {
url: '/pms/sku/export',
method: 'get',
params: query
})
});
}

77
src/components/OssImageUpload/index.vue
View File

@ -24,27 +24,23 @@
<!-- 上传提示 -->
<div class="el-upload__tip" slot="tip" v-if="showTip">
请上传
<template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
<template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
<template v-if="fileSize">
大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
</template>
<template v-if="fileType">
格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b>
</template>
的文件
</div>
<el-dialog
:visible.sync="dialogVisible"
title="预览"
width="800"
append-to-body
>
<img
:src="dialogImageUrl"
style="display: block; max-width: 100%; margin: 0 auto"
/>
<el-dialog v-model:visible="dialogVisible" title="预览" width="800" append-to-body>
<img :src="dialogImageUrl" style="display: block; max-width: 100%; margin: 0 auto" />
</el-dialog>
</div>
</template>
<script>
import { getToken } from "@/utils/auth";
import { getToken } from '@/utils/auth';
export default {
props: {
@ -52,17 +48,17 @@ export default {
// 图片数量限制
limit: {
type: Number,
default: 5,
default: 5
},
// 大小限制(MB)
fileSize: {
type: Number,
default: 5,
default: 5
},
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
default: () => ["png", "jpg", "jpeg"],
default: () => ['png', 'jpg', 'jpeg']
},
// 是否显示提示
isShowTip: {
@ -74,13 +70,13 @@ export default {
return {
number: 0,
uploadList: [],
dialogImageUrl: "",
dialogImageUrl: '',
dialogVisible: false,
hideUpload: false,
baseUrl: import.meta.env.VITE_APP_BASE_API,
uploadImgUrl: import.meta.env.VITE_APP_BASE_API + "/oss/upload", // 上传的图片服务器地址
uploadImgUrl: import.meta.env.VITE_APP_BASE_API + '/resource/oss/upload', // 上传的图片服务器地址
headers: {
Authorization: "Bearer " + getToken(),
Authorization: 'Bearer ' + getToken()
},
fileList: []
};
@ -92,8 +88,8 @@ export default {
// 首先将值转为数组
const list = Array.isArray(val) ? val : this.value.split(',');
// 然后将数组转为对象数组
this.fileList = list.map(item => {
if (typeof item === "string") {
this.fileList = list.map((item) => {
if (typeof item === 'string') {
item = { name: item, url: item };
}
return item;
@ -111,25 +107,26 @@ export default {
// 是否显示提示
showTip() {
return this.isShowTip && (this.fileType || this.fileSize);
},
}
},
methods: {
// 删除图片
handleRemove(file, fileList) {
const findex = this.fileList.map(f => f.name).indexOf(file.name);
const findex = this.fileList.map((f) => f.name).indexOf(file.name);
if (findex > -1) {
this.fileList.splice(findex, 1);
this.$emit("input", this.listToString(this.fileList));
this.$emit('input', this.listToString(this.fileList));
}
},
// 上传成功回调
handleUploadSuccess(res) {
this.uploadList.push({ name: res.fileName, url: res.url });
const { fileName, url } = res.data || {};
this.uploadList.push({ name: fileName, url: url });
if (this.uploadList.length === this.number) {
this.fileList = this.fileList.concat(this.uploadList);
this.uploadList = [];
this.number = 0;
this.$emit("input", this.listToString(this.fileList));
this.$emit('input', this.listToString(this.fileList));
this.$modal.closeLoading();
}
},
@ -137,21 +134,21 @@ export default {
handleBeforeUpload(file) {
let isImg = false;
if (this.fileType.length) {
let fileExtension = "";
if (file.name.lastIndexOf(".") > -1) {
fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
let fileExtension = '';
if (file.name.lastIndexOf('.') > -1) {
fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1);
}
isImg = this.fileType.some(type => {
isImg = this.fileType.some((type) => {
if (file.type.indexOf(type) > -1) return true;
if (fileExtension && fileExtension.indexOf(type) > -1) return true;
return false;
});
} else {
isImg = file.type.indexOf("image") > -1;
isImg = file.type.indexOf('image') > -1;
}
if (!isImg) {
this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`);
this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join('/')}图片格式文件!`);
return false;
}
if (this.fileSize) {
@ -161,7 +158,7 @@ export default {
return false;
}
}
this.$modal.loading("正在上传图片，请稍候...");
this.$modal.loading('正在上传图片，请稍候...');
this.number++;
},
// 文件个数超出
@ -170,7 +167,7 @@ export default {
},
// 上传失败
handleUploadError() {
this.$modal.msgError("上传图片失败，请重试");
this.$modal.msgError('上传图片失败，请重试');
this.$modal.closeLoading();
},
// 预览
@ -180,10 +177,10 @@ export default {
},
// 对象转成指定字符串分隔
listToString(list, separator) {
let strs = "";
separator = separator || ",";
for (let i in list) {
strs += list[i].url.replace(this.baseUrl, "") + separator;
let strs = '';
separator = separator || ',';
for (const i in list) {
strs += list[i].url.replace(this.baseUrl, '') + separator;
}
return strs != '' ? strs.substr(0, strs.length - 1) : '';
}
@ -201,9 +198,9 @@ export default {
transition: all 0s;
}
::v-deep .el-list-enter, .el-list-leave-active {
::v-deep .el-list-enter,
.el-list-leave-active {
opacity: 0;
transform: translateY(0);
}
</style>

6
src/store/modules/mall.ts
View File

@ -30,8 +30,10 @@ export const useMallStore = defineStore('mall', () => {
if (!force && state.value.brandList.length > 0) {
return Promise.resolve();
}
return allBrand({}).then((res: any) => {
state.value.brandList = res;
// 全量品牌接口未迁移，暂时用分页接口代替
return allBrand({ current: 1, size: 99999 }).then((res: any) => {
const { records } = res.data;
state.value.brandList = records || [];
});
};
return {

22
src/views/pms/product/index.vue
View File

@ -48,7 +48,7 @@
<el-table-column label="原价" prop="outProductId"> </el-table-column>
<el-table-column label="优惠金额" prop="outProductId"> </el-table-column>
<el-table-column label="销量" prop="outProductId"> </el-table-column>
<el-table-column label="商品状态" prop="outProductId">
<el-table-column label="商品状态" prop="outProductId" fixed="right">
<template v-slot="scope">
<el-switch
:model-value="scope.row.status"
@ -65,7 +65,7 @@
>
</el-switch> </template
></el-table-column>
<el-table-column label="审核状态" prop="outProductId">
<el-table-column label="审核状态" prop="outProductId" fixed="right">
<template v-slot="scope">
<el-switch
:model-value="scope.row.status"
@ -105,22 +105,14 @@
<dict-tag :value="row.publishStatus" prop-name="pms_publish_status" />
</template>
</el-table-column>-->
<el-table-column label="操作" class-name="small-padding fixed-width">
<!-- <template v-slot="scope">
<el-table-column label="操作" class-name="small-padding fixed-width" width="150" align="center" fixed="right">
<template v-slot="scope">
<el-button size="small" type="text" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
<el-button size="small" type="text" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
</template>-->
<template v-slot="scope">
<el-button size="small" type="text" @click="showProductEditModal(scope.row)">编辑</el-button>
<!-- <el-button size="small" type="text">余额变更记录 </el-button>
<el-button size="small" type="text">开通易生支付 </el-button>
<el-button size="small" type="text" @click="showUserLoginInfoModal(scope.row, true)">登录记录 </el-button>
<el-button size="small" type="text">操作日志 </el-button>
<el-button size="small" type="text">封禁记录 </el-button>-->
<!-- <el-button size="small" type="text" @click="showStatistics(scope.row.id)" v-hasPermi="['ums:member:statistics']">查看数据 </el-button>
<el-button size="small" type="text" @click="goOrder(scope.row.phoneEncrypted)">查看下单</el-button>
<el-button size="small" type="text" @click="goCart(scope.row.phoneEncrypted)">查看购物车</el-button>-->
</template>
<!-- <template v-slot="scope">
<el-button size="small" type="text" @click="showProductEditModal(scope.row)">编辑</el-button>
</template>-->
</el-table-column>
</el-table>