From 74d35a6491a937847fabe27a6ac1a48c489b7216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kaizheng=28=E9=83=91=E5=87=AF=29?= Date: Tue, 4 Mar 2025 12:10:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 36 +++---- src/api/tg.js | 8 +- src/utils/request.js | 46 ++++----- src/views/Circle/components/ChatFrame.vue | 117 ++++++++++------------ src/views/Tg/index.vue | 6 ++ 5 files changed, 103 insertions(+), 110 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index e780a46..90413b0 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,4 +1,4 @@ -import request from "../utils/request"; +import request from "../utils/request" // 登录 export function queryLogin(queryParams) { @@ -6,7 +6,7 @@ export function queryLogin(queryParams) { url: "/app/user/login", method: "get", params: queryParams, - }); + }) } export function getUserAuthInfo(data) { @@ -14,7 +14,7 @@ export function getUserAuthInfo(data) { url: "/app/user/getUserAuthInfo", method: "post", data, - }); + }) } /** @@ -27,7 +27,7 @@ export function queryCommentList(queryParams) { url: "/admin/comment/queryCommentList", method: "post", data: queryParams, - }); + }) } // APP首页查询精品专栏（只返回id,名称） @@ -36,7 +36,7 @@ export function queryMainColumnList(queryParams) { url: "/app/video/live/column/list/main", method: "get", params: queryParams, - }); + }) } // 查询栏目列表 export function queryColumnList(queryParams) { @@ -44,7 +44,7 @@ export function queryColumnList(queryParams) { url: "/app/video/live/column/list", method: "get", params: queryParams, - }); + }) } // APP查询视频列表 // type 1 直播计划 2 直播列表 3 投顾直播列表 4 我的关注 @@ -53,7 +53,7 @@ export function queryLivePlan(queryParams) { url: "/app/video/live/info/list", method: "post", data: queryParams, - }); + }) } // APP查询视频列表（新） @@ -62,7 +62,7 @@ export function queryLivePlanNew(queryParams) { url: "/app/video/live/info/listNew", method: "post", data: queryParams, - }); + }) } //APP查询推荐位列表 @@ -71,7 +71,7 @@ export function queryRecommendList(queryParams) { url: "/app/common/recommend/list", method: "get", params: queryParams, - }); + }) } // app查询视频标签列表 @@ -79,7 +79,7 @@ export function queryVideoTagList() { return request({ url: "/app/video-tag/list", method: "post", - }); + }) } // APP关注投顾 @@ -88,7 +88,7 @@ export function attentionTg(queryParams) { url: "/app/advisor/info/follow", method: "post", data: queryParams, - }); + }) } // APP查询用户预约、浏览 @@ -97,7 +97,7 @@ export function getSubscribeList(queryParams) { url: "/app/video/live/getSubscribeList", method: "get", params: queryParams, - }); + }) } // 查询关注投顾列表 @@ -106,7 +106,7 @@ export function getFollowTgList(queryParams) { url: "/app/advisor/info/listFollow", method: "get", params: queryParams, - }); + }) } // 获取有直播的日期 @@ -115,7 +115,7 @@ export function getLiveHistory(queryParams) { url: "/app/video/live/subscribe/history", method: "get", params: queryParams, - }); + }) } // 获取全部订单 @@ -124,7 +124,7 @@ export function queryUserOrderList(queryParams) { url: "/frontend/module/getUserOrderList", method: "post", data: queryParams, - }); + }) } // 微信授权登录 @@ -133,7 +133,7 @@ export function wxLogin(queryParams) { url: "/admin/wechat/codeToken", method: "post", data: queryParams, - }); + }) } // 获取C端用户信息 @@ -142,7 +142,7 @@ export function getUserInfo(queryParams) { url: "/app/user/getUserInfo", method: "post", data: queryParams, - }); + }) } // app获取原始链接 @@ -151,5 +151,5 @@ export function getUrlOriginal(queryParams) { url: "/app/url/original", method: "post", data: queryParams, - }); + }) } diff --git a/src/api/tg.js b/src/api/tg.js index 847a645..e815a30 100644 --- a/src/api/tg.js +++ b/src/api/tg.js @@ -1,4 +1,4 @@ -import request from "../utils/request"; +import request from "../utils/request" // APP查询投顾详情 export function queryTgInfo(queryParams) { @@ -6,7 +6,7 @@ export function queryTgInfo(queryParams) { url: `/app/advisor/info/get`, method: "get", params: queryParams, - }); + }) } // 查询观点包列表 @@ -15,7 +15,7 @@ export function queryPackageList(queryParams) { url: `/app/view/package/list`, method: "POST", data: queryParams, - }); + }) } export function queryTgTab(queryParams) { @@ -23,5 +23,5 @@ export function queryTgTab(queryParams) { url: `/app/mainTab/info/list`, method: "POST", data: queryParams, - }); + }) } diff --git a/src/utils/request.js b/src/utils/request.js index f930d43..af34b25 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,18 +1,18 @@ /* eslint-disable no-param-reassign */ -import axios from "axios"; +import axios from "axios" // import { Notification, MessageBox, Message } from "element-ui"; // import router from "@/router/index"; -import store from "../store"; -import { showToast, showDialog } from "vant"; -import { userLogin } from "@/utils/login"; -import router from "@/router/index"; -import { terminalType } from "@/utils/index"; +import store from "../store" +import { showToast, showDialog } from "vant" +import { userLogin } from "@/utils/login" +import router from "@/router/index" +import { terminalType } from "@/utils/index" // 创建axios实例 const service = axios.create({ baseURL: process.env.VUE_APP_BASE_API, // api 的 base_url timeout: 5000, // 请求超时时间 -}); +}) // request拦截器 service.interceptors.request.use( @@ -22,17 +22,17 @@ service.interceptors.request.use( store.state.token && !["/previewQuestion"].includes(router.currentRoute.value.path) ) { - config.headers.token = `${store.state.token}`; // 让每个请求携带自定义token 请根据实际情况自行修改 + config.headers.token = `${store.state.token}` // 让每个请求携带自定义token 请根据实际情况自行修改 } - return Promise.resolve(config); + return Promise.resolve(config) }, (error) => { // Do something with request error - console.log(error); // for debug + console.log(error) // for debug // Promise.reject(error) - Promise.reject(error); + Promise.reject(error) } -); +) // response 拦截器 service.interceptors.response.use( @@ -45,21 +45,21 @@ service.interceptors.response.use( message: response.data.message, showConfirmButton: "重新登陆", }).then(() => { - userLogin(); - }); - return response.data; + userLogin() + }) + return response.data } else { - userLogin(); - return response.data; + userLogin() + return response.data } } else if (response.data.code !== 0) { - showToast(response.data.message); + showToast(`${response.data.message}-${response.data.requestId}`) } - return response.data; + return response.data }, (error) => { - error && error.message && showToast(`${error.config.url}-${error.message}`); - return Promise.reject(error); + error && error.message && showToast(`${error.config.url}-${error.message}`) + return Promise.reject(error) } -); -export default service; +) +export default service diff --git a/src/views/Circle/components/ChatFrame.vue b/src/views/Circle/components/ChatFrame.vue index eac9180..91ac5fa 100644 --- a/src/views/Circle/components/ChatFrame.vue +++ b/src/views/Circle/components/ChatFrame.vue @@ -6,8 +6,7 @@ v-if="affirmDate.length" name="cross" color="#1989fa" - @click.stop="clearAffirmDate" - /> + @click.stop="clearAffirmDate" />

@@ -29,15 +28,13 @@ `li${item.id}`, item.userId === store.state.userInfo.userId ? 'row-reverse' : '', ]" - :key="item.id" - > + :key="item.id">
+ ">
{{ item.chatTime }}
@@ -47,23 +44,19 @@ item.userId === store.state.userInfo.userId ? 'row-reverse' : '', - ]" - > + ]">
+ " /> + :src="defaultAvatar.assistant" /> + :src="item.userHeadPicUrl || defaultAvatar.student" />
@@ -120,13 +112,11 @@ {{ item.replyMessage?.content }}
@@ -144,8 +134,7 @@ + :src="item.content" />
@@ -162,24 +151,22 @@ :min-date="minDate" :max-date="maxDate" @confirm="onConfirm" - @cancel="onCancel" - /> + @cancel="onCancel" /> + src="@/assets/images/refresh.png" />