Merge branch 'master' of http://101.37.204.35:3000/admin/tmerclub-uniapp

fix：接口修改
2025-04-13 23:41:24 +08:00 · 2025-04-13 23:40:58 +08:00
16 changed files with 29 additions and 24 deletions
--- a/.env.development
+++ b/.env.development
@ -26,7 +26,7 @@ VITE_APP_WS_IM_API = 'wss://cloud-api.mall4j.com'
 VITE_APP_MERCHANT_PLATFORM_URL = 'https://cloud-multishop.mall4j.com'

 # 访问文件存储资源的url 对应阿里云的Bucket域名
-VITE_APP_RESOURCES_URL = 'https://mall4j-minio-test.mall4j.com/tmerclub'
+VITE_APP_RESOURCES_URL = 'https://tmer-test.oss-cn-hangzhou.aliyuncs.com'

 # 线上域名
 VITE_APP_DOMAIN_ADDRESS = 'https://h5.mall4j.com/cloud'
--- a/.env.production
+++ b/.env.production
@ -1,3 +1,8 @@
+###
+ # @Description  :
+ # @Autor        : cl
+ # @Date         : 2025-03-24 22:12:26
+###
 # 如需添加更多环境变量，请以 VITE_APP_ 开头声明
 # 在代码中使用 import.meta.env.VITE_APP_XXX 获取指定变量
 # 环境配置标识
@ -21,7 +26,7 @@ VITE_APP_WS_IM_API = 'wss://cloud-api.mall4j.com'
 VITE_APP_MERCHANT_PLATFORM_URL = 'https://cloud-multishop.mall4j.com'

 # 访问文件存储资源的url 对应阿里云的Bucket域名
-VITE_APP_RESOURCES_URL = 'https://tmerclub.oss-cn-guangzhou.aliyuncs.com'
+VITE_APP_RESOURCES_URL = 'https://tmer-test.oss-cn-hangzhou.aliyuncs.com'

 # 线上域名
 VITE_APP_DOMAIN_ADDRESS = 'https://h5.mall4j.com/cloud'
--- a/src/components/feature/all-feature/notice/index.vue
+++ b/src/components/feature/all-feature/notice/index.vue
@ -55,7 +55,7 @@ onMounted(() => {
 const getNoticeList = () => {
  // 加载公告
  http.request({
-    url: '/tmerclub_admin/mua/app/notice',
+    url: '/tmerclub_admin/ma/notice',
    method: 'GET',
    data: {
      shopId: props.shopId,
--- a/src/components/feature/feature.vue
+++ b/src/components/feature/feature.vue
@ -145,7 +145,7 @@ onMounted(() => {
 const getPageInfoById = () => {
  list.value = []
  const params = {
-    url: '/tmerclub_admin/mua/app/shopRenovation/get_renovation_by_id',
+    url: '/tmerclub_admin/ua/shop_renovation/get_renovation_by_id',
    method: 'GET',
    data: {
      renovationId: props.pageId
--- a/src/package-activities/pages/live-room/live-room.nvue
+++ b/src/package-activities/pages/live-room/live-room.nvue
@ -1051,7 +1051,7 @@ const onFollowShop = () => {
  const shopId = liveInfo.value.shopId
  util.checkAuthInfo(() => {
    http.request({
-      url: '/tmerclub_admin/mua/app/userFavorite/add_or_cancel',
+      url: '/tmerclub_admin/user_collection_shop/add_or_cancel',
      method: 'post',
      data: shopId
    }).then((res) => {
@ -1063,7 +1063,7 @@ const onFollowShop = () => {
 const queryShopCollection = () => {
  const shopId = liveInfo.value.shopId
  http.request({
-    url: '/tmerclub_admin/mua/app/userFavorite/ma/is_collection',
+    url: '/tmerclub_admin/user_collection_shop/ma/is_collection',
    method: 'get',
    data: {
      shopId
--- a/src/package-activities/pages/message-detail/message-detail.vue
+++ b/src/package-activities/pages/message-detail/message-detail.vue
@ -29,7 +29,7 @@ onLoad((options) => {
 */
 const onQueryDetailsOfNotice = (id) => {
  http.request({
-    url: '/tmerclub_admin/mua/app/notice/info',
+    url: '/tmerclub_admin/ma/notice/info',
    method: 'GET',
    data: {
      id
--- a/src/package-activities/pages/my-collection/my-collection.vue
+++ b/src/package-activities/pages/my-collection/my-collection.vue
@ -191,7 +191,7 @@ const onGetNumberOfProdCollected = () => {
 const shopCollectedNum = ref(0)
 const onGetNumberOfShopCollected = () => {
  http.request({
-    url: '/tmerclub_admin/mua/app/userFavorite/count',
+    url: '/tmerclub_admin/user_collection_shop/count',
    method: 'GET'
  }).then(res => {
    shopCollectedNum.value = res
@ -208,7 +208,7 @@ const onQueryCollectData = (pageNum, pageSize) => {
  if (navStatus.value === 0) {
    url = '/tmerclub_product/spu_collection/page'
  } else if (navStatus.value === 1) {
-    url = '/tmerclub_admin/mua/app/userFavorite/page'
+    url = '/tmerclub_admin/user_collection_shop/page'
  }
  http.request({
    url,
@ -233,7 +233,7 @@ const onCancelCollect = () => {
  if (navStatus.value === 0) {
    url = '/tmerclub_product/spu_collection/add_or_cancel'
  } else if (navStatus.value === 1) {
-    url = '/tmerclub_admin/mua/app/userFavorite/add_or_cancel'
+    url = '/tmerclub_admin/user_collection_shop/add_or_cancel'
  }
  http.request({
    url,
--- a/src/package-shop/components/shop-head/index.vue
+++ b/src/package-shop/components/shop-head/index.vue
@ -242,7 +242,7 @@ const queryCollectedStatus = () => {
    return
  }
  http.request({
-    url: '/tmerclub_admin/mua/app/userFavorite/ma/is_collection',
+    url: '/tmerclub_admin/user_collection_shop/ma/is_collection',
    method: 'get',
    data: {
      shopId: props.shopId
@ -258,7 +258,7 @@ const queryCollectedStatus = () => {
 const addOrCancelOfCollection = () => {
  const shopId = props.shopId
  http.request({
-    url: '/tmerclub_admin/mua/app/userFavorite/add_or_cancel',
+    url: '/tmerclub_admin/user_collection_shop/add_or_cancel',
    method: 'post',
    data: shopId
  }).then((res) => {
--- a/src/package-shop/shop-page/notice-list/notice-list.vue
+++ b/src/package-shop/shop-page/notice-list/notice-list.vue
@ -85,7 +85,7 @@ const pagingRef = ref(null)
 */
 const queryShopNotices = (pageNum, pageSize) => {
  http.request({
-    url: '/tmerclub_admin/mua/app/notice',
+    url: '/tmerclub_admin/ma/notice',
    method: 'GET',
    data: {
      shopId: shopId.value,
--- a/src/package-shop/shop-page/shop-index/shop-index.vue
+++ b/src/package-shop/shop-page/shop-index/shop-index.vue
@ -302,7 +302,7 @@ const banners = ref([]) // 轮播图
 */
 const queryShopBanners = () => {
  http.request({
-    url: '/tmerclub_admin/mua/app/indexPic/list',
+    url: '/tmerclub_admin/ua/index_img/list',
    method: 'GET',
    data: {
      shopId: shopId.value,
@ -328,7 +328,7 @@ const queryCollectedStatus = () => {
    return
  }
  http.request({
-    url: '/tmerclub_admin/mua/app/userFavorite/ma/is_collection',
+    url: '/tmerclub_admin/user_collection_shop/ma/is_collection',
    method: 'get',
    data: {
      shopId: shopId.value
@ -343,7 +343,7 @@ const queryCollectedStatus = () => {
 */
 const addOrCancelOfCollection = () => {
  http.request({
-    url: '/tmerclub_admin/mua/app/userFavorite/add_or_cancel',
+    url: '/tmerclub_admin/user_collection_shop/add_or_cancel',
    method: 'post',
    data: shopId.value,
    dontShowLogin: true
--- a/src/package-shop/shop-page/shop-search/shop-search.vue
+++ b/src/package-shop/shop-page/shop-search/shop-search.vue
@ -117,7 +117,7 @@ const hotSearchList = ref([])
 const getHotSearch = () => {
  isLoaded.value = false
  http.request({
-    url: '/tmerclub_admin/mua/app/hotQuery/list',
+    url: '/tmerclub_admin/ua/app/hot_search/list',
    method: 'GET',
    data: {
      sort: 1,
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@ -506,7 +506,7 @@ const isBgImg = ref(false)
 */
 const onGetFeatureIndex = () => {
  http.request({
-    url: '/tmerclub_admin/mua/app/shopRenovation/get_home',
+    url: '/tmerclub_admin/ua/shop_renovation/get_home',
    data: {
      renovationType: 2, // 装修类型 1.pc 2.移动端
      shopId: 0
@ -574,7 +574,7 @@ const indexImgs = ref([]) // 轮播图
 */
 const onGetIndexImgs = () => {
  const params = {
-    url: '/tmerclub_admin/mua/app/indexPic/list',
+    url: '/tmerclub_admin/ua/index_img/list',
    method: 'GET',
    data: {
      shopId: pageQuery.shopId,
--- a/src/pages/message-platform/message-platform.vue
+++ b/src/pages/message-platform/message-platform.vue
@ -190,7 +190,7 @@ const onLoadMsgList = () => {
      pageSize
    }
  } else if (currentTabType.value === 1) {
-    url = '/tmerclub_admin/mua/app/notice'
+    url = '/tmerclub_admin/ma/notice'
    reqData = {
      shopId,
      pageNum,
--- a/src/pages/search-list/search-list.vue
+++ b/src/pages/search-list/search-list.vue
@ -846,7 +846,7 @@ const onGetDataList = (pageNum, pageSize) => {
    })
  } else {
    const params = {
-      url: '/tmerclub_admin/mua/app/shopDetail/page',
+      url: '/tmerclub_admin/ua/shop_detail/page',
      method: 'get',
      data: {
        pageNum,
@ -1493,7 +1493,7 @@ const onToShopPage = (shopId) => {
 */
 const onGetShopInfo = (shopId) => {
  const params = {
-    url: '/tmerclub_admin/mua/app/shopDetail/head_info',
+    url: '/tmerclub_admin/ua/shop_detail/head_info',
    method: 'GET',
    data: {
      shopId,
--- a/src/pages/search-page/search-page.vue
+++ b/src/pages/search-page/search-page.vue
@ -143,7 +143,7 @@ const searchKeyword = ref('') // 关键词
 const onGetHotSearchList = (type) => {
  isLoaded.value = false
  const params = {
-    url: '/tmerclub_admin/mua/app/hotQuery/list',
+    url: '/tmerclub_admin/ua/app/hot_search/list',
    method: 'GET',
    data: {
      shopId: 0,
--- a/src/utils/util.js
+++ b/src/utils/util.js
@ -273,7 +273,7 @@ const util = {
  getShopMessage: (shopId) => {
    return new Promise((resolve) => {
      const params = {
-        url: '/tmerclub_admin/mua/app/shopDetail/head_info',
+        url: '/tmerclub_admin/ua/shop_detail/head_info',
        method: 'GET',
        data: {
          shopId,
Author	SHA1	Message	Date
快乐橙	5459b980e9	Merge branch 'master' of http://101.37.204.35:3000/admin/tmerclub-uniapp	2025-04-13 23:41:24 +08:00
快乐橙	589b8d2736	fix：接口修改	2025-04-13 23:40:58 +08:00