diff --git a/src/api/ums/feedback.js b/src/api/ums/feedback.js index 6067524..45561ba 100644 --- a/src/api/ums/feedback.js +++ b/src/api/ums/feedback.js @@ -1,11 +1,11 @@ -import request from "@/utils/request"; +import request from '@/utils/request'; export function updateMark(data) { return request({ url: '/ums/feedback/mark/update', method: 'post', data: data - }) + }); } export function changeHandleStatus(data) { @@ -13,7 +13,7 @@ export function changeHandleStatus(data) { url: '/ums/feedback/handle/status/change', method: 'post', data: data - }) + }); } export function listFeedbacks(query, pageReq) { @@ -22,5 +22,5 @@ export function listFeedbacks(query, pageReq) { method: 'post', data: query, params: pageReq - }) + }); } diff --git a/src/api/ums/memberAddress.js b/src/api/ums/memberAddress.js index 110081c..8cf34ff 100644 --- a/src/api/ums/memberAddress.js +++ b/src/api/ums/memberAddress.js @@ -21,7 +21,7 @@ export function getUmsMemberAddress(id) { // 新增会员收货地址 export function addUmsMemberAddress(data) { return request({ - url: '/ums/memberAddress', + url: '/ums/memberAddress/add', method: 'post', data: data }); @@ -30,8 +30,8 @@ export function addUmsMemberAddress(data) { // 修改会员收货地址 export function updateUmsMemberAddress(data) { return request({ - url: '/ums/memberAddress', - method: 'put', + url: '/ums/memberAddress/update', + method: 'post', data: data }); } diff --git a/src/api/ums/memberCart.js b/src/api/ums/memberCart.js index 734e832..41dea25 100644 --- a/src/api/ums/memberCart.js +++ b/src/api/ums/memberCart.js @@ -1,54 +1,54 @@ -import request from '@/utils/request' +import request from '@/utils/request'; // 查询购物车列表 export function listUmsMemberCart(query, pageReq) { return request({ - url: '/ums/memberCart/list', + url: '/ums/cart/list', method: 'post', data: query, params: pageReq - }) + }); } // 查询购物车详细 export function getUmsMemberCart(id) { return request({ - url: '/ums/memberCart/' + id, + url: '/ums/cart/' + id, method: 'get' - }) + }); } // 新增购物车 export function addUmsMemberCart(data) { return request({ - url: '/ums/memberCart', + url: '/ums/cart/add', method: 'post', data: data - }) + }); } // 修改购物车 export function updateUmsMemberCart(data) { return request({ - url: '/ums/memberCart', - method: 'put', + url: '/ums/cart/update', + method: 'post', data: data - }) + }); } // 删除购物车 export function delUmsMemberCart(id) { return request({ - url: '/ums/memberCart/' + id, + url: '/ums/cart/' + id, method: 'delete' - }) + }); } // 导出购物车 export function exportUmsMemberCart(query) { return request({ - url: '/ums/memberCart/export', + url: '/ums/cart/export', method: 'get', params: query - }) + }); } diff --git a/src/api/ums/memberLogininfor.js b/src/api/ums/memberLogininfor.js index a883dcf..8bd2637 100644 --- a/src/api/ums/memberLogininfor.js +++ b/src/api/ums/memberLogininfor.js @@ -1,54 +1,54 @@ -import request from '@/utils/request' +import request from '@/utils/request'; // 查询会员登录记录列表 export function listUmsMemberLogininfor(query, pageReq) { return request({ - url: '/ums/memberLogininfor/list', + url: '/ums/member/loginInfo/list', method: 'post', data: query, params: pageReq - }) + }); } // 查询会员登录记录详细 export function getUmsMemberLogininfor(id) { return request({ - url: '/ums/memberLogininfor/' + id, + url: '/ums/member/loginInfo/' + id, method: 'get' - }) + }); } // 新增会员登录记录 export function addUmsMemberLogininfor(data) { return request({ - url: '/ums/memberLogininfor', + url: '/ums/member/loginInfo/add', method: 'post', data: data - }) + }); } // 修改会员登录记录 export function updateUmsMemberLogininfor(data) { return request({ - url: '/ums/memberLogininfor', - method: 'put', + url: '/ums/member/loginInfo/update', + method: 'post', data: data - }) + }); } // 删除会员登录记录 export function delUmsMemberLogininfor(id) { return request({ - url: '/ums/memberLogininfor/' + id, + url: '/ums/member/loginInfo/' + id, method: 'delete' - }) + }); } // 导出会员登录记录 export function exportUmsMemberLogininfor(query) { return request({ - url: '/ums/memberLogininfor/export', + url: '/ums/member/loginInfo/export', method: 'get', params: query - }) + }); } diff --git a/src/views/pms/product/productSelect.vue b/src/views/pms/product/productSelect.vue index 823c073..c34d861 100644 --- a/src/views/pms/product/productSelect.vue +++ b/src/views/pms/product/productSelect.vue @@ -65,9 +65,9 @@ export default { list: [], width: '60%', queryParams: { - pageNum: 1, + current: 1, + size: 10, categoryId: null, - pageSize: 10, nameLike: null, publishStatus: 1, excludeProductIds: [] @@ -110,12 +110,12 @@ export default { if (query.categoryId && Array.isArray(query.categoryId)) { query.categoryId = query.categoryId.pop(); } - const { pageNum, pageSize } = this.chooseSkuObj.queryParams; - const pageReq = { page: pageNum - 1, size: pageSize }; + const { current: pageNum, size: pageSize } = this.chooseSkuObj.queryParams; + const pageReq = { current: pageNum - 1, size: pageSize }; await listPmsProduct(query, pageReq).then((response) => { - const { content, totalElements } = response; - this.chooseSkuObj.list = [...content]; - this.chooseSkuObj.total = totalElements; + const { records, total } = response.data || {}; + this.chooseSkuObj.list = [...records]; + this.chooseSkuObj.total = total; this.chooseSkuObj.loading = false; }); } diff --git a/src/views/ums/feedback/index.vue b/src/views/ums/feedback/index.vue index 3e871b1..51abbbd 100644 --- a/src/views/ums/feedback/index.vue +++ b/src/views/ums/feedback/index.vue @@ -120,8 +120,8 @@ export default { open: false, // 查询参数 queryParams: { - pageNum: 1, - pageSize: 10, + current: 1, + size: 10, status: null }, dateRange: [], @@ -163,23 +163,23 @@ export default { /** 查询会员信息列表 */ getList() { this.loading = true; - const { pageNum, pageSize } = this.queryParams; + const { current: pageNum, size: pageSize } = this.queryParams; let query = { ...this.queryParams, pageNum: undefined, pageSize: undefined }; - const pageReq = { page: pageNum - 1, size: pageSize }; + const pageReq = { current: pageNum - 1, size: pageSize }; if (!this.dateRange || this.dateRange.length > 0) { query = { ...this.addDateRange2(query, this.dateRange) }; } listFeedbacks(query, pageReq).then((response) => { - const { content, totalElements } = response; - content.forEach((it) => { + const { records, total } = response.data || {}; + records.forEach((it) => { if (it.images) { it.imageList = it.images.split(','); } else { it.imageList = []; } }); - this.feedbackList = content; - this.total = totalElements; + this.feedbackList = records; + this.total = total; this.loading = false; }); }, diff --git a/src/views/ums/memberAddress/index.vue b/src/views/ums/memberAddress/index.vue index b2636ce..1e4720d 100644 --- a/src/views/ums/memberAddress/index.vue +++ b/src/views/ums/memberAddress/index.vue @@ -170,8 +170,8 @@ export default { open: false, // 查询参数 queryParams: { - pageNum: 1, - pageSize: 10, + current: 1, + size: 10, memberId: null, name: null, phone: null, @@ -200,13 +200,13 @@ export default { /** 查询会员收货地址列表 */ getList() { this.loading = true; - const { pageNum, pageSize } = this.queryParams; + const { current: pageNum, size: pageSize } = this.queryParams; const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined }; - const pageReq = { page: pageNum - 1, size: pageSize }; + const pageReq = { current: pageNum - 1, size: pageSize }; listUmsMemberAddress(query, pageReq).then((response) => { - const { content, totalElements } = response; - this.umsMemberAddressList = content; - this.total = totalElements; + const { records, total } = response.data || {}; + this.umsMemberAddressList = records; + this.total = total; this.loading = false; }); }, diff --git a/src/views/ums/memberCart/index.vue b/src/views/ums/memberCart/index.vue index c1a2be1..8f9aa8c 100644 --- a/src/views/ums/memberCart/index.vue +++ b/src/views/ums/memberCart/index.vue @@ -121,8 +121,8 @@ export default { open: false, // 查询参数 queryParams: { - pageNum: 1, - pageSize: 10, + current: 1, + size: 10, productName: null, phone: null }, @@ -141,13 +141,13 @@ export default { /** 查询购物车列表 */ getList() { this.loading = true; - const { pageNum, pageSize } = this.queryParams; + const { current: pageNum, size: pageSize } = this.queryParams; const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined }; - const pageReq = { page: pageNum - 1, size: pageSize }; + const pageReq = { current: pageNum - 1, size: pageSize }; listUmsMemberCart(query, pageReq).then((response) => { - const { content, totalElements } = response; - this.umsMemberCartList = content; - this.total = totalElements; + const { records = [], total = 0 } = response.data || {}; + this.umsMemberCartList = records; + this.total = total; this.loading = false; }); }, diff --git a/src/views/ums/memberLogininfor/index.vue b/src/views/ums/memberLogininfor/index.vue index d0bc68c..5581460 100644 --- a/src/views/ums/memberLogininfor/index.vue +++ b/src/views/ums/memberLogininfor/index.vue @@ -102,8 +102,8 @@ export default { open: false, // 查询参数 queryParams: { - pageNum: 1, - pageSize: 10, + current: 1, + size: 10, phone: null, ipaddr: null, loginLocation: null, @@ -124,13 +124,13 @@ export default { /** 查询会员登录记录列表 */ getList() { this.loading = true; - const { pageNum, pageSize } = this.queryParams; + const { current: pageNum, size: pageSize } = this.queryParams; const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined }; - const pageReq = { page: pageNum - 1, size: pageSize }; + const pageReq = { current: pageNum - 1, size: pageSize }; listUmsMemberLogininfor({ ...this.addDateRange2(query, this.dateRange) }, pageReq).then((response) => { - const { content, totalElements } = response; - this.umsMemberLogininforList = content; - this.total = totalElements; + const { records, total } = response.data || {}; + this.umsMemberLogininforList = records; + this.total = total; this.loading = false; }); }, diff --git a/src/views/ums/memberWechat/index.vue b/src/views/ums/memberWechat/index.vue index 1981507..53dca24 100644 --- a/src/views/ums/memberWechat/index.vue +++ b/src/views/ums/memberWechat/index.vue @@ -188,8 +188,8 @@ export default { open: false, // 查询参数 queryParams: { - pageNum: 1, - pageSize: 10, + current: 1, + size: 10, memberId: null, unionid: null, openid: null, @@ -218,13 +218,13 @@ export default { /** 查询用户微信信息列表 */ getList() { this.loading = true; - const { pageNum, pageSize } = this.queryParams; + const { current: pageNum, size: pageSize } = this.queryParams; const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined }; - const pageReq = { page: pageNum - 1, size: pageSize }; + const pageReq = { current: pageNum - 1, size: pageSize }; listUmsMemberWechat(query, pageReq).then((response) => { - const { content, totalElements } = response; - this.umsMemberWechatList = content; - this.total = totalElements; + const { records, total } = response.data || {}; + this.umsMemberWechatList = records; + this.total = total; this.loading = false; }); }, diff --git a/vite.config.ts b/vite.config.ts index 282091e..6b26aad 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -26,9 +26,9 @@ export default defineConfig(({ mode, command }) => { proxy: { [env.VITE_APP_BASE_API]: { // target: 'http://192.168.1.13:8080', - target: 'http://192.168.1.32:8080', //佳豪 + // target: 'http://192.168.1.32:8080', //佳豪 // target: 'http://192.168.1.13:8080', //祥哥 - // target: 'http://111.62.22.190:8080', // 测试环境 + target: 'http://111.62.22.190:8080', // 测试环境 changeOrigin: true, ws: true, rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), ''),