Browse Source

Merge branch 'develop' into test

test
JinxChen 1 year ago
parent
commit
4d39df112e
6 changed files with 17 additions and 9 deletions
  1. +8
    -1
      README.md
  2. +2
    -2
      src/config/models.js
  3. +2
    -1
      src/views/health/psychological-main/index.vue
  4. +2
    -2
      src/views/health/psychological/index.vue
  5. +2
    -2
      src/views/psychological-modeling/index.vue
  6. +1
    -1
      src/views/psychological-questionnaire/index.vue

+ 8
- 1
README.md View File

@@ -657,4 +657,11 @@ update
`2023.7.12`
update
- 心理监测详情
- 修改 心情等级日历数据接口参数,增加 startDate 和 endDate,删除month参数
- 修改 心情等级日历数据接口参数,增加 startDate 和 endDate,删除month参数


## v1.0.82
`2023.8.11`
update
- 心理监测
- 修改 AuthToken 为 accessToken

+ 2
- 2
src/config/models.js View File

@@ -1,11 +1,11 @@
/*
* @Date: 2021-11-20 10:26:39
* @LastEditors: JinxChen
* @LastEditTime: 2023-07-12 16:52:30
* @LastEditTime: 2023-08-11 09:50:44
* @FilePath: \TelpoH5FrontendWeb\src\config\models.js
* @description:
*/
export const VERSION_MODEL = '1.0.81F'; //版本号
export const VERSION_MODEL = '1.0.82F'; //版本号
export const IMAGE_URL = {
production: 'http://zfb.ssjlai.com/web/',
test: 'http://zfb.ssjlai.com/web/',


+ 2
- 1
src/views/health/psychological-main/index.vue View File

@@ -77,6 +77,7 @@ export default {
this.uid = params.uid;
this.routeDate = params.date;
this.params = params;
this.$store.commit('ssjlToken', params.accessToken);
}
},
getHomeData() {
@@ -89,7 +90,7 @@ export default {
};
axios.get(reqUrl, {
params: { ...reqParams },
headers: { 'AuthToken': this.$store.getters.ssjlToken }
headers: { 'AccessToken': this.$store.getters.ssjlToken }
}).then(res => {
console.log("res", res);
const data = res.data.response;


+ 2
- 2
src/views/health/psychological/index.vue View File

@@ -701,7 +701,7 @@ export default {
};
axios.get(reqUrl, {
params: { ...reqParams },
headers: { 'AuthToken': this.$store.getters.ssjlToken }
headers: { 'AccessToken': this.$store.getters.ssjlToken }
}).then(res => {
if (res.data) {
let data = res.data.response;
@@ -757,7 +757,7 @@ export default {
axios
.get(reqUrl, {
params: { ...reqParams },
headers: { 'AuthToken': this.$store.getters.ssjlToken }
headers: { 'AccessToken': this.$store.getters.ssjlToken }
})
.then(res => {
if (res.data) {


+ 2
- 2
src/views/psychological-modeling/index.vue View File

@@ -114,7 +114,7 @@ export default {
if (params.uid) {
this.uid = params.uid;
// 缓存从随手精灵传过来的token
this.$store.commit('ssjlToken', params.token);
this.$store.commit('ssjlToken', params.token || params.accessToken);
// 缓存从随手精灵传过来的标识
this.$store.commit('fromSsjl', params.fromSsjl);
// 是否显示 返回标签
@@ -180,7 +180,7 @@ export default {
...config,
// 增加请求头部 token
headers: {
'AuthToken': token
'AccessToken': token
}
})
.then((re) => {


+ 1
- 1
src/views/psychological-questionnaire/index.vue View File

@@ -236,7 +236,7 @@ export default {
...config,
// 增加请求头部 token
headers: {
'AuthToken': token
'AccessToken': token
}
})
.then((re) => {


Loading…
Cancel
Save