From 539a9524e8d0d8ccfa45624f97141eda93bae6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=AB=E4=B9=90=E6=A9=99?= <1760016317@qq.com> Date: Fri, 11 Apr 2025 20:21:19 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 99cc7af3387c9b32b14455f50dec7eae8a275f09. --- .env.development | 2 +- .env.production | 2 +- src/api/multishop/hot-search.js | 10 +++++----- src/api/multishop/index-img.js | 10 +++++----- src/api/multishop/notice.js | 12 ++++++------ src/api/multishop/shop-process.js | 8 ++++---- src/api/multishop/shop-refund-addr.js | 12 ++++++------ src/api/multishop/shop_wallet_log.js | 10 +++++----- src/api/notify/notify.js | 2 +- .../components/small-page-component/index.vue | 4 ++-- .../components/store-component/index.vue | 2 +- .../modules/multishop/decorate/create/edit/index.vue | 12 ++++++------ .../decorate/create/select-decorate/index.vue | 2 +- src/views/modules/multishop/decorate/list/index.vue | 6 +++--- .../decorate/template/components/template-select.vue | 2 +- .../modules/multishop/decorate/template/index.vue | 6 +++--- .../modules/multishop/feature/create/edit/index.vue | 12 ++++++------ src/views/modules/multishop/feature/list/index.vue | 6 +++--- .../template/components/template-select/index.vue | 2 +- .../modules/multishop/feature/template/index.vue | 6 +++--- 20 files changed, 64 insertions(+), 64 deletions(-) diff --git a/.env.development b/.env.development index 46e4184..afbc62c 100644 --- a/.env.development +++ b/.env.development @@ -17,7 +17,7 @@ VITE_APP_BASE_API = 'http://118.31.107.112:8000' VITE_APP_WEBSOCKET_URL ='wss://cloud-api.mall4j.com' # 访问文件存储资源的url 对应阿里云的Bucket域名 -VITE_APP_RESOURCES_URL = 'https://tmer-test.oss-cn-hangzhou.aliyuncs.com' +VITE_APP_RESOURCES_URL = 'https://mall4j-minio-test.mall4j.com/tmerclub' # 腾讯地图key VITE_APP_MAP_KEY = '' diff --git a/.env.production b/.env.production index 582738f..5fc4b89 100644 --- a/.env.production +++ b/.env.production @@ -12,7 +12,7 @@ VITE_APP_BASE_API = 'http://118.31.107.112:8000' VITE_APP_WEBSOCKET_URL = 'wss://cloud-api.mall4j.com' # 访问文件存储资源的url 对应阿里云的Bucket域名 -VITE_APP_RESOURCES_URL = 'https://tmer-test.oss-cn-hangzhou.aliyuncs.com' +VITE_APP_RESOURCES_URL = 'https://tmerclub.oss-cn-guangzhou.aliyuncs.com' # 腾讯地图key VITE_APP_MAP_KEY = '' diff --git a/src/api/multishop/hot-search.js b/src/api/multishop/hot-search.js index 3b8b9bb..fabe185 100644 --- a/src/api/multishop/hot-search.js +++ b/src/api/multishop/hot-search.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function page (pageParam) { return request({ - url: '/tmerclub_admin/ma/hotQuery/page', + url: '/tmerclub_admin/mp/hot_search/page', method: 'get', params: pageParam }) @@ -10,7 +10,7 @@ export function page (pageParam) { export function get (hotSearchId) { return request({ - url: '/tmerclub_admin/ma/hotQuery', + url: '/tmerclub_admin/mp/hot_search', method: 'get', params: { hotSearchId @@ -20,7 +20,7 @@ export function get (hotSearchId) { export function save (data) { return request({ - url: '/tmerclub_admin/ma/hotQuery', + url: '/tmerclub_admin/mp/hot_search', method: 'post', data }) @@ -28,7 +28,7 @@ export function save (data) { export function update (data) { return request({ - url: '/tmerclub_admin/ma/hotQuery', + url: '/tmerclub_admin/mp/hot_search', method: 'put', data }) @@ -36,7 +36,7 @@ export function update (data) { export function deleteById (hotSearchId) { return request({ - url: '/tmerclub_admin/ma/hotQuery', + url: '/tmerclub_admin/mp/hot_search', method: 'delete', params: { hotSearchId diff --git a/src/api/multishop/index-img.js b/src/api/multishop/index-img.js index 2aa6199..2e56b9c 100644 --- a/src/api/multishop/index-img.js +++ b/src/api/multishop/index-img.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function page (pageParam) { return request({ - url: '/tmerclub_admin/ma/indexPic/page', + url: '/tmerclub_admin/mp/index_img/page', method: 'get', params: pageParam }) @@ -10,7 +10,7 @@ export function page (pageParam) { export function get (imgId) { return request({ - url: '/tmerclub_admin/ma/indexPic', + url: '/tmerclub_admin/mp/index_img', method: 'get', params: { imgId @@ -20,7 +20,7 @@ export function get (imgId) { export function save (data) { return request({ - url: '/tmerclub_admin/ma/indexPic', + url: '/tmerclub_admin/mp/index_img', method: 'post', data }) @@ -28,7 +28,7 @@ export function save (data) { export function update (data) { return request({ - url: '/tmerclub_admin/ma/indexPic', + url: '/tmerclub_admin/mp/index_img', method: 'put', data }) @@ -36,7 +36,7 @@ export function update (data) { export function deleteById (imgId) { return request({ - url: '/tmerclub_admin/ma/indexPic', + url: '/tmerclub_admin/mp/index_img', method: 'delete', params: { imgId diff --git a/src/api/multishop/notice.js b/src/api/multishop/notice.js index 58d87ef..cd170e2 100644 --- a/src/api/multishop/notice.js +++ b/src/api/multishop/notice.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function page (pageParam) { return request({ - url: '/tmerclub_admin/ma/notice/page', + url: '/tmerclub_admin/mp/notice/page', method: 'get', params: pageParam }) @@ -10,7 +10,7 @@ export function page (pageParam) { export function platformPage (pageParam) { return request({ - url: '/tmerclub_admin/ma/notice/p/pagePlatformNotice', + url: '/tmerclub_admin/mp/notice/p/pagePlatformNotice', method: 'get', params: pageParam }) @@ -18,7 +18,7 @@ export function platformPage (pageParam) { export function get (id) { return request({ - url: '/tmerclub_admin/ma/notice', + url: '/tmerclub_admin/mp/notice', method: 'get', params: { id @@ -28,7 +28,7 @@ export function get (id) { export function save (data) { return request({ - url: '/tmerclub_admin/ma/notice', + url: '/tmerclub_admin/mp/notice', method: 'post', data }) @@ -36,7 +36,7 @@ export function save (data) { export function update (data) { return request({ - url: '/tmerclub_admin/ma/notice', + url: '/tmerclub_admin/mp/notice', method: 'put', data }) @@ -44,7 +44,7 @@ export function update (data) { export function deleteById (id) { return request({ - url: '/tmerclub_admin/ma/notice', + url: '/tmerclub_admin/mp/notice', method: 'delete', params: { id diff --git a/src/api/multishop/shop-process.js b/src/api/multishop/shop-process.js index c464e98..13378c9 100644 --- a/src/api/multishop/shop-process.js +++ b/src/api/multishop/shop-process.js @@ -10,7 +10,7 @@ export function getShopProtocol () { // 检查统一信用码是否已存在 export function checkForDuplicateCreditCode (param) { return request({ - url: '/tmerclub_admin/ma/shopCompany/check_credit_code', + url: '/tmerclub_admin/mp/shop_company/check_credit_code', method: 'GET', params: param }) @@ -227,7 +227,7 @@ export function applyChangeCompanyInfo (data) { // 查看申请审核情况 export function shopCompanyAuditingAuditInfo () { return request({ - url: '/tmerclub_admin/ma/shopAuditing/auditInfo', + url: '/tmerclub_admin/mp/shop_company_auditing/auditInfo', method: 'GET' }) } @@ -351,7 +351,7 @@ export function createAllinpayMember () { // 更新影印件(通联支付) export function updateIdCardStatus (params) { return request({ - url: '/tmerclub_admin/ma/shopCompany/update_id_card_status', + url: '/tmerclub_admin/mp/shop_company/update_id_card_status', method: 'PUT', params }) @@ -360,7 +360,7 @@ export function updateIdCardStatus (params) { // 重新上传影印件 (通联支付) export function reUploadIdCard (data) { return request({ - url: '/tmerclub_admin/ma/shopCompany/upload_id_card', + url: '/tmerclub_admin/mp/shop_company/upload_id_card', method: 'PUT', data }) diff --git a/src/api/multishop/shop-refund-addr.js b/src/api/multishop/shop-refund-addr.js index 71f7ebb..16620e6 100644 --- a/src/api/multishop/shop-refund-addr.js +++ b/src/api/multishop/shop-refund-addr.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function page (pageParam) { return request({ - url: '/tmerclub_admin/ma/ShopRedundAddr/page', + url: '/tmerclub_admin/mp/shop_refund_addr/page', method: 'get', params: pageParam }) @@ -10,7 +10,7 @@ export function page (pageParam) { export function get (shopRefundAddrId) { return request({ - url: '/tmerclub_admin/ma/ShopRedundAddr', + url: '/tmerclub_admin/mp/shop_refund_addr', method: 'get', params: { shopRefundAddrId @@ -20,7 +20,7 @@ export function get (shopRefundAddrId) { export function save (data) { return request({ - url: '/tmerclub_admin/ma/ShopRedundAddr', + url: '/tmerclub_admin/mp/shop_refund_addr', method: 'post', data }) @@ -28,7 +28,7 @@ export function save (data) { export function update (data) { return request({ - url: '/tmerclub_admin/ma/ShopRedundAddr', + url: '/tmerclub_admin/mp/shop_refund_addr', method: 'put', data }) @@ -36,7 +36,7 @@ export function update (data) { export function deleteById (shopRefundAddrId) { return request({ - url: '/tmerclub_admin/ma/ShopRedundAddr', + url: '/tmerclub_admin/mp/shop_refund_addr', method: 'delete', params: { shopRefundAddrId @@ -46,7 +46,7 @@ export function deleteById (shopRefundAddrId) { export function list () { return request({ - url: '/tmerclub_admin/ma/ShopRedundAddr/list', + url: '/tmerclub_admin/mp/shop_refund_addr/list', method: 'get' }) } diff --git a/src/api/multishop/shop_wallet_log.js b/src/api/multishop/shop_wallet_log.js index 461f44c..616a86e 100644 --- a/src/api/multishop/shop_wallet_log.js +++ b/src/api/multishop/shop_wallet_log.js @@ -34,7 +34,7 @@ export function shopWithdrawCash (data) { export function page (pageParam) { return request({ - url: '/tmerclub_admin/ma/shopWallet/page', + url: '/tmerclub_admin/mp/shop_wallet/page', method: 'get', params: pageParam }) @@ -42,7 +42,7 @@ export function page (pageParam) { // get_shop_wallet export function shopWallet () { return request({ - url: '/tmerclub_admin/ma/shopWallet/get_shop_wallet', + url: '/tmerclub_admin/mp/shop_wallet/get_shop_wallet', method: 'get' }) } @@ -89,7 +89,7 @@ export function orderDetaiList (orderId, refundId) { // 获取提现记录信息 export function withdrawCashList (params) { return request({ - url: '/tmerclub_admin/ma/shopWithdrwaCash/page', + url: '/tmerclub_admin/mp/shop_withdraw_cash/page', method: 'get', params }) @@ -98,7 +98,7 @@ export function withdrawCashList (params) { // 获取银行信息详情 export function withdrawCashBankInfo (cashId) { return request({ - url: '/tmerclub_admin/ma/shopWithdrwaCash/info', + url: '/tmerclub_admin/mp/shop_withdraw_cash/info', method: 'get', params: { cashId @@ -109,7 +109,7 @@ export function withdrawCashBankInfo (cashId) { // 分页获取商家充值记录信息 export function rechargeList (params) { return request({ - url: '/tmerclub_admin/ma/shopCharge/page', + url: '/tmerclub_admin/mp/shop_recharge/page', method: 'get', params }) diff --git a/src/api/notify/notify.js b/src/api/notify/notify.js index d5f112f..7fff0e6 100644 --- a/src/api/notify/notify.js +++ b/src/api/notify/notify.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function page (pageParam) { return request({ - url: '/tmerclub_admin/ma/notice/p/pagePlatformNotice', + url: '/tmerclub_admin/mp/notice/p/pagePlatformNotice', method: 'get', params: pageParam }) diff --git a/src/components/decorate-dialog-select/components/small-page-component/index.vue b/src/components/decorate-dialog-select/components/small-page-component/index.vue index 43bdaf1..6748fb8 100644 --- a/src/components/decorate-dialog-select/components/small-page-component/index.vue +++ b/src/components/decorate-dialog-select/components/small-page-component/index.vue @@ -122,10 +122,10 @@ const getSmallPage = (val) => { let url = '' let type = 0 if (props.deviceType === 'pc') { - url = '/tmerclub_admin/ma/shopRenovation/page' + url = '/tmerclub_admin/mp/shop_renovation/page' type = 1 } else if (props.deviceType === 'mobile') { - url = '/tmerclub_admin/ma/shopRenovation/page_h5' + url = '/tmerclub_admin/mp/shop_renovation/page_h5' type = 2 } request({ diff --git a/src/components/decorate-dialog-select/components/store-component/index.vue b/src/components/decorate-dialog-select/components/store-component/index.vue index 92a672f..82ec0dc 100644 --- a/src/components/decorate-dialog-select/components/store-component/index.vue +++ b/src/components/decorate-dialog-select/components/store-component/index.vue @@ -253,7 +253,7 @@ const getStoreList = (val) => { const { page, perPage } = searchForm.value tableLoading.value = true request({ - url: '/tmerclub_admin/mup/shopDetail/search_shops', + url: '/tmerclub_admin/p/shop_detail/search_shops', method: 'get', params: { pageNum: page, diff --git a/src/views/modules/multishop/decorate/create/edit/index.vue b/src/views/modules/multishop/decorate/create/edit/index.vue index cc05d0c..c4f9d8e 100644 --- a/src/views/modules/multishop/decorate/create/edit/index.vue +++ b/src/views/modules/multishop/decorate/create/edit/index.vue @@ -307,7 +307,7 @@ const closeDecorateNavbar = () => { } const getDetail = () => { request({ - url: '/tmerclub_admin/ma/shopRenovation', + url: '/tmerclub_admin/mp/shop_renovation', params: { renovationId }, @@ -351,7 +351,7 @@ const getDetail = () => { // 获取模板详情 const getTemplateDetail = () => { request({ - url: '/tmerclub_admin/ma/shopTemplate', + url: '/tmerclub_admin/mp/shop_template', params: { templateId }, @@ -780,11 +780,11 @@ const handleSave = () => { let method = '' let tips = '' if (renovationId) { - url = '/tmerclub_admin/ma/shopRenovation/update_pc' + url = '/tmerclub_admin/mp/shop_renovation/update_pc' method = 'put' tips = '保存成功' } else { - url = '/tmerclub_admin/ma/shopRenovation/save_pc' + url = '/tmerclub_admin/mp/shop_renovation/save_pc' method = 'post' tips = '保存成功' } @@ -841,11 +841,11 @@ const handleSaveTemplate = (dataForm) => { let method = '' let tips = '' if (templateId) { - url = '/tmerclub_admin/ma/shopTemplate/update_pc' + url = '/tmerclub_admin/mp/shop_template/update_pc' method = 'put' tips = '保存成功' } else { - url = '/tmerclub_admin/ma/shopTemplate/save_pc' + url = '/tmerclub_admin/mp/shop_template/save_pc' method = 'post' tips = '保存成功' } diff --git a/src/views/modules/multishop/decorate/create/select-decorate/index.vue b/src/views/modules/multishop/decorate/create/select-decorate/index.vue index acd666e..a81ba58 100644 --- a/src/views/modules/multishop/decorate/create/select-decorate/index.vue +++ b/src/views/modules/multishop/decorate/create/select-decorate/index.vue @@ -91,7 +91,7 @@ const viewContent = async (data) => { // 获取详情 const getDetail = (id) => { request({ - url: '/tmerclub_admin/ma/shopRenovation', + url: '/tmerclub_admin/mp/shop_renovation', params: { renovationId: id }, diff --git a/src/views/modules/multishop/decorate/list/index.vue b/src/views/modules/multishop/decorate/list/index.vue index 54b563f..af27d06 100644 --- a/src/views/modules/multishop/decorate/list/index.vue +++ b/src/views/modules/multishop/decorate/list/index.vue @@ -168,7 +168,7 @@ onMounted(() => { const getMiniPageList = () => { const { pageNum, pageSize } = perProps.value request({ - url: '/tmerclub_admin/ma/shopRenovation/page', + url: '/tmerclub_admin/mp/shop_renovation/page', methods: 'get', params: { pageNum, // 当前页 @@ -234,7 +234,7 @@ const handleDelete = (item) => { type: 'warning' }).then(() => { request({ - url: '/tmerclub_admin/ma/shopRenovation/delete_pc', + url: '/tmerclub_admin/mp/shop_renovation/delete_pc', params: { renovationId: item.renovationId }, @@ -251,7 +251,7 @@ const handleDelete = (item) => { // 设置为主页 const handleSetHomePage = (renovationId) => { request({ - url: '/tmerclub_admin/ma/shopRenovation/update_home_status_pc', + url: '/tmerclub_admin/mp/shop_renovation/update_home_status_pc', params: { renovationId }, diff --git a/src/views/modules/multishop/decorate/template/components/template-select.vue b/src/views/modules/multishop/decorate/template/components/template-select.vue index 7bb16e4..d754cb1 100644 --- a/src/views/modules/multishop/decorate/template/components/template-select.vue +++ b/src/views/modules/multishop/decorate/template/components/template-select.vue @@ -92,7 +92,7 @@ const currentChangeHandle = (val) => { const getMiniPageList = () => { const { pageNum, pageSize } = perProps.value request({ - url: '/tmerclub_admin/ma/shopTemplate/page', + url: '/tmerclub_admin/mp/shop_template/page', methods: 'get', params: { pageNum, // 当前页 diff --git a/src/views/modules/multishop/decorate/template/index.vue b/src/views/modules/multishop/decorate/template/index.vue index 27fe3d3..e98b255 100644 --- a/src/views/modules/multishop/decorate/template/index.vue +++ b/src/views/modules/multishop/decorate/template/index.vue @@ -100,7 +100,7 @@ onMounted(() => { const getMiniPageList = () => { const { pageNum, pageSize } = perProps.value request({ - url: '/tmerclub_admin/ma/shopTemplate/page', + url: '/tmerclub_admin/mp/shop_template/page', methods: 'get', params: { pageNum, // 当前页 @@ -115,7 +115,7 @@ const getMiniPageList = () => { // 复制模板 const copyTemplatePage = (templateId) => { request({ - url: '/tmerclub_admin/ma/shopTemplate/copy_pc', + url: '/tmerclub_admin/mp/shop_template/copy_pc', params: { templateId }, @@ -168,7 +168,7 @@ const handleDelete = (renovationId) => { type: 'warning' }).then(() => { request({ - url: '/tmerclub_admin/ma/shopTemplate/delete_pc', + url: '/tmerclub_admin/mp/shop_template/delete_pc', params: { templateId: renovationId }, diff --git a/src/views/modules/multishop/feature/create/edit/index.vue b/src/views/modules/multishop/feature/create/edit/index.vue index fbb8515..336e5a6 100644 --- a/src/views/modules/multishop/feature/create/edit/index.vue +++ b/src/views/modules/multishop/feature/create/edit/index.vue @@ -784,10 +784,10 @@ const saveData = async ($data) => { let url = '' let method = '' if (renovationId.value) { - url = '/tmerclub_admin/ma/shopRenovation/update_h5' + url = '/tmerclub_admin/mp/shop_renovation/update_h5' method = 'put' } else { - url = '/tmerclub_admin/ma/shopRenovation/save_h5' + url = '/tmerclub_admin/mp/shop_renovation/save_h5' method = 'post' } request({ @@ -840,10 +840,10 @@ const saveTemplateData = async ($data) => { let url = '' let method = '' if (templateId.value) { - url = '/tmerclub_admin/ma/shopTemplate/update_h5' + url = '/tmerclub_admin/mp/shop_template/update_h5' method = 'put' } else { - url = '/tmerclub_admin/ma/shopTemplate/save_h5' + url = '/tmerclub_admin/mp/shop_template/save_h5' method = 'post' } request({ @@ -898,7 +898,7 @@ const viewContent = async (data) => { */ const getInfo = () => { request({ - url: '/tmerclub_admin/ma/shopRenovation/get_h5', + url: '/tmerclub_admin/mp/shop_renovation/get_h5', params: { renovationId: renovationId.value }, @@ -944,7 +944,7 @@ const getInfo = () => { // 获取模板详情 const getTemplateDetail = () => { request({ - url: '/tmerclub_admin/ma/shopTemplate', + url: '/tmerclub_admin/mp/shop_template', params: { templateId: templateId.value }, diff --git a/src/views/modules/multishop/feature/list/index.vue b/src/views/modules/multishop/feature/list/index.vue index 0ded482..f62b23d 100644 --- a/src/views/modules/multishop/feature/list/index.vue +++ b/src/views/modules/multishop/feature/list/index.vue @@ -180,7 +180,7 @@ const totalPage = ref(0) */ const getMiniPagesList = () => { request({ - url: '/tmerclub_admin/ma/shopRenovation/page_h5', + url: '/tmerclub_admin/mp/shop_renovation/page_h5', method: 'get', params: Object.assign( { @@ -244,7 +244,7 @@ const handleDelete = (item) => { type: 'warning' }).then(() => { request({ - url: '/tmerclub_admin/ma/shopRenovation/delete_h5', + url: '/tmerclub_admin/mp/shop_renovation/delete_h5', params: { renovationId: item.renovationId }, @@ -264,7 +264,7 @@ const handleDelete = (item) => { */ const handleSetHomePage = (renovationId) => { request({ - url: '/tmerclub_admin/ma/shopRenovation/update_h5_home_status', + url: '/tmerclub_admin/mp/shop_renovation/update_h5_home_status', params: { renovationId }, diff --git a/src/views/modules/multishop/feature/template/components/template-select/index.vue b/src/views/modules/multishop/feature/template/components/template-select/index.vue index 3a94dc8..a45f370 100644 --- a/src/views/modules/multishop/feature/template/components/template-select/index.vue +++ b/src/views/modules/multishop/feature/template/components/template-select/index.vue @@ -91,7 +91,7 @@ const visible = ref(false) const getMiniPageList = () => { const { pageNum, pageSize } = perProps request({ - url: '/tmerclub_admin/ma/shopTemplate/page', + url: '/tmerclub_admin/mp/shop_template/page', methods: 'get', params: { pageNum, // 当前页 diff --git a/src/views/modules/multishop/feature/template/index.vue b/src/views/modules/multishop/feature/template/index.vue index 8b3334b..1e65667 100644 --- a/src/views/modules/multishop/feature/template/index.vue +++ b/src/views/modules/multishop/feature/template/index.vue @@ -102,7 +102,7 @@ const templateList = ref([]) // 列表页 const getMiniPageList = () => { const { pageNum, pageSize } = perProps request({ - url: '/tmerclub_admin/ma/shopTemplate/page', + url: '/tmerclub_admin/mp/shop_template/page', methods: 'get', params: { pageNum, // 当前页 @@ -118,7 +118,7 @@ const getMiniPageList = () => { // 复制模板 const copyTemplatePage = (templateId) => { request({ - url: '/tmerclub_admin/ma/shopTemplate/copy_h5', + url: '/tmerclub_admin/mp/shop_template/copy_h5', params: { templateId }, @@ -175,7 +175,7 @@ const handleDelete = (renovationId) => { type: 'warning' }).then(() => { request({ - url: '/tmerclub_admin/ma/shopTemplate/delete_h5', + url: '/tmerclub_admin/mp/shop_template/delete_h5', params: { templateId: renovationId },