Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mobile-web/src/api/promotion.js
#	mobile-web/src/config/request.js
This commit is contained in:
sin
2019-04-08 23:41:25 +08:00
41 changed files with 1193 additions and 185 deletions

View File

@@ -135,8 +135,8 @@ service.interceptors.request.use(
const { target, prefix } = serviceRouter(config.url)
let url = config.url = config.url.replace(`${prefix}`, target);
// TODO 芋艿,这些 url 不用增加认证 token 。可能这么写,有点脏,后面看看咋优化下。
if (url.indexOf('user-api/users/passport/mobile/send_register_code') != -1
|| url.indexOf('user-api/users/passport/mobile/register') != -1) {
if (url.indexOf('user-api/users/passport/mobile/send_register_code') !== -1
|| url.indexOf('user-api/users/passport/mobile/register') !== -1) {
return config;
}