Merge branch 'feature/comment-0620-ch' into msb_test

fix/0701-ch
ch 2 years ago
commit 46a6767afb

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-06-20 11:38:48 * @Date: 2022-06-20 11:38:48
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-06-29 16:04:59 * @LastEditTime: 2022-06-29 17:41:44
* @Description: file content * @Description: file content
*/ */
@ -15,8 +15,7 @@ const BASE_URL = '/mall/comment';
* @param {*} param0 * @param {*} param0
*/ */
export const ApiGetCommentList = (params) => export const ApiGetCommentList = (params) =>
ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/comment`, { ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/comment`,params, {
...params,
notVerifyToken: true notVerifyToken: true
})); }));
/** /**
@ -24,7 +23,7 @@ export const ApiGetCommentList = (params) =>
* @param {*} param0 * @param {*} param0
*/ */
export const ApiGetCommentCount = ({productId}) => export const ApiGetCommentCount = ({productId}) =>
ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/comment/getAllCommentCountByProductId/${productId}`, { ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/comment/getAllCommentCountByProductId/${productId}`,{}, {
notVerifyToken: true notVerifyToken: true
})); }));
/** /**
@ -44,7 +43,7 @@ export const ApiGetOrderCommentDetail = ({orderId}) =>
* @param {*} param0 * @param {*} param0
*/ */
export const ApiGetCommentDetail = ({commentId}) => export const ApiGetCommentDetail = ({commentId}) =>
ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/comment/getCommentDetail/${commentId}`, { ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/comment/getCommentDetail/${commentId}`,{}, {
notVerifyToken: true notVerifyToken: true
})); }));
/** /**

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-03-17 17:42:32 * @Date: 2022-03-17 17:42:32
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-06-29 17:33:30 * @LastEditTime: 2022-06-29 17:37:04
* @Description: 项目接口请求统一处理器返回一个需要token和不需要token的请求封装方法 * @Description: 项目接口请求统一处理器返回一个需要token和不需要token的请求封装方法
*/ */
@ -107,15 +107,15 @@ MsbRequestTk.baseUrl = ENV.baseUrl;
MsbRequestTk.use('request', (option) => { MsbRequestTk.use('request', (option) => {
const token = $store.state.token; const token = $store.state.token;
option.header.uid = uuid; option.header.uid = uuid;
debugger
if(!token && !option.headers.notVerifyToken){ if(!token && !option.header.notVerifyToken){
// 登录状态处理没有token直接跳转至登录 // 登录状态处理没有token直接跳转至登录
uni.redirectTo({ uni.redirectTo({
url: '/login' url: '/login'
}); });
return Promise.reject({message:'要先登录才能操作哦~'}); return Promise.reject({message:'要先登录才能操作哦~'});
} }
delete option.headers.notVerifyToken delete option.header.notVerifyToken
option.header = {...option.header, Authorization:token}; option.header = {...option.header, Authorization:token};
if(option.header.repeat){ if(option.header.repeat){

Loading…
Cancel
Save