diff --git a/.env b/.env index 83a9ced..2d1b476 100644 --- a/.env +++ b/.env @@ -1,5 +1,12 @@ # API VITE_SYSTEM_URL = "http://w6972efb.natappfree.cc" +# VITE_SYSTEM_URL = "https://dev.cqjcteach.cn/prod-api" + +# 第三方客户 channelId +VITE_CHANNEL_ID = "7b81ec142eca42baa045820793b821bb" + +# 第三方客户 groupId +VITE_GROUP_ID = "793db3a29c7846e198d71a1100d9d67b" #文档地址 VITE_DOC_URL = "http://f69dbab6.natappfree.cc" \ No newline at end of file diff --git a/App.vue b/App.vue index ad79bad..38747c6 100644 --- a/App.vue +++ b/App.vue @@ -1,13 +1,13 @@ diff --git a/api/index.js b/api/index.js index 3fd9fb3..a299327 100644 --- a/api/index.js +++ b/api/index.js @@ -138,3 +138,12 @@ export const getTencentUserSig = () => { }) } + +/** 根据ip判断是否黑名单 */ +export const getIpBlack = (loading = true) => { + return http({ + url: '/api/free/black/isBlack', + method: 'get', + loading + }) +} \ No newline at end of file diff --git a/api/my-index.js b/api/my-index.js index d803d75..de63286 100644 --- a/api/my-index.js +++ b/api/my-index.js @@ -267,3 +267,11 @@ export const getUserNoticeDetail = id => { method: 'get' }) } + +/** 客服列表 */ +export const getUserServiceList = () => { + return http({ + url: '/api/service/customerStaff/list', + method: 'get' + }) +} diff --git a/api/tui-kit.js b/api/tui-kit.js index 2bdd937..dc0bd6f 100644 --- a/api/tui-kit.js +++ b/api/tui-kit.js @@ -139,3 +139,20 @@ export const getLiveActivityRecord = id => { method: 'get' }) } + +/** 直播记录列表 */ +export const getLiveRecordList = data => { + return http({ + url: `/api/service/imLiveRoom/list`, + method: 'get', + data + }) +} + +/** 直播记录详情 */ +export const getLiveRecordDetail = id => { + return http({ + url: `/api/service/imLiveRoom/${id}`, + method: 'get' + }) +} diff --git a/pages.json b/pages.json index 3ee4478..5d29aab 100644 --- a/pages.json +++ b/pages.json @@ -208,7 +208,7 @@ { "path": "pages/my-index/meeting-record/index", "style": { - "navigationBarTitleText": "会议记录", + "navigationBarTitleText": "直播记录", "navigationBarBackgroundColor": "#ffffff" } }, @@ -225,6 +225,12 @@ "navigationBarTitleText": "客服" } }, + { + "path": "pages/my-index/customer-service/third-party", + "style": { + "navigationBarTitleText": "第三方客服" + } + }, { "path": "pages/my-index/set-up/index", "style": { @@ -323,6 +329,12 @@ "navigationBarTitleText": "拼团记录" } }, + { + "path": "pages/shop-together/share", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/discover/ranking-list", "style": { @@ -400,6 +412,12 @@ "titleNView": false } } + }, + { + "path": "pages/adduser/index", + "style": { + "navigationBarTitleText": "添加好友" + } } ], "globalStyle": { @@ -441,4 +459,4 @@ } ] } -} +} \ No newline at end of file diff --git a/pages/address/index.vue b/pages/address/index.vue index 4c7d03e..89a2054 100644 --- a/pages/address/index.vue +++ b/pages/address/index.vue @@ -126,6 +126,9 @@ diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue index 4072a4b..a150567 100644 --- a/pages/discover/discover.vue +++ b/pages/discover/discover.vue @@ -1,6 +1,9 @@