diff --git a/src/api/pms/product.js b/src/api/pms/product.js index 442b2cd..5c216be 100644 --- a/src/api/pms/product.js +++ b/src/api/pms/product.js @@ -9,6 +9,23 @@ export function listPmsProduct(query, pageReq) { params: pageReq }); } +// 查询商品分类数据 +export function getproductCategoryNameLike() { + return request({ + url: '/pms/productCategory/list', + method: 'post', + data: {} + }); +} +// 查询商品分类数据 +export function getbrand() { + return request({ + url: '/pms/brand/page', + method: 'post', + data: {} + }); +} + //审核 export function productaudit(query, pageReq) { return request({ diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts index d4aa392..fb466d6 100644 --- a/src/api/system/tenant/index.ts +++ b/src/api/system/tenant/index.ts @@ -28,7 +28,7 @@ export function getTenant(id: string | number): AxiosPromise { } // 新增租户 -export function addTenant(data: TenantForm) { +export function addTenant(data: any) { return request({ url: '/system/tenant/add', method: 'post', @@ -41,7 +41,7 @@ export function addTenant(data: TenantForm) { } // 修改租户 -export function updateTenant(data: TenantForm) { +export function updateTenant(data: any) { return request({ url: '/system/tenant/update', method: 'post', diff --git a/src/api/ums/member.js b/src/api/ums/member.js index 512dc2f..be2d338 100644 --- a/src/api/ums/member.js +++ b/src/api/ums/member.js @@ -9,6 +9,15 @@ export function listUmsMember(query, pageReq) { params: pageReq }); } +// 查询会员账号钱详细 +export function listCurrent(query, pageReq) { + return request({ + url: '/account/detail/current', + method: 'post', + data: query, + params: pageReq + }); +} // 查询会员信息详细 export function getUmsMember(id) { diff --git a/src/views/account/index.vue b/src/views/account/index.vue index 5aba169..f0b0f2d 100644 --- a/src/views/account/index.vue +++ b/src/views/account/index.vue @@ -32,6 +32,11 @@ {{ scope.row.type === 1 ? '商家' : scope.row.type === 2 ? '代理' : '平台' }} + + +
+ + + + + + + + @@ -74,7 +87,12 @@ const getListList = async () => { const handleQuery = () => { getListList(); }; -const showRefuteDialog = ref(false); +const tableData = ref([]); +const dialogVisible = ref(false); +// 查看明细 +const handleSeach = (row: any) => { + console.log(row); +}; const resetQuery = () => { queryParams.value = { current: 1, diff --git a/src/views/login.vue b/src/views/login.vue index c6ef39d..39ea39b 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -73,7 +73,7 @@ diff --git a/src/views/oms/order/detail.vue b/src/views/oms/order/detail.vue index 926f3bc..9775f18 100644 --- a/src/views/oms/order/detail.vue +++ b/src/views/oms/order/detail.vue @@ -37,14 +37,14 @@ {{ getPayType(orderDetail) }}--> - + diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue index 8e58b05..32619c3 100644 --- a/src/views/oms/order/index.vue +++ b/src/views/oms/order/index.vue @@ -61,7 +61,7 @@ - + 搜索 @@ -131,26 +131,26 @@ - + + + + + diff --git a/src/views/pms/product/index.vue b/src/views/pms/product/index.vue index 49f0a6a..5f02226 100644 --- a/src/views/pms/product/index.vue +++ b/src/views/pms/product/index.vue @@ -9,11 +9,15 @@ - - + + + + - - + + + + @@ -35,18 +39,12 @@ - - @@ -91,45 +89,8 @@ - - @@ -221,12 +179,11 @@