hotfix/【20211018】修改桂冠俱乐部专区星路历程和专属海报在生产环境上出现的bug--提交人:张齐

This commit is contained in:
zhangqi1
2021-10-18 14:26:15 +08:00
parent 3dde1befc7
commit 57f96682ce
2 changed files with 147 additions and 111 deletions

View File

@@ -223,9 +223,6 @@ export default {
ctx.textAlign = 'center' ctx.textAlign = 'center'
ctx.fillText(that.posterCanvasObj.managerComName, 310, 830) // 地区名称 ctx.fillText(that.posterCanvasObj.managerComName, 310, 830) // 地区名称
ctx.fillStyle = '#FFCB6B' ctx.fillStyle = '#FFCB6B'
ctx.font = '90px PingFangSC-Light, PingFang SC'
ctx.fillText('·', 400, 850) // 间隔符
ctx.fillStyle = '#FFCB6B'
ctx.font = '32px SourceHanSerifCN-SemiBold' ctx.font = '32px SourceHanSerifCN-SemiBold'
ctx.textAlign = 'center' ctx.textAlign = 'center'
ctx.fillText(that.posterCanvasObj.name, 450, 830) // 名称 ctx.fillText(that.posterCanvasObj.name, 450, 830) // 名称

View File

@@ -1,25 +1,29 @@
<template> <template>
<div v-if="isCheck == 1" class="text-center"> <div v-if='isCheck == 1' class='text-center'>
<img class="w40 h40 mt60 mb20" src="@/assets/images/ebiz/waiting.png" alt="" /> <img class='w40 h40 mt60 mb20' src='@/assets/images/ebiz/waiting.png' alt='' />
<p class="f10 gray">您当前不是桂冠会员暂无使用权限</p> <p class='f10 gray'>您当前不是桂冠会员暂无使用权限</p>
</div> </div>
<div v-else-if="isCheck == 0" class="starProcess-container"> <div v-else-if='isCheck == 0' class='starProcess-container'>
<!-- 开启播放背景音乐的图标 --> <!-- 开启播放背景音乐的图标 -->
<img class="play-music-img" v-if="isPlayAudio" @click="isPlayAudioFunc" :src="globalDataObj.imageObj.playMusicImg" alt="" /> <img class='play-music-img' v-if='isPlayAudio' @click='isPlayAudioFunc' :src='globalDataObj.imageObj.playMusicImg'
alt='' />
<!-- 关闭播放背景音乐的图标 --> <!-- 关闭播放背景音乐的图标 -->
<img class="close-play-music-img" v-if="!isPlayAudio" @click="isPlayAudioFunc" :src="globalDataObj.imageObj.closePlayMusicImg" alt="" /> <img class='close-play-music-img' v-if='!isPlayAudio' @click='isPlayAudioFunc'
:src='globalDataObj.imageObj.closePlayMusicImg' alt='' />
<!-- 引入音频组件 --> <!-- 引入音频组件 -->
<audio-component ref="audioComponents"></audio-component> <audio-component ref='audioComponents'></audio-component>
<!-- 下方轮播组件中第四个页面中的职级变化列表模块 --> <!-- 下方轮播组件中第四个页面中的职级变化列表模块 -->
<div class="agentGrade-change-div" v-if="currentCopy == 3"> <div class='agentGrade-change-div' v-if='currentCopy == 3'>
<img class="time-line-img animate__animated animate__zoomIn animate__slow" :src="fourthPageDataObj.imageObj.timeLineImg" alt="" /> <img class='time-line-img animate__animated animate__zoomIn animate__slow'
<div class="agentGrade-change-list animate__animated animate__fadeInLeft animate__slow"> :src='fourthPageDataObj.imageObj.timeLineImg' alt='' />
<div class="content" v-for="(item, index) in fourthPageDataObj.rankAllData" :key="index"> <div class='agentGrade-change-list animate__animated animate__fadeInLeft animate__slow'>
<span class="time">{{ item.startdate }}</span> <div class='content' v-for='(item, index) in fourthPageDataObj.rankAllData' :key='index'>
<span class='time'>{{ item.startdate }}</span>
<span <span
>这一天<span class="name-or-agentGrade">{{ item.name }}</span >这一天<span class='name-or-agentGrade'>{{ item.name }}</span
>达成<span class="name-or-agentGrade">{{ item.agentgrade | agentGrade(fourthPageDataObj.agentGradeEnumObj) }}</span></span >达成<span class='name-or-agentGrade'>{{ item.agentgrade | agentGrade(fourthPageDataObj.agentGradeEnumObj)
}}</span></span
> >
<span>{{ item.agentgrade | slogan(fourthPageDataObj.agentGradeEnumObj) }}</span> <span>{{ item.agentgrade | slogan(fourthPageDataObj.agentGradeEnumObj) }}</span>
</div> </div>
@@ -27,162 +31,189 @@
</div> </div>
<!-- 轮播组件 --> <!-- 轮播组件 -->
<van-swipe @change="changeVanSwipeFunc" :loop="false" :show-indicators="false" :touchable="true" vertical> <van-swipe @change='changeVanSwipeFunc' :loop='false' :show-indicators='false' :touchable='true' vertical>
<!-- 第一页 --> <!-- 第一页 -->
<van-swipe-item> <van-swipe-item>
<div class="first-page-background-img animate__animated animate__fadeIn" v-if="current == 0"> <div class='first-page-background-img animate__animated animate__fadeIn' v-if='current == 0'>
<img class="crown-group-img animate__animated animate__zoomIn animate__slow" :src="globalDataObj.imageObj.crownGroupImg" alt="" /> <img class='crown-group-img animate__animated animate__zoomIn animate__slow'
<img class="company-name-img animate__animated animate__zoomIn" :src="firstPageDataObj.imageObj.companyNameImg" alt="" /> :src='globalDataObj.imageObj.crownGroupImg' alt='' />
<img class="company-introduce-img animate__animated animate__zoomIn animate__slow" :src="firstPageDataObj.imageObj.companyIntroduceImg" alt="" /> <img class='company-name-img animate__animated animate__zoomIn'
<img class="company-slogan-img animate__animated animate__zoomIn animate__slower" :src="firstPageDataObj.imageObj.companySloganImg" alt="" /> :src='firstPageDataObj.imageObj.companyNameImg' alt='' />
<img class="down-arrow-img animate__animated animate__shakeY animate__slower animate__infinite" :src="globalDataObj.imageObj.downArrowImg" alt="" /> <img class='company-introduce-img animate__animated animate__zoomIn animate__slow'
:src='firstPageDataObj.imageObj.companyIntroduceImg' alt='' />
<img class='company-slogan-img animate__animated animate__zoomIn animate__slower'
:src='firstPageDataObj.imageObj.companySloganImg' alt='' />
<img class='down-arrow-img animate__animated animate__shakeY animate__slower animate__infinite'
:src='globalDataObj.imageObj.downArrowImg' alt='' />
</div> </div>
</van-swipe-item> </van-swipe-item>
<!-- 第二页 --> <!-- 第二页 -->
<van-swipe-item> <van-swipe-item>
<div class="second-page-background-img animate__animated animate__fadeIn" v-if="current == 1"> <div class='second-page-background-img animate__animated animate__fadeIn' v-if='current == 1'>
<img class="crown-group-img animate__animated animate__zoomIn animate__slow" :src="globalDataObj.imageObj.crownGroupImg" alt="" /> <img class='crown-group-img animate__animated animate__zoomIn animate__slow'
:src='globalDataObj.imageObj.crownGroupImg' alt='' />
<!-- --> <!-- -->
<div v-if="globalDataObj.sex == '0'"> <div v-if="globalDataObj.sex == '0'">
<div class="man-card-img animate__animated animate__bounceIn animate__delay-1s"> <div class='man-card-img animate__animated animate__bounceIn animate__delay-1s'>
<div class="line line-first animate__animated animate__bounceInLeft"> <div class='line line-first animate__animated animate__bounceInLeft'>
我于 <span class="special-text">{{ this.formatEmployDate.year }}</span 我于 <span class='special-text'>{{ this.formatEmployDate.year }}</span
> <span class="special-text">{{ this.formatEmployDate.month }}</span > <span class='special-text'>{{ this.formatEmployDate.month }}</span
> <span class="special-text">{{ this.formatEmployDate.day }}</span > <span class='special-text'>{{ this.formatEmployDate.day }}</span
> >
</div> </div>
<div class="line line-second animate__animated animate__bounceInLeft">加入国富人寿</div> <div class='line line-second animate__animated animate__bounceInLeft'>加入国富人寿</div>
<div class="line line-third animate__animated animate__bounceInLeft"> <div class='line line-third animate__animated animate__bounceInLeft'>
至今已<span class="special-text">{{ this.formatEmployDate.employDateBetweenToday }}</span 至今已<span class='special-text'>{{ this.formatEmployDate.employDateBetweenToday }}</span
> >
</div> </div>
</div> </div>
<img class="man-img animate__animated animate__zoomIn" :src="secondPageDataObj.imageObj.manImg" alt="" /> <img class='man-img animate__animated animate__zoomIn' :src='secondPageDataObj.imageObj.manImg' alt='' />
</div> </div>
<!-- --> <!-- -->
<div v-if="globalDataObj.sex == '1'"> <div v-if="globalDataObj.sex == '1'">
<div class="woman-card-img animate__animated animate__bounceIn animate__delay-1s"> <div class='woman-card-img animate__animated animate__bounceIn animate__delay-1s'>
<div class="line line-first animate__animated animate__bounceInLeft"> <div class='line line-first animate__animated animate__bounceInLeft'>
我于 <span class="special-text">{{ this.formatEmployDate.year }}</span 我于 <span class='special-text'>{{ this.formatEmployDate.year }}</span
> <span class="special-text">{{ this.formatEmployDate.month }}</span > <span class='special-text'>{{ this.formatEmployDate.month }}</span
> <span class="special-text">{{ this.formatEmployDate.day }}</span > <span class='special-text'>{{ this.formatEmployDate.day }}</span
> >
</div> </div>
<div class="line line-second animate__animated animate__bounceInLeft">加入国富人寿</div> <div class='line line-second animate__animated animate__bounceInLeft'>加入国富人寿</div>
<div class="line line-third animate__animated animate__bounceInLeft"> <div class='line line-third animate__animated animate__bounceInLeft'>
至今已<span class="special-text">{{ this.formatEmployDate.employDateBetweenToday }}</span 至今已<span class='special-text'>{{ this.formatEmployDate.employDateBetweenToday }}</span
> >
</div> </div>
</div> </div>
<img class="woman-img animate__animated animate__zoomIn" :src="secondPageDataObj.imageObj.womanImg" alt="" /> <img class='woman-img animate__animated animate__zoomIn' :src='secondPageDataObj.imageObj.womanImg'
alt='' />
</div> </div>
<img class="down-arrow-img animate__animated animate__shakeY animate__slower animate__infinite" :src="globalDataObj.imageObj.downArrowImg" alt="" /> <img class='down-arrow-img animate__animated animate__shakeY animate__slower animate__infinite'
:src='globalDataObj.imageObj.downArrowImg' alt='' />
</div> </div>
</van-swipe-item> </van-swipe-item>
<!-- 第三页 --> <!-- 第三页 -->
<van-swipe-item> <van-swipe-item>
<div class="third-page-background-img animate__animated animate__fadeIn" v-if="current == 2"> <div class='third-page-background-img animate__animated animate__fadeIn' v-if='current == 2'>
<img class="crown-group-img animate__animated animate__zoomIn animate__slow" :src="globalDataObj.imageObj.crownGroupImg" alt="" /> <img class='crown-group-img animate__animated animate__zoomIn animate__slow'
<img class="together-img animate__animated animate__zoomIn" :src="thirdPageDataObj.imageObj.togetherImg" alt="" /> :src='globalDataObj.imageObj.crownGroupImg' alt='' />
<h1 class="userName animate__animated animate__zoomIn animate__slow">{{ globalDataObj.name }}</h1> <img class='together-img animate__animated animate__zoomIn' :src='thirdPageDataObj.imageObj.togetherImg'
<img class="star-path-img animate__animated animate__zoomIn animate__slower" :src="thirdPageDataObj.imageObj.starPathImg" alt="" /> alt='' />
<img class="fireworks-left-img animate__animated animate__zoomIn animate__slower" :src="thirdPageDataObj.imageObj.fireworksLeftImg" alt="" /> <h1 class='userName animate__animated animate__zoomIn animate__slow'>{{ globalDataObj.name }}</h1>
<img class="fireworks-right-top-img animate__animated animate__zoomIn animate__slower" :src="thirdPageDataObj.imageObj.fireworksRightTopImg" alt="" /> <img class='star-path-img animate__animated animate__zoomIn animate__slower'
:src='thirdPageDataObj.imageObj.starPathImg' alt='' />
<img class='fireworks-left-img animate__animated animate__zoomIn animate__slower'
:src='thirdPageDataObj.imageObj.fireworksLeftImg' alt='' />
<img class='fireworks-right-top-img animate__animated animate__zoomIn animate__slower'
:src='thirdPageDataObj.imageObj.fireworksRightTopImg' alt='' />
<img <img
class="fireworks-right-down-img animate__animated animate__zoomIn animate__slower" class='fireworks-right-down-img animate__animated animate__zoomIn animate__slower'
:src="thirdPageDataObj.imageObj.fireworksRightDownImg" :src='thirdPageDataObj.imageObj.fireworksRightDownImg'
alt="" alt=''
/> />
<img class="runner-reticular-img animate__animated animate__fadeInLeft animate__slower" :src="thirdPageDataObj.imageObj.runnerReticularImg" alt="" /> <img class='runner-reticular-img animate__animated animate__fadeInLeft animate__slower'
<img class="down-arrow-img animate__animated animate__shakeY animate__slower animate__infinite" :src="globalDataObj.imageObj.downArrowImg" alt="" /> :src='thirdPageDataObj.imageObj.runnerReticularImg' alt='' />
<img class='down-arrow-img animate__animated animate__shakeY animate__slower animate__infinite'
:src='globalDataObj.imageObj.downArrowImg' alt='' />
</div> </div>
</van-swipe-item> </van-swipe-item>
<!-- 第四页 --> <!-- 第四页 -->
<van-swipe-item> <van-swipe-item>
<div class="fourth-page-background-img animate__animated animate__fadeIn" v-if="current == 3"> <div class='fourth-page-background-img animate__animated animate__fadeIn' v-if='current == 3'>
<div class="Echart animate__animated animate__zoomIn"></div> <div class='Echart animate__animated animate__zoomIn'></div>
<img class="down-arrow-img animate__animated animate__shakeY animate__slower animate__infinite" :src="globalDataObj.imageObj.downArrowImg" alt="" /> <img class='down-arrow-img animate__animated animate__shakeY animate__slower animate__infinite'
:src='globalDataObj.imageObj.downArrowImg' alt='' />
</div> </div>
</van-swipe-item> </van-swipe-item>
<!-- 第五页 --> <!-- 第五页 -->
<van-swipe-item> <van-swipe-item>
<div class="fifth-page-background-img animate__animated animate__fadeIn" v-if="current == 4"> <div class='fifth-page-background-img animate__animated animate__fadeIn' v-if='current == 4'>
<img class="crown-group-img animate__animated animate__zoomIn animate__slow" :src="globalDataObj.imageObj.crownGroupImg" alt="" /> <img class='crown-group-img animate__animated animate__zoomIn animate__slow'
<div class="global-style"> :src='globalDataObj.imageObj.crownGroupImg' alt='' />
<img class="GG-level-img animate__animated animate__zoomIn" :src="fifthPageDataObj.imageObj.GGLevelImg" alt="" /> <div class='global-style'>
<span class="animate__animated animate__fadeInLeft" v-if="fifthPageDataObj.glevel != 0" <img class='GG-level-img animate__animated animate__zoomIn' :src='fifthPageDataObj.imageObj.GGLevelImg'
>桂冠级别已达<strong>{{ fifthPageDataObj.glevel }}</strong alt='' />
> <span class='animate__animated animate__fadeInLeft' v-if='fifthPageDataObj.glevel != 0'
>桂冠级别已达<strong>{{ fifthPageDataObj.glevel }}</strong
>
</span> </span>
<span class="animate__animated animate__fadeInLeft" v-else>桂冠级别为非会员</span> <span class='animate__animated animate__fadeInLeft' v-else>桂冠级别为非会员</span>
</div> </div>
<div class="global-style" v-if="fifthPageDataObj.slevel != 0"> <div class='global-style' v-if='fifthPageDataObj.slevel != 0'>
<img class="SG-level-img animate__animated animate__zoomIn animate__slow" :src="fifthPageDataObj.imageObj.SGLevelImg" alt="" /> <img class='SG-level-img animate__animated animate__zoomIn animate__slow'
<span class="animate__animated animate__fadeInLeft animate__slow" :src='fifthPageDataObj.imageObj.SGLevelImg' alt='' />
>双冠级别已达<strong>{{ fifthPageDataObj.slevel }}</strong <span class='animate__animated animate__fadeInLeft animate__slow'
> >双冠级别已达<strong>{{ fifthPageDataObj.slevel }}</strong
>
</span> </span>
</div> </div>
<div class="global-style"> <div class='global-style'>
<img class="service-number-img animate__animated animate__zoomIn animate__slower" :src="fifthPageDataObj.imageObj.serviceNumberImg" alt="" /> <img class='service-number-img animate__animated animate__zoomIn animate__slower'
<span class="animate__animated animate__fadeInLeft animate__slower" :src='fifthPageDataObj.imageObj.serviceNumberImg' alt='' />
>当前服务客户数量已达<strong>{{ fifthPageDataObj.clientcount }}</strong <span class='animate__animated animate__fadeInLeft animate__slower'
>/ >当前服务客户数量已达<strong>{{ fifthPageDataObj.clientcount }}</strong
>/
</span> </span>
</div> </div>
<div class="global-style"> <div class='global-style'>
<img class="cumulative-number-img animate__animated animate__zoomIn" :src="fifthPageDataObj.imageObj.cumulativeNumberImg" alt="" /> <img class='cumulative-number-img animate__animated animate__zoomIn'
<span class="cumulative-number-span animate__animated animate__fadeInLeft" :src='fifthPageDataObj.imageObj.cumulativeNumberImg' alt='' />
>累计为<strong>{{ fifthPageDataObj.polnum }}</strong <span class='cumulative-number-span animate__animated animate__fadeInLeft'
>位客户送去保障 >累计为<strong>{{ fifthPageDataObj.polnum }}</strong
>位客户送去保障
</span> </span>
</div> </div>
<div class="global-style"> <div class='global-style'>
<img class="security-fund-img animate__animated animate__zoomIn" :src="fifthPageDataObj.imageObj.securityFundImg" alt="" /> <img class='security-fund-img animate__animated animate__zoomIn'
<span class="security-fund-span animate__animated animate__fadeInLeft" :src='fifthPageDataObj.imageObj.securityFundImg' alt='' />
>客户保障金额达<strong>{{ fifthPageDataObj.transmoney }}</strong <span class='security-fund-span animate__animated animate__fadeInLeft'
>万元 >客户保障金额达<strong>{{ fifthPageDataObj.transmoney }}</strong
>万元
</span> </span>
</div> </div>
<img class="down-arrow-img animate__animated animate__shakeY animate__slower animate__infinite" :src="globalDataObj.imageObj.downArrowImg" alt="" /> <img class='down-arrow-img animate__animated animate__shakeY animate__slower animate__infinite'
:src='globalDataObj.imageObj.downArrowImg' alt='' />
</div> </div>
</van-swipe-item> </van-swipe-item>
<!-- 第六页 --> <!-- 第六页 -->
<van-swipe-item> <van-swipe-item>
<div class="sixth-page-background-img animate__animated animate__fadeIn" v-if="current == 5"> <div class='sixth-page-background-img animate__animated animate__fadeIn' v-if='current == 5'>
<img class="crown-img animate__animated animate__zoomIn" :src="sixthPageDataObj.imageObj.crownImg" alt="" /> <img class='crown-img animate__animated animate__zoomIn' :src='sixthPageDataObj.imageObj.crownImg' alt='' />
<img class="head-portrait-img" :src="globalDataObj.headPortraitImg" alt="" /> <img class='head-portrait-img' :src='globalDataObj.headPortraitImg' alt='' />
<div class="name-likedNumber" v-if="!isWeixin"> <div class='name-likedNumber' v-if='!isWeixin'>
<span class="name">{{ globalDataObj.name }}</span> <span class='name'>{{ globalDataObj.name }}</span>
<span class="likedNumber">收获点赞量为 {{ sixthPageDataObj.likedNumber > 999 ? '999+' : sixthPageDataObj.likedNumber }}继续加油吧</span> <span
class='likedNumber'>收获点赞量为 {{ sixthPageDataObj.likedNumber > 999 ? '999+' : sixthPageDataObj.likedNumber
}}继续加油吧</span>
</div> </div>
<div v-else> <div v-else>
<img class="no-likes-img" :src="sixthPageDataObj.imageObj.noLikesImg" @click="goLikedFunc" v-if="!sixthPageDataObj.isLiked" alt="" /> <img class='no-likes-img' :src='sixthPageDataObj.imageObj.noLikesImg' @click='goLikedFunc'
<img class="Liked-img" :src="sixthPageDataObj.imageObj.LikedImg" v-else alt="" /> v-if='!sixthPageDataObj.isLiked' alt='' />
<img class='Liked-img' :src='sixthPageDataObj.imageObj.LikedImg' v-else alt='' />
<img <img
class="add-one-like-img animate__animated animate__fadeInUp" class='add-one-like-img animate__animated animate__fadeInUp'
:src="sixthPageDataObj.imageObj.addOneLikeImg" :src='sixthPageDataObj.imageObj.addOneLikeImg'
v-if="sixthPageDataObj.addOneLiked" v-if='sixthPageDataObj.addOneLiked'
alt="" alt=''
/> />
<div class="name-likedNumber-fighting"> <div class='name-likedNumber-fighting'>
<span <span
> <span class="name">{{ globalDataObj.name }}</span> 收获点赞量为 > <span class='name'>{{ globalDataObj.name }}</span> 收获点赞量为
{{ sixthPageDataObj.likedNumber > 999 ? '999+' : sixthPageDataObj.likedNumber }}</span {{ sixthPageDataObj.likedNumber > 999 ? '999+' : sixthPageDataObj.likedNumber }}</span
> >
<span>赶快为你的代理人点赞加油吧</span> <span>赶快为你的代理人点赞加油吧</span>
</div> </div>
</div> </div>
<img class="bottom-slogan-img animate__animated animate__zoomIn" :src="sixthPageDataObj.imageObj.bottomSloganImg" alt="" /> <img class='bottom-slogan-img animate__animated animate__zoomIn'
:src='sixthPageDataObj.imageObj.bottomSloganImg' alt='' />
</div> </div>
</van-swipe-item> </van-swipe-item>
</van-swipe> </van-swipe>
<Loading :isLoading="isLoading"></Loading> <Loading :isLoading='isLoading'></Loading>
</div> </div>
</template> </template>
@@ -192,7 +223,12 @@ import { Swipe, SwipeItem } from 'vant'
import audioComponent from '../../../components/common/audioComponent' import audioComponent from '../../../components/common/audioComponent'
import audioMusic from '@/assets/audio/audio-star-process-music.mp3' import audioMusic from '@/assets/audio/audio-star-process-music.mp3'
// 引入调用接口的方法 // 引入调用接口的方法
import { queryPersonal, queryStarCourseDataUrl, queryFavorDataUrl, editFavorDataUrl } from '@/api/ebiz/laurelClub/laurelClub' import {
queryPersonal,
queryStarCourseDataUrl,
queryFavorDataUrl,
editFavorDataUrl
} from '@/api/ebiz/laurelClub/laurelClub'
import { getAgentInfo } from '@/api/ebiz/my/my' import { getAgentInfo } from '@/api/ebiz/my/my'
import { getSharingToken } from '@/api/ebiz/proposal/proposal' import { getSharingToken } from '@/api/ebiz/proposal/proposal'
// 公共的图片路径 // 公共的图片路径
@@ -381,6 +417,9 @@ export default {
* @Date:2021-09-02 * @Date:2021-09-02
*/ */
appCallBack(data) { appCallBack(data) {
if (data.trigger == 'left_button_click') {
this.$refs.audioComponents.handlePause()
}
if (data.trigger == 'right_button_click') { if (data.trigger == 'right_button_click') {
getSharingToken({ shareType: 'club_star_process' }).then((res) => { getSharingToken({ shareType: 'club_star_process' }).then((res) => {
if (res.result == '0') { if (res.result == '0') {
@@ -592,7 +631,7 @@ export default {
}, },
axisLabel: { axisLabel: {
margin: 15, margin: 15,
formatter: function (value) { formatter: function(value) {
let dataArr = value.split('-') let dataArr = value.split('-')
return dataArr[0] + '\n' + dataArr[1] + '-' + dataArr[2] return dataArr[0] + '\n' + dataArr[1] + '-' + dataArr[2]
} }