瀏覽代碼

Merge branch 'main' into feature/v1.0.36

lianbingjie 1 年之前
父節點
當前提交
5d6c19e046
共有 61 個文件被更改,包括 1549 次插入716 次删除
  1. 1 2
      apps/bigmember_pc/.env.development
  2. 1 1
      apps/bigmember_pc/.env.production
  3. 0 4
      apps/bigmember_pc/.env.test
  4. 3 0
      apps/bigmember_pc/index.html
  5. 10 10
      apps/bigmember_pc/src/api/modules/analysis.js
  6. 2 4
      apps/bigmember_pc/src/api/modules/biService.js
  7. 2 4
      apps/bigmember_pc/src/api/modules/business.js
  8. 25 27
      apps/bigmember_pc/src/api/modules/chart.js
  9. 6 12
      apps/bigmember_pc/src/api/modules/coupon.js
  10. 1 2
      apps/bigmember_pc/src/api/modules/course.js
  11. 4 8
      apps/bigmember_pc/src/api/modules/crmApplication.js
  12. 8 16
      apps/bigmember_pc/src/api/modules/customer.js
  13. 12 20
      apps/bigmember_pc/src/api/modules/dataExport.js
  14. 7 14
      apps/bigmember_pc/src/api/modules/entbase.js
  15. 3 6
      apps/bigmember_pc/src/api/modules/entnicheNew.js
  16. 2 4
      apps/bigmember_pc/src/api/modules/file.js
  17. 20 20
      apps/bigmember_pc/src/api/modules/forecast.js
  18. 9 23
      apps/bigmember_pc/src/api/modules/home.js
  19. 1 2
      apps/bigmember_pc/src/api/modules/jyMerge.js
  20. 2 4
      apps/bigmember_pc/src/api/modules/leadGeneration.js
  21. 4 8
      apps/bigmember_pc/src/api/modules/marketing.js
  22. 7 14
      apps/bigmember_pc/src/api/modules/medical.js
  23. 9 18
      apps/bigmember_pc/src/api/modules/medicalField.js
  24. 1 2
      apps/bigmember_pc/src/api/modules/message.js
  25. 7 14
      apps/bigmember_pc/src/api/modules/order.js
  26. 6 12
      apps/bigmember_pc/src/api/modules/pay.js
  27. 3 6
      apps/bigmember_pc/src/api/modules/placeOrder.js
  28. 9 14
      apps/bigmember_pc/src/api/modules/potential.js
  29. 21 35
      apps/bigmember_pc/src/api/modules/project.js
  30. 15 30
      apps/bigmember_pc/src/api/modules/public.js
  31. 9 9
      apps/bigmember_pc/src/api/modules/report.js
  32. 34 39
      apps/bigmember_pc/src/api/modules/subscribe.js
  33. 10 20
      apps/bigmember_pc/src/api/modules/svip.js
  34. 16 30
      apps/bigmember_pc/src/api/modules/user.js
  35. 13 26
      apps/bigmember_pc/src/api/modules/workspace.js
  36. 二進制
      apps/bigmember_pc/src/assets/images/recommend-hd.png
  37. 二進制
      apps/bigmember_pc/src/assets/images/setkey-dialog.png
  38. 7 3
      apps/bigmember_pc/src/components/article-item/ArticleItem.vue
  39. 5 0
      apps/bigmember_pc/src/components/dialog/Dialog.vue
  40. 4 1
      apps/bigmember_pc/src/components/forecast/ForeCast.vue
  41. 2 2
      apps/bigmember_pc/src/components/push-setting/setList.vue
  42. 25 2
      apps/bigmember_pc/src/components/subscribe-manager/KeyConfig.vue
  43. 1 1
      apps/bigmember_pc/src/components/subscribe-manager/SubConfig.vue
  44. 36 2
      apps/bigmember_pc/src/components/subscribe-manager/index.vue
  45. 1 0
      apps/bigmember_pc/src/router/router-interceptors.js
  46. 6 0
      apps/bigmember_pc/src/router/routers.js
  47. 5 0
      apps/bigmember_pc/src/store/workspace/subscribe.js
  48. 207 0
      apps/bigmember_pc/src/views/recommen-list/recommenList.vue
  49. 42 2
      apps/bigmember_pc/src/views/subscribe/components/key/KeyConfig.vue
  50. 85 20
      apps/bigmember_pc/src/views/workspace/components/SubscribeList.vue
  51. 7 1
      apps/bigmember_pc/src/views/workspace/ui/ListCard.vue
  52. 2 1
      apps/bigmember_pc/vite.config.js
  53. 23 13
      apps/mobile/src/api/modules/subscribe.js
  54. 二進制
      apps/mobile/src/assets/image/public/goset.png
  55. 14 1
      apps/mobile/src/router/modules/tabbar.js
  56. 3 3
      apps/mobile/src/views/push/PushSetting.vue
  57. 1 1
      apps/mobile/src/views/tabbar/Home.vue
  58. 288 0
      apps/mobile/src/views/tabbar/RecommendedBannerlist.vue
  59. 442 154
      apps/mobile/src/views/tabbar/Subscribe.vue
  60. 0 49
      apps/work-bench/public/index.html.bak
  61. 60 0
      configs/proxy/dev-proxy.js

+ 1 - 2
apps/bigmember_pc/.env.development

@@ -1,5 +1,4 @@
 NODE_ENV=development
-VITE_APP_BASE_API='/bigmember'
+VITE_APP_BASE_API='/dev-api'
 VITE_APP_BASE_URL='/swordfish/page_big_pc'
-VITE_APP_MOCK=false
 VITE_APP_BASE_PUBLIC='/'

+ 1 - 1
apps/bigmember_pc/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VITE_APP_BASE_API='/bigmember'
+VITE_APP_BASE_API=''
 VITE_APP_BASE_URL='/page_big_pc'
 VITE_APP_BASE_PUBLIC='/page_big_pc/'

+ 0 - 4
apps/bigmember_pc/.env.test

@@ -1,4 +0,0 @@
-NODE_ENV=production
-VITE_APP_BASE_API='/bigmember/'
-VITE_APP_BASE_URL='/swordfish/page_big_pc'
-VITE_APP_BASE_PUBLIC='/page_big_pc/'

+ 3 - 0
apps/bigmember_pc/index.html

@@ -54,6 +54,9 @@
     .big-member-page {
       margin: 0 auto;
     }
+    body.big-transparent{
+      background-color: transparent!important;
+    }
   </style>
   <body style="background-color: #f2f2f4;">
     <noscript>

+ 10 - 10
apps/bigmember_pc/src/api/modules/analysis.js

@@ -5,7 +5,7 @@ import qs from 'qs'
 export function getFollowInfo(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/project/check',
+    url: '/bigmember/follow/project/check',
     method: 'post',
     data
   })
@@ -15,7 +15,7 @@ export function getFollowInfo(data) {
 export function addFollow(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/project/add',
+    url: '/bigmember/follow/project/add',
     method: 'post',
     data
   })
@@ -25,7 +25,7 @@ export function addFollow(data) {
 export function cancelFollow(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/project/cancel',
+    url: '/bigmember/follow/project/cancel',
     method: 'post',
     data
   })
@@ -35,7 +35,7 @@ export function cancelFollow(data) {
 export function getProjectInfo(data) {
   data = qs.stringify(data)
   return request({
-    url: '/analysis/projectInfo',
+    url: '/bigmember/analysis/projectInfo',
     method: 'post',
     data
   })
@@ -45,7 +45,7 @@ export function getProjectInfo(data) {
 export function getFollowAssociationList(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/ent/association',
+    url: '/bigmember/follow/ent/association',
     method: 'post',
     data
   })
@@ -55,7 +55,7 @@ export function getFollowAssociationList(data) {
 export function getAnalysisResult(data) {
   // data = qs.stringify(data)
   return request({
-    url: '/decision/decInfo',
+    url: '/bigmember/decision/decInfo',
     method: 'post',
     data
   })
@@ -65,7 +65,7 @@ export function getAnalysisResult(data) {
 export function getAnalysisDetail(data) {
   // data = qs.stringify(data)
   return request({
-    url: '/decision/projectInfoByBW',
+    url: '/bigmember/decision/projectInfoByBW',
     method: 'post',
     data
   })
@@ -74,7 +74,7 @@ export function getAnalysisDetail(data) {
 // 分析内容-中标企业top10
 export function getAnalysisHotTop10(data) {
   return request({
-    url: '/decision/hotWinnerTop',
+    url: '/bigmember/decision/hotWinnerTop',
     method: 'post',
     data
   })
@@ -83,7 +83,7 @@ export function getAnalysisHotTop10(data) {
 // 分析内容-评标专家top10
 export function getAnalysisDecReviewExperts(data) {
   return request({
-    url: '/decision/decReviewExperts',
+    url: '/bigmember/decision/decReviewExperts',
     method: 'post',
     data
   })
@@ -92,7 +92,7 @@ export function getAnalysisDecReviewExperts(data) {
 // 分析内容-评标专家top10项目信息明细
 export function getAnalysisERProjects(data) {
   return request({
-    url: '/decision/getREProjects',
+    url: '/bigmember/decision/getREProjects',
     method: 'post',
     data
   })

+ 2 - 4
apps/bigmember_pc/src/api/modules/biService.js

@@ -2,16 +2,14 @@ import request from '@/api'
 
 export function getBiAddedProjects() {
   return request({
-    baseURL: '/jyapi/biService',
-    url: '/getInfoId',
+    url: '/jyapi/biService/getInfoId',
     method: 'POST'
   })
 }
 
 export function addBiProject(data) {
   return request({
-    baseURL: '/jyapi/biService',
-    url: '/addProject',
+    url: '/jyapi/biService/addProject',
     method: 'POST',
     data
   })

+ 2 - 4
apps/bigmember_pc/src/api/modules/business.js

@@ -4,8 +4,7 @@ import qs from 'qs'
 export function getBusinessDetails(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/bigmember',
-    url: '/project/businessDetails',
+    url: '/bigmember/project/businessDetails',
     method: 'POST',
     data
   })
@@ -14,8 +13,7 @@ export function getBusinessDetails(data) {
 // 是否需要完善信息提示
 export function isNeedCompleteInfo() {
   return request({
-    baseURL: '/salesLeads',
-    url: '/businessRetain',
+    url: '/salesLeads/businessRetain',
     method: 'POST'
   })
 }

+ 25 - 27
apps/bigmember_pc/src/api/modules/chart.js

@@ -5,7 +5,7 @@ import qs from 'qs'
 export function getUnitDt(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/buyer/getNewMsg',
+    url: '/bigmember/portrait/buyer/getNewMsg',
     method: 'post',
     data
   })
@@ -15,7 +15,7 @@ export function getUnitDt(data) {
 export function getVipUnitDt(data) {
   data = qs.stringify(data)
   return request({
-    url: '/subVipPortrait/buyer/getNewMsg',
+    url: '/bigmember/subVipPortrait/buyer/getNewMsg',
     method: 'post',
     data
   })
@@ -25,7 +25,7 @@ export function getVipUnitDt(data) {
 export function getUnitChart(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/buyer/getData',
+    url: '/bigmember/portrait/buyer/getData',
     method: 'post',
     data
   })
@@ -35,7 +35,7 @@ export function getUnitChart(data) {
 export function getVipUnitChart(data) {
   data = qs.stringify(data)
   return request({
-    url: '/subVipPortrait/buyer/getData',
+    url: '/bigmember/subVipPortrait/buyer/getData',
     method: 'post',
     data
   })
@@ -55,7 +55,7 @@ export function getMapJson(data) {
 export function getEntChart(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/winner/getData',
+    url: '/bigmember/portrait/winner/getData',
     method: 'post',
     data
   })
@@ -65,7 +65,7 @@ export function getEntChart(data) {
 export function getEntAssociatedInfo(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/winner/noLoginAssociatedInfo',
+    url: '/bigmember/portrait/winner/noLoginAssociatedInfo',
     method: 'post',
     data
   })
@@ -75,7 +75,7 @@ export function getEntAssociatedInfo(data) {
 export function getSubVipEntChart(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/subVipPortrait/winner',
+    url: '/bigmember/portrait/subVipPortrait/winner',
     method: 'post',
     data
   })
@@ -85,7 +85,7 @@ export function getSubVipEntChart(data) {
 export function getEntWinnerSelect(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/winner/selects',
+    url: '/bigmember/portrait/winner/selects',
     method: 'post',
     data
   })
@@ -95,7 +95,7 @@ export function getEntWinnerSelect(data) {
 export function getsubVipPortraitSelect(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/subVipPortrait/selects',
+    url: '/bigmember/portrait/subVipPortrait/selects',
     method: 'post',
     data
   })
@@ -105,7 +105,7 @@ export function getsubVipPortraitSelect(data) {
 export function getEntForm(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/ent/detail',
+    url: '/bigmember/portrait/ent/detail',
     method: 'post',
     data
   })
@@ -115,7 +115,7 @@ export function getEntForm(data) {
 export function getSubVipEntForm(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/subVipPortrait/entDetail',
+    url: '/bigmember/portrait/subVipPortrait/entDetail',
     method: 'post',
     data
   })
@@ -125,7 +125,7 @@ export function getSubVipEntForm(data) {
 export function getEntChangeList(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/ent/entChangeList',
+    url: '/bigmember/follow/ent/entChangeList',
     method: 'post',
     data
   })
@@ -135,7 +135,7 @@ export function getEntChangeList(data) {
 export function getBuyerSelect(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/buyer/selects',
+    url: '/bigmember/portrait/buyer/selects',
     method: 'post',
     data
   })
@@ -145,7 +145,7 @@ export function getBuyerSelect(data) {
 export function getVipBuyerSelect(data) {
   data = qs.stringify(data)
   return request({
-    url: '/subVipPortrait/buyer/selects',
+    url: '/bigmember/subVipPortrait/buyer/selects',
     method: 'post',
     data
   })
@@ -155,7 +155,7 @@ export function getVipBuyerSelect(data) {
 export function getNewMsg(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/winner/getNewMsg',
+    url: '/bigmember/portrait/winner/getNewMsg',
     method: 'post',
     data
   })
@@ -165,7 +165,7 @@ export function getNewMsg(data) {
 export function getSvipNewMsg(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/subVipPortrait/winnerNewMsg',
+    url: '/bigmember/portrait/subVipPortrait/winnerNewMsg',
     method: 'post',
     data
   })
@@ -175,7 +175,7 @@ export function getSvipNewMsg(data) {
 export function setFollowEnt(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/ent/addFollow',
+    url: '/bigmember/follow/ent/addFollow',
     method: 'post',
     data
   })
@@ -185,7 +185,7 @@ export function setFollowEnt(data) {
 export function setCancelEnt(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/ent/delFollow',
+    url: '/bigmember/follow/ent/delFollow',
     method: 'post',
     data
   })
@@ -194,8 +194,7 @@ export function setCancelEnt(data) {
 // 查询当前企业是否在 关注的客户 列表中
 export function getStatusCustomer(data) {
   return request({
-    baseURL: '/publicapply',
-    url: '/customer/check',
+    url: '/publicapply/customer/check',
     method: 'post',
     data
   })
@@ -205,8 +204,7 @@ export function getStatusCustomer(data) {
 export function setStatusCustomer(data) {
   // data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/customer/attention',
+    url: '/publicapply/customer/attention',
     method: 'post',
     data
   })
@@ -216,7 +214,7 @@ export function setStatusCustomer(data) {
 export function getBuyerHistoryContact(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/contacts',
+    url: '/bigmember/portrait/contacts',
     method: 'post',
     data
   })
@@ -226,7 +224,7 @@ export function getBuyerHistoryContact(data) {
 export function getWinnerHistoryContact(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/winner/contacts',
+    url: '/bigmember/portrait/winner/contacts',
     method: 'post',
     data
   })
@@ -236,7 +234,7 @@ export function getWinnerHistoryContact(data) {
 export function vipBuyerHistoryContact(data) {
   data = qs.stringify(data)
   return request({
-    url: '/subVipPortrait/buyer/contacts',
+    url: '/bigmember/subVipPortrait/buyer/contacts',
     method: 'post',
     data
   })
@@ -245,7 +243,7 @@ export function vipBuyerHistoryContact(data) {
 // 周报月报项目明细
 export function getWeekMonthReportProjectList(data) {
   return request({
-    url: '/report/projectInfo',
+    url: '/bigmember/report/projectInfo',
     method: 'post',
     data
   })
@@ -255,7 +253,7 @@ export function getWeekMonthReportProjectList(data) {
 export function getMarketAnalysisReportProjectList(data) {
   data = qs.stringify(data)
   return request({
-    url: '/marketAnalysis/projectInfo',
+    url: '/bigmember/marketAnalysis/projectInfo',
     method: 'post',
     data
   })

+ 6 - 12
apps/bigmember_pc/src/api/modules/coupon.js

@@ -7,16 +7,14 @@ export function getCouponList(data) {
   if (data && data.token) {
     data = qs.stringify(data)
     return request({
-      baseURL: '/jyCoupon',
-      url: '/offlineCoupons',
+      url: '/jyCoupon/offlineCoupons',
       method: 'POST',
       data
     })
   } else {
     data = qs.stringify(data)
     return request({
-      baseURL: '/jyCoupon',
-      url: '/showCoupons',
+      url: '/jyCoupon/showCoupons',
       method: 'POST',
       data
     })
@@ -27,8 +25,7 @@ export function getCouponList(data) {
 export function optimalCoupon(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/jyCoupon',
-    url: '/optimalCoupon',
+    url: '/jyCoupon/optimalCoupon',
     method: 'POST',
     data
   })
@@ -39,16 +36,14 @@ export function getGiftList(data) {
   if (data && data.token) {
     data = qs.stringify(data)
     return request({
-      baseURL: '/jyCoupon',
-      url: '/offlineGiveInfo',
+      url: '/jyCoupon/offlineGiveInfo',
       method: 'POST',
       data
     })
   } else {
     data = qs.stringify(data)
     return request({
-      baseURL: '/jyCoupon',
-      url: '/giveInfo',
+      url: '/jyCoupon/giveInfo',
       method: 'POST',
       data
     })
@@ -57,8 +52,7 @@ export function getGiftList(data) {
 export function getInfoByUser(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/jyCoupon',
-    url: '/getInfoByUser',
+    url: '/jyCoupon/getInfoByUser',
     method: 'POST',
     data
   })

+ 1 - 2
apps/bigmember_pc/src/api/modules/course.js

@@ -3,8 +3,7 @@ import request from '@/api'
 // 根据ID获取线上课程详情
 export function getCourseInfo(params) {
   return request({
-    baseURL: '/OnlineCourses',
-    url: '/course/onlineCourseDetails',
+    url: '/OnlineCourses/course/onlineCourseDetails',
     method: 'GET',
     params
   })

+ 4 - 8
apps/bigmember_pc/src/api/modules/crmApplication.js

@@ -3,8 +3,7 @@ import request from '@/api'
 export function ajaxIgnoreOperate(data) {
   // data = qs.stringify(data)
   return request({
-    baseURL: '/jyapi',
-    url: '/crmApplication/ignore/operate',
+    url: '/jyapi/crmApplication/ignore/operate',
     method: 'post',
     data
   })
@@ -13,8 +12,7 @@ export function ajaxIgnoreOperate(data) {
 // 收录操作
 export function ajaxEmployOperate(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/crmApplication/employ/operate',
+    url: '/jyapi/crmApplication/employ/operate',
     method: 'post',
     data
   })
@@ -23,8 +21,7 @@ export function ajaxEmployOperate(data) {
 // 收录情况
 export function ajaxEmployInfo(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/crmApplication/employ/info',
+    url: '/jyapi/crmApplication/employ/info',
     method: 'post',
     data
   })
@@ -33,8 +30,7 @@ export function ajaxEmployInfo(data) {
 // 判断是否能创建
 export function isAjaxCanAdd(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/crmApplication/info/canAdd',
+    url: '/jyapi/crmApplication/info/canAdd',
     method: 'post',
     data
   })

+ 8 - 16
apps/bigmember_pc/src/api/modules/customer.js

@@ -5,8 +5,7 @@ import qs from 'qs'
 export function getCustomQuery(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/privatedata',
-    url: '/enterpriseSearch/doQuery',
+    url: '/privatedata/enterpriseSearch/doQuery',
     method: 'POST',
     data: data
   })
@@ -15,8 +14,7 @@ export function getCustomQuery(data) {
 export function getCustomBuyerData(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/privatedata',
-    url: '/portrait/buyer/getData',
+    url: '/privatedata/portrait/buyer/getData',
     method: 'POST',
     data: data
   })
@@ -25,8 +23,7 @@ export function getCustomBuyerData(data) {
 export function getBuyerNewMsg(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/privatedata',
-    url: '/portrait/buyer/getNewMsg',
+    url: '/privatedata/portrait/buyer/getNewMsg',
     method: 'POST',
     data: data
   })
@@ -35,8 +32,7 @@ export function getBuyerNewMsg(data) {
 export function getCustomBuyerSelect(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/privatedata',
-    url: '/portrait/buyer/selects',
+    url: '/privatedata/portrait/buyer/selects',
     method: 'POST',
     data: data
   })
@@ -45,8 +41,7 @@ export function getCustomBuyerSelect(data) {
 export function getBuyerProposed(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/privatedata',
-    url: '/portrait/buyer/getProposed',
+    url: '/privatedata/portrait/buyer/getProposed',
     method: 'POST',
     data: data
   })
@@ -55,8 +50,7 @@ export function getBuyerProposed(data) {
 export function getBuyerNotice(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/privatedata',
-    url: '/portrait/buyer/getNotice',
+    url: '/privatedata/portrait/buyer/getNotice',
     method: 'POST',
     data: data
   })
@@ -65,8 +59,7 @@ export function getBuyerNotice(data) {
 export function getBuyerExpire(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/privatedata',
-    url: '/portrait/buyer/getExpire',
+    url: '/privatedata/portrait/buyer/getExpire',
     method: 'POST',
     data: data
   })
@@ -75,8 +68,7 @@ export function getBuyerExpire(data) {
 export function getEntNicheAuth(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/front',
-    url: '/entExportAuth/getAuth?t=' + Date.now(),
+    url: '/front/entExportAuth/getAuth?t=' + Date.now(),
     method: 'GET',
     data: data
   })

+ 12 - 20
apps/bigmember_pc/src/api/modules/dataExport.js

@@ -8,15 +8,15 @@ export function getPortrayalSearchExportId(isMember, isWinner, data) {
   let url = ''
   if (isMember) {
     if (isWinner) {
-      url = '/portrait/winner/winnerNewMsgExport'
+      url = '/bigmember/portrait/winner/winnerNewMsgExport'
     } else {
-      url = '/portrait/buyer/getNewMsgExport'
+      url = '/bigmember/portrait/buyer/getNewMsgExport'
     }
   } else {
     if (isWinner) {
-      url = '/portrait/subVipPortrait/winnerNewMsgExport'
+      url = '/bigmember/portrait/subVipPortrait/winnerNewMsgExport'
     } else {
-      url = '/subVipPortrait/buyer/getNewMsgExport'
+      url = '/bigmember/subVipPortrait/buyer/getNewMsgExport'
     }
   }
   data = qs.stringify(data)
@@ -30,8 +30,7 @@ export function getPortrayalSearchExportId(isMember, isWinner, data) {
 // 获取数据导出页面个人支付价格信息
 export function getDataExportPrice(data) {
   return request({
-    baseURL: '/jypay',
-    url: '/dataexport/getPrice',
+    url: '/jypay/dataexport/getPrice',
     method: 'post',
     data
   })
@@ -40,8 +39,7 @@ export function getDataExportPrice(data) {
 // 获取数据导出页面数据包信息
 export function getDataPackUsage(data) {
   return request({
-    baseURL: '/subscribepay',
-    url: '/dataExportPack/account',
+    url: '/subscribepay/dataExportPack/account',
     method: 'post',
     data
   })
@@ -51,8 +49,7 @@ export function getDataPackUsage(data) {
 export function getDataExportInfo(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/dataexport/payPageParams',
+    url: '/publicapply/dataexport/payPageParams',
     method: 'post',
     data
   })
@@ -62,8 +59,7 @@ export function getDataExportInfo(data) {
 export function getDataExportFilterInfo(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/subscribepay',
-    url: '/dataExportPack/statistics',
+    url: '/subscribepay/dataExportPack/statistics',
     method: 'post',
     data
   })
@@ -73,8 +69,7 @@ export function getDataExportFilterInfo(data) {
 export function sendMailCode(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/front',
-    url: '/dataExport/sendMailVerify',
+    url: '/front/dataExport/sendMailVerify',
     method: 'POST',
     data
   })
@@ -84,8 +79,7 @@ export function sendMailCode(data) {
 export function checkMailCode(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/front',
-    url: '/dataExport/checkMailVerify',
+    url: '/front/dataExport/checkMailVerify',
     method: 'POST',
     data
   })
@@ -95,8 +89,7 @@ export function checkMailCode(data) {
 export function ajaxSetDontPromptAgain(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/front',
-    url: '/dataExport/setDontPromptAgain',
+    url: '/front/dataExport/setDontPromptAgain',
     method: 'POST',
     data
   })
@@ -106,8 +99,7 @@ export function ajaxSetDontPromptAgain(data) {
 export function ajaxGetDontPromptAgain(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/front',
-    url: '/dataExport/getDontPromptAgain',
+    url: '/front/dataExport/getDontPromptAgain',
     method: 'POST',
     data
   })

+ 7 - 14
apps/bigmember_pc/src/api/modules/entbase.js

@@ -3,23 +3,20 @@ import request from '@/api'
 export function entBaseInfo(typeobj) {
   if (typeobj && typeobj.noIntercept) {
     return request({
-      baseURL: '/entbase',
-      url: '/ent/entinfo',
+      url: '/entbase/ent/entinfo',
       method: 'GET',
       noIntercept: true
     })
   } else {
     return request({
-      baseURL: '/entbase',
-      url: '/ent/entinfo',
+      url: '/entbase/ent/entinfo',
       method: 'GET'
     })
   }
 }
 export function userRule() {
   return request({
-    baseURL: '/entnicheNew',
-    url: '/distribute/userRule',
+    url: '/entnicheNew/distribute/userRule',
     method: 'GET'
   })
 }
@@ -27,15 +24,13 @@ export function userRule() {
 export function defaultSelectEnt(typeobj) {
   if (typeobj && typeobj.noIntercept) {
     return request({
-      baseURL: '/entbase',
-      url: '/ent/mySelectent',
+      url: '/entbase/ent/mySelectent',
       method: 'GET',
       noIntercept: true
     })
   } else {
     return request({
-      baseURL: '/entbase',
-      url: '/ent/mySelectent',
+      url: '/entbase/ent/mySelectent',
       method: 'GET',
       noIntercept: true
     })
@@ -44,8 +39,7 @@ export function defaultSelectEnt(typeobj) {
 // 获取当前用户的企业信息
 export function getUserEntInfo() {
   return request({
-    baseURL: '/entbase',
-    url: '/ent/entinfo',
+    url: '/entbase/ent/entinfo',
     method: 'POST'
   })
 }
@@ -53,8 +47,7 @@ export function getUserEntInfo() {
 //  企业人员结构信息(过滤企业管理员、部门管理员权限)
 export function getEntPowerPersons() {
   return request({
-    baseURL: '/entbase',
-    url: '/person/dept',
+    url: '/entbase/person/dept',
     method: 'POST'
   })
 }

+ 3 - 6
apps/bigmember_pc/src/api/modules/entnicheNew.js

@@ -4,8 +4,7 @@ import qs from 'qs'
 // 获取用户自定义标签/分类标签列表
 export function getEntUserTags() {
   return request({
-    baseURL: '/entnicheNew',
-    url: `/customer/getLabel?t=${Date.now()}`,
+    url: `/entnicheNew/customer/getLabel?t=${Date.now()}`,
     method: 'POST'
   })
 }
@@ -13,8 +12,7 @@ export function getEntUserTags() {
 // 添加标签后认领接口
 export function renLingCustomerAddTags(data) {
   return request({
-    baseURL: '/entnicheNew',
-    url: '/customer/attention',
+    url: '/entnicheNew/customer/attention',
     method: 'POST',
     data
   })
@@ -24,8 +22,7 @@ export function renLingCustomerAddTags(data) {
 export function customerAddLabel(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/entnicheNew',
-    url: '/customer/addLabel',
+    url: '/entnicheNew/customer/addLabel',
     method: 'POST',
     data
   })

+ 2 - 4
apps/bigmember_pc/src/api/modules/file.js

@@ -3,8 +3,7 @@ import qs from 'qs'
 
 export function createOrder(data) {
   return request({
-    baseURL: '/jypay',
-    url: '/resourcePack/createOrder',
+    url: '/jypay/resourcePack/createOrder',
     method: 'POST',
     data
   })
@@ -13,8 +12,7 @@ export function createOrder(data) {
 export function getFilePackList(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/jypay',
-    url: '/resourcePack/price',
+    url: '/jypay/resourcePack/price',
     method: 'POST',
     data
   })

+ 20 - 20
apps/bigmember_pc/src/api/modules/forecast.js

@@ -5,7 +5,7 @@ import qs from 'qs'
 export function getPotenList(data) {
   data = qs.stringify(data)
   return request({
-    url: '/forecast/forPList',
+    url: '/bigmember/forecast/forPList',
     method: 'post',
     data: data
   })
@@ -15,7 +15,7 @@ export function getPotenList(data) {
 export function getProjectList(data) {
   data = qs.stringify(data)
   return request({
-    url: '/analysis/projectName',
+    url: '/bigmember/analysis/projectName',
     method: 'post',
     data: data
   })
@@ -25,7 +25,7 @@ export function getProjectList(data) {
 export function getResultDetail(data) {
   data = qs.stringify(data)
   return request({
-    url: '/forecast/forWResult',
+    url: '/bigmember/forecast/forWResult',
     method: 'post',
     data: data
   })
@@ -35,7 +35,7 @@ export function getResultDetail(data) {
 export function getEntFollowList(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/ent/list',
+    url: '/bigmember/follow/ent/list',
     method: 'post',
     data: data
   })
@@ -45,7 +45,7 @@ export function getEntFollowList(data) {
 export function getBidAssociation(data) {
   data = qs.stringify(data)
   return request({
-    url: '/search/ent/association',
+    url: '/bigmember/search/ent/association',
     method: 'post',
     data: data
   })
@@ -55,7 +55,7 @@ export function getBidAssociation(data) {
 export function getBuyerAssociation(data) {
   data = qs.stringify(data)
   return request({
-    url: '/search/buyer/association',
+    url: '/bigmember/search/buyer/association',
     method: 'post',
     data
   })
@@ -65,7 +65,7 @@ export function getBuyerAssociation(data) {
 export function getBidProjectInfo(data) {
   data = qs.stringify(data)
   return request({
-    url: '/analysis/projectInfo',
+    url: '/bigmember/analysis/projectInfo',
     method: 'post',
     data: data
   })
@@ -75,7 +75,7 @@ export function getBidProjectInfo(data) {
 export function getForWData(data) {
   // data = qs.stringify(data)
   return request({
-    url: '/forecast/forWData',
+    url: '/bigmember/forecast/forWData',
     method: 'post',
     data: data
   })
@@ -85,7 +85,7 @@ export function getForWData(data) {
 export function getForWStatus(data) {
   data = qs.stringify(data)
   return request({
-    url: '/forecast/forWStatus',
+    url: '/bigmember/forecast/forWStatus',
     method: 'post',
     data: data
   })
@@ -95,7 +95,7 @@ export function getForWStatus(data) {
 export function getForWResult(data) {
   data = qs.stringify(data)
   return request({
-    url: '/forecast/forWResult',
+    url: '/bigmember/forecast/forWResult',
     method: 'post',
     data: data
   })
@@ -105,7 +105,7 @@ export function getForWResult(data) {
 export function getPotenDetail(data) {
   data = qs.stringify(data)
   return request({
-    url: '/forecast/forPContent',
+    url: '/bigmember/forecast/forPContent',
     method: 'post',
     data: data
   })
@@ -115,7 +115,7 @@ export function getPotenDetail(data) {
 export function getfollowCheck(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/ent/followCheck',
+    url: '/bigmember/follow/ent/followCheck',
     method: 'post',
     data: data
   })
@@ -125,7 +125,7 @@ export function getfollowCheck(data) {
 export function getBidAiused(data) {
   data = qs.stringify(data)
   return request({
-    url: '/use/aiused_history',
+    url: '/bigmember/use/aiused_history',
     method: 'post',
     data: data
   })
@@ -135,7 +135,7 @@ export function getBidAiused(data) {
 export function getBdInfoStatus(data) {
   data = qs.stringify(data)
   return request({
-    url: '/forecast/bdInfoStatus',
+    url: '/bigmember/forecast/bdInfoStatus',
     method: 'post',
     data: data
   })
@@ -145,7 +145,7 @@ export function getBdInfoStatus(data) {
 export function getSearchByNames(data) {
   // data = qs.stringify(data)
   return request({
-    url: '/entinfo/bynames',
+    url: '/bigmember/entinfo/bynames',
     method: 'post',
     data: data
   })
@@ -155,7 +155,7 @@ export function getSearchByNames(data) {
 export function getNewMsgSelects(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/winner/getNewMsgSelects',
+    url: '/bigmember/portrait/winner/getNewMsgSelects',
     method: 'post',
     data: data
   })
@@ -165,7 +165,7 @@ export function getNewMsgSelects(data) {
 export function getSvipMsgSelects(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/subVipPortrait/getNewMsgSelects',
+    url: '/bigmember/portrait/subVipPortrait/getNewMsgSelects',
     method: 'post',
     data: data
   })
@@ -175,7 +175,7 @@ export function getSvipMsgSelects(data) {
 export function changeEntGroup(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/ent/changeGroup',
+    url: '/bigmember/follow/ent/changeGroup',
     method: 'post',
     data: data
   })
@@ -184,7 +184,7 @@ export function changeEntGroup(data) {
 // 潜在预测订阅省份
 export function forecastArea() {
   return request({
-    url: '/forecast/forArea',
+    url: '/bigmember/forecast/forArea',
     method: 'get'
   })
 }
@@ -193,7 +193,7 @@ export function forecastArea() {
 export function forecastDataExport(data) {
   data = qs.stringify(data)
   return request({
-    url: '/forecast/forDerive',
+    url: '/bigmember/forecast/forDerive',
     method: 'post',
     data: data
   })

+ 9 - 23
apps/bigmember_pc/src/api/modules/home.js

@@ -1,13 +1,6 @@
 import request from '@/api'
 import qs from 'qs'
 
-export const getSearchTag = (params) =>
-  request({
-    url: '/indexTag',
-    method: 'get',
-    params
-  })
-
 const vtMap = {
   v: 'vType',
   m: 'mType',
@@ -18,8 +11,7 @@ const vtMap = {
 export function getPushList(vt, data) {
   // data = qs.stringify(data)
   return request({
-    baseURL: '/jyapi/jybx',
-    url: `/subscribe/${vtMap[vt]}/list`,
+    url: `/jyapi/jybx/subscribe/${vtMap[vt]}/list`,
     method: 'post',
     data: data
   })
@@ -27,8 +19,7 @@ export function getPushList(vt, data) {
 
 export function getPushListExport(vt, data) {
   return request({
-    baseURL: '/jyapi',
-    url: `/jybx/subscribe/${vtMap[vt]}/byPushHistory`,
+    url: `/jyapi/jybx/subscribe/${vtMap[vt]}/byPushHistory`,
     method: 'post',
     data: data
   })
@@ -37,7 +28,7 @@ export function getPushListExport(vt, data) {
 export function getSimpleFollowList(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/ent/pcSimpleFollowList',
+    url: '/bigmember/follow/ent/pcSimpleFollowList',
     method: 'post',
     data: data
   })
@@ -46,7 +37,7 @@ export function getSimpleFollowList(data) {
 export function getDeskFollowList(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/ent/list',
+    url: '/bigmember/follow/ent/list',
     method: 'post',
     data: data
   })
@@ -56,8 +47,7 @@ export function getDeskFollowList(data) {
 export function getReportList(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/subscribepay',
-    url: '/report/newest?type=member',
+    url: '/subscribepay/report/newest?type=member',
     method: 'post',
     data: data
   })
@@ -67,8 +57,7 @@ export function getReportList(data) {
 export function getSubscribeKeywords(vt, data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/jyapi',
-    url: `/jybx/subscribe/${vtMap[vt]}/getKey`,
+    url: `/jyapi/jybx/subscribe/${vtMap[vt]}/getKey`,
     method: 'post',
     data: data
   })
@@ -78,8 +67,7 @@ export function getSubscribeKeywords(vt, data) {
 export function setSubscribeInfoRead(vt, data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/jyapi',
-    url: `/jybx/subscribe/${vtMap[vt]}/setRead`,
+    url: `/jyapi/jybx/subscribe/${vtMap[vt]}/setRead`,
     method: 'post',
     data: data
   })
@@ -88,8 +76,7 @@ export function setSubscribeInfoRead(vt, data) {
 // 设置列表阅读状态
 export function getAttendBiddingList(type, data) {
   return request({
-    baseURL: '/jyapi',
-    url: `/jybx/core/participate/${type}/list`,
+    url: `/jyapi/jybx/core/participate/${type}/list`,
     method: 'post',
     data: data
   })
@@ -98,8 +85,7 @@ export function getAttendBiddingList(type, data) {
 // 企业人员结构信息
 export function getEntPersons(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/jybx/core/participate/persons',
+    url: '/jyapi/jybx/core/participate/persons',
     method: 'post',
     data: data
   })

+ 1 - 2
apps/bigmember_pc/src/api/modules/jyMerge.js

@@ -2,8 +2,7 @@ import request from '@/api'
 
 export function getMergeStatus() {
   return request({
-    baseURL: '/jyMerge',
-    url: '/usermerge/state?t=' + Date.now(),
+    url: '/jyMerge/usermerge/state?t=' + Date.now(),
     method: 'GET'
   })
 }

+ 2 - 4
apps/bigmember_pc/src/api/modules/leadGeneration.js

@@ -5,8 +5,7 @@ import qs from 'qs'
 export function leadGetDate(data) {
   data = qs.stringify(data)
   return request({
-    url: '/getDate',
-    baseURL: '/leadGeneration',
+    url: '/leadGeneration/getDate',
     method: 'post',
     data
   })
@@ -15,8 +14,7 @@ export function leadGetDate(data) {
 // 市场分析报告&超前项目 点击事件统计
 export function ajaxSetLeadGetDateRecord(data) {
   return request({
-    url: '/clickRecord',
-    baseURL: '/leadGeneration',
+    url: '/leadGeneration/clickRecord',
     method: 'get',
     params: data
   })

+ 4 - 8
apps/bigmember_pc/src/api/modules/marketing.js

@@ -7,8 +7,7 @@ import request from '@/api'
 // 获取服务端当前时间戳
 export function getServerInitTime() {
   return request({
-    baseURL: '/jyapi/marketing',
-    url: '/time/now?t=' + Date.now(),
+    url: '/jyapi/marketing/time/now?t=' + Date.now(),
     method: 'post'
   })
 }
@@ -16,8 +15,7 @@ export function getServerInitTime() {
 // 预约
 export function appointmentAdd(data) {
   return request({
-    baseURL: '/jyapi/marketing',
-    url: '/appointment/add',
+    url: '/jyapi/marketing/appointment/add',
     method: 'post',
     data
   })
@@ -26,8 +24,7 @@ export function appointmentAdd(data) {
 // 预热信息
 export function getAppointmentInfo(data) {
   return request({
-    baseURL: '/jyapi/marketing',
-    url: '/appointment/info',
+    url: '/jyapi/marketing/appointment/info',
     method: 'post',
     data
   })
@@ -36,8 +33,7 @@ export function getAppointmentInfo(data) {
 // 是否已预约
 export function getIsAppointment(data) {
   return request({
-    baseURL: '/jyapi/marketing',
-    url: '/appointment/isAppointment',
+    url: '/jyapi/marketing/appointment/isAppointment',
     method: 'post',
     data
   })

+ 7 - 14
apps/bigmember_pc/src/api/modules/medical.js

@@ -3,8 +3,7 @@ import request from '@/api'
 // 资源查询
 export function GetResourceSurplus(headers) {
   return request({
-    url: '/resourceCenter/surplus',
-    baseURL: '/jyapi',
+    url: '/jyapi/resourceCenter/surplus',
     headers: headers,
     method: 'post'
   })
@@ -13,8 +12,7 @@ export function GetResourceSurplus(headers) {
 // 查询我关注的医疗机构
 export function followInstitutionList(data) {
   return request({
-    url: '/domain/claim/institution',
-    baseURL: '/jyapi',
+    url: '/jyapi/domain/claim/institution',
     method: 'POST',
     data
   })
@@ -23,8 +21,7 @@ export function followInstitutionList(data) {
 // 查询我关注的经销商
 export function followDistributorList(data) {
   return request({
-    url: '/domain/claim/distributor',
-    baseURL: '/jyapi',
+    url: '/jyapi/domain/claim/distributor',
     method: 'POST',
     data
   })
@@ -33,8 +30,7 @@ export function followDistributorList(data) {
 // 医疗机构画像-基本信息
 export function getInstitution(data) {
   return request({
-    url: '/domain/portrait/institution',
-    baseURL: '/jyapi',
+    url: '/jyapi/domain/portrait/institution',
     method: 'post',
     data: data
   })
@@ -43,8 +39,7 @@ export function getInstitution(data) {
 // 医疗机构-最新标讯信息
 export function getMeNewMsgList(data) {
   return request({
-    url: '/domain/portrait/getNewMsgList',
-    baseURL: '/jyapi',
+    url: '/jyapi/domain/portrait/getNewMsgList',
     method: 'post',
     data: data
   })
@@ -53,8 +48,7 @@ export function getMeNewMsgList(data) {
 // 医疗机构画像-是否认领
 export function isClaimed(data) {
   return request({
-    url: '/domain/isClaimed',
-    baseURL: '/jyapi',
+    url: '/jyapi/domain/isClaimed',
     method: 'post',
     data: data
   })
@@ -63,8 +57,7 @@ export function isClaimed(data) {
 // 医疗机构标讯信息导出
 export function getPortrayalMedicalExportId(data) {
   return request({
-    url: '/domain/portrait/newMsgListExport',
-    baseURL: '/jyapi',
+    url: '/jyapi/domain/portrait/newMsgListExport',
     method: 'post',
     data: data
   })

+ 9 - 18
apps/bigmember_pc/src/api/modules/medicalField.js

@@ -4,8 +4,7 @@ import qs from 'qs'
 // 用户认证信息保存
 export function domainUsersave(data) {
   return request({
-    url: '/domain/userAuthInfoSave',
-    baseURL: '/jyapi',
+    url: '/jyapi/domain/userAuthInfoSave',
     method: 'post',
     data
   })
@@ -15,8 +14,7 @@ export function domainUsersave(data) {
 export function domainUserauthinfo(data) {
   data = qs.stringify(data)
   return request({
-    url: '/domain/userAuthInfo',
-    baseURL: '/jyapi',
+    url: '/jyapi/domain/userAuthInfo',
     method: 'post',
     data
   })
@@ -25,8 +23,7 @@ export function domainUserauthinfo(data) {
 // 经销商列表
 export function getDistributorList(data) {
   return request({
-    baseURL: '/jyapi/domain',
-    url: '/search/distributor',
+    url: '/jyapi/domain/search/distributor',
     method: 'post',
     data
   })
@@ -35,8 +32,7 @@ export function getDistributorList(data) {
 // 获取医疗机构筛选条件
 export function getMedicalFilter() {
   return request({
-    baseURL: '/jyapi/domain',
-    url: '/getFilterItem',
+    url: '/jyapi/domain/getFilterItem',
     method: 'post'
   })
 }
@@ -44,8 +40,7 @@ export function getMedicalFilter() {
 // 筛选医疗机构列表
 export function getSearchMedicalList(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/domain/search/institution',
+    url: '/jyapi/domain/search/institution',
     method: 'post',
     data
   })
@@ -54,8 +49,7 @@ export function getSearchMedicalList(data) {
 // 经销商认领
 export function distributorClaim(data) {
   return request({
-    baseURL: '/jyapi/domain',
-    url: '/distributor/claim',
+    url: '/jyapi/domain/distributor/claim',
     method: 'post',
     data
   })
@@ -64,8 +58,7 @@ export function distributorClaim(data) {
 // 经销商取消认领
 export function distributorUnClaimed(data) {
   return request({
-    baseURL: '/jyapi/domain',
-    url: '/distributor/unclaimed',
+    url: '/jyapi/domain/distributor/unclaimed',
     method: 'post',
     data
   })
@@ -74,8 +67,7 @@ export function distributorUnClaimed(data) {
 // 机构认领
 export function setInstitutionClaim(data) {
   return request({
-    baseURL: '/jyapi/domain',
-    url: '/institution/claim',
+    url: '/jyapi/domain/institution/claim',
     method: 'post',
     data
   })
@@ -84,8 +76,7 @@ export function setInstitutionClaim(data) {
 // 机构取消认领
 export function institutionUnClaimed(data) {
   return request({
-    baseURL: '/jyapi/domain',
-    url: '/institution/unclaimed',
+    url: '/jyapi/domain/institution/unclaimed',
     method: 'post',
     data
   })

+ 1 - 2
apps/bigmember_pc/src/api/modules/message.js

@@ -3,8 +3,7 @@ import request from '@/api'
 // 获取聊天会话列表
 export function getUserSessionList(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/message/userList',
+    url: '/jyapi/message/userList',
     method: 'post',
     data
   })

+ 7 - 14
apps/bigmember_pc/src/api/modules/order.js

@@ -4,8 +4,7 @@ import qs from 'qs'
 // 根据商品ID、扩展等参数获取商品规格信息
 export function ajaxGetProductInfo(data) {
   return request({
-    url: '/commodity/detail',
-    baseURL: '/jypay',
+    url: '/jypay/commodity/detail',
     method: 'post',
     data
   })
@@ -14,8 +13,7 @@ export function ajaxGetProductInfo(data) {
 // 根据商品ID、规格等参数获取商品优惠信息
 export function ajaxGetProductOffers(data) {
   return request({
-    url: '/commodity/couponInfo',
-    baseURL: '/jypay',
+    url: '/jypay/commodity/couponInfo',
     method: 'post',
     data
   })
@@ -24,8 +22,7 @@ export function ajaxGetProductOffers(data) {
 // 根据商品ID、规格、优惠等参数获取商品订单金额信息
 export function ajaxGetProductOrderAmount(data) {
   return request({
-    url: '/commodity/price',
-    baseURL: '/jypay',
+    url: '/jypay/commodity/price',
     method: 'post',
     data
   })
@@ -33,8 +30,7 @@ export function ajaxGetProductOrderAmount(data) {
 // 根据商品ID、规格、优惠等参数获取商品订单金额信息
 export function ajaxSubmitCreatedProductOrder(data) {
   return request({
-    url: '/common/createorder',
-    baseURL: '/jypay',
+    url: '/jypay/common/createorder',
     method: 'post',
     data
   })
@@ -45,8 +41,7 @@ export function ajaxSubmitCreatedProductOrder(data) {
 export function packPayApi(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/subscribepay',
-    url: '/dataExportPack/packPay',
+    url: '/subscribepay/dataExportPack/packPay',
     method: 'POST',
     data
   })
@@ -55,8 +50,7 @@ export function packPayApi(data) {
 export function packExportFile(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/subscribepay',
-    url: '/dataExportPack/fileCheck',
+    url: '/subscribepay/dataExportPack/fileCheck',
     method: 'POST',
     data
   })
@@ -67,8 +61,7 @@ export function packExportFile(data) {
 export function getEffectiveTime(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/subscribepay',
-    url: '/vipsubscribe/effectiveTime',
+    url: '/subscribepay/vipsubscribe/effectiveTime',
     method: 'post',
     data
   })

+ 6 - 12
apps/bigmember_pc/src/api/modules/pay.js

@@ -3,8 +3,7 @@ import qs from 'qs'
 
 export function getPhoneCaptcha() {
   return request({
-    baseURL: '/jypay',
-    url: `/user/phone/imgCaptcha?t=${Date.now()}`,
+    url: `/jypay/user/phone/imgCaptcha?t=${Date.now()}`,
     method: 'GET'
   })
 }
@@ -12,8 +11,7 @@ export function getPhoneCaptcha() {
 export function phoneBind(data, type) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/jypay',
-    url: `/user/phone/${type}`,
+    url: `/jypay/user/phone/${type}`,
     method: 'POST',
     data
   })
@@ -22,8 +20,7 @@ export function phoneBind(data, type) {
 export function emailBind(data, type) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/jypay',
-    url: `/user/mail/${type}`,
+    url: `/jypay/user/mail/${type}`,
     method: 'POST',
     data
   })
@@ -32,8 +29,7 @@ export function emailBind(data, type) {
 export function accountAuth(data, type) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/jypay',
-    url: `/user/auth/${type}`,
+    url: `/jypay/user/auth/${type}`,
     method: 'POST',
     data
   })
@@ -42,8 +38,7 @@ export function accountAuth(data, type) {
 export function filePackUseHistory(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/jypay',
-    url: '/resourcePack/exchangeCancelList',
+    url: '/jypay/resourcePack/exchangeCancelList',
     method: 'POST',
     data
   })
@@ -51,8 +46,7 @@ export function filePackUseHistory(data) {
 
 export function getUserAccountShow() {
   return request({
-    baseURL: '/jypay',
-    url: '/user/account/show',
+    url: '/jypay/user/account/show',
     method: 'POST'
   })
 }

+ 3 - 6
apps/bigmember_pc/src/api/modules/placeOrder.js

@@ -4,8 +4,7 @@ export function commodityDetail(data) {
   // 商品详情
   // data = qs.stringify(data)
   return request({
-    baseURL: '/jypay',
-    url: '/commodity/detail',
+    url: '/jypay/commodity/detail',
     method: 'POST',
     data
   })
@@ -15,8 +14,7 @@ export function commodityDiscounts(data) {
   // 获取优惠券
   // data = qs.stringify(data)
   return request({
-    baseURL: '/jypay',
-    url: '/commodity/couponInfo',
+    url: '/jypay/commodity/couponInfo',
     method: 'POST',
     data
   })
@@ -25,8 +23,7 @@ export function commodityDiscounts(data) {
 export function commodityPrice(data) {
   //  计算价格
   return request({
-    baseURL: '/jypay',
-    url: '/commodity/price',
+    url: '/jypay/commodity/price',
     method: 'POST',
     data: data
   })

+ 9 - 14
apps/bigmember_pc/src/api/modules/potential.js

@@ -4,7 +4,7 @@ import qs from 'qs'
 // 潜在客户/竞争对手接口
 export function getCorList(data) {
   return request({
-    url: '/potential/corList',
+    url: '/bigmember/potential/corList',
     method: 'post',
     data
   })
@@ -13,7 +13,7 @@ export function getCorList(data) {
 // 潜在客户/竞争对手接口--首页
 export function getIndexCorList(data) {
   return request({
-    url: '/potential/index',
+    url: '/bigmember/potential/index',
     method: 'post',
     data
   })
@@ -22,7 +22,7 @@ export function getIndexCorList(data) {
 export function setRemoveEnt(data) {
   data = qs.stringify(data)
   return request({
-    url: '/potential/rMyRivals',
+    url: '/bigmember/potential/rMyRivals',
     method: 'POST',
     data
   })
@@ -31,8 +31,7 @@ export function setRemoveEnt(data) {
 export function setRemoveCustomer(data) {
   // data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/customer/exclude',
+    url: '/publicapply/customer/exclude',
     method: 'POST',
     data
   })
@@ -41,7 +40,7 @@ export function setRemoveCustomer(data) {
 export function getUsage(data) {
   data = qs.stringify(data)
   return request({
-    url: '/portrait/subVipPortrait/usage',
+    url: '/bigmember/portrait/subVipPortrait/usage',
     method: 'POST',
     data
   })
@@ -50,8 +49,7 @@ export function getUsage(data) {
 export function setLogs(data) {
   // data = qs.stringify(data)
   return request({
-    url: '/drainage/buyerunit',
-    baseURL: '/publicapply',
+    url: '/publicapply/drainage/buyerunit',
     method: 'POST',
     data
   })
@@ -60,8 +58,7 @@ export function setLogs(data) {
 export function followClientList(data) {
   data = qs.stringify(data)
   return request({
-    url: '/customer/list',
-    baseURL: '/publicapply',
+    url: '/publicapply/customer/list',
     method: 'POST',
     data
   })
@@ -70,8 +67,7 @@ export function followClientList(data) {
 // 是否认领企业
 export function claimchecked(data) {
   return request({
-    baseURL: '/entnicheNew',
-    url: '/customer/claimcheck',
+    url: '/entnicheNew/customer/claimcheck',
     method: 'POST',
     data
   })
@@ -80,8 +76,7 @@ export function claimchecked(data) {
 // 添加认领
 export function custAttention(data) {
   return request({
-    baseURL: '/entnicheNew',
-    url: '/customer/attention',
+    url: '/entnicheNew/customer/attention',
     method: 'POST',
     data
   })

+ 21 - 35
apps/bigmember_pc/src/api/modules/project.js

@@ -4,7 +4,7 @@ import qs from 'qs'
 export function getFollowProjectDetail(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/project/detail',
+    url: '/bigmember/follow/project/detail',
     method: 'POST',
     data
   })
@@ -13,8 +13,7 @@ export function getFollowProjectDetail(data) {
 export function getProjectReport(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/bigmember',
-    url: '/project/getPdfFile',
+    url: '/bigmember/project/getPdfFile',
     method: 'POST',
     data
   })
@@ -24,8 +23,7 @@ export function getProjectReport(data) {
 export function getProjectHistory(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/project/history',
+    url: '/publicapply/project/history',
     method: 'POST',
     data
   })
@@ -34,7 +32,7 @@ export function getProjectHistory(data) {
 export function getFollowProjectList(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/project/list',
+    url: '/bigmember/follow/project/list',
     method: 'POST',
     data
   })
@@ -43,7 +41,7 @@ export function getFollowProjectList(data) {
 export function followProjectAdd(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/project/add',
+    url: '/bigmember/follow/project/add',
     method: 'POST',
     data
   })
@@ -52,7 +50,7 @@ export function followProjectAdd(data) {
 export function followProjectCancel(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/project/cancel',
+    url: '/bigmember/follow/project/cancel',
     method: 'POST',
     data
   })
@@ -61,7 +59,7 @@ export function followProjectCancel(data) {
 export function setFollowRemove30Day(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/project/remove30Day',
+    url: '/bigmember/follow/project/remove30Day',
     method: 'POST',
     data
   })
@@ -70,7 +68,7 @@ export function setFollowRemove30Day(data) {
 export function attentionProject(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/project/list',
+    url: '/bigmember/follow/project/list',
     method: 'POST',
     data
   })
@@ -79,7 +77,7 @@ export function attentionProject(data) {
 export function areaProject(data) {
   data = qs.stringify(data)
   return request({
-    url: '/follow/project/screenArea',
+    url: '/bigmember/follow/project/screenArea',
     method: 'POST',
     data
   })
@@ -88,8 +86,7 @@ export function areaProject(data) {
 export function showAnnouncement(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/project/history',
+    url: '/publicapply/project/history',
     method: 'POST',
     data
   })
@@ -98,8 +95,7 @@ export function showAnnouncement(data) {
 // 首页-已认领的项目
 export function getClaimList() {
   return request({
-    baseURL: '/bigmember',
-    url: '/project/claim/list',
+    url: '/bigmember/project/claim/list',
     method: 'get'
   })
 }
@@ -111,8 +107,7 @@ export function getClaimList() {
  */
 export function getProjectRecordStatus(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/jybx/core/participate/content',
+    url: '/jyapi/jybx/core/participate/content',
     method: 'post',
     data
   })
@@ -125,8 +120,7 @@ export function getProjectRecordStatus(data) {
  */
 export function setProjectRecordStatus(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/jybx/core/participate/updateBidStatus',
+    url: '/jyapi/jybx/core/participate/updateBidStatus',
     method: 'post',
     data
   })
@@ -139,8 +133,7 @@ export function setProjectRecordStatus(data) {
  */
 export function getProjectRecords(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/jybx/core/participate/records',
+    url: '/jyapi/jybx/core/participate/records',
     method: 'post',
     data
   })
@@ -153,8 +146,7 @@ export function getProjectRecords(data) {
  */
 export function getProjectRecordStatusOptions(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/jybx/core/participate/setUpInfo',
+    url: '/jyapi/jybx/core/participate/setUpInfo',
     method: 'post',
     data
   })
@@ -166,8 +158,7 @@ export function getProjectRecordStatusOptions(data) {
  */
 export function getBidIsJoin(data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: '/core/participate/show',
+    url: '/jyapi/jybx/core/participate/show',
     method: 'post',
     data
   })
@@ -187,8 +178,7 @@ export function getBidIsJoin(data) {
  */
 export function getDetailBidIsJoin(data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: '/core/participate/info',
+    url: '/jyapi/jybx/core/participate/info',
     method: 'post',
     data
   })
@@ -202,8 +192,7 @@ export function getDetailBidIsJoin(data) {
  */
 export function joinBidAction(action, data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: `/core/participate/${action}/info`,
+    url: `/jyapi/jybx/core/participate/${action}/info`,
     method: 'post',
     data
   })
@@ -212,8 +201,7 @@ export function joinBidAction(action, data) {
 // 订阅推送列表参标统计
 export function getPushBidStatistics(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/jybx/core/statistics/pushStatistics',
+    url: '/jyapi/jybx/core/statistics/pushStatistics',
     method: 'post',
     data
   })
@@ -222,8 +210,7 @@ export function getPushBidStatistics(data) {
 // 参标项目汇总统计
 export function getProjectBidStatistics(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/jybx/core/statistics/projectStatistics',
+    url: '/jyapi/jybx/core/statistics/projectStatistics',
     method: 'post',
     data
   })
@@ -232,8 +219,7 @@ export function getProjectBidStatistics(data) {
 // 项目明细汇总统计
 export function getProjectBidDetailStatistics(data) {
   return request({
-    baseURL: '/jyapi',
-    url: '/jybx/core/statistics/projectDetails',
+    url: '/jyapi/jybx/core/statistics/projectDetails',
     method: 'post',
     data
   })

+ 15 - 30
apps/bigmember_pc/src/api/modules/public.js

@@ -3,8 +3,7 @@ import qs from 'qs'
 
 export function getCommonAdList(data) {
   return request({
-    baseURL: '/publicapply',
-    url: '/free/getJyAdList',
+    url: '/publicapply/free/getJyAdList',
     method: 'POST',
     data
   })
@@ -12,8 +11,7 @@ export function getCommonAdList(data) {
 
 export function getFreeUserPushInfo(data) {
   return request({
-    baseURL: '/publicapply',
-    url: '/myinfo',
+    url: '/publicapply/myinfo',
     method: 'POST'
   })
 }
@@ -21,8 +19,7 @@ export function getFreeUserPushInfo(data) {
 // 获取免费订阅信息接口
 export function getFreeUserSubscribeList(data) {
   return request({
-    baseURL: '/publicapply',
-    url: '/free/subscribe',
+    url: '/publicapply/free/subscribe',
     method: 'POST'
   })
 }
@@ -39,8 +36,7 @@ export const getFreeSubscribeInfo = getFreeUserSubscribeList
 */
 export function bidCollAction(data) {
   return request({
-    baseURL: '/publicapply',
-    url: '/bidcoll/action',
+    url: '/publicapply/bidcoll/action',
     method: 'POST',
     data
   })
@@ -49,8 +45,7 @@ export function bidCollAction(data) {
 // 获取用户标讯收藏自定义标签
 export function getBidCollTagList() {
   return request({
-    baseURL: '/publicapply',
-    url: `/bidcoll/getLabel?t=${Date.now()}`,
+    url: `/publicapply/bidcoll/getLabel?t=${Date.now()}`,
     method: 'POST'
   })
 }
@@ -59,8 +54,7 @@ export function getBidCollTagList() {
 export function createBidTag(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/bidcoll/addLabel',
+    url: '/publicapply/bidcoll/addLabel',
     method: 'POST',
     data
   })
@@ -81,8 +75,7 @@ export function createBidTag(data) {
 */
 export function saveBidCollAddTag(data) {
   return request({
-    baseURL: '/publicapply',
-    url: '/bidcoll/label',
+    url: '/publicapply/bidcoll/label',
     method: 'POST',
     data
   })
@@ -92,8 +85,7 @@ export function saveBidCollAddTag(data) {
 export function checkBidsIsColl(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/bidcoll/isColl?t=' + Date.now(),
+    url: '/publicapply/bidcoll/isColl?t=' + Date.now(),
     method: 'POST',
     data
   })
@@ -103,8 +95,7 @@ export function checkBidsIsColl(data) {
 export function getIdentityList() {
   return request({
     timeout: 5000,
-    baseURL: '/publicapply',
-    url: '/identity/list',
+    url: '/publicapply/identity/list',
     method: 'POST'
   })
 }
@@ -112,8 +103,7 @@ export function getIdentityList() {
 // 校验密码
 export function passwordCheck(data) {
   return request({
-    baseURL: '/publicapply',
-    url: '/password/check',
+    url: '/publicapply/password/check',
     method: 'POST',
     data
   })
@@ -122,8 +112,7 @@ export function passwordCheck(data) {
 // 修改密码
 export function passwordUpdate(data) {
   return request({
-    baseURL: '/publicapply',
-    url: '/password/update',
+    url: '/publicapply/password/update',
     method: 'POST',
     data
   })
@@ -133,8 +122,7 @@ export function passwordUpdate(data) {
 export function getUserIdentity(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/identity/maintenance/detail',
+    url: '/publicapply/identity/maintenance/detail',
     method: 'POST',
     data
   })
@@ -143,8 +131,7 @@ export function getUserIdentity(data) {
 export function editUserIdentity(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/identity/maintenance/edit',
+    url: '/publicapply/identity/maintenance/edit',
     method: 'POST',
     data
   })
@@ -154,8 +141,7 @@ export function editUserIdentity(data) {
 export function getActivityConfig(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/activity/day/info',
+    url: '/publicapply/activity/day/info',
     method: 'post',
     data
   })
@@ -165,8 +151,7 @@ export function getActivityConfig(data) {
 export function setReadStatus(data) {
   // data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/customer/read',
+    url: '/publicapply/customer/read',
     method: 'POST',
     data
   })

+ 9 - 9
apps/bigmember_pc/src/api/modules/report.js

@@ -5,7 +5,7 @@ import qs from 'qs'
 export function getReportDetail(data) {
   data = qs.stringify(data)
   return request({
-    url: '/report/detail',
+    url: '/bigmember/report/detail',
     method: 'post',
     data: data
   })
@@ -15,7 +15,7 @@ export function getReportDetail(data) {
 export function getReportIndex(data) {
   data = qs.stringify(data)
   return request({
-    url: '/report/index',
+    url: '/bigmember/report/index',
     method: 'post',
     data: data
   })
@@ -25,7 +25,7 @@ export function getReportIndex(data) {
 export function getReportStartTime(data) {
   data = qs.stringify(data)
   return request({
-    url: '/report/starttime',
+    url: '/bigmember/report/starttime',
     method: 'post',
     data: data
   })
@@ -35,7 +35,7 @@ export function getReportStartTime(data) {
 export function getReportHistoryList(data) {
   data = qs.stringify(data)
   return request({
-    url: '/marketAnalysis/analysisHistory',
+    url: '/bigmember/marketAnalysis/analysisHistory',
     method: 'post',
     data: data
   })
@@ -45,7 +45,7 @@ export function getReportHistoryList(data) {
 export function doReportAnalysis(data) {
   data = qs.stringify(data)
   return request({
-    url: '/marketAnalysis/doAnalysis',
+    url: '/bigmember/marketAnalysis/doAnalysis',
     method: 'post',
     data: data
   })
@@ -55,7 +55,7 @@ export function doReportAnalysis(data) {
 export function getReportAnalysisInfo(data) {
   data = qs.stringify(data)
   return request({
-    url: '/marketAnalysis/getAnalysisResult',
+    url: '/bigmember/marketAnalysis/getAnalysisResult',
     method: 'post',
     data: data
   })
@@ -65,7 +65,7 @@ export function getReportAnalysisInfo(data) {
 export function cancelReportAnalysis(data) {
   data = qs.stringify(data)
   return request({
-    url: '/marketAnalysis/cancel',
+    url: '/bigmember/marketAnalysis/cancel',
     method: 'post',
     data: data
   })
@@ -75,7 +75,7 @@ export function cancelReportAnalysis(data) {
 export function deleteReportItem(data) {
   data = qs.stringify(data)
   return request({
-    url: '/marketAnalysis/delete',
+    url: '/bigmember/marketAnalysis/delete',
     method: 'post',
     data: data
   })
@@ -85,7 +85,7 @@ export function deleteReportItem(data) {
 export function isOfflineReport(data) {
   data = qs.stringify(data)
   return request({
-    url: '/marketAnalysis/isOffline',
+    url: '/bigmember/marketAnalysis/isOffline',
     method: 'post',
     data: data
   })

+ 34 - 39
apps/bigmember_pc/src/api/modules/subscribe.js

@@ -4,7 +4,7 @@ import qs from 'qs'
 // 获取大会员信息(订阅设置)
 export function getBigMemberInfo() {
   return request({
-    url: '/use/info?t=' + Date.now(),
+    url: '/bigmember/use/info?t=' + Date.now(),
     method: 'get'
   })
 }
@@ -12,7 +12,7 @@ export function getBigMemberInfo() {
 // 获取订阅关键词(市场分析报告
 export function getAnalysisrKeyInfo() {
   return request({
-    url: '/marketAnalysis/analysisKeyWord?t=' + Date.now(),
+    url: '/bigmember/marketAnalysis/analysisKeyWord?t=' + Date.now(),
     method: 'get'
   })
 }
@@ -21,7 +21,7 @@ export function getAnalysisrKeyInfo() {
 export function updateKey(data) {
   // data = qs.stringify(data)
   return request({
-    url: '/subscribe/key/update',
+    url: '/bigmember/subscribe/key/update',
     method: 'post',
     data: data
   })
@@ -30,7 +30,7 @@ export function updateKey(data) {
 // 修改区域设置
 export function updateArea(data) {
   return request({
-    url: '/subscribe/area/update',
+    url: '/bigmember/subscribe/area/update',
     method: 'post',
     data: data
   })
@@ -39,7 +39,7 @@ export function updateArea(data) {
 // 修改信息类型
 export function updateInfoType(data) {
   return request({
-    url: '/subscribe/infotype/update',
+    url: '/bigmember/subscribe/infotype/update',
     method: 'post',
     data: data
   })
@@ -48,7 +48,7 @@ export function updateInfoType(data) {
 // 修改采购单位行业
 export function updateBuyClass(data) {
   return request({
-    url: '/subscribe/buyerclass/update',
+    url: '/bigmember/subscribe/buyerclass/update',
     method: 'post',
     data: data
   })
@@ -58,7 +58,7 @@ export function updateBuyClass(data) {
 export function updateProjectMatch(data) {
   data = qs.stringify(data)
   return request({
-    url: '/subscribe/projectmatch/update',
+    url: '/bigmember/subscribe/projectmatch/update',
     method: 'post',
     data: data
   })
@@ -68,7 +68,7 @@ export function updateProjectMatch(data) {
 export function updateOtherBuyClass(data) {
   data = qs.stringify(data)
   return request({
-    url: '/subscribe/otherbuyclass/update',
+    url: '/bigmember/subscribe/otherbuyclass/update',
     method: 'post',
     data: data
   })
@@ -78,7 +78,7 @@ export function updateOtherBuyClass(data) {
 export function updateMatchType(data) {
   data = qs.stringify(data)
   return request({
-    url: '/subscribe/matchtype/update',
+    url: '/bigmember/subscribe/matchtype/update',
     method: 'post',
     data: data
   })
@@ -89,8 +89,7 @@ export function setAreaBuyer(data) {
   data.vSwitch = 'm'
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/subscribe/update',
+    url: '/publicapply/subscribe/update',
     method: 'post',
     data: data
   })
@@ -101,8 +100,7 @@ export function setUserInfoVip(data) {
   data.vSwitch = 'm'
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/subscribe/setUserInfo',
+    url: '/publicapply/subscribe/setUserInfo',
     method: 'post',
     data: data
   })
@@ -112,8 +110,7 @@ export function setUserInfoVip(data) {
 export function getRecommend(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/member',
-    url: '/getRecomKWs',
+    url: '/member/getRecomKWs',
     method: 'post',
     data: data
   })
@@ -124,8 +121,7 @@ export function getPushCount(data) {
   data.vt = 'm'
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/subscribe/keyset/getPushCount',
+    url: '/publicapply/subscribe/keyset/getPushCount',
     method: 'post',
     data: data
   })
@@ -135,7 +131,7 @@ export function getPushCount(data) {
 export function getPushSetDetail(data) {
   data = qs.stringify(data)
   return request({
-    url: '/pushset/detail',
+    url: '/bigmember/pushset/detail',
     method: 'post',
     data: data
   })
@@ -144,8 +140,7 @@ export function getPushSetDetail(data) {
 // 超级订阅订阅设置-修改订阅设置(全量提交,新增接口)
 export function updateVipSubscribe(data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: '/subscribe/vType/update',
+    url: '/jyapi/jybx/subscribe/vType/update',
     method: 'post',
     data: data
   })
@@ -161,8 +156,7 @@ const vtMap = {
 // 企业订阅查询状态
 export function getViewStatus(vt, data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: `/subscribe/${vtMap[vt]}/viewStatus`,
+    url: `/jyapi/jybx/subscribe/${vtMap[vt]}/viewStatus`,
     method: 'post',
     data: data
   })
@@ -171,8 +165,7 @@ export function getViewStatus(vt, data) {
 // 企业订阅接收人员获取
 export function getDistributor(vt, data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: `/subscribe/${vtMap[vt]}/distributor`,
+    url: `/jyapi/jybx/subscribe/${vtMap[vt]}/distributor`,
     method: 'post',
     data: data
   })
@@ -181,8 +174,7 @@ export function getDistributor(vt, data) {
 // 订阅手动分发
 export function getMsgDistributor(data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: '/subscribe/msgDistributor',
+    url: '/jyapi/jybx/subscribe/msgDistributor',
     method: 'post',
     data: data
   })
@@ -191,8 +183,7 @@ export function getMsgDistributor(data) {
 // 用户绑定信息获取
 export function getUserBindInfo(data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: '/subscribe/getUser',
+    url: '/jyapi/jybx/subscribe/getUser',
     method: 'post',
     data: data
   })
@@ -201,8 +192,7 @@ export function getUserBindInfo(data) {
 // 用户绑定信息获取
 export function setUserBindInfo(data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: '/subscribe/setUser',
+    url: '/jyapi/jybx/subscribe/setUser',
     method: 'post',
     data: data
   })
@@ -211,8 +201,7 @@ export function setUserBindInfo(data) {
 // 用户推送设置信息获取
 export function getUserPushInfo(data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: '/subscribe/getPushSet?t=' + Date.now(),
+    url: '/jyapi/jybx/subscribe/getPushSet?t=' + Date.now(),
     method: 'post',
     data: data
   })
@@ -221,8 +210,7 @@ export function getUserPushInfo(data) {
 // 用户推送设置信息设置
 export function setUserPushInfo(data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: '/subscribe/setPushSet',
+    url: '/jyapi/jybx/subscribe/setPushSet',
     method: 'post',
     data: data
   })
@@ -231,8 +219,7 @@ export function setUserPushInfo(data) {
 // 查询用户订阅列表
 export function getStaffSubscribeList(data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: '/subscribe/getStaffSubscribe',
+    url: '/jyapi/jybx/subscribe/getStaffSubscribe',
     method: 'post',
     data: data
   })
@@ -241,17 +228,25 @@ export function getStaffSubscribeList(data) {
 // 查询用户订阅详情
 export function getStaffSubscribeDetail(data) {
   return request({
-    baseURL: '/jyapi/jybx',
-    url: '/subscribe/getStaffSubscribeDetail',
+    url: '/jyapi/jybx/subscribe/getStaffSubscribeDetail',
     method: 'post',
     data: data
   })
 }
 // 采购单位详情未登录右侧数据
 export function relatesInformation(data) {
+  return request({
+    url: '/jyapi/jybx/buyer/relates/information',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取推荐标讯列表数据
+export function getRecommenListData(data) {
   return request({
     baseURL: '/jyapi/jybx',
-    url: '/buyer/relates/information',
+    url: '/subscribe/getRecList',
     method: 'post',
     data: data
   })

+ 10 - 20
apps/bigmember_pc/src/api/modules/svip.js

@@ -7,15 +7,13 @@ export function getSVIPBuyInfo(data) {
   if (data && data.token) {
     data = qs.stringify(data)
     return request({
-      baseURL: '/jypay',
-      url: '/free/seller/svip/getSubBuyMsg',
+      url: '/jypay/free/seller/svip/getSubBuyMsg',
       method: 'POST',
       data
     })
   } else {
     return request({
-      baseURL: '/subscribepay',
-      url: '/vipsubscribe/getSubBuyMsg?t=' + Date.now(),
+      url: '/subscribepay/vipsubscribe/getSubBuyMsg?t=' + Date.now(),
       method: 'POST'
     })
   }
@@ -27,15 +25,13 @@ export function getGoodsPrice(data) {
     // 免登录状态查询
     data = qs.stringify(data)
     return request({
-      baseURL: '/jypay',
-      url: '/free/seller/svip/getPrice',
+      url: '/jypay/free/seller/svip/getPrice',
       method: 'POST',
       data
     })
   } else {
     return request({
-      baseURL: '/subscribepay',
-      url: '/vipsubscribe/getPrice',
+      url: '/subscribepay/vipsubscribe/getPrice',
       method: 'POST'
     })
   }
@@ -46,16 +42,14 @@ export function getSelectPrice(data) {
   if (data && data.token) {
     data = qs.stringify(data)
     return request({
-      baseURL: '/jypay',
-      url: '/free/seller/svip/getSelectPrice',
+      url: '/jypay/free/seller/svip/getSelectPrice',
       method: 'POST',
       data
     })
   } else {
     data = qs.stringify(data)
     return request({
-      baseURL: '/subscribepay',
-      url: '/vipsubscribe/getSelectPrice',
+      url: '/subscribepay/vipsubscribe/getSelectPrice',
       method: 'POST',
       data
     })
@@ -66,8 +60,7 @@ export function getSelectPrice(data) {
 export function createSVIPOrder(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/subscribepay',
-    url: '/vipsubscribe/createOrder',
+    url: '/subscribepay/vipsubscribe/createOrder',
     method: 'POST',
     data
   })
@@ -77,8 +70,7 @@ export function createSVIPOrder(data) {
 export function svipUpgrade(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/subscribepay',
-    url: '/vipsubscribe/upgrade',
+    url: '/subscribepay/vipsubscribe/upgrade',
     method: 'POST',
     data
   })
@@ -88,15 +80,13 @@ export function svipUpgrade(data) {
 export function createCommonOrder(data) {
   if (data && data.token) {
     return request({
-      baseURL: '/jypay',
-      url: '/free/seller/createOrder',
+      url: '/jypay/free/seller/createOrder',
       method: 'POST',
       data
     })
   } else {
     return request({
-      baseURL: '/jypay',
-      url: '/common/createorder',
+      url: '/jypay/common/createorder',
       method: 'POST',
       data
     })

+ 16 - 30
apps/bigmember_pc/src/api/modules/user.js

@@ -4,15 +4,13 @@ import qs from 'qs'
 export function getEntApi(typeobj) {
   if (typeobj && typeobj.noIntercept) {
     return request({
-      baseURL: '/entnicheNew',
-      url: '/buy/whetherbuy',
+      url: '/entnicheNew/buy/whetherbuy',
       method: 'post',
       noIntercept: true // 不走登录拦截逻辑
     })
   } else {
     return request({
-      baseURL: '/entnicheNew',
-      url: '/buy/whetherbuy',
+      url: '/entnicheNew/buy/whetherbuy',
       method: 'post',
       noIntercept: true // 不走登录拦截逻辑
     })
@@ -21,15 +19,14 @@ export function getEntApi(typeobj) {
 
 export function getUserPower() {
   return request({
-    url: '/use/isAdd',
+    url: '/bigmember/use/isAdd',
     method: 'get'
   })
 }
 
 export function getUserAccountInfo() {
   return request({
-    baseURL: '/jypay',
-    url: '/user/getAccountInfo',
+    url: '/jypay/user/getAccountInfo',
     method: 'get'
   })
 }
@@ -37,8 +34,7 @@ export function getUserAccountInfo() {
 // 获取entSearch权限信息
 export function getEntSearchPower() {
   return request({
-    baseURL: '/publicapply',
-    url: '/bidcoll/power',
+    url: '/publicapply/bidcoll/power',
     method: 'POST'
   })
 }
@@ -46,8 +42,7 @@ export function getEntSearchPower() {
 // 获取标讯收藏列表
 export function getEntCollectionList(data) {
   return request({
-    baseURL: '/publicapply',
-    url: '/bidcoll/list',
+    url: '/publicapply/bidcoll/list',
     method: 'POST',
     data
   })
@@ -57,8 +52,7 @@ export function getEntCollectionList(data) {
 export function getAdList(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/jypay',
-    url: '/getAdvertisement',
+    url: '/jypay/getAdvertisement',
     method: 'post',
     data
   })
@@ -68,7 +62,7 @@ export function getAdList(data) {
 export function getUseEquity(data) {
   data = qs.stringify(data)
   return request({
-    url: '/use/equity',
+    url: '/bigmember/use/equity',
     method: 'post',
     data
   })
@@ -78,8 +72,7 @@ export function getUseEquity(data) {
 export function getAllFunctions(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/userbase/allFunctions',
+    url: '/publicapply/userbase/allFunctions',
     method: 'post',
     data
   })
@@ -87,8 +80,7 @@ export function getAllFunctions(data) {
 
 export function getMedicalIndustry(data) {
   return request({
-    baseURL: '/publicapply',
-    url: '/userbase/medical/industryTag',
+    url: '/publicapply/userbase/medical/industryTag',
     method: 'post',
     data
   })
@@ -98,8 +90,7 @@ export function getMedicalIndustry(data) {
 export function getCanUseFunctions(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/userbase/functions',
+    url: '/publicapply/userbase/functions',
     method: 'post',
     data
   })
@@ -109,8 +100,7 @@ export function getCanUseFunctions(data) {
 export function saveCommonFunctions(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/userbase/saveFunctions',
+    url: '/publicapply/userbase/saveFunctions',
     method: 'post',
     data
   })
@@ -120,8 +110,7 @@ export function saveCommonFunctions(data) {
 export function getLeftMenu(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/publicapply',
-    url: '/userbase/bigmemberMenu',
+    url: '/publicapply/userbase/bigmemberMenu',
     method: 'post',
     data
   })
@@ -130,8 +119,7 @@ export function getLeftMenu(data) {
 // 大会员首页消息展示
 export function latestNews() {
   return request({
-    baseURL: '/jymessageCenter',
-    url: '/latestNews',
+    url: '/jymessageCenter/latestNews',
     method: 'post'
   })
 }
@@ -143,8 +131,7 @@ export function latestNews() {
  */
 export function clickMessage(data) {
   return request({
-    baseURL: '/jyapi/messageCenter',
-    url: '/msgOpenLog',
+    url: '/jyapi/messageCenter/msgOpenLog',
     method: 'post',
     data
   })
@@ -157,8 +144,7 @@ export function clickMessage(data) {
  */
 export function readMark(data) {
   return request({
-    baseURL: '/jyapi/messageCenter/',
-    url: '/markRead',
+    url: '/jyapi/messageCenter/markRead',
     method: 'post',
     data
   })

+ 13 - 26
apps/bigmember_pc/src/api/modules/workspace.js

@@ -19,8 +19,7 @@ export function workspaceCommonUse(type, data) {
     return console.warn('未知类型type')
   }
   return request({
-    baseURL: '/userCenter',
-    url: `/workDesktop/renew/${actionMode}`,
+    url: `/userCenter/workDesktop/renew/${actionMode}`,
     method: 'POST',
     data
   })
@@ -29,8 +28,7 @@ export function workspaceCommonUse(type, data) {
 // 获取工作桌面菜单
 export function getWorkspaceMenu() {
   return request({
-    baseURL: '/userCenter',
-    url: '/workDesktop/menuInfo',
+    url: '/userCenter/workDesktop/menuInfo',
     method: 'POST'
   })
 }
@@ -38,8 +36,7 @@ export function getWorkspaceMenu() {
 // 商机管理 - 我的客户
 export function customerQuery(data) {
   return request({
-    baseURL: '/entnicheNew',
-    url: '/customer/query',
+    url: '/entnicheNew/customer/query',
     method: 'POST',
     data
   })
@@ -48,8 +45,7 @@ export function customerQuery(data) {
 // 商机管理 - 客户关注列表
 export function entNewFollowClientList(params) {
   return request({
-    baseURL: '/entnicheNew',
-    url: '/customer/list',
+    url: '/entnicheNew/customer/list',
     method: 'GET',
     params
   })
@@ -59,8 +55,7 @@ export function entNewFollowClientList(params) {
 export function getEmployeeDataOverview(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/entnicheNew',
-    url: '/employeeDataBoard/userDataView',
+    url: '/entnicheNew/employeeDataBoard/userDataView',
     method: 'POST',
     data
   })
@@ -69,8 +64,7 @@ export function getEmployeeDataOverview(data) {
 export function getDepDataOverview(data) {
   data = qs.stringify(data)
   return request({
-    baseURL: '/entnicheNew',
-    url: '/reportform/departDataOverView',
+    url: '/entnicheNew/reportform/departDataOverView',
     method: 'POST',
     data
   })
@@ -79,8 +73,7 @@ export function getDepDataOverview(data) {
 // 商机管理 - 查询用户关键词列表
 export function getEntNicheSubKeyList() {
   return request({
-    baseURL: '/entnicheNew',
-    url: '/subscribe/key/get',
+    url: '/entnicheNew/subscribe/key/get',
     method: 'POST'
   })
 }
@@ -88,8 +81,7 @@ export function getEntNicheSubKeyList() {
 // 消息中心 - 消息列表查询
 export function getMessageCenterList(data) {
   return request({
-    baseURL: '/jyapi/messageCenter',
-    url: '/MessageList',
+    url: '/jyapi/messageCenter/MessageList',
     method: 'POST',
     data
   })
@@ -98,8 +90,7 @@ export function getMessageCenterList(data) {
 // 获工作台介绍
 export function getWhatIsWorkspace() {
   return request({
-    baseURL: '/front',
-    url: '/bootstrap/specification',
+    url: '/front/bootstrap/specification',
     method: 'get'
   })
 }
@@ -107,8 +98,7 @@ export function getWhatIsWorkspace() {
 // 工作台首页-要闻
 export function getWorkspaceNews() {
   return request({
-    baseURL: '/front',
-    url: '/project/importantNews',
+    url: '/front/project/importantNews',
     method: 'get'
   })
 }
@@ -116,8 +106,7 @@ export function getWorkspaceNews() {
 // 工作台首页-行业分析简报
 export function getWorkspaceIndustryReport() {
   return request({
-    baseURL: '/front',
-    url: '/project/deskAnalysisReport',
+    url: '/front/project/deskAnalysisReport',
     method: 'get'
   })
 }
@@ -125,8 +114,7 @@ export function getWorkspaceIndustryReport() {
 // 工作台首页-我的企业关注、项目关注、标讯收藏、认领等权益数量(客户监控在另外接口返回)
 export function getWorkspaceEquityCount() {
   return request({
-    baseURL: '/bigmember',
-    url: '/project/meMonitoring',
+    url: '/bigmember/project/meMonitoring',
     method: 'get'
   })
 }
@@ -134,8 +122,7 @@ export function getWorkspaceEquityCount() {
 // 工作台首页-商机情报、待办消息列表(getMessageCenterList接口简版)
 export function getBusinessTodoList(data) {
   return request({
-    baseURL: '/jyapi/messageCenter',
-    url: '/WorkDeskList',
+    url: '/jyapi/messageCenter/WorkDeskList',
     method: 'POST',
     data
   })

二進制
apps/bigmember_pc/src/assets/images/recommend-hd.png


二進制
apps/bigmember_pc/src/assets/images/setkey-dialog.png


+ 7 - 3
apps/bigmember_pc/src/components/article-item/ArticleItem.vue

@@ -51,10 +51,14 @@
           >企业手动分发</span
         >
         <span class="tag" v-if="article.area">{{ article.area }}</span>
-        <span class="tag orange" v-if="article.type">{{ article.type }}</span>
-        <span class="tag green" v-if="article.buyerclass">{{
-          article.buyerclass
+        <span class="tag orange" v-if="article.type || article.subtype">{{
+          article.type || article.subtype
         }}</span>
+        <span
+          class="tag green"
+          v-if="article.buyerclass || article.buyerClass"
+          >{{ article.buyerclass || article.buyerClass }}</span
+        >
         <span class="tag dpink" v-if="calcBudget && calcBudget !== '0元'">{{
           calcBudget
         }}</span>

+ 5 - 0
apps/bigmember_pc/src/components/dialog/Dialog.vue

@@ -6,6 +6,7 @@
     :show-close="showClose"
     :visible="visible"
     @update:visible="update"
+    v-component-change-mount="{ selector: comMount }"
     @open="$emit('open')"
     @opened="$emit('opened')"
     @close="$emit('close')"
@@ -41,6 +42,10 @@ export default {
   props: {
     visible: Boolean,
     showClose: Boolean,
+    comMount: {
+      type: String,
+      default: ''
+    },
     showFooter: {
       type: Boolean,
       default() {

+ 4 - 1
apps/bigmember_pc/src/components/forecast/ForeCast.vue

@@ -457,7 +457,10 @@
         >前往订阅设置</el-button
       >
     </Empty>
-    <Empty v-else-if="showEmpty && potenCode == 1" images="jy-cry.png">
+    <Empty
+      v-else-if="showEmpty && potenCode == 1"
+      :images="getAssetsFile('empty/jy-cry.png')"
+    >
       <div name="default">
         <div class="poten_tip">暂未设置订阅关键词,无法进行预测</div>
         <div class="setKeyWords" v-if="!info.isSubCount">

+ 2 - 2
apps/bigmember_pc/src/components/push-setting/setList.vue

@@ -14,14 +14,14 @@
               :append-to-body="false"
               placement="top"
               trigger="hover"
-              content="根据订阅条件,未匹配到新的招投标公告信息时,将为您发送提醒通知"
+              content="根据您在平台的订阅词/搜索词/浏览标讯进行联想推荐,剑鱼标讯智能推荐为您推送新的标讯信息。"
             >
               <img
                 src="@/assets/images/icon/help.png"
                 alt=""
                 slot="reference"
               /> </el-popover
-            >消息提醒:
+            >推荐消息提醒:
           </p>
           <el-radio-group v-model="nomsgtipRadio" @input="nomsgtipRadioChange">
             <el-radio :label="1">开启</el-radio>

+ 25 - 2
apps/bigmember_pc/src/components/subscribe-manager/KeyConfig.vue

@@ -7,8 +7,20 @@
           ><em style="color: #2cb7ca"> {{ keyCounts }}</em
           >/{{ maxCount }}</span
         >
-        <p style="font-size: 14px; color: #2cb7ca">
+        <p
+          style="
+            display: flex;
+            align-items: center;
+            font-size: 14px;
+            color: #2cb7ca;
+          "
+        >
           注:任意1组关键词组匹配成功即推送相关信息
+          <img
+            @click="setClickEvent"
+            src="@/assets/images/icon/help.png"
+            class="icon-help-img"
+          />
         </p>
       </div>
       <div class="add-classify" @click="addClassifyFn">
@@ -83,7 +95,8 @@ export default {
         dialog: false,
         className: ''
       },
-      sort: 1
+      sort: 1,
+      showSetKeyDialog: false
     }
   },
   computed: {
@@ -98,6 +111,9 @@ export default {
     }
   },
   methods: {
+    setClickEvent() {
+      this.$emit('closeDilog')
+    },
     onUpdateKey(data) {
       this.keywordsList = data || []
       this.$emit('update', this.keywordsList)
@@ -172,6 +188,13 @@ export default {
     color: #1d1d1d;
     line-height: 28px;
     border-bottom: 1px solid #ececec;
+    .icon-help-img {
+      display: inline-block;
+      width: 18px;
+      height: 18px;
+      margin: 0 7px 0 8px;
+      cursor: pointer;
+    }
     .add-classify {
       width: 110px;
       height: 38px;

+ 1 - 1
apps/bigmember_pc/src/components/subscribe-manager/SubConfig.vue

@@ -233,7 +233,7 @@ export default {
       timeout: null,
       entStatus: false,
       districtMapData: {},
-      areaMapData: {},
+      areaMapData: this.area,
       regionMapData: this.regionMap
     }
   },

+ 36 - 2
apps/bigmember_pc/src/components/subscribe-manager/index.vue

@@ -17,8 +17,23 @@
       :list="setData.keyList"
       :max-count="setData.maxCount"
       @update="onUpdateKey"
+      @closeDilog="showSetKeyDialog = true"
     >
     </KeyConfig>
+    <common-dialog
+      width="500px"
+      :com-mount="'.drawer-dialog'"
+      class="setkey-dialog"
+      :visible="showSetKeyDialog"
+      :show-footer="false"
+    >
+      <img
+        @click="showSetKeyDialog = false"
+        class="setkey-img"
+        src="@/assets/images/setkey-dialog.png"
+        alt=""
+      />
+    </common-dialog>
     <!-- <PushConfig
       :rateModel="setData.rateModel"
       :mailPush="setData.mailPush"
@@ -33,6 +48,7 @@
 <script>
 import SubConfig from '@/components/subscribe-manager/SubConfig'
 import KeyConfig from '@/components/subscribe-manager/KeyConfig'
+import commonDialog from '@/components/dialog/Dialog'
 // import PushConfig from '@/components/subscribe-manager/PushConfig'
 export default {
   name: 'subscribeManage',
@@ -46,7 +62,8 @@ export default {
   },
   components: {
     SubConfig,
-    KeyConfig
+    KeyConfig,
+    commonDialog
   },
   data() {
     return {
@@ -71,7 +88,8 @@ export default {
         canSetCityCount: -1,
         // 县区
         district: {}
-      }
+      },
+      showSetKeyDialog: false
     }
   },
   watch: {
@@ -439,5 +457,21 @@ export default {
       padding: 0 0 32px;
     }
   }
+  .custom-dialog.setkey-dialog {
+    z-index: 2100 !important;
+    .el-dialog__header {
+      display: none;
+    }
+    .el-dialog__body {
+      padding: 0;
+    }
+  }
+}
+</style>
+<style lang="scss" scoped>
+.setkey-img {
+  position: absolute;
+  cursor: pointer;
+  top: calc(100% + 100px);
 }
 </style>

+ 1 - 0
apps/bigmember_pc/src/router/router-interceptors.js

@@ -40,6 +40,7 @@ const powerCheckWhiteList = [
   'unit_portrayal_id',
   'set-password',
   'portrayal_loading',
+  'recommen-list',
   'business_detail'
 ]
 

+ 6 - 0
apps/bigmember_pc/src/router/routers.js

@@ -246,6 +246,12 @@ export default [
     name: 'set-identity-info',
     component: () => import('@/views/accountInfo/SetIdentityInfo.vue')
   },
+  // 推荐标讯列表
+  {
+    path: '/recommen-list',
+    name: 'recommen-list',
+    component: () => import('@/views/recommen-list/recommenList.vue')
+  },
   // 商机情报-详情页
   {
     path: '/business_detail/:id',

+ 5 - 0
apps/bigmember_pc/src/store/workspace/subscribe.js

@@ -13,6 +13,7 @@ export default {
     hasKey: false,
     loading: true,
     loaded: false,
+    isRecommend: '1',
     list: [],
     subscribeKeyList: []
   }),
@@ -22,6 +23,9 @@ export default {
         state.list = list
       }
     },
+    setRecommenStatus(state, f = false) {
+      state.isRecommend = f
+    },
     changeLoading(state, f = false) {
       state.loading = f
     },
@@ -71,6 +75,7 @@ export default {
             }
           })
           // commit('changeHasKeyState', hasKey)
+          commit('setRecommenStatus', data.isRecommend)
           commit('changeList', list)
         }
         commit('changeLoading', false)

+ 207 - 0
apps/bigmember_pc/src/views/recommen-list/recommenList.vue

@@ -0,0 +1,207 @@
+<template>
+  <div class="recommend-list">
+    <div class="recommon-main">
+      <div class="content-header">
+        <span class="header-left card-title">推荐标讯列表</span>
+      </div>
+      <div class="content-config" @click="setKeyEvent">
+        <img src="@/assets/images/recommend-hd.png" alt="" />
+      </div>
+      <FollowOfficialAccountDialog
+        :visible.sync="toFollowOfficialAccount"
+      ></FollowOfficialAccountDialog>
+      <div class="recommend-pushList">
+        <div
+          class="info-list"
+          element-loading-background="rgba(255,255,255, .4)"
+          element-loading-custom-class="self-export-loading"
+          v-loading="exportLoading"
+        >
+          <article-item
+            @setShow="setShow(item._id)"
+            class="list-item"
+            v-for="(item, index) in listState.list"
+            :class="{ visited: item.visited || item.ca_isvisit }"
+            :key="index"
+            :index="index + 1"
+            :article="item"
+            :config="config"
+            :vt="vt"
+            @onClick="toDetail(item)"
+          >
+            <template #right-time>
+              <span>{{ dateFromNow(item.publishTime * 1000) }}</span>
+            </template>
+          </article-item>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ArticleItem from '@/components/article-item/ArticleItem.vue'
+import FollowOfficialAccountDialog from '@/components/dialog/FollowOfficialAccountDialog.vue'
+import {
+  getViewStatus,
+  setSubscribeInfoRead,
+  getRecommenListData
+} from '@/api/modules/'
+import { mixinVisited } from '@/utils/mixins/visited'
+import { dateFromNow, openSelfLink, openLinkInWorkspace } from '@/utils/'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'recommendList',
+  mixins: [mixinVisited],
+  components: {
+    ArticleItem,
+    FollowOfficialAccountDialog
+  },
+  data() {
+    return {
+      listState: {
+        list: []
+      },
+      exportLoading: false,
+      config: {
+        gray: true,
+        table: false,
+        collect: false
+      },
+      statusList: [],
+      vt: '',
+      toFollowOfficialAccount: false
+    }
+  },
+  computed: {
+    ...mapGetters('user', {
+      autoVt: 'vt'
+    })
+  },
+  created() {
+    this.getParams()
+    this.getListData()
+  },
+  methods: {
+    dateFromNow,
+    // 获取列表数据
+    async getListData() {
+      const params = {
+        spath: '1'
+      }
+      const { data, error_code: code } = await getRecommenListData(params)
+      if (code === 0 && data) {
+        this.listState.list = data.list
+      }
+    },
+    getParams() {
+      const { vt } = this.$route.query
+      if (vt) {
+        this.vt = vt
+      } else {
+        this.vt = this.autoVt
+      }
+    },
+    setKeyEvent() {
+      // 前往订阅管理
+      if (this.vt === 'f' || this.vt === 'v') {
+        // 弹窗提示关注公众号
+        this.toFollowOfficialAccount = true
+      } else if (this.vt === 'm') {
+        openSelfLink(this.$router.resolve('/set_subscribe/config'))
+      } else if (this.vt === 's') {
+        // 商机管理跳转老页面(框架内打开)
+        const url = '/entpc/newBus/set_subscribe'
+        window.open(url)
+      }
+    },
+    // 查看分发状态
+    async setShow(id) {
+      const query = {
+        infoId: id
+      }
+      const { data, error_code: code } = await getViewStatus(this.vt, query)
+      if (code === 0) {
+        data.forEach((item) => {
+          if (item.isvisit === 0 || !item.isvisit) {
+            item.isvisit = '未读'
+          } else if (item.isvisit === 1) {
+            item.isvisit = '已读'
+          }
+          if (item.visittime) {
+            item.visittime = `${item.visittime.split(' ')[0]}\n${
+              item.visittime.split(' ')[1]
+            }`
+          } else {
+            item.visittime = '-'
+          }
+          if (item.date) {
+            item.date = `${item.date.split(' ')[0]}\n${item.date.split(' ')[1]}`
+          } else {
+            item.date = '-'
+          }
+        })
+        this.statusList = data
+      }
+    },
+    async toDetail(item) {
+      const { _id, matchKeys, ca_index } = item
+      item.visited = true
+      if (this.vt !== 'q') {
+        await setSubscribeInfoRead(this.vt, {
+          vsid: ca_index,
+          isEnt: this.$route.query?.vt === 'q'
+        })
+      }
+      this.pathVisiting(
+        this.createPathItem('/article/content/*.html', `id=${_id}`)
+      )
+      let match = ''
+      if (Array.isArray(matchKeys) && matchKeys.length) {
+        match = matchKeys.join(' ')
+        if (match) {
+          match = encodeURIComponent(match)
+        }
+      }
+      // 在工作桌面内打开三级页
+      openLinkInWorkspace(true, {
+        url: `/article/content/${_id}.html?kds=${match}`,
+        newTab: true
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.recommend-list {
+  padding: 24px;
+  box-sizing: border-box;
+  background: #fff;
+  .recommon-main {
+    margin: 0 auto;
+    width: 1200px;
+  }
+  ::v-deep {
+    .a-i-right {
+      padding: 8px 0 0 0px;
+    }
+  }
+  .card-title {
+    font-size: 24px;
+    color: #1d1d1d;
+    line-height: 36px;
+  }
+  .content-config {
+    margin-top: 16px;
+    height: 60px;
+    cursor: pointer;
+    & > img {
+      height: 100%;
+      width: 1200px;
+    }
+  }
+  .list-item:hover {
+    background: #f7f9fc;
+  }
+}
+</style>

+ 42 - 2
apps/bigmember_pc/src/views/subscribe/components/key/KeyConfig.vue

@@ -10,11 +10,28 @@
         <span style="font-size: 14px; color: #2cb7ca; margin-left: 16px"
           >注:任意1组关键词组匹配成功即推送相关信息</span
         >
+        <img
+          @click="showSetKeyDialog = true"
+          src="@/assets/images/icon/help.png"
+          class="icon-help-img"
+        />
       </div>
       <div class="add-classfily" @click="addClassfilyFn()">
         <i class="el-icon-plus"></i> 新增分类
       </div>
     </div>
+    <common-dialog
+      width="500px"
+      :visible="showSetKeyDialog"
+      :show-footer="false"
+    >
+      <img
+        @click="showSetKeyDialog = false"
+        class="setkey-img"
+        src="@/assets/images/setkey-dialog.png"
+        alt=""
+      />
+    </common-dialog>
     <div class="key-content">
       <!-- <div v-if="datas.keyList.length === 0">
         <div class="classify-title">
@@ -62,6 +79,7 @@
 import { Input, Button, Dialog, RadioGroup, Radio } from 'element-ui'
 import KeyCard from '@/components/selector/SelectorCard'
 import { setUserInfoVip } from '@/api/modules'
+import commonDialog from '@/components/dialog/Dialog'
 export default {
   name: 'key-config',
   props: {
@@ -77,7 +95,8 @@ export default {
     [Button.name]: Button,
     [RadioGroup.name]: RadioGroup,
     [Radio.name]: Radio,
-    KeyCard
+    KeyCard,
+    commonDialog
     // Edit
   },
   data() {
@@ -85,7 +104,8 @@ export default {
       add: {
         dialog: false,
         className: ''
-      }
+      },
+      showSetKeyDialog: false
     }
   },
   computed: {
@@ -181,6 +201,13 @@ export default {
     color: #1d1d1d;
     line-height: 28px;
     border-bottom: 1px solid #ececec;
+    .icon-help-img {
+      display: inline-block;
+      width: 18px;
+      height: 18px;
+      margin: 0 7px 0 8px;
+      cursor: pointer;
+    }
     .add-classfily {
       width: 110px;
       height: 38px;
@@ -265,5 +292,18 @@ export default {
       width: 352px;
     }
   }
+  ::v-deep {
+    .el-dialog__header {
+      display: none;
+    }
+    .el-dialog__body {
+      padding: 0;
+    }
+  }
+}
+.setkey-img {
+  position: absolute;
+  cursor: pointer;
+  top: calc(100% + 100px);
 }
 </style>

+ 85 - 20
apps/bigmember_pc/src/views/workspace/components/SubscribeList.vue

@@ -1,13 +1,25 @@
 <template>
   <ListCard
     class="subscribe-list"
-    :list="subscribeList"
+    :list="setListData"
     title="订阅推送"
     @clickListItem="clickListItem"
     @linkMore="linkMore"
+    :is-recommend="isRecommend"
     :loading="loading"
     :loaded="loaded"
   >
+    <template #dialog>
+      <FollowOfficialAccountDialog
+        :visible.sync="toFollowOfficialAccount"
+      ></FollowOfficialAccountDialog>
+    </template>
+    <template #warn-text>
+      <div v-show="showRecommend" class="warn-text">
+        <span>标准匹配不精准?</span>
+        <span @click="addSet">点击设置精准匹配></span>
+      </div>
+    </template>
     <div slot="empty-content" class="empty-content">
       <div v-if="emptyButtonShow">
         <p>暂无订阅信息</p>
@@ -24,9 +36,6 @@
         <p v-else>对不起,没有匹配到数据,请修改订阅设置</p>
         <button class="empty-button mt12" @click="addSet">前往订阅设置</button>
       </div>
-      <FollowOfficialAccountDialog
-        :visible.sync="toFollowOfficialAccount"
-      ></FollowOfficialAccountDialog>
     </div>
   </ListCard>
 </template>
@@ -56,8 +65,23 @@ export default {
       hasKey: (state) => state.workspace.subscribe.hasKey, // 是否有订阅关键词
       loading: (state) => state.workspace.subscribe.loading,
       loaded: (state) => state.workspace.subscribe.loaded,
-      subscribeList: (state) => state.workspace.subscribe.list.slice(0, 10)
-    })
+      subscribeList: (state) => state.workspace.subscribe.list.slice(0, 10),
+      isRecommend: (state) => state.workspace.subscribe.isRecommend
+    }),
+    showRecommend() {
+      return this.isRecommend === '2' || this.isRecommend === '3'
+    },
+    setListData() {
+      if (this.showRecommend) {
+        if (this.subscribeList.length > 9) {
+          return this.subscribeList.slice(0, 9)
+        } else {
+          return this.subscribeList
+        }
+      } else {
+        return this.subscribeList
+      }
+    }
   },
   data() {
     return {
@@ -66,7 +90,8 @@ export default {
   },
   created() {
     this.getList({
-      notReturnCount: 1
+      notReturnCount: 1,
+      stag: 'home'
     })
     this.getSubscribeKeywordList({
       vt: this.vt,
@@ -98,20 +123,30 @@ export default {
       })
     },
     linkMore() {
-      tryCallHooks({
-        fn: () => {
-          this.$BRACE.methods.open({
-            route: {
-              link: `/big_subscribe?vt=${this.vt}`,
-              appName: 'big',
-              appType: 'qiankun'
+      if (this.showRecommend) {
+        // 跳转到推荐标讯列表页面
+        openSelfLink(this.$router.resolve('/recommen-list'))
+      } else {
+        tryCallHooks({
+          fn: () => {
+            this.$BRACE.methods.open({
+              route: {
+                link: `/big_subscribe?vt=${this.vt}`,
+                appName: 'big',
+                appType: 'qiankun'
+              }
+            })
+          },
+          spareFn: () => {
+            if (this.showRecommend) {
+              // 跳转到推荐标讯列表页面
+              openSelfLink(this.$router.resolve('/recommen-list'))
+            } else {
+              openSelfLink(this.$router.resolve(`/big_subscribe?vt=${this.vt}`))
             }
-          })
-        },
-        spareFn: () => {
-          openSelfLink(this.$router.resolve(`/big_subscribe?vt=${this.vt}`))
-        }
-      })
+          }
+        })
+      }
     },
     addSet() {
       // 前往订阅管理
@@ -129,3 +164,33 @@ export default {
   }
 }
 </script>
+
+<style lang="scss" scoped>
+.warn-text {
+  padding: 4px 20px;
+  margin-bottom: 8px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 14px;
+  background-color: #fff5ec;
+  & > span {
+    line-height: 22px;
+    color: #ff9f40;
+  }
+  & > span:last-child {
+    cursor: pointer;
+    font-weight: bold;
+  }
+}
+::v-deep {
+  .card-content {
+    padding-left: 0;
+    padding-right: 0;
+  }
+  .article-item.list-item {
+    padding-left: 20px;
+    padding-right: 20px;
+  }
+}
+</style>

+ 7 - 1
apps/bigmember_pc/src/views/workspace/ui/ListCard.vue

@@ -4,7 +4,7 @@
       <div
         slot="header-right"
         class="h-header-more"
-        v-show="list.length !== 0"
+        v-show="list.length !== 0 && isRecommend !== '3'"
         @click="linkMore"
       >
         <span class="more-text">更多</span>
@@ -12,6 +12,8 @@
       </div>
     </slot>
     <div class="list-container" v-loading="loading">
+      <slot name="dialog"></slot>
+      <slot name="warn-text"></slot>
       <slot name="default">
         <ArticleItem
           class="list-item"
@@ -52,6 +54,10 @@ export default {
       type: String,
       default: ''
     },
+    isRecommend: {
+      type: String,
+      default: ''
+    },
     loading: {
       type: Boolean,
       default: false

+ 2 - 1
apps/bigmember_pc/vite.config.js

@@ -8,6 +8,7 @@ import { viteExternalsPlugin } from 'vite-plugin-externals'
 import { getProxyOfDomain } from './config/proxy'
 import { legacyQiankun } from 'vite-plugin-legacy-qiankun'
 import eslintPlugin from 'vite-plugin-eslint'
+import { useServerProxy } from '../../configs/proxy/dev-proxy'
 
 const env = loadEnv(process.env.NODE_ENV, process.cwd())
 
@@ -132,6 +133,6 @@ export default defineConfig({
   },
   server: {
     port: 8081,
-    proxy: getProxyOfDomain('https://www.jianyu360.cn')
+    proxy: useServerProxy('web2')
   }
 })

+ 23 - 13
apps/mobile/src/api/modules/subscribe.js

@@ -4,7 +4,7 @@ import { envs } from '@/utils/prototype/modules/platform'
 
 // 获取用户订阅信息
 // https://yapi.jydev.jianyu360.com/project/63/interface/api/191
-export function getUserSubscribeList (type = 'fType', data) {
+export function getUserSubscribeList(type = 'fType', data) {
   // fType免费用户  vType超级订阅用户  mType大会员用户  eType商机管理用户
   return request({
     url: `/jyapi/jybx/subscribe/${type}/list`,
@@ -13,10 +13,18 @@ export function getUserSubscribeList (type = 'fType', data) {
     data
   })
 }
-
+export function getRecList(data) {
+  // 订阅推荐列表
+  return request({
+    url: '/jyapi/jybx/subscribe/getRecList',
+    method: 'post',
+    noToast: true,
+    data
+  })
+}
 // 获取用户订阅信息其他额外的信息
 // https://yapi.jydev.jianyu360.com/project/63/interface/api/203
-export function getUserSubscribeSomeInfo (type = 'fType') {
+export function getUserSubscribeSomeInfo(type = 'fType') {
   return request({
     url: `/jyapi/jybx/subscribe/${type}/someInfo`,
     method: 'post',
@@ -26,7 +34,7 @@ export function getUserSubscribeSomeInfo (type = 'fType') {
 
 // 获取用户订阅筛选关键词
 // 返回内容中,合并了企业订阅的关键词
-export function getUserSubscribeKeywords (type = 'fType', data) {
+export function getUserSubscribeKeywords(type = 'fType', data) {
   data = qs.stringify(data)
   return request({
     url: `/jyapi/jybx/subscribe/${type}/getKey`,
@@ -37,7 +45,7 @@ export function getUserSubscribeKeywords (type = 'fType', data) {
 }
 
 // 推送数据浏览状态修改
-export function setUserSubscribeListVisited (type = 'fType', data) {
+export function setUserSubscribeListVisited(type = 'fType', data) {
   data = qs.stringify(data)
   return request({
     url: `/jyapi/jybx/subscribe/${type}/setRead`,
@@ -48,17 +56,19 @@ export function setUserSubscribeListVisited (type = 'fType', data) {
 }
 
 // 免费用户设置订阅关键词
-export function freeSubscribeKeys (data) {
+export function freeSubscribeKeys(data) {
   data = qs.stringify(data)
   return request({
-    url: envs.inWX ? '/member/swordfish/ajaxReq' : '/jyapp/member/swordfish/ajaxReq',
+    url: envs.inWX
+      ? '/member/swordfish/ajaxReq'
+      : '/jyapp/member/swordfish/ajaxReq',
     method: 'post',
     data
   })
 }
 
 // 企业订阅接收人员获取
-export function getDistributorPerson (type = 'fType', data) {
+export function getDistributorPerson(type = 'fType', data) {
   // data = qs.stringify(data)
   return request({
     url: `/jyapi/jybx/subscribe/${type}/distributor`,
@@ -69,7 +79,7 @@ export function getDistributorPerson (type = 'fType', data) {
 }
 
 // 订阅页面数据导出接口
-export function getPushListDataExportId (type = 'fType', data) {
+export function getPushListDataExportId(type = 'fType', data) {
   return request({
     url: `/jyapi/jybx/subscribe/${type}/byPushHistory`,
     method: 'post',
@@ -79,7 +89,7 @@ export function getPushListDataExportId (type = 'fType', data) {
 
 // 推送设置接口
 // 用户信息获取
-export function getUser (data) {
+export function getUser(data) {
   return request({
     url: '/jyapi//jybx/subscribe/getUser',
     method: 'post',
@@ -88,7 +98,7 @@ export function getUser (data) {
 }
 
 // 用户信息设置
-export function setUser (data) {
+export function setUser(data) {
   return request({
     url: '/jyapi//jybx/subscribe/setUser',
     method: 'post',
@@ -97,7 +107,7 @@ export function setUser (data) {
 }
 
 // 推送设置获取
-export function getPushSet (data) {
+export function getPushSet(data) {
   return request({
     url: '/jyapi/jybx/subscribe/getPushSet',
     method: 'post',
@@ -106,7 +116,7 @@ export function getPushSet (data) {
 }
 
 // 推送设置修改
-export function setPushSet (data) {
+export function setPushSet(data) {
   return request({
     url: '/jyapi/jybx/subscribe/setPushSet',
     method: 'post',

二進制
apps/mobile/src/assets/image/public/goset.png


+ 14 - 1
apps/mobile/src/router/modules/tabbar.js

@@ -58,7 +58,10 @@ export default [
       {
         path: 'message',
         name: 'tabbar-message',
-        alias: ['/jyapp/frontPage/messageCenter/sess/index', '/weixin/frontPage/messageCenter/sess/index'],
+        alias: [
+          '/jyapp/frontPage/messageCenter/sess/index',
+          '/weixin/frontPage/messageCenter/sess/index'
+        ],
         component: () => import('@/views/tabbar/Message.vue'),
         meta: {
           title: '消息中心',
@@ -76,5 +79,15 @@ export default [
       //   }
       // }
     ]
+  },
+  {
+    path: '/recommendedlist',
+    name: 'tabbar-recommendedlist',
+    component: () => import('@/views/tabbar/RecommendedBannerlist.vue'),
+    meta: {
+      header: true,
+      title: '推荐标讯列表'
+      // tabbar: 'subscribe'
+    }
   }
 ]

+ 3 - 3
apps/mobile/src/views/push/PushSetting.vue

@@ -37,7 +37,7 @@
           </template>
           <div class="noMessage" v-if="item.title === '我的订阅'">
             <div class="left_">
-              <div class="title">消息提醒</div>
+              <div class="title">推荐消息提醒</div>
               <div class="warm" @click.stop="PopupBox"></div>
               <div class="states">{{ item.i_nomsgtip ? '已开启' : '已关闭' }}</div>
             </div>
@@ -748,8 +748,8 @@ export default {
     },
     PopupBox () {
       this.$dialog.confirm({
-        title: '消息提醒',
-        message: '根据订阅条件,未匹配到新的招投标公告信息时,将为您发送提醒通知。',
+        title: '推荐消息提醒',
+        message: '根据您在平台的订阅词/搜索词/浏览标讯进行联想推荐,剑鱼标讯智能推荐为您推送新的标讯信息。',
         className: 'j-confirm-dialog',
         messageAlign: 'left',
         showCancelButton: false,

+ 1 - 1
apps/mobile/src/views/tabbar/Home.vue

@@ -337,7 +337,7 @@ export default {
       //   this.toLogin()
       // }
     },
-    toSearch () {
+    toSearch () { 
       this.$router.push({
         name: 'search-middle-bidding',
         params: {

+ 288 - 0
apps/mobile/src/views/tabbar/RecommendedBannerlist.vue

@@ -0,0 +1,288 @@
+<template>
+  <div class="RecommendedBannerlist">
+    <div class="listContent">
+      <div @click="toSubManagePage">
+        <img src="@/assets/image/public/goset.png" alt="" class="topimg" />
+      </div>
+      <ProjectCell
+        v-for="item in list"
+        class="list-item"
+        cardType="simplify"
+        :class="item.className"
+        :detailList="item.detailList"
+        @click="onClickCell(item)"
+        :title="item.title"
+        :time="item.dateTime"
+        :isFile="item.isFile"
+        :keys="item.matchKeys"
+        :leftTopBadgeText="item.leftTopBadgeText"
+        :tags="item.tagList"
+        :pushSource="item.pushSource"
+        :key="item.id"
+        v-visited:subscribe="item._id"
+      >
+      </ProjectCell>
+      <AppEmpty
+        class="center"
+        state="sleep"
+        v-show="list.length === 0"
+      ></AppEmpty>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters, mapState } from 'vuex'
+import qs from 'qs'
+import { AppEmpty, ProjectCell } from '@/ui'
+import {
+  getRecList,
+  getUserSubscribeSomeInfo,
+  getUserSubscribeKeywords
+} from '@/api/modules'
+import { LINKS } from '@/data'
+import {
+  openAppOrWxPage,
+  openLinkOfOther,
+  getRandomString,
+  formatMoney
+} from '@/utils'
+export default {
+  name: 'RecommendedBannerlist',
+  components: {
+    [ProjectCell.name]: ProjectCell,
+    [AppEmpty.name]: AppEmpty
+  },
+  computed: {
+    ...mapState('user', ['power', 'mySelectEntInfo']),
+    ...mapGetters('user', [
+      'isLogin',
+      'restfulApiUserTypeWitchVSwitch',
+      'vSwitch'
+    ]),
+    isHasKey() {
+      return this.mergedKeywords.length > 0
+    }
+  },
+  data() {
+    return {
+      isEntSubscribe: '',
+      mergedKeywords: [],
+      list: [],
+      // 用户其他信息
+      someInfo: {
+        userId: '',
+        hasKey: false, // 是否订阅关键词
+        isInTSguide: false, // 是否进入向导
+        isExpire: 0, // 超级订阅到期提醒
+        isOnTail: false, // 超级订阅试用状态
+        isPassCount: false, // 推送数量达到上限校验
+        otherFlag: false, // 首次用户推送查询“其他”
+        isread: false, // 某个通知??是否已读
+        industry: [] // 会员订阅的行业
+      }
+    }
+  },
+
+  created() {
+    this.getUserSubscribeSomeInfo()
+    this.getMergedEntSubscribeKeywords()
+    this.getList()
+  },
+  methods: {
+    formatMoney,
+    async onClickCell(item) {
+      const { _id, industry } = item
+      const { inWX } = this.$envs
+      const query = {}
+      if (industry) {
+        query.industry = industry
+      }
+      if (item.matchKeys) {
+        query.keywords = item.matchKeys.join(' ')
+      }
+      const targetMap = {
+        wx: `/article/content/${_id}.html?${qs.stringify(query)}`,
+        h5: `/jyapp/article/content/${_id}.html?${qs.stringify(query)}`,
+        app: `/jyapp/article/content/${_id}.html?${qs.stringify(query)}`
+      }
+      if (!this.isLogin) {
+        return openLinkOfOther(LINKS.APP登录页.app, {
+          query: {
+            url: inWX ? targetMap.wx : targetMap.app
+          }
+        })
+      }
+      openAppOrWxPage(targetMap)
+    },
+    // 去订阅页面
+    toSubManagePage() {
+      const { isUpgrade } = this.power
+      const { isInTSguide } = this.someInfo
+      // 打开订阅页面
+      // 商机管理跳转商机管理页面
+      if (this.vSwitch === 's') {
+        openLinkOfOther('/page_entniche_new/page/subsetting/sub_entrance.html')
+      } else if (this.vSwitch === 'v' || this.vSwitch === 'm') {
+        // 超级订阅/大会员
+        openAppOrWxPage(LINKS.订阅管理页面, {
+          query: {
+            vSwitch: this.vSwitch
+          }
+        })
+      } else {
+        // vSwitch === 'f' || vSwitch === ''
+        // 是否是免费用户订阅升级用户 默认true
+        if (isInTSguide) {
+          openAppOrWxPage(LINKS.老关键词列表)
+        } else {
+          if (isUpgrade || !this.isHasKey) {
+            // 无关键词时候,也要跳转订阅管理
+            openAppOrWxPage(LINKS.订阅管理页面)
+          } else {
+            // 老用户订阅用户跳转老订阅管理
+            openAppOrWxPage(LINKS.老关键词列表)
+          }
+        }
+      }
+
+      // openLinkOfOther(
+      //   '/page_entniche_new/page/sub_management/sub_management_system.html?pagesource=enterprise'
+      // )
+    },
+    // 获取用户订阅信息
+    async getUserSubscribeSomeInfo() {
+      try {
+        const {
+          data = {},
+          error_code: code = 0,
+          // eslint-disable-next-line no-unused-vars
+          error_msg: msg
+        } = await getUserSubscribeSomeInfo(this.restfulApiUserTypeWitchVSwitch)
+        if (code === 0 && data) {
+          Object.assign(this.someInfo, data)
+        }
+      } catch (error) {
+        // eslint-disable-next-line no-empty
+      } finally {
+      }
+    },
+    async getMergedEntSubscribeKeywords() {
+      const {
+        ent_buy_vip: entBuyVip,
+        ent_buy_member: entBuyMember,
+        power_source: powerSource,
+        user_power: userPower
+      } = this.mySelectEntInfo
+      const params = {
+        ent_buy_vip: entBuyVip,
+        ent_buy_member: entBuyMember,
+        powerSource,
+        userPower,
+        isEnt: false
+      }
+      const {
+        data,
+        error_code: code,
+        error_msg: msg
+      } = await getUserSubscribeKeywords(
+        this.restfulApiUserTypeWitchVSwitch,
+        params
+      )
+      if (code === 0) {
+        this.mergedKeywords = data?.items || []
+      } else {
+        // eslint-disable-next-line no-console
+        console.warn(msg)
+      }
+    },
+    async getList() {
+      const loading = this.$toast.loading({
+        duration: 0,
+        message: 'loading...'
+      })
+      const {
+        data = {},
+        error_code: code = 0,
+        error_msg: msg
+      } = await getRecList({ spath: '2' }) // 1订阅更多 2模版消息
+      loading.clear()
+      if (code === 0 && data) {
+        const list = data.list
+        if (Array.isArray(list)) {
+          this.preSortList(list)
+          this.list = list
+        }
+      } else {
+        this.$toast(msg || '请求失败')
+      }
+    },
+    preSortList(list = []) {
+      if (!Array.isArray(list)) return
+      list.forEach(this.preSortItem)
+    },
+    // 格式化查询后的每一项数据
+    preSortItem(item) {
+      if (!item) return
+      const { area, collection, projectInfo } = item
+      const {
+        vip_power: vipPower,
+        member_power: memberPower,
+        user_power: userPower
+      } = this.mySelectEntInfo
+      item.star = !!collection
+      // 参标状态
+      item.isCB = {
+        id: '',
+        value: 0
+      }
+      // 是否有附件
+      item.isFile = item?.ca_fileExists || false
+      item.leftTopBadgeText = item.site === '剑鱼信息发布平台' ? '用户发布' : ''
+      // 拟建项目独有参数
+      if (projectInfo) {
+        Object.assign(item, projectInfo)
+      }
+      if (!Array.isArray(item.matchKeys)) {
+        item.matchKeys = []
+      }
+
+      // 个人订阅下, 来自企业分发的信息(企业超级订阅/企业大会员/企业商机管理), 都要添加标签
+      const powerFromEnt =
+        vipPower === 1 || memberPower === 1 || userPower === 1
+      if (powerFromEnt) {
+        item.pushSource = item.source
+      }
+      const buyerClass =
+        item?.buyerClass && item?.buyerClass !== '其它'
+          ? item?.buyerClass
+          : undefined
+      // 标签
+      item.tagList = [
+        area || '全国',
+        buyerClass,
+        item?.type || item?.subtype,
+        // 有中标金额取中标金额,没有取预算,预算没有置空
+        // eslint-disable-next-line prettier/prettier
+        item?.bidAmount ? formatMoney(item?.bidAmount - 0) : item?.budget ? formatMoney(item?.budget - 0)  : ''
+      ].filter((v) => v)
+
+      // 添加随机id
+      item.id = `${item._id}--${getRandomString(8).toLowerCase()}`
+      item.dateTime = item.publishTime ? item.publishTime * 1000 : ''
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.topimg {
+  width: 100%;
+  display: block;
+  // position: fixed;
+  // top: 0;
+  // left: 0;
+}
+.listContent {
+  // padding-top: 0.96rem;
+}
+</style>

File diff suppressed because it is too large
+ 442 - 154
apps/mobile/src/views/tabbar/Subscribe.vue


+ 0 - 49
apps/work-bench/public/index.html.bak

@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-<<<<<<< HEAD
-    <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/23.8.30/iconfont.css">
-=======
-    <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/23.9.28/iconfont.css">
->>>>>>> main
-    <title>工作台</title>
-    <% if (process.env.NODE_ENV === 'production') { %>
-        <script src="/common-module/public/head.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
-    <% } %>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-<<<<<<< HEAD
-    <script src="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/23.8.30/iconfont.js"></script>
-=======
-    <script src="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/23.9.28/iconfont.js"></script>
->>>>>>> main
-    <script src="//cdn-common.jianyu360.com/cdn/lib/jquery/3.5.1/jquery.min.js"></script>
-
-    <% if (process.env.NODE_ENV === 'production') { %>
-    <!--  临时处理 fotter 中覆盖 appendChild 导致的 qiankun 加载资源异常问题  -->
-    <!--  (后续可尝试从 qiankun 自定义资源拦截排查处理该问题)  -->
-    <script>
-        window._needInjectionTrackStatus = false
-    </script>
-    <script src="/common-module/public/fotter.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
-    <script src="/js/jyWebScoket.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
-    <script src="/common-module/ad/js/msgbuoy.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
-<!--    智能助手-->
-<!--    <script src="/common-module/chat/jy-chat.umd.js?auto=true&v=<%= htmlWebpackPlugin.options.assets.version %>"></script>-->
-    <% } %>
-
-    <% if (process.env.NODE_ENV === 'development') { %>
-    <!-- test--- msg加载 公共js方法 -->
-    <script src="/common-module/ad/js/msgbuoy.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
-    <% } %>
-
-    <!-- built files will be auto injected -->
-  </body>
-</html>

+ 60 - 0
configs/proxy/dev-proxy.js

@@ -0,0 +1,60 @@
+// 代理环境映射表
+const ProxyTargets = {
+  prod: 'https://www.jianyu360.cn',
+  webdev: 'https://webdev-webtest.jydev.jianyu360.com',
+  web3: 'https://jybx3-webtest.jydev.jianyu360.com',
+  web2: 'https://jybx2-webtest.jydev.jianyu360.com',
+  web: 'https://jybx-webtest.jydev.jianyu360.com',
+  app5: 'https://app5-jytest.jydev.jianyu360.com/'
+}
+
+
+// 需要代理的请求前缀
+const ProxyPrefixes = [
+  // 请求代理
+  '/bigmember',
+  '/entbase',
+  '/entnicheNew',
+  '/front',
+  '/userCenter',
+  '/OnlineCourses',
+  '/publicapply',
+  '/privatedata',
+  '/subscribepay',
+  '/salesLeads',
+  '/jyapi',
+  '/jypay',
+  '/jyCoupon',
+  '/jymessageCenter',
+  '/jyMerge',
+  '/leadGeneration',
+  '/member',
+  // 静态资源代理
+  '/commonFunctions',
+  '/common-module',
+  '/public-pc',
+  '/pccss',
+  '/js',
+  '/css',
+  '/antiRes',
+  '/images/wx/'
+]
+
+
+export function useServerProxy (domain, defaultProxy = {}) {
+  const ProxyTarget = ProxyTargets[domain] || domain
+  const DevProxy = Object.assign({}, defaultProxy, {
+    '^/dev-api': {
+      target: ProxyTarget,
+      changeOrigin: true,
+      rewrite: (path) =>
+        path.replace(/^\/dev-api/, '/')
+    }
+  })
+  const ProxyRules = ProxyPrefixes.reduce((a, b) => {
+    a[b] = ProxyTarget
+    return a
+  }, DevProxy)
+
+  return ProxyRules
+}

Some files were not shown because too many files changed in this diff