Skip to content

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

榜单首页接口字段对接

上级 cab80ede
隐藏空白字符变更
内嵌 并排
正在显示 包含 52 行增加 和 57 行删除
package-lock.json
浏览文件 @ 5fa10be0
......@@ -8567,8 +8567,7 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -8728,7 +8727,6 @@
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -8747,7 +8745,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -8841,7 +8838,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -8927,8 +8923,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -8964,7 +8959,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",
......@@ -9028,14 +9022,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
}
}
},
......@@ -13599,8 +13591,7 @@
},
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"optional": true
"bundled": true
},
"aproba": {
"version": "1.2.0",
......@@ -13637,8 +13628,7 @@
},
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"optional": true
"bundled": true
},
"concat-map": {
"version": "0.0.1",
......@@ -13647,8 +13637,7 @@
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"optional": true
"bundled": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -13751,8 +13740,7 @@
},
"inherits": {
"version": "2.0.3",
"bundled": true,
"optional": true
"bundled": true
},
"ini": {
"version": "1.3.5",
......@@ -13762,7 +13750,6 @@
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -13788,7 +13775,6 @@
"minipass": {
"version": "2.3.5",
"bundled": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -13805,7 +13791,6 @@
"mkdirp": {
"version": "0.5.1",
"bundled": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -13889,7 +13874,6 @@
"once": {
"version": "1.4.0",
"bundled": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -13965,8 +13949,7 @@
},
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"optional": true
"bundled": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -13996,7 +13979,6 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -14014,7 +13996,6 @@
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
......@@ -14053,13 +14034,11 @@
},
"wrappy": {
"version": "1.0.2",
"bundled": true,
"optional": true
"bundled": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"optional": true
"bundled": true
}
}
},
......
pages/awards-list/index.vue
浏览文件 @ 5fa10be0
......@@ -4,33 +4,33 @@
<img src="~/assets/img/stage3/rule-btn.png" alt="">
</div>
<!--已登录及个人未参加-->
<!--<div class="person-details">
<div class="person-details">
<div class="info">
<img src="https://test-file.yunqueyi.com/png/2019/9/19/1568874397547_45fff40f.png" alt="">
<div class="right">
<div class="name">赵欢</div>
<div class="hospital">上海复旦大学附属中山医院</div>
<div class="name">{{mainInfo.name}}</div>
<div class="hospital">{{mainInfo.hospitalName}}</div>
</div>
</div>
<div class="self-grade">
<div class="left">
<p class="title">个人勤奋榜</p>
<p class="rank">第10000名</p>
<p class="score">个人勤奋分 50000</p>
<p class="rank">第{{mainInfo.personRank}}名</p>
<p class="score">个人勤奋分 {{mainInfo.diligence}}</p>
</div>
<div class="right">
<p class="title">机构星火榜</p>
<p class="rank">第9名</p>
<p class="score">机构勤奋分 50000</p>
<p class="title">机构{{dealHospitalRankName(mainInfo.hospitalType)}}</p>
<p class="rank">第{{mainInfo.hospitalRank}}名</p>
<p class="score">机构勤奋分 {{mainInfo.hospitalDiligence}}</p>
</div>
</div>
<div class="my-grade">我的成绩</div>
<div class="bottom">
<p class="text">参与人数 28788348</p>
<p class="text">参与人数 {{mainInfo.count}}</p>
<p class="line"></p>
<p class="text">参与机构数 28788348</p>
<p class="text">参与机构数 {{mainInfo.hospitalCount}}</p>
</div>
</div>-->
</div>
<!--未登录-->
<!--<div class="person-details not-login">
<div class="description">登录查看个人和机构排名</div>
......@@ -51,7 +51,7 @@
</div>
</div>-->
<!--微信打开页面-->
<div class="person-details in-wx">
<!-- <div class="person-details in-wx">
<div class="wx-left wx-item">
<p class="num">28788348</p>
<p class="text">参与人数</p>
......@@ -61,7 +61,7 @@
<p class="num"> 28788348</p>
<p class="text">参与机构数</p>
</div>
</div>
</div>-->
<div class="main-container">
<img class="top-img" src="~/assets/img/stage3/hospital-icon.png" alt="">
<div class="award-container hospital-awards">
......@@ -144,7 +144,7 @@
</template>
<script>
import { getThirdMainInfo } from '@/service'
import { getThirdMainInfo } from '@/service/stage3Api'
export default {
name: "index",
components: {
......@@ -152,7 +152,7 @@
},
data() {
return {
mainInfo: {},//顶部个人信息等相关数据
}
},
asyncData() {
......@@ -169,8 +169,21 @@
methods: {
getMainInfo() {
getThirdMainInfo().then(res => {
if(res.code == '000000') {
this.mainInfo = res.data;
}
})
},
dealHospitalRankName(hospitalType) {
if(hospitalType == 0) {
return '星火榜';
} else if(hospitalType == 1) {
return '萌芽榜';
} else if(hospitalType == 2) {
return '奋进榜';
} else if(hospitalType == 3) {
return '超越榜';
}
}
}
}
......
service/api.js
浏览文件 @ 5fa10be0
......@@ -15,7 +15,8 @@ Axios.interceptors.request.use(
const method = config.method.toLocaleLowerCase();
if (method === 'post' || method === 'put' || method === 'delete') {}
if (config.withCredentials) {
config.headers.token = getCookie('token') || sessionStorage.getItem('token');
//config.headers.token = getCookie('token') || sessionStorage.getItem('token');
config.headers.token = 'DA04EEE95F9F4D2A8630A61A8088C933'
}
return config;
},
......
service/index.js
浏览文件 @ 5fa10be0
......@@ -93,11 +93,3 @@ export const getAuthCode = ({ mobilePhone, flag, captchaToken, captchaAnswer })
},
})
}
/*获取三阶段主要数据*/
export const getThirdMainInfo = async (params) => {
return request({
url: '/campaign/third/share/home/top',
params: params
})
}
service/stage3Api.js 0 → 100644
浏览文件 @ 5fa10be0
import request from './api';
/*获取三阶段主要数据*/
export const getThirdMainInfo = async (params) => {
return request({
url: '/campaign/third/share/home/top',
withCredentials: true,
params: params
})
}
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或