chenJinxu
/
TelpoH5FrontendWeb
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'test' into develop

master
JinxChen 1 year ago
parent
3ef54f844a 7de5fc2713
commit
4bd0a049d1
7 changed files with 59 additions and 18 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +8
    -0
      README.md
  2. +2
    -2
      public/index.html
  3. +1
    -1
      src/config/models.js
  4. +3
    -1
      src/router/index.js
  5. +3
    -3
      src/views/card-info/index.vue
  6. +36
    -0
      src/views/health/psychological/report.vue
  7. +6
    -11
      src/views/package-home/index.vue

+ 8
- 0
README.md View File

@@ -755,3 +755,11 @@ fix
fix
- 话费查询
- 修复 token过期时导致获取openId失败的问题



## v1.0.95
`2023.10.30`
fix
- 话费查询
- 修复 异步问题导致首次进入页面白屏的问题

+ 2
- 2
public/index.html View File

@@ -1,7 +1,7 @@
<!--
* @Date: 2022-01-19 10:08:26
* @LastEditors: JinxChen
* @LastEditTime: 2023-02-25 15:03:02
* @LastEditTime: 2023-10-30 14:28:19
* @FilePath: \TelpoH5FrontendWeb\public\index.html
* @description:
-->
@@ -10,7 +10,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title></title>
</head>


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

@@ -5,7 +5,7 @@
* @FilePath: \TelpoH5FrontendWeb\src\config\models.js
* @description:
*/
export const VERSION_MODEL = '1.0.94F'; //版本号
export const VERSION_MODEL = '1.0.95F'; //版本号
export const IMAGE_URL = {
production: 'http://zfb.ssjlai.com/web/',
test: 'http://zfb.ssjlai.com/web/',


+ 3
- 1
src/router/index.js View File

@@ -1,7 +1,7 @@
/*
* @Date: 2023-09-21 09:54:53
* @LastEditors: JinxChen
* @LastEditTime: 2023-10-13 11:30:23
* @LastEditTime: 2023-10-30 11:31:37
* @FilePath: \TelpoH5FrontendWeb\src\router\index.js
* @description:
*/
@@ -61,6 +61,8 @@ const routes = [
{ path: '/psychological', name: 'psychological', component: resolve => require(['@/views/health/psychological'], resolve) },
// 健康-抑郁，压力和疲劳汇总入口
{ path: '/psychologicalMain', name: 'psychologicalMain', component: resolve => require(['@/views/health/psychological-main'], resolve) },
// 周报/月报
{ path: '/psychologicalReport', name: 'psychologicalReport', component: resolve => require(['@/views/health/psychological/report'], resolve) },

// 告警详情-中间页
{ path: '/aiCallAlarm', name: 'aiCallAlarm', component: resolve => require(['@/views/ai-call-alarm'], resolve) },


+ 3
- 3
src/views/card-info/index.vue View File

@@ -1,7 +1,7 @@
<!--
* @Date: 2022-04-15 10:22:36
* @LastEditors: JinxChen
* @LastEditTime: 2023-10-30 10:04:00
* @LastEditTime: 2023-10-30 14:58:43
* @FilePath: \TelpoH5FrontendWeb\src\views\card-info\index.vue
* @description:
-->
@@ -171,13 +171,13 @@ export default {
// 根据code获取openId
getOpenId(code) {
let openId = this.$store.getters.openId;
APIPay.getOpenId(code).then(res => {
APIPay.getOpenId(code).then( async res => {
let data= res.data;
if(data.code === 20000) {
this.$store.commit("openId", data.data.openId);
}else if (data.state === false) {
console.log("token过期");
let hasToken = this.getToken();
let hasToken = await this.getToken();
if(hasToken) {
this.getOpenId(this.code);
} else {


+ 36
- 0
src/views/health/psychological/report.vue View File

@@ -0,0 +1,36 @@
<!--
* @Date: 2023-10-30 11:30:22
* @LastEditors: JinxChen
* @LastEditTime: 2023-10-30 11:40:51
* @FilePath: \TelpoH5FrontendWeb\src\views\health\psychological\report.vue
* @description:
-->
<template>
<!-- 周/月报 -->
<div class="report">
<van-nav-bar title="心理周报" :border="true" :left-arrow="true" @click-left="onNavBack">
<template #left>
<van-icon name="arrow-left" size="24" style="padding: 0"/>
</template>
</van-nav-bar>
</div>
</template>

<script>
export default {
name:'',
data(){
return {

}
},
methods: {
onNavBack() {},

}
}
</script>

<style scoped>

</style>

+ 6
- 11
src/views/package-home/index.vue View File

@@ -1,7 +1,7 @@
<!--
* @Date: 2023-02-24 14:18:25
* @LastEditors: JinxChen
* @LastEditTime: 2023-09-20 14:20:27
* @LastEditTime: 2023-10-30 14:51:45
* @FilePath: \TelpoH5FrontendWeb\src\views\package-home\index.vue
* @description:
-->
@@ -41,8 +41,7 @@ export default {
// 3.如果有基础套餐并且已充值，跳转费查询页面
// 4.如果有基础套餐但未充值，跳转套餐充值页面
getDevicePayPackage() {
return new Promise((resolve, reject) => {
APICore.devicePayPackage(this.params.imei)
APICore.devicePayPackage(this.params.imei)
.then(res => {
let data = res.data;
if (data.code === 106 || data.code === 104) {
@@ -52,15 +51,11 @@ export default {
}, 1500);
} else {
// 筛选是否存在基础套餐, producModelId = 1 是基础套餐， 2 是加油包
const isHasBasePackage = data.data.packagesList.some(res => {
this.isHasBasePackage = data.data.packagesList.some(res => {
return res.producModelId === 1;
});
resolve(isHasBasePackage);
}
}).catch(e => {
reject(false);
})
})
}).catch(() => {})
},
checkImei() {
let reqBody = {
@@ -182,7 +177,7 @@ export default {

},
// 获取url传过来的参数
async getParams() {
getParams() {
let params = this.$route.query;
if (params) {
this.params = {...params};
@@ -191,7 +186,7 @@ export default {
const reqUrl = encodeURI(params.reqUrl);
window.location.href = reqUrl;
} else {
this.isHasBasePackage = await this.getDevicePayPackage();
this.getDevicePayPackage();
this.checkImei();
}
}


Write Preview
Loading…
Cancel
Save