Skip to content

P
project-www-pc
提交 841a7546 authored 作者: lihuihui's avatar lihuihui
浏览文件
操作

update

上级 27eb7cb0
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 299 行增加 和 135 行删除
.nuxt/index.js
浏览文件 @ 841a7546
...@@ -13,7 +13,7 @@ import { setContext, getLocation, getRouteData, normalizeError } from './utils' ...@@ -13,7 +13,7 @@ import { setContext, getLocation, getRouteData, normalizeError } from './utils'
/* Plugins */ /* Plugins */
import nuxt_plugin_plugin_430d6d16 from 'nuxt_plugin_plugin_430d6d16' // Source: ./components/plugin.js (mode: 'all') import nuxt_plugin_plugin_430d6d16 from 'nuxt_plugin_plugin_430d6d16' // Source: ./components/plugin.js (mode: 'all')
import nuxt_plugin_axios_65ca092c from 'nuxt_plugin_axios_65ca092c' // Source: ./axios.js (mode: 'all') import nuxt_plugin_axios_2228ef02 from 'nuxt_plugin_axios_2228ef02' // Source: ../plugins/axios (mode: 'all')
import nuxt_plugin_elementui_d905880e from 'nuxt_plugin_elementui_d905880e' // Source: ../plugins/element-ui (mode: 'all') import nuxt_plugin_elementui_d905880e from 'nuxt_plugin_elementui_d905880e' // Source: ../plugins/element-ui (mode: 'all')
import nuxt_plugin_vueswiper_9e702eda from 'nuxt_plugin_vueswiper_9e702eda' // Source: ../plugins/vue-swiper.js (mode: 'client') import nuxt_plugin_vueswiper_9e702eda from 'nuxt_plugin_vueswiper_9e702eda' // Source: ../plugins/vue-swiper.js (mode: 'client')
...@@ -183,8 +183,8 @@ async function createApp(ssrContext, config = {}) { ...@@ -183,8 +183,8 @@ async function createApp(ssrContext, config = {}) {
await nuxt_plugin_plugin_430d6d16(app.context, inject) await nuxt_plugin_plugin_430d6d16(app.context, inject)
} }
if (typeof nuxt_plugin_axios_65ca092c === 'function') { if (typeof nuxt_plugin_axios_2228ef02 === 'function') {
await nuxt_plugin_axios_65ca092c(app.context, inject) await nuxt_plugin_axios_2228ef02(app.context, inject)
} }
if (typeof nuxt_plugin_elementui_d905880e === 'function') { if (typeof nuxt_plugin_elementui_d905880e === 'function') {
......
.nuxt/utils.js
浏览文件 @ 841a7546
...@@ -200,7 +200,7 @@ export async function setContext (app, context) { ...@@ -200,7 +200,7 @@ export async function setContext (app, context) {
payload: context.payload, payload: context.payload,
error: context.error, error: context.error,
base: app.router.options.base, base: app.router.options.base,
env: {} env: {"projectId":"6800242743894343680","baseURL":"https://project-api.ezijing.com"}
} }
// Only set once // Only set once
......
api/index.js 0 → 100644
浏览文件 @ 841a7546
import httpRequest from '@/utils/httpRequest'
// 获取新闻列表
export function getNewsList(params) {
return httpRequest.get(`/api/zws/v1/cms/news`, { params })
}
// 获取新闻详情
export function getNewsDetails(params) {
return httpRequest.get(`/api/zws/v1/cms/new`, { params })
}
/**
* 发送验证码
*/
export function sendCode(data) {
return httpRequest.post('/api/usercenter/user/send-code', data)
}
/**
* 检验验证码
*/
export function checkCode(params) {
return httpRequest.get('/api/usercenter/user/check-code', { params })
}
/**
* 提交留咨信息
*/
export function postNes(data) {
return httpRequest.post('/api/enrollment/v1.0/applications', data)
}
api/my.js 0 → 100644
浏览文件 @ 841a7546
import httpRequest from '@/utils/httpRequest'
const projectId = process.env.projectId
/**
* 获取用户信息
*/
export function getUser() {
return httpRequest.get('/api/passport/account/get-user-info')
}
/**
* 修改用户信息
*/
export function updateUser(data) {
return httpRequest.post('/api/usercenter/user/update-user', data)
}
/**
* 修改密码
*/
export function updatePassword(data) {
return httpRequest.post('/api/usercenter/user/update-pwd', data)
}
/**
* 发送验证码
*/
export function sendCode(data) {
return httpRequest.post('/api/usercenter/user/send-code', data)
}
/**
* 检验验证码
*/
export function checkCode(params) {
return httpRequest.get('/api/usercenter/user/check-code', { params })
}
/**
* 获取报名信息
*/
export function getApplication(params) {
return httpRequest.get(`/api/enrollment/v1.0/application-materials/${projectId}`, { params })
}
/**
* 获取报名信息
*/
export function updateApplication(data) {
return httpRequest.post(`/api/enrollment/v1.0/application-materials/${projectId}/put`, data, {
headers: { 'Content-Type': 'application/json' }
})
}
/**
* 获取报名审核状态
*/
export function getApplicationStatus() {
return httpRequest.get(`/api/enrollment/v1.0/application-materials/profile/${projectId}`)
}
/**
* 获取支付二维码
*/
export function getOrder(params) {
return httpRequest.get(
`/api/enrollment/v1.0/application-materials/payment-records/request/${projectId}/APPLICATION_FEE`,
{ params }
)
}
/**
* 检查支付状态
*/
export function checkPay(id, params) {
return httpRequest.get(
`/api/enrollment/v1.0/application-materials/payment-records/check-status/${projectId}/APPLICATION_FEE/${id}`,
{ params }
)
}
/**
* 写推荐信
*/
export function addLetter(userId, letterId, data) {
return httpRequest.post(
`/api/enrollment/v1.0/application-materials/reco-letters/submit/${projectId}/${userId}/${letterId}/put`,
data,
{
headers: { 'Content-Type': 'application/json' }
}
)
}
/**
* 更换推荐人
*/
export function updateProvider(letterId, data) {
return httpRequest.post(
`/api/enrollment/v1.0/application-materials/reco-letters/change-provider/${projectId}/${letterId}/put`,
data,
{
headers: { 'Content-Type': 'application/json' }
}
)
}
/**
* 再次邀请
*/
export function sendToProvider(letterId) {
return httpRequest.get(
`/api/enrollment/v1.0/application-materials/reco-letters/send-invitation-to-provider/${projectId}/${letterId}`
)
}
/**
* 退出登录
*/
export function logout() {
return httpRequest.get('/api/passport/rest/logout')
}
/**
* 更改附件状态
*/
export function changeFileStatus(userId, recordId, status) {
return httpRequest.get(
`/api/enrollment/v1.0/application-materials/attachments/change-status/${projectId}/${userId}/${recordId}`,
{ params: { status } }
)
}
/**
* 修改用户信息
*/
export function getOpenId(data) {
return httpRequest.post('/api/usercenter/v1/wechat/get-openid', data)
}
/**
* 签名
*/
export function createSign(data) {
return httpRequest.post('/api/usercenter/v1/sign/sign', data)
}
/**
* 获取签名文档
*/
export function getSignDocument(params) {
return httpRequest.get('/api/usercenter/v1/sign/document', { params })
}
/**
* 提交留咨信息
*/
export function postNes(obj) {
return httpRequest.post('/new-app/v1.0/applications', obj, {
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
})
}
components/about/detail.vue
浏览文件 @ 841a7546
...@@ -4,13 +4,10 @@ ...@@ -4,13 +4,10 @@
<div class="el-icon-arrow-left"></div> <div class="el-icon-arrow-left"></div>
<div class="text">返回</div> <div class="text">返回</div>
</div> </div>
<div class="times">{{ data.created_time }}</div> <div class="times">{{ data.created_at }}</div>
<div class="titles">{{ data.title }}</div> <div class="titles">{{ data.title }}</div>
<div class="article-content" v-html="data.content"> <img :src="data.web_img_uri" alt="">
<!-- 当今世界正经历百年未有之大变局，中国正在努力构建“双循环”新格局，深化金融改革信号明确，我们迫切需要什么样的金融人才？如何培养担当大任的金融领军人才？ <div class="article-content" v-html="data.abstract"></div>
10月16日上午，由紫荆教育、印第安纳大学KELLEY商学院主办，中国教育发展战略学会支持的2020（第七届）紫荆·国际金融人才论坛暨“中国未来金融领袖计划”新闻发布会在北京威斯汀酒店举行，权威大咖云集，观点激荡碰撞出独家思想盛宴。紫荆教育董事长张博、资深副总裁金梅，全国社会保障基金理事会原副理事长、中国基金业协会母基金专委会主席王忠民，中国银行业协会东方银行业高级管理人员研修院院长助理唐绍云，中国教育发展战略学会教育认证专业委员会秘书长顾占春，清华大学公共管理学院中国公共领导力中心副主任于永达，清华大学五道口金融学院业界导师、香港致富证券首席经济学家肇越，天风证券首席风险官王勇，人民网、新华网、新浪网、凤凰网、搜狐视频、网易网等媒体朋友参加了论坛。
<img src="https://zws-imgs-pub.ezijing.com/static/public/c563a1e422b67a14b9fb22ea86d56e0b.png" alt=""> -->
</div>
<div class="recommend-content"> <div class="recommend-content">
<div class="titles"> <div class="titles">
<div class="line"></div> <div class="line"></div>
...@@ -35,17 +32,15 @@ export default { ...@@ -35,17 +32,15 @@ export default {
} }
}, },
async fetch() { async fetch() {
this.data = await this.$axios.$get(`/api/zws/v1/cms/news/${this.$route.query.id}`).then(res => { this.data = await this.$axios.get(`/api/cms/api/v1/article/${this.$route.query.id}/detail`).then(res => {
return res return res.data
}) })
const params = { const params = {
page: 1, project_id: process.env.projectId,
per_page: 100, type_tag: 'article_news'
type: 74,
project_id: 1013
} }
this.listData = await this.$axios.$get('/api/zws/v1/cms/news', { params }).then(res => { this.listData = await this.$axios.get('/api/cms/api/v1/articles', { params }).then(res => {
return res.filter((item, index) => { return res.data.data.filter((item, index) => {
return index < 3 return index < 3
}) })
}) })
......
components/about/news.vue
浏览文件 @ 841a7546
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<ul class="list-content"> <ul class="list-content">
<template v-for="(item, index) in listData"> <template v-for="(item, index) in listData">
<li @click="goDetail(item)" :key="index"> <li @click="goDetail(item)" :key="index">
<img :src="item.photo_uri" alt=""> <img :src="item.web_img_uri" alt="">
<div class="right-con"> <div class="right-con">
<div class="time">{{ item.created_time }}</div> <div class="time">{{ item.created_at }}</div>
<div class="title">{{ item.title }}</div> <div class="title">{{ item.title }}</div>
<div class="text">{{ item.summary }}</div> <div class="text">{{ item.abstract }}</div>
</div> </div>
</li> </li>
</template> </template>
...@@ -23,28 +23,30 @@ export default { ...@@ -23,28 +23,30 @@ export default {
} }
}, },
async fetch() { async fetch() {
// sss
const params = { const params = {
page: 1, project_id: process.env.projectId,
per_page: 100, type_tag: 'article_news'
type: this.$route.query.type || 74,
project_id: 1013
} }
this.listData = await this.$axios.$get('/api/zws/v1/cms/news', { params }).then(res => { this.listData = await this.$axios.get('/api/cms/api/v1/articles', { params }).then(res => {
return res return res.data.data
}) })
}, },
methods: { methods: {
// s
goDetail(item) { goDetail(item) {
if (item.source === '') { this.data = this.$axios.get(`/api/cms/api/v1/article/${item.id}/detail`).then(res => {
this.$router.push({ if (res.data.uri) {
path: '/about/news-detail', window.open(res.data.uri)
query: { } else {
id: item.id this.$router.push({
} path: '/about/news-detail',
}) query: {
} else { id: item.id
window.open(item.source) }
} })
}
})
} }
} }
} }
......
components/home/alumniStories.vue
浏览文件 @ 841a7546
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
type: 71, type: 71,
project_id: 1013 project_id: 1013
} }
this.listData = await this.$axios.$get('/api/zws/v1/cms/news', { params }).then(res => { this.listData = await this.$axios.get('/api/zws/v1/cms/news', { params }).then(res => {
return res return res
}) })
}, },
......
components/home/banner.vue
浏览文件 @ 841a7546
...@@ -33,25 +33,12 @@ ...@@ -33,25 +33,12 @@
} }
} }
}, },
// async fetch() {
// const params = {
// terminal_type: 'WWW',
// ad_position_uri: 'www.ezijing.com'
// }
// this.bannerData = await this.$axios.$get('/api/zws/v1/marketing/advertisements', { params }).then(res => {
// return res.filter((item, index) => {
// return index < 4
// })
// })
// },
async fetch() { async fetch() {
const params = { const params = {
page: 1, project_id: process.env.projectId
per_page: 100,
type: 69,
project_id: 1013
} }
this.listData = await this.$axios.$get('/api/zws/v1/cms/news', { params }).then(res => { this.listData = await this.$axios.get('/api/cms/api/v1/advertisements', { params }).then(res => {
console.log(res)
return res return res
}) })
}, },
......
components/home/headmasterMsg.vue
浏览文件 @ 841a7546
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
type: 70, type: 70,
project_id: 1013 project_id: 1013
} }
this.listData = await this.$axios.$get('/api/zws/v1/cms/news', { params }).then(res => { this.listData = await this.$axios.get('/api/zws/v1/cms/news', { params }).then(res => {
console.log(params) console.log(params)
return res return res
}) })
......
components/home/openClass.vue
浏览文件 @ 841a7546
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
type: 72, type: 72,
project_id: 1013 project_id: 1013
} }
this.listData = await this.$axios.$get('/api/zws/v1/cms/news', { params }).then(res => { this.listData = await this.$axios.get('/api/zws/v1/cms/news', { params }).then(res => {
return res.filter((item, index) => { return res.filter((item, index) => {
return index < 3 return index < 3
}) })
......
components/home/projectNotice.vue
浏览文件 @ 841a7546
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
type: 75, type: 75,
project_id: 1013 project_id: 1013
} }
this.listData = await this.$axios.$get('/api/zws/v1/cms/news', { params }).then(res => { this.listData = await this.$axios.get('/api/zws/v1/cms/news', { params }).then(res => {
const data = [] const data = []
console.log(res) console.log(res)
res.map((item, index) => { res.map((item, index) => {
......
components/home/serviceCase.vue
浏览文件 @ 841a7546
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
type: 73, type: 73,
project_id: 1013 project_id: 1013
} }
this.listData = await this.$axios.$get('/api/zws/v1/cms/news', { params }).then(res => { this.listData = await this.$axios.get('/api/zws/v1/cms/news', { params }).then(res => {
return res return res
}) })
}, },
......
components/rightAside.vue
浏览文件 @ 841a7546
...@@ -24,27 +24,18 @@ ...@@ -24,27 +24,18 @@
<div id="show-enroll" v-show="tabBtnActive" class="tab_cont" @mouseover="handleMsOver('')" @mouseout="handleMsOut"> <div id="show-enroll" v-show="tabBtnActive" class="tab_cont" @mouseover="handleMsOver('')" @mouseout="handleMsOut">
<div class="enroll_cont" id="show-enroll-content" v-show="tabBtnTarget === 'enroll'"> <div class="enroll_cont" id="show-enroll-content" v-show="tabBtnTarget === 'enroll'">
<h5>报名咨询</h5> <h5>报名咨询</h5>
<p><el-input v-model="formInfo.name" placeholder="请输入您的姓名" size="small"></el-input></p> <div class="p"><el-input v-model="formInfo.name" placeholder="请输入您的姓名" size="small"></el-input></div>
<p><el-input v-model="formInfo.phone" placeholder="请输入您的电话" size="small"></el-input></p> <div class="p"><el-input v-model="formInfo.phone" placeholder="请输入您的电话" size="small"></el-input></div>
<!-- <p><el-input v-model="projectName" size="small" :readonly="true"></el-input></p> --> <div class="p">
<p>
<select name="" id="" v-model="formInfo.projectId"> <select name="" id="" v-model="formInfo.projectId">
<option :value="item.value" v-for="(item, index) in projectList" :key="index">{{ item.label }}</option> <option :value="item.value" v-for="(item, index) in projectList" :key="index">{{ item.label }}</option>
</select> </select>
<span class="icon el-icon-arrow-down"></span> <span class="icon el-icon-arrow-down"></span>
<!-- <el-select v-model="formInfo.projectId" placeholder="请选择" size="small"> </div>
<el-option <div class="p sendcode">
v-for="item in projectList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select> -->
</p>
<p class="sendcode">
<el-input v-model="sendCode" placeholder="请输入验证码" size="small"></el-input><el-button class="btn" :disabled="isBtnDisabled" id="checkedCode" @click="getSendCode">获取验证码</el-button> <el-input v-model="sendCode" placeholder="请输入验证码" size="small"></el-input><el-button class="btn" :disabled="isBtnDisabled" id="checkedCode" @click="getSendCode">获取验证码</el-button>
</p> </div>
<p><el-button style="width: 100%" @click="submitEnroll">立即报名</el-button></p> <div class="p"><el-button style="width: 100%" @click="submitEnroll">立即报名</el-button></div>
</div> </div>
<div class="wx_cont" v-show="tabBtnTarget === 'wx'" id="show-enroll-wx"> <div class="wx_cont" v-show="tabBtnTarget === 'wx'" id="show-enroll-wx">
<h5>扫描关注微信公众号</h5> <h5>扫描关注微信公众号</h5>
...@@ -55,7 +46,7 @@ ...@@ -55,7 +46,7 @@
</div> </div>
</template> </template>
<script> <script>
import { sendCode, checkCode, postNes } from '../plugins/api' import { sendCode, checkCode, postNes } from '@/api/index'
const MOBILE_REG = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/ const MOBILE_REG = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
export default { export default {
data() { data() {
...@@ -129,7 +120,6 @@ export default { ...@@ -129,7 +120,6 @@ export default {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
postNes(params) postNes(params)
.then(res => { .then(res => {
console.log(res)
if (res && res.status === 200 && res.error === 0) { if (res && res.status === 200 && res.error === 0) {
resolve({ resolve({
type: 'enroll', type: 'enroll',
...@@ -157,7 +147,6 @@ export default { ...@@ -157,7 +147,6 @@ export default {
} }
sendCode(param) sendCode(param)
.then(res => { .then(res => {
console.log(res)
this.btnDisabledTimer() this.btnDisabledTimer()
if (res && res.code === 0) this.$message.success('验证码已发送，请注意查收') if (res && res.code === 0) this.$message.success('验证码已发送，请注意查收')
else this.$message.error('获取验证码失败，请稍后再试') else this.$message.error('获取验证码失败，请稍后再试')
...@@ -169,7 +158,6 @@ export default { ...@@ -169,7 +158,6 @@ export default {
const checkCodeParam = '?account=' + this.formInfo.phone + '&code=' + this.sendCode + '&countryCode=86' const checkCodeParam = '?account=' + this.formInfo.phone + '&code=' + this.sendCode + '&countryCode=86'
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
checkCode(checkCodeParam).then(res => { checkCode(checkCodeParam).then(res => {
console.log(res)
if (res && res.code === 0) { if (res && res.code === 0) {
res.type = 'checkcode' res.type = 'checkcode'
resolve({ resolve({
...@@ -281,7 +269,7 @@ export default { ...@@ -281,7 +269,7 @@ export default {
} }
.enroll_cont { .enroll_cont {
padding: 0 20px; padding: 0 20px;
p { .p {
margin-bottom: 15px; margin-bottom: 15px;
position: relative; position: relative;
::v-deep.el-input__inner { ::v-deep.el-input__inner {
......
nuxt.config.js
浏览文件 @ 841a7546
...@@ -3,13 +3,18 @@ import fs from 'fs' ...@@ -3,13 +3,18 @@ import fs from 'fs'
let config = {} let config = {}
if (process.env.NODE_ENV === 'production') { if (process.env.NODE_ENV === 'production') {
config = { config = {
server: { port: 2048, host: '0.0.0.0', timing: false }, env: {
axios: { projectId: '6800242743894343680',
baseURL: 'https://project-api.ezijing.com', baseURL: 'https://project-api.ezijing.com'
} },
server: { port: 2048, host: '0.0.0.0', timing: false }
} }
} else { } else {
config = { config = {
env: {
projectId: '6800242743894343680',
baseURL: 'https://project-api.ezijing.com'
},
axios: { axios: {
proxy: true proxy: true
}, },
...@@ -79,6 +84,7 @@ export default { ...@@ -79,6 +84,7 @@ export default {
// Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
plugins: [ plugins: [
'@/plugins/axios',
'@/plugins/element-ui', '@/plugins/element-ui',
{ {
// 引入一个插件，这里的 ssr 表示使用服务端渲染 // 引入一个插件，这里的 ssr 表示使用服务端渲染
...@@ -95,7 +101,6 @@ export default { ...@@ -95,7 +101,6 @@ export default {
// Modules: https://go.nuxtjs.dev/config-modules // Modules: https://go.nuxtjs.dev/config-modules
modules: [ modules: [
'@nuxtjs/axios'
], ],
// Build Configuration: https://go.nuxtjs.dev/config-build // Build Configuration: https://go.nuxtjs.dev/config-build
......
package-lock.json
浏览文件 @ 841a7546
差异被折叠。
package.json
浏览文件 @ 841a7546
...@@ -12,17 +12,13 @@ ...@@ -12,17 +12,13 @@
"axios": "^0.21.1", "axios": "^0.21.1",
"core-js": "^3.9.1", "core-js": "^3.9.1",
"element-ui": "^2.15.1", "element-ui": "^2.15.1",
"fs": "0.0.1-security",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"nuxt": "^2.15.3", "nuxt": "^2.15.3",
"path": "^0.12.7",
"qs": "^6.10.1", "qs": "^6.10.1",
"swiper": "^5.4.5", "swiper": "^5.4.5",
"vue-awesome-swiper": "^4.1.1" "vue-awesome-swiper": "^4.1.1"
}, },
"devDependencies": { "devDependencies": {
"@nuxtjs/axios": "^5.13.1",
"@nuxtjs/proxy": "^2.1.0",
"sass": "^1.32.11", "sass": "^1.32.11",
"sass-loader": "^10.1.1" "sass-loader": "^10.1.1"
} }
......
plugins/api.js deleted 100644 → 0
浏览文件 @ 27eb7cb0
import httpRequest from './base_api'
/**
* 发送验证码
*/
export function sendCode(data) {
return httpRequest.post('https://project-api.ezijing.com/api/usercenter/user/send-code', data)
}
/**
* 检验验证码
*/
export function checkCode(params) {
return httpRequest.get('https://project-api.ezijing.com/api/usercenter/user/check-code' + params)
}
/**
* 提交留咨信息
*/
export function postNes(obj) {
return httpRequest.post('https://project-api.ezijing.com/api/new-app/v1.0/applications', obj, {
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
})
}
plugins/axios.js 0 → 100644
浏览文件 @ 841a7546
import httpRequest from '@/utils/httpRequest'
export default function({ redirect }, inject) {
inject('axios', httpRequest)
}
plugins/base_api.js → utils/httpRequest.js
浏览文件 @ 841a7546
...@@ -3,21 +3,43 @@ import qs from 'qs' ...@@ -3,21 +3,43 @@ import qs from 'qs'
import { Message } from 'element-ui' import { Message } from 'element-ui'
const httpRequest = axios.create({ const httpRequest = axios.create({
// baseURL: process.env.VUE_APP_BASE_API, baseURL: process.env.baseURL,
timeout: 60000, timeout: 60000,
withCredentials: true, withCredentials: true,
headers: { headers: {
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded'
tenant: 'transport'
} }
}) })
// 请求拦截 // 请求拦截
httpRequest.interceptors.request.use( httpRequest.interceptors.request.use(
function(config) { function(config) {
if (config.headers['Content-Type'] === 'application/x-www-form-urlencoded') { const defaultParams = {
config.data = qs.stringify(config.data) timestamp: parseInt(Date.now() / 1000),
nonce: Math.random()
.toString(36)
.slice(-8)
}
// 接口请求参数
let params = config.params || config.data
// 排序
function alphabeticalSort(a, b) {
return a.localeCompare(b)
}
params = Object.assign({}, defaultParams, params)
const str = qs.stringify(Object.assign({}, params, { salt: 'n7xAav2tSjn9Ysnr' }), { sort: alphabeticalSort })
const strs = qs.parse(str)
Object.keys(strs).map(item => {
strs[item] = Array.isArray(strs[item]) ? JSON.stringify(strs[item]) : strs[item]
})
params.signature = 'UG7wBenexQhiuD2wpCwuxkU0jqcj006d'
if (config.method === 'post') {
config.data = params
} else {
config.params = params
} }
// if (config.headers['Content-Type'] === 'application/x-www-form-urlencoded') {
// config.data = qs.stringify(config.data)
// }
if (config.headers['Content-Type'] === 'multipart/form-data') { if (config.headers['Content-Type'] === 'multipart/form-data') {
const form = new window.FormData() const form = new window.FormData()
for (const key in config.data) { for (const key in config.data) {
...@@ -36,33 +58,29 @@ httpRequest.interceptors.request.use( ...@@ -36,33 +58,29 @@ httpRequest.interceptors.request.use(
httpRequest.interceptors.response.use( httpRequest.interceptors.response.use(
function(response) { function(response) {
const { data } = response const { data } = response
if (data.msg) { // zws
if (data.msg === '请先登录') { if (parseInt(data.code)) {
window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}` return Promise.reject(data)
}
} }
if (parseInt(data.code) === 1) { if (parseInt(data.error) && data.message === '需要登录才能调用接口') {
return Message.error(data.msg) location.href = `${process.env.loginURL}/login/index?redirect_uri=${encodeURIComponent(location.href)}`
return Promise.reject(data)
} }
if (data.code) {
if (data.code === 4001) { // enrollment
window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}` if (parseInt(data.error)) {
} Message.error(data.message)
return data.message ? Message.error(data.message) : Message.error(data.msg) return Promise.reject(data)
} }
return data return data
}, },
function(error) { function(error) {
if (error.response) { if (error.response) {
const { status, message } = error.response.data const { message } = error.response.data
// 未登录
if (status === 403) {
window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`
}
Message.error(message || error.response.data) Message.error(message || error.response.data)
return Promise.reject(error.response) return Promise.reject(error.response)
} else { } else {
Message.error(error) console.log(error)
} }
return Promise.reject(error) return Promise.reject(error)
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论