Skip to content

Y
year-end-activitiy
提交 ba658e50 编写于 作者: chengxiang.li's avatar chengxiang.li
浏览文件
操作

Merge branch 'dev-stage2-20191125' of... 

Merge branch 'dev-stage2-20191125' of http://192.168.110.53/com.pica.cloud.foundation.frontend/year-end-activitiy into dev-stage2-20191125
上级 c71d46a6 0775fa31
隐藏空白字符变更
内嵌 并排
正在显示 包含 152 行增加 和 82 行删除
components/normal-header.vue
浏览文件 @ ba658e50
......@@ -4,7 +4,7 @@
<header class="header-container">
<img @click="goBack" src="~/assets/img/icon-back.png" alt="">
{{title}}
<div class="btn-right" v-if="rightText">{{rightText}}</div>
<div class="btn-right" v-if="rightText" @click="rightBtnClick">{{rightText}}</div>
</header>
</section>
</template>
......@@ -44,6 +44,9 @@
}else {
this.$rocNative.goBack()
}
},
rightBtnClick() {
this.$emit('handleRightBtn')
}
}
}
......
components/share-container.vue
浏览文件 @ ba658e50
......@@ -18,7 +18,7 @@ export default {
</script>
<style lang="less">
.smo-share-mask{
width: 375px;
width: 100%;
height: 100%;
position: fixed;
left: 0;
......
package-lock.json
浏览文件 @ ba658e50
......@@ -9697,9 +9697,9 @@
"integrity": "sha512-gwtKq3QWbXMQpdHf7tFKQWYvknQBU+qJUFxLxskHL10mChguSkyl7CxFND1mafVApTH6N1qgAOKKQLILgaJhTw=="
},
"pica-wx-share": {
"version": "1.1.3",
"resolved": "http://192.168.110.93:4873/pica-wx-share/-/pica-wx-share-1.1.3.tgz",
"integrity": "sha512-iPUiTr4Gj0ndetUViqkNr9tPcJxycVFSMVlWCowQNe3mlZvfrFddKbD6AXLWB9Pc9aducYmYcTwGzX7s8PWspA==",
"version": "1.2.0",
"resolved": "http://192.168.110.93:4873/pica-wx-share/-/pica-wx-share-1.2.0.tgz",
"integrity": "sha512-n3eD91DADLLKzfDAncGSJ1TKZW78aVIQ7n+HivbZMrzC1bzq1+0wfkBrElcBPTCYSE62NMzBFrX6XvDme4eW+w==",
"requires": {
"axios": "^0.18.0",
"weixin-js-sdk": "^1.4.0-test"
......
pages/activityPage.vue
浏览文件 @ ba658e50
<template>
<div class="in-activity-wrap">
<div :style="{width: '375px',height: padTop + 'px', background: '#fff'}"></div>
<div :style="{width: '100%',height: padTop + 'px', background: '#fff'}"></div>
<h5header
v-if="!isWeb"
title="云鹊奖2019"
......
pages/hospital-ranking/index.less
浏览文件 @ ba658e50
......@@ -160,6 +160,23 @@
}
}
}
.no-more {
height: 62px;
display: flex;
justify-content: center;
align-items: center;
.line {
display: inline-block;
width: 84px;
height: 1px;
background:#F7F7F7;
}
.text {
color: #BEC2CC;
font-size: 13px;
margin: 0 8px;
}
}
.no-data {
margin-top: 112px;
img {
......
pages/hospital-ranking/index.vue
浏览文件 @ ba658e50
......@@ -60,19 +60,29 @@
<span class="marginAuto">{{activeBtnType?'机构勤奋分':'贡献勤奋分'}}</span>
</div>
<div class="ranking-list" :style="{marginBottom: `${50+homeIndicatorHeight}` + 'Px'}">
<div class="item" v-if="activeBtnType" v-for="(itemH,index) in hospitalRanking.topRankList">
<img v-if="index<=2" :src="dealRankIcon(index)" alt="" class="ranking-icon">
<p v-else class="icon-num" >{{index+1}}</p>
<div class="item" v-if="activeBtnType" v-for="(itemH,indexH) in topRankListH" :key="indexH">
<img v-if="indexH<=2" :src="dealRankIcon(indexH)" alt="" class="ranking-icon">
<p v-else class="icon-num" >{{indexH+1}}</p>
<p class="hospital-name">{{itemH.name}}</p>
<p class="num">{{itemH.score}}</p>
</div>
<div class="item" v-if="!activeBtnType" v-for="(itemD,index) in contributionRanking.topRankList">
<img v-if="index<=2" :src="dealRankIcon(index)" alt="" class="ranking-icon">
<p v-else class="icon-num" >{{index+1}}</p>
<div class="item" v-if="!activeBtnType" v-for="(itemD,indexD) in topRankListC" :key="indexD">
<img v-if="indexD<=2" :src="dealRankIcon(indexD)" alt="" class="ranking-icon">
<p v-else class="icon-num" >{{indexD+1}}</p>
<img :src="itemD.avatarImageUrl" alt="" class="doctor-photo">
<p class="doctor-name">{{itemD.name}}</p>
<p class="num">{{itemD.score}}</p>
</div>
<div class="no-more" v-if="activeBtnType&&topRankListH.length>=10">
<span class="line"></span>
<span class="text">到底啦</span>
<span class="line"></span>
</div>
<div class="no-more" v-if="!activeBtnType&&topRankListC.length>=10">
<span class="line"></span>
<span class="text">到底啦</span>
<span class="line"></span>
</div>
</div>
</div>
<div class="main-content" v-if="noContributionRanking">
......@@ -111,7 +121,9 @@
},
activeBtnType: true, //true机构，false人员
hospitalRanking: {},
topRankListH: [],//机构排行
contributionRanking: {},
topRankListC: [], //贡献排行
btnText: '助力机构 创造佳绩',
btnType: true,
noContributionRanking: false //是否有人员贡献榜单数据
......@@ -156,6 +168,7 @@
getHospitalRanking().then(res => {
if(res.code == '000000') {
this.hospitalRanking = res.data;
this.topRankListH = res.data.topRankList
}
})
},
......@@ -163,6 +176,7 @@
getContributionRanking().then(res => {
if(res.code == '000000') {
this.contributionRanking = res.data;
this.topRankListC = res.data.topRankList
if(this.contributionRanking.topRankList.length) {
this.noContributionRanking = false;
} else {
......
pages/invite-details/index.vue
浏览文件 @ ba658e50
......@@ -26,7 +26,7 @@
<b class="l"></b>
<p class="text">输入手机号领取课程</p>
<p class="awards">
<span v-for="item in dealJsonData(this.node1)">
<span v-for="(item, index) in dealJsonData(this.node1)" :key="index">
+{{item.rewardQuantity}}{{changeAwardsName(item.rewardType)}}
</span>
</p>
......@@ -36,7 +36,7 @@
<b class="l"></b>
<p class="text">使用手机号登录云鹊APP</p>
<p class="awards">
<span v-for="item in dealJsonData(this.node2)">
<span v-for="(item, index) in dealJsonData(this.node2)" :key="index">
+{{item.rewardQuantity}}{{changeAwardsName(item.rewardType)}}
</span>
</p>
......@@ -65,20 +65,20 @@
<p class="sum" v-if="inviteList.length">共{{recordTotal}}人</p>
<div class="loadMore" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy"
infinite-scroll-distance="10">
<div class="record-item" v-if="inviteList.length" v-for="item in inviteList">
<div class="record-item" v-if="inviteList.length" v-for="(item, index) in inviteList" :key="index">
<img :src="item.avatarImageUrl" alt="" class="person-photo">
<div class="person-info">
<p class="phone">{{item.mobile}}</p>
<p class="time">{{item.inviteDate}}</p>
</div>
<div class="awards">
<p class="item" v-for="item1 in dealJsonData(item.rewardJsonInfo)">
<p class="item" v-for="(item1, index1) in dealJsonData(item.rewardJsonInfo)" :key="index1">
<span class="num">+{{item1.rewardQuantity}}</span>
<span class="award-name">{{changeAwardsName(item1.rewardType)}}</span>
</p>
</div>
</div>
<div class="no-more" v-if="noMore&&inviteList.length">
<div class="no-more" v-if="noMore&&inviteList.length>=10">
<span class="line"></span>
<span class="text">到底啦</span>
<span class="line"></span>
......@@ -138,7 +138,7 @@
this.pageNo++
this.getOneInviteDetails();
this.getInviteDetailAward();
const _this = this
window.addEventListener('scroll', function (e) {
let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
......@@ -154,7 +154,7 @@
console.log('headDivHeight',headDivHeight);*/
const tabNab=document.getElementsByClassName('tab-nav')[0];
if(recordDetailsHeight<=headDivHeight) {
tabNab.setAttribute('style',`position:fixed;top: ${44}px;`);
tabNab.setAttribute('style',`position:fixed;top: ${44+_this.statusBarHeight}px;`);
} else {
tabNab.removeAttribute('style');
}
......@@ -178,7 +178,10 @@
console.log(this.node1,this.node2)
})
},
goInvite() { // 去分享
goInvite() { // 去邀请
this.$sendBuriedData({
component_tag: `308#308001`
});
let shareObj = wxShare;
//处理分享链接需要的参数
......
pages/person-detail/index.vue
浏览文件 @ ba658e50
......@@ -29,7 +29,7 @@
<div class="awards-details">血压计 1 支/温度计 1 支/小米电视4C 2 台/米家洗衣机 1 台/米家冰箱 2 台/华为荣耀Play3 2 部</div>
</div>-->
<div class="detail-list" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
<div class="item" v-for="item in personDetails" v-if="personDetails.length">
<div class="item" v-for="(item, index) in personDetails" v-if="personDetails.length" :key="index">
<div class="left">
<img :src="detailTaskIcon(item.resourceType)" alt="">
</div>
......@@ -39,14 +39,14 @@
<p class="time">{{item.finishTime}}</p>
</div>
<div class="r-right">
<div class="award-item" v-for="item1 in item.timsRewardResp">
<div class="award-item" v-for="(item1, index1) in item.timsRewardResp" :key="index1">
<span class="num">+{{item1.rewardQuantity}}</span>
<span class="award-name">{{detailAwardsName(item1.rewardType)}}</span>
</div>
</div>
</div>
</div>
<div class="no-more" v-if="noMore&&personDetails.length">
<div class="no-more" v-if="noMore&&personDetails.length>=10">
<span class="line"></span>
<span class="text">到底啦</span>
<span class="line"></span>
......
pages/person-ranking/index.less
浏览文件 @ ba658e50
......@@ -130,5 +130,22 @@
}
}
}
.no-more {
height: 62px;
display: flex;
justify-content: center;
align-items: center;
.line {
display: inline-block;
width: 84px;
height: 1px;
background:#F7F7F7;
}
.text {
color: #BEC2CC;
font-size: 13px;
margin: 0 8px;
}
}
}
}
\ No newline at end of file
pages/person-ranking/index.vue
浏览文件 @ ba658e50
......@@ -38,13 +38,18 @@
<span class="marginAuto">{{activeBtnType?'今日':'累计'}}勤奋分</span>
</div>
<div class="ranking-list" :style="{marginBottom: `${50+homeIndicatorHeight}Px`}">
<div class="item" v-for="(item,index) in rankData.topRankList">
<div class="item" v-for="(item,index) in topRankList" :key="index">
<img v-if="index<=2" :src="dealRankIcon(index)" alt="" class="ranking-icon">
<p v-else class="icon-num" >{{index+1}}</p>
<img :src="item.avatarImageUrl" alt="" class="doctor-photo">
<p class="doctor-name">{{item.name}}</p>
<p class="num">{{item.score}}</p>
</div>
<div class="no-more" v-if="topRankList.length>=10">
<span class="line"></span>
<span class="text">到底啦</span>
<span class="line"></span>
</div>
</div>
<footer-button
:btnText="btnText"
......@@ -71,6 +76,7 @@
showPop: false,
title: '个人明细',
rankData: {},
topRankList: [], //排行榜list
rightBtn: '',
headBtn: {
leftName: '今日排行榜',
......@@ -139,6 +145,7 @@
getTodayUserRanking().then(res => {
if(res.code == '000000') {
this.rankData = res.data;
this.topRankList = res.data.topRankList
this.getRankAwards(this.rankData,res.data.todayDate);
this.todayDate = res.data.todayDate;
if(this.rankData.score) {
......
pages/prehot.vue
浏览文件 @ ba658e50
......@@ -69,7 +69,6 @@ import { Toast } from 'vant';
import { remind, getRemindStatus, checkHospitalStatus, getCnt, checkToken } from '@/service';
import h5header from '@/components/h5header';
import shareContainer from '@/components/share-container';
import { BASE_URL } from '@/utils/enumerate';
export default {
// head() {
......@@ -152,16 +151,8 @@ export default {
this.scrollHandle();
// 微信分享
this.$picaWxShare({
// baseUrl: BASE_URL[process.env.NUXT_ENV_APP],
baseUrl: 'https://test1-sc.yunqueyi.com',
authUrl: window.location.href,
isDebug: false,
type: 15,
jsApiList: [
'checkJsApi',
'onMenuShareTimeline',
'onMenuShareAppMessage'
]
type: (process.env.NUXT_ENV_APP != 'prod') ? 15 : '',
authUrl: wxShare.shareUrl
},(wx)=>{
const title = this.shareObj.title1;
const desc = this.shareObj.title2;
......
pages/shareActive.vue
浏览文件 @ ba658e50
......@@ -72,7 +72,6 @@
time: TIMEALL,
btnMsg: '点击获取',
isReq: false,
shareObj: wxShare,
}
},
async asyncData({ query }){
......@@ -101,26 +100,18 @@
},
mounted(){
document.querySelector('body').setAttribute('style', 'background: #FE9A51;');
// document.querySelector('body').setAttribute('style', 'overflow-x: hidden;');
this.checkCache();
// 微信分享
this.shareObj.shareUrl = window.location.href;
window.localStorage.setItem('shareUrl', this.shareObj.shareUrl);
wxShare.shareUrl = window.location.href;
window.localStorage.setItem('shareUrl', wxShare.shareUrl);
this.$picaWxShare({
// baseUrl: BASE_URL[process.env.NUXT_ENV_APP],
baseUrl: 'https://test1-sc.yunqueyi.com',
type: 15,
authUrl: this.shareObj.shareUrl,
isDebug: false,
jsApiList: [
'onMenuShareTimeline',
'onMenuShareAppMessage'
]
type: (process.env.NUXT_ENV_APP != 'prod') ? 15 : '',
authUrl: wxShare.shareUrl,
},(wx)=>{
const title = this.shareObj.title1;
const desc = this.shareObj.title2;
const title = wxShare.title1;
const desc = wxShare.title2;
const link = window.localStorage.getItem('shareUrl') || window.location.href;
const imgUrl = this.shareObj.shareImageUrl;
const imgUrl = wxShare.shareImageUrl;
// 分享给朋友
wx.onMenuShareAppMessage({
title,desc,link,imgUrl
......
pages/shareResult.vue
浏览文件 @ ba658e50
......@@ -55,44 +55,24 @@
<script>
import { wxShare } from '@/configs/wxShare';
export default {
// asyncData({ query }){
// const { status } = query; // 上个页面传递过来领取结果， false 为已领取， true 为领取成功
// const statusTxt = (status=='true') ? '领取成功' : '您已领取';
// return {
// statusTxt
// }
// },
data(){
return {
shareObj: wxShare,
statusTxt: ''
}
},
mounted(){
if(this.$route.query.status.toString()=='true'){
this.statusTxt = '领取成功';
}else{
this.statusTxt = '您已领取';
}
this.statusTxt = (this.$route.query.status.toString()=='true') ? '领取成功' : '您已领取';
document.querySelector('body').setAttribute('style', 'background: "";');
// document.querySelector('body').setAttribute('style', 'overflow-x: hidden;');
// 微信分享
this.shareObj.shareUrl = window.location.href;
wxShare.shareUrl = window.location.href;
this.$picaWxShare({
// baseUrl: BASE_URL[process.env.NUXT_ENV_APP],
baseUrl: 'https://test1-sc.yunqueyi.com',
type: 15,
authUrl: this.shareObj.shareUrl,
isDebug: false,
jsApiList: [
'onMenuShareTimeline',
'onMenuShareAppMessage'
]
type: (process.env.NUXT_ENV_APP != 'prod') ? 15 : '',
authUrl: wxShare.shareUrl
},(wx)=>{
const title = this.shareObj.title1;
const desc = this.shareObj.title2;
const title = wxShare.title1;
const desc = wxShare.title2;
const link = window.localStorage.getItem('shareUrl') || window.location.href;
const imgUrl = this.shareObj.shareImageUrl;
const imgUrl = wxShare.shareImageUrl;
// 分享给朋友
wx.onMenuShareAppMessage({
title,desc,link,imgUrl
......
pages/yesterday-prize/index.less
浏览文件 @ ba658e50
......@@ -78,6 +78,22 @@
transform: scaleY(0.5);
}
}
.no-more {
height: 62px;
display: flex;
justify-content: center;
align-items: center;
.line {
display: inline-block;
width: 84px;
height: 1px;
background:#F7F7F7;
}
.text {
color: #BEC2CC;
font-size: 13px;
margin: 0 8px;
}
}
}
}
\ No newline at end of file
pages/yesterday-prize/index.vue
浏览文件 @ ba658e50
......@@ -3,10 +3,11 @@
<normal-header
:title="title"
:rightText="rightText"
:backType="1">
:backType="1"
@handleRightBtn="rightBtn">
</normal-header>
<div class="prize-list" :style="{ marginTop: `${44+statusBarHeight}Px`,marginBottom: `${50+homeIndicatorHeight}Px`}">
<div class="item" v-for="(item, index) in rewardsList">
<div class="item" v-for="(item, index) in rewardsList" :key="index">
<img v-if="index<=2" :src="dealRankIcon(index)" alt="" class="ranking-icon">
<p v-else class="icon-num" >{{index+1}}</p>
<div class="item-right">
......@@ -20,6 +21,11 @@
<p class="awards" v-if="index>2">体温计*1支</p>
</div>
</div>
<div class="no-more" v-if="rewardsList.length>=10">
<span class="line"></span>
<span class="text">到底啦</span>
<span class="line"></span>
</div>
</div>
<footer-button
:btnText="btnText"
......@@ -67,6 +73,31 @@
return require('../../assets/img/icon-copper.png')
}
},
rightBtn() {
let url = 'https://phome.yunqueyi.com/template_v2/?id=599';
let paramList = [
{
"key":"pageUrl",
"value": url,
"type":4,
"seqNo":1
}/*,{
"key":"showTitle",
"value": false,
"type":1,
"seqNo":2
},{
"key":"title",
"value": '',
"type":1,
"seqNo":3
}*/
]
this.$rocNative.dispatchEventByModuleCode({
modeCode: 'M300',
jsonString: paramList
});
},
getRewardList() {
getYesterdayRanking().then(res => {
if(res.code == '000000') {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或