Skip to content

Y
year-end-activitiy
提交 6dc27a4f 编写于 作者: Yuanzhao.dai's avatar Yuanzhao.dai
浏览文件
操作

处理加密的doctor id中含有==导致微信签名获取失败

上级 e6caac59
隐藏空白字符变更
内嵌 并排
正在显示 包含 43 行增加 和 28 行删除
package-lock.json
浏览文件 @ 6dc27a4f
......@@ -6330,12 +6330,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -6350,17 +6352,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -6477,7 +6482,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -6489,6 +6495,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -6503,6 +6510,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -6510,12 +6518,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -6534,6 +6544,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -6614,7 +6625,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -6626,6 +6638,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -6747,6 +6760,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -8562,8 +8576,7 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -8722,7 +8735,6 @@
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -8834,7 +8846,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -8956,7 +8967,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -13634,11 +13644,13 @@
},
"balanced-match": {
"version": "1.0.0",
"bundled": true
"bundled": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -13655,7 +13667,8 @@
},
"concat-map": {
"version": "0.0.1",
"bundled": true
"bundled": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
......@@ -13784,6 +13797,7 @@
"minimatch": {
"version": "3.0.4",
"bundled": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......
pages/awards-list/hospital-grades.vue
浏览文件 @ 6dc27a4f
......@@ -31,7 +31,7 @@
<div class="content">
<div class="left">
<p class="score">我的机构勤奋分<span>{{personalData.hospitalDiligence}}</span></p>
<p class="rank" v-if="personalData.hospitalRank<=100">恭喜您的机构上榜排名<span>{{personalData.hospitalRank}}</span></p>
<p class="rank" v-if="personalData.hospitalRank<=100&&personalData.hospitalRank">恭喜您的机构上榜排名<span>{{personalData.hospitalRank}}</span></p>
<p class="rank" v-else>很遗憾，您的机构未上榜</p>
</div>
<div class="right" @click="share">分享排名</div>
......
pages/awards-list/index.vue
浏览文件 @ 6dc27a4f
......@@ -120,7 +120,7 @@
import { getThirdMainInfo, getMainRank } from '@/service/stage3Api'
import h5header from '@/components/h5header';
import { Base64 } from 'js-base64';
import { setCookie, getCookie, delCookie } from '@/utils/cookieFun';
export default {
name: "index",
......@@ -164,11 +164,9 @@
},
mounted() {
this.getMainInfo();
this.$rocNative.appInit();
this.isWeb = this.$rocNative.isWeb;
/*if(getCookie('token')) {
this.getMainInfo();
}*/
// this.isWeb = this.$rocNative.isWeb;
this.shareObj = {
title1: '云鹊奖榜单公布',
title2: '来看看全中国最杰出的医院机构和医生个人',
......@@ -237,7 +235,7 @@
this.$router.push({
path: '/awards-list/personal-grade',
query: {
encyptId: this.mainInfo.encyptId
encyptId: Base64.encode(this.mainInfo.encyptId)
}
})
},
......
pages/awards-list/personal-grade.vue
浏览文件 @ 6dc27a4f
......@@ -8,7 +8,7 @@
:shareObj="shareObj"/>
<div class="wrap-container" :class="{'marginBott60': isWeb}" :style="{ marginTop: isWeb?0:`${44+statusBarHeight}Px`}">
<img src="~/assets/img/stage3/awards-title.png" alt="" class="title">
<img :src="rewardIcon[myGrades.rewardType||3]" alt="" class="awards-grade">
<img :src="rewardIcon[myGrades.rewardType]" alt="" class="awards-grade">
<div class="personal-info">
<img :src="myGrades.avatarImageUrl" alt="">
<div class="right">
......@@ -50,8 +50,8 @@
</div>
</div>
<div class="right">
<p>{{rewardText[myGrades.rewardType||3].rightText1}}</p>
<p>{{rewardText[myGrades.rewardType||3].rightText2}}</p>
<p>{{rewardText[myGrades.rewardType].rightText1}}</p>
<p>{{rewardText[myGrades.rewardType].rightText2}}</p>
</div>
</div>
<div class="task-details">
......@@ -86,6 +86,7 @@
<script>
import { getMyGrades } from '@/service/stage3Api';
import h5header from '@/components/h5header';
import { Base64 } from 'js-base64';
export default {
name: "personal-grade",
components: {
......@@ -97,11 +98,13 @@
isWeb: false,
appCallUrl: '',
rewardIcon: {
0: '',
1: require('../../assets/img/stage3/awards-icon1.png'),// 1-金色云鹊勋章 0%~10% 勤学不辍，必有收获
2: require('../../assets/img/stage3/awards-icon2.png'),//2-银色云鹊勋章 11%-40% 学无止境，不知疲倦
3: require('../../assets/img/stage3/awards-icon3.png'),//3-铜色云鹊勋章 41%-100% 学而不倦，可圈可点
},
rewardText: {
0: {},
1: {// 1-金色云鹊勋章 0%~10% 勤学不辍，必有收获
rightText1: '勤学不辍',
rightText2: '必有收获'
......@@ -118,9 +121,9 @@
}
},
async asyncData({query}) {
const { data } = await getMyGrades({id: query.encyptId});
const { data } = await getMyGrades({id: Base64.decode(query.encyptId)});
return {
encyptId: query.encyptId,//加密doctorId
encyptId: Base64.decode(query.encyptId),//加密doctorId
myGrades: data
}
},
......
pages/awards-list/personal-rank.vue
浏览文件 @ 6dc27a4f
......@@ -32,7 +32,7 @@
<div class="content">
<div class="left">
<p class="score">我的勤奋分<span>{{personalData.diligence}}</span></p>
<p class="rank" v-if="personalData.personRank<=100">恭喜您上榜排名<span>第{{personalData.personRank}}</span></p>
<p class="rank" v-if="personalData.personRank<=100&&personalData.personRank">恭喜您上榜排名<span>第{{personalData.personRank}}</span></p>
<p class="rank" v-else>很遗憾，您未上榜</p>
</div>
<div class="right" @click="share">分享排名</div>
......@@ -79,7 +79,7 @@
},
mounted() {
this.$rocNative.appInit();
// this.isWeb = this.$rocNative.isWeb;
this.isWeb = this.$rocNative.isWeb;
this.shareObj = {
title1: '云鹊奖个人榜单公布',
title2: '全中国最杰出的医生个人在这里',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或