msb-mca
/
shop-app
2.1k
2
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev1.0.0' into develop

Browse Source
msb_beta
ch 3 years ago
parent 9f5f5fdb43 562a8cdbae
commit 61a94dc2fc
17 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File

8
common/plugins/msbUniRequest.js
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-03-17 16:36:59 * @Date: 2022-03-17 16:36:59
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-20 10:41:17 * @LastEditTime: 2022-04-20 11:57:58
* @Description: 针对uniapp request请求做了一次封装，使用思维参考axios * @Description: 针对uniapp request请求做了一次封装，使用思维参考axios
* *
* *
@ -59,9 +59,10 @@ class MsbUniRequest {
method(option){ method(option){
option.header = {...this.header,...option.header}; option.header = {...this.header,...option.header};
option.url = this.baseUrl + option.url; option.url = this.baseUrl + option.url;
if(this.hook.request && !option.header){ if(this.hook.request){
option = this.hook.request(option); option = this.hook.request(option);
} };
if(!option){ if(!option){
throw new Error('没有请求配置，或是request拦截未做return'); throw new Error('没有请求配置，或是request拦截未做return');
} }
@ -69,6 +70,7 @@ class MsbUniRequest {
return option return option
} }
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject)=>{
console.log(option);
uni.request({ uni.request({
...option, ...option,
success: res => { success: res => {

9
common/utils/requset.js
Unescape View File

@ -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-04-20 11:03:08 * @LastEditTime: 2022-04-20 11:52:43
* @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法 * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
*/ */
@ -11,8 +11,8 @@ import $store from '@/common/store';
const ENV = 'test'; const ENV = 'test';
const BASE_URL = { const BASE_URL = {
'test' : 'http://k8s-horse-gateway.mashibing.cn', // 'test' : 'http://k8s-horse-gateway.mashibing.cn',
// 'test' : '', 'test' : '',
'release' : '', 'release' : '',
'prod' : '' 'prod' : ''
}; };
@ -102,7 +102,7 @@ MsbRequestTk.use('request', (option) => {
page.$Router.replace('/login'); page.$Router.replace('/login');
return Promise.reject({message:'要先登录才能操作哦~'}); return Promise.reject({message:'要先登录才能操作哦~'});
}else{ }else{
option.header = {...option.header, Authorization:$store.state.token}; option.header = {...option.header, Authorization:token};
if(option.header.repeat){ if(option.header.repeat){
// 如果当前请求不允许重复调用，则检查重复请求，当前接口有正在请求则不发起请求 // 如果当前请求不允许重复调用，则检查重复请求，当前接口有正在请求则不发起请求
@ -111,6 +111,7 @@ MsbRequestTk.use('request', (option) => {
return isRepeatVerify; return isRepeatVerify;
} }
} }
console.log(option);
return option; return option;
} }
}) })

2
h5/index.html
Unescape View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.70f3e4b8.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.f2ba7ba9.js></script></body></html>

2
h5/static/js/index.70f3e4b8.js → h5/static/js/index.f2ba7ba9.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.64dbd10d.js → h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.7473f8b1.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.a67d1002.js → h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.982d4b88.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-index.00371bc7.js → h5/static/js/pages-account-index.606a0016.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-setting-setName.32709783.js → h5/static/js/pages-account-setting-setName.c5273ae6.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-goods-detail-index.f83768a7.js → h5/static/js/pages-goods-detail-index.219fc095.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-login.5e18e6cd.js → h5/static/js/pages-login.dddb55b7.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-detail-index.98291f55.js → h5/static/js/pages-order-detail-index.04c5950e.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-logisitcsInfo.f1943d16.js → h5/static/js/pages-order-logisitcsInfo.85b1801d.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-saleAfter-saleAfterApply.89a55ee6.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-saleAfter-saleAfterApply.ac1aa539.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterEdit.9cf90c6a.js → h5/static/js/pages-order-saleAfter-saleAfterEdit.254f6eb1.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterSelect.63359c85.js → h5/static/js/pages-order-saleAfter-saleAfterSelect.eacf1061.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-submit.566e5e74.js → h5/static/js/pages-order-submit.438ce29e.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save