diff --git a/src/api/index.js b/src/api/index.js index da911b7..fbe01c8 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -56,8 +56,20 @@ api.interceptors.request.use( request.params = {} } let timestamp = new Date().getTime() + // get 请求所有参数转成string类型 用于签名计算 request.params.timestamp = '' + timestamp - let sign = signMd5Utils.getSign(request.url, request.params) + let strParams = JSON.stringify(request.params, function(key, value) { + if (key) { + if (value == undefined || value == null) { + return undefined + } + return '' + value + } + + return value + }) + console.log(JSON.stringify(request.params) + ':str' + strParams) + let sign = signMd5Utils.getSign(request.url, JSON.parse(strParams)) request.params.sign = sign } return request diff --git a/src/components/FontIcon/index.vue b/src/components/FontIcon/index.vue index 06cd100..c2a0e6a 100644 --- a/src/components/FontIcon/index.vue +++ b/src/components/FontIcon/index.vue @@ -15,3 +15,8 @@ export default { } } + diff --git a/src/router/modules/root.js b/src/router/modules/root.js index 8b68411..b691d48 100644 --- a/src/router/modules/root.js +++ b/src/router/modules/root.js @@ -61,6 +61,11 @@ export default [ meta: {requireLogin: true}, component: () => import(/* webpackChunkName: 'root' */ '@/views/project/create.vue') }, + { + path: 'my', + meta: {requireLogin: true}, + component: () => import(/* webpackChunkName: 'root' */ '@/views/project/MyProject.vue') + }, { path: 'form', meta: {requireLogin: true}, diff --git a/src/utils/sign.js b/src/utils/sign.js index 4840e41..573866b 100644 --- a/src/utils/sign.js +++ b/src/utils/sign.js @@ -29,10 +29,10 @@ export default class sign { * @returns {string} 获取签名 */ static getSign(url, requestParams) { - let urlParams = this.parseQueryString(url) let jsonObj = _.merge(urlParams, requestParams) let requestBody = this.sortAsc(jsonObj) + console.log(constants.signSecret + JSON.stringify(requestBody)) return md5(constants.signSecret + JSON.stringify(requestBody)).toLowerCase() } diff --git a/src/views/form/statistics.vue b/src/views/form/statistics.vue index 0dbaee8..14c4992 100644 --- a/src/views/form/statistics.vue +++ b/src/views/form/statistics.vue @@ -151,7 +151,7 @@ export default { } }, queryProjectItems() { - this.$api.get(`/user/project/item/query/${this.projectKey}`).then(res => { + this.$api.get(`/user/project/item/list/${this.projectKey}`).then(res => { if (res.data) { res.data.map((item) => { _.set(this.projectItemColumns, `field${item.formItemId}`, item.label) diff --git a/src/views/home/HomButton.vue b/src/views/home/HomButton.vue index 3fbad47..0046c1a 100644 --- a/src/views/home/HomButton.vue +++ b/src/views/home/HomButton.vue @@ -6,7 +6,9 @@ - 我的项目 + + 我的项目 + 行业模板 diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 378fb29..8f01c9f 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,76 +1,78 @@