Commit 63575108 authored by 罗超's avatar 罗超

修改

parent 82c244d8
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
:class="{'mobile':$q.platform.is.mobile}"> :class="{'mobile':$q.platform.is.mobile}">
<q-img v-if="$q.platform.is.desktop" src="../../assets/images/personal/bg1.png" <q-img v-if="$q.platform.is.desktop" src="../../assets/images/personal/bg1.png"
width="156px" width="156px"
height="162px" style="position: absolute; bottom: 0px;"/> height="162px" style="position: absolute; bottom: 0px;"/>
<div class="text-center passbookHead-title" <div class="text-center passbookHead-title"
:class="[$q.platform.is.desktop?'desktop':'mobile']"> :class="[$q.platform.is.desktop?'desktop':'mobile']">
<q-img src="../../assets/images/personal/title.png" <q-img src="../../assets/images/personal/title.png"
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<q-img v-if="$q.platform.is.mobile" src="../../assets/images/personal/bg1.png" <q-img v-if="$q.platform.is.mobile" src="../../assets/images/personal/bg1.png"
style="position: absolute;right: 20px;top: 40px;" style="position: absolute;right: 20px;top: 40px;"
width="117px" width="117px"
height="auto"/> height="auto"/>
</div> </div>
<q-separator v-if="$q.platform.is.mobile" dark class="q-mt-md" /> <q-separator v-if="$q.platform.is.mobile" dark class="q-mt-md" />
<div class="row justify-between col-8" <div class="row justify-between col-8"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
:style="{'width':$q.platform.is.mobile?'100%':''}"> :style="{'width':$q.platform.is.mobile?'100%':''}">
<q-img v-if="$q.platform.is.desktop" src="../../assets/images/personal/ck.png" <q-img v-if="$q.platform.is.desktop" src="../../assets/images/personal/ck.png"
width="12px" width="12px"
height="12px" style="position: relative; top: 0px;"/> height="12px" style="position: relative; top: 0px;"/>
<span class="fz14 q-pl-xs">{{$t('v104.passbook.details')}}</span> <span class="fz14 q-pl-xs">{{$t('v104.passbook.details')}}</span>
</div> </div>
</div> </div>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
background: -webkit-linear-gradient(left, #F0886B , #ED6A6B); background: -webkit-linear-gradient(left, #F0886B , #ED6A6B);
background: -moz-linear-gradient(right, #F0886B, #ED6A6B); background: -moz-linear-gradient(right, #F0886B, #ED6A6B);
background: -o-linear-gradient(right, #F0886B, #ED6A6B); background: -o-linear-gradient(right, #F0886B, #ED6A6B);
background: linear-gradient(to right, #F0886B , #ED6A6B); background: linear-gradient(to right, #F0886B , #ED6A6B);
border-radius: 24px; border-radius: 24px;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<div class="bg-white q-mt-lg" <div class="bg-white q-mt-lg"
:style="{'margin':$q.platform.is.mobile?'20px 10px 0 10px':'', :style="{'margin':$q.platform.is.mobile?'20px 10px 0 10px':'',
'border-radius':$q.platform.is.desktop?'':'10px'}"> 'border-radius':$q.platform.is.desktop?'':'10px'}">
<rebatehead :title="titleHead"/> <rebatehead :title="titleHead"/>
<q-separator color="grey-3" class="q-my-sm" /> <q-separator color="grey-3" class="q-my-sm" />
<div <div
style="padding: 15px 0 0 0;" style="padding: 15px 0 0 0;"
:class="[$q.platform.is.desktop?'row justify-between':'column reverse']"> :class="[$q.platform.is.desktop?'row justify-between':'column reverse']">
<!-- style="border: 1px dashed #E0E0E0;" --> <!-- style="border: 1px dashed #E0E0E0;" -->
<div class="col"> <div class="col">
<div v-if="$q.platform.is.mobile" class="text-center fz16 q-pb-md" @click="isShow=!isShow"> <div v-if="$q.platform.is.mobile" class="text-center fz16 q-pb-md" @click="isShow=!isShow">
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
appear appear
enter-active-class="animated fadeInUp" enter-active-class="animated fadeInUp"
leave-active-class="animated fadeInDown" leave-active-class="animated fadeInDown"
> >
<div class="column col rebate-left fz14" <div class="column col rebate-left fz14"
:style="{'padding':$q.platform.is.desktop?'0 30px 0 30px':''}"> :style="{'padding':$q.platform.is.desktop?'0 30px 0 30px':''}">
<div class="row items-center left-text text-grey-9" <div class="row items-center left-text text-grey-9"
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</div> </div>
<q-separator color="grey-3" /> <q-separator color="grey-3" />
<div class="column" v-if="dataList.length>0"> <div class="column" v-if="dataList.length>0">
<div <div
v-for="(item,index) in dataList" v-for="(item,index) in dataList"
class="row items-center left-text text-dark"> class="row items-center left-text text-dark">
<div>{{item.id}}</div> <div>{{item.id}}</div>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<svg-icon :size="50" color="nav" icon="General/Clipboard.svg"></svg-icon> <svg-icon :size="50" color="nav" icon="General/Clipboard.svg"></svg-icon>
<div class="q-mt-md f12 text-grey-6">{{ $t('noneData') }}</div> <div class="q-mt-md f12 text-grey-6">{{ $t('noneData') }}</div>
</div> </div>
</div> </div>
</transition> </transition>
</div> </div>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<div class="fz14 text-grey-7" <div class="fz14 text-grey-7"
:class="[$q.platform.is.desktop?'':'q-pl-md']">{{$t('v104.passbook.titles.text2')}}</div> :class="[$q.platform.is.desktop?'':'q-pl-md']">{{$t('v104.passbook.titles.text2')}}</div>
<div :class="[$q.platform.is.desktop?'q-pl-lg':'']"> <div :class="[$q.platform.is.desktop?'q-pl-lg':'']">
<div ref="main" style="width: 100%;height: 300px;"></div> <div ref="main" style="width: 100%;height: 300px;"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
dataList: [] as Array<any>, dataList: [] as Array<any>,
zbList:[] as Array<any>, zbList:[] as Array<any>,
}) })
const methods = { const methods = {
getZb(){ getZb(){
let CustomerId let CustomerId
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
.then(r => { .then(r => {
data.zbList = [] data.zbList = []
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
let datainfo=r.data.data; let datainfo=r.data.data;
let arr=[]; let arr=[];
datainfo.forEach(item=>{ datainfo.forEach(item=>{
let obj={}; let obj={};
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
passbookService.getDepositBankbookDetail_V2(CustomerId) passbookService.getDepositBankbookDetail_V2(CustomerId)
.then(r => { .then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
data.dataList= r.data.data.pageData; data.dataList= r.data.data.pageData;
} else { } else {
message.errorMsg(r.data.message) message.errorMsg(r.data.message)
} }
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
getinit() { getinit() {
// 基于准备好的dom,初始化echarts实例 // 基于准备好的dom,初始化echarts实例
const myChart = echarts.init(main.value); const myChart = echarts.init(main.value);
// 指定图表的配置项和数据 // 指定图表的配置项和数据
const option = { const option = {
tooltip: { tooltip: {
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
} }
] ]
}; };
// 使用刚指定的配置项和数据显示图表。 // 使用刚指定的配置项和数据显示图表。
myChart.setOption(option); myChart.setOption(option);
} }
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
padding: 15px 30px 0 30px; padding: 15px 30px 0 30px;
} }
.rebate-left { .rebate-left {
} }
.left-text div{ .left-text div{
display: inline-block; display: inline-block;
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
background: #E0E0E0; background: #E0E0E0;
} }
.rebate-right{ .rebate-right{
} }
</style> </style>
\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="bg-white q-mt-lg" <div class="bg-white q-mt-lg"
:style="{'margin':$q.platform.is.mobile?'20px 10px 0 10px':'', :style="{'margin':$q.platform.is.mobile?'20px 10px 0 10px':'',
'border-radius':$q.platform.is.desktop?'':'10px'}"> 'border-radius':$q.platform.is.desktop?'':'10px'}">
<rebatehead :title="titleHead"/> <rebatehead :title="titleHead"/>
<q-separator color="grey-3" class="q-my-sm" /> <q-separator color="grey-3" class="q-my-sm" />
<div style="padding: 15px 0 0 0;" <div style="padding: 15px 0 0 0;"
:class="[$q.platform.is.desktop?'row justify-between':'column mobile']"> :class="[$q.platform.is.desktop?'row justify-between':'column mobile']">
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<p class="fz14 text-grey-7" <p class="fz14 text-grey-7"
:class="[$q.platform.is.desktop?'':'q-pl-md']">{{$t('v104.passbook.titles.text6')}}</p> :class="[$q.platform.is.desktop?'':'q-pl-md']">{{$t('v104.passbook.titles.text6')}}</p>
<div ref="main" :class="[$q.platform.is.desktop?'q-pt-lg':'']" style="height: 280px;position: relative;top: -30px;" <div ref="main" :class="[$q.platform.is.desktop?'q-pt-lg':'']" style="height: 280px;position: relative;top: -30px;"
:style="{'width': $q.platform.is.desktop?'100%':'95%', 'left': $q.platform.is.desktop?'-20px':'10px','top': $q.platform.is.desktop?'-30px':'0'}"></div> :style="{'width': $q.platform.is.desktop?'100%':'95%', 'left': $q.platform.is.desktop?'-20px':'10px','top': $q.platform.is.desktop?'-30px':'0'}"></div>
</div> </div>
<div v-if="$q.platform.is.desktop" class="row justify-center"> <div v-if="$q.platform.is.desktop" class="row justify-center">
<q-separator vertical inset style="height: 50%;position: relative;top: 11%;"/> <q-separator vertical inset style="height: 50%;position: relative;top: 11%;"/>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="row items-end" <div class="row items-end"
:class="[$q.platform.is.desktop?'q-pt-sm q-pb-lg':'justify-center']"> :class="[$q.platform.is.desktop?'q-pt-sm q-pb-lg':'justify-center']">
<span class="fz12">¥</span> <div class="fz32 q-pl-sm"><span style="position: relative;top: 9px;">{{datainfo.Amount}}</span></div> <span class="fz12">¥</span> <div class="fz32 q-pl-sm"><span style="position: relative;top: 9px;">{{datainfo.Amount}}</span></div>
</div> </div>
</div> </div>
<q-separator v-if="$q.platform.is.desktop" color="grey-3"/> <q-separator v-if="$q.platform.is.desktop" color="grey-3"/>
<div :class="[$q.platform.is.desktop?'q-pb-sm':'col-6 text-center']"> <div :class="[$q.platform.is.desktop?'q-pb-sm':'col-6 text-center']">
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</div> </div>
<div :class="[$q.platform.is.desktop?'q-pb-lg q-px-lg':'q-py-md q-px-md']"><span>{{$t('v104.passbook.titles.text11')}}</span><span class="q-pl-lg">¥</span><span class="fz32 q-pl-sm">{{datainfo.Amount.toFixed(2)}}</span> </div> <div :class="[$q.platform.is.desktop?'q-pb-lg q-px-lg':'q-py-md q-px-md']"><span>{{$t('v104.passbook.titles.text11')}}</span><span class="q-pl-lg">¥</span><span class="fz32 q-pl-sm">{{datainfo.Amount.toFixed(2)}}</span> </div>
<div class="q-pt-sm" :class="[$q.platform.is.desktop?'q-px-lg':'q-px-md']"> <div class="q-pt-sm" :class="[$q.platform.is.desktop?'q-px-lg':'q-px-md']">
<div class="q-pb-lg" v-for="(item,index) in datainfo.RatioList" :key="index" <div class="q-pb-lg" v-for="(item,index) in datainfo.RatioList" :key="index"
:class="[$q.platform.is.desktop?'row items-center no-wrap':'column']"> :class="[$q.platform.is.desktop?'row items-center no-wrap':'column']">
<div class="col"> <div class="col">
<template v-if="$q.platform.is.desktop"> <template v-if="$q.platform.is.desktop">
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<q-linear-progress style="border-radius: 15px;" v-else-if="item.percent<1" stripe rounded size="10px" :value="item.width/1000" color="red-5"/> <q-linear-progress style="border-radius: 15px;" v-else-if="item.percent<1" stripe rounded size="10px" :value="item.width/1000" color="red-5"/>
<q-linear-progress style="border-radius: 15px;" v-else stripe rounded size="10px" :value="item.width/1000" color="cyan-4"/> <q-linear-progress style="border-radius: 15px;" v-else stripe rounded size="10px" :value="item.width/1000" color="cyan-4"/>
</template> </template>
</div> </div>
<div class="row items-center no-wrap" <div class="row items-center no-wrap"
:class="[$q.platform.is.desktop?'col-4 q-ml-lg':'col']"> :class="[$q.platform.is.desktop?'col-4 q-ml-lg':'col']">
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<template v-if="$q.platform.is.desktop"> <template v-if="$q.platform.is.desktop">
<q-img v-if="item.percent>1" src="../../assets/images/personal/gou.png" <q-img v-if="item.percent>1" src="../../assets/images/personal/gou.png"
width="20px" width="20px"
height="20px" style="position: relative;"/> height="20px" style="position: relative;"/>
<q-img v-else src="../../assets/images/personal/x1.png" <q-img v-else src="../../assets/images/personal/x1.png"
width="26px" width="26px"
height="26px" style="position: relative;"/> height="26px" style="position: relative;"/>
...@@ -71,13 +71,13 @@ ...@@ -71,13 +71,13 @@
<template v-else> <template v-else>
<q-img v-if="item.percent>1" src="../../assets/images/personal/gou.png" <q-img v-if="item.percent>1" src="../../assets/images/personal/gou.png"
width="15px" width="15px"
height="15px" style="position: relative;"/> height="15px" style="position: relative;"/>
<q-img v-else src="../../assets/images/personal/x1.png" <q-img v-else src="../../assets/images/personal/x1.png"
width="16px" width="16px"
height="16px" style="position: relative;"/> height="16px" style="position: relative;"/>
</template> </template>
</div> </div>
<div <div
:class="[$q.platform.is.desktop?'column q-ml-md':'row no-wrap items-center justify-between q-pt-xs']"> :class="[$q.platform.is.desktop?'column q-ml-md':'row no-wrap items-center justify-between q-pt-xs']">
<span class="row" <span class="row"
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
<template v-if="item.percent>1">{{$t('v104.passbook.titles.text12')}} ¥{{(item.Money*item.Ratio)/1000}}</template> <template v-if="item.percent>1">{{$t('v104.passbook.titles.text12')}} ¥{{(item.Money*item.Ratio)/1000}}</template>
<template v-if="item.percent<1">{{$t('v104.passbook.titles.text13')}}¥{{item.Money-datainfo.Amount}},{{$t('v104.passbook.titles.text14')}} ¥{{(item.Money*item.Ratio)/1000}}</template> <template v-if="item.percent<1">{{$t('v104.passbook.titles.text13')}}¥{{item.Money-datainfo.Amount}},{{$t('v104.passbook.titles.text14')}} ¥{{(item.Money*item.Ratio)/1000}}</template>
</span> </span>
<span class="fz12 text-grey-6 q-pt-xs" <span class="fz12 text-grey-6 q-pt-xs"
:class="[$q.platform.is.desktop?'':'col-6']">{{$t('v104.passbook.titles.text15')}} ¥ {{item.Money}} {{$t('v104.passbook.titles.text16')}}{{item.Ratio}}‰</span> :class="[$q.platform.is.desktop?'':'col-6']">{{$t('v104.passbook.titles.text15')}} ¥ {{item.Money}} {{$t('v104.passbook.titles.text16')}}{{item.Ratio}}‰</span>
</div> </div>
</div> </div>
...@@ -148,12 +148,12 @@ ...@@ -148,12 +148,12 @@
width: 30, width: 30,
} }
}, },
axisTick: false, axisTick: false,
data: data.xMonth, data: data.xMonth,
}, },
yAxis: { yAxis: {
type: "value", type: "value",
min: '10', min: '10',
axisTick: true, axisTick: true,
splitLine: { splitLine: {
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
type: "line", type: "line",
smooth: 2, smooth: 2,
symbol: 'none', symbol: 'none',
data: data.yMoney1, data: data.yMoney1,
lineStyle: { lineStyle: {
width: 3, width: 3,
color: "#36C7D9", color: "#36C7D9",
...@@ -189,30 +189,30 @@ ...@@ -189,30 +189,30 @@
}, },
{ {
type: "line", type: "line",
smooth: 2, smooth: 2,
data: data.yMoney2, data: data.yMoney2,
lineStyle: { lineStyle: {
width: 3, width: 3,
color: "#ED6A6B", color: "#ED6A6B",
type: 'dashed' type: 'dashed'
}, },
itemStyle: { itemStyle: {
borderWidth: 5, borderWidth: 5,
}, },
areaStyle: { areaStyle: {
color: "#FAD2D2" color: "#FAD2D2"
} }
} }
] ]
}; };
// 使用刚指定的配置项和数据显示图表。 // 使用刚指定的配置项和数据显示图表。
myChart.setOption(option); myChart.setOption(option);
} }
} }
onBeforeUnmount(()=>{ onBeforeUnmount(()=>{
}) })
onMounted(() => { onMounted(() => {
methods.getinit(); methods.getinit();
...@@ -229,10 +229,10 @@ ...@@ -229,10 +229,10 @@
padding: 15px 10px 0 20px; padding: 15px 10px 0 20px;
} }
.redEnvelope-left { .redEnvelope-left {
} }
.redEnvelope-right{ .redEnvelope-right{
} }
</style> </style>
\ No newline at end of file
...@@ -1509,7 +1509,7 @@ export default { ...@@ -1509,7 +1509,7 @@ export default {
//#region ending v1.0.4 //#region ending v1.0.4
v104: { v104: {
passbook: { passbook: {
pageTitle: 'Happiness passbook', pageTitle: 'Cashback',
available: 'Available balance', available: 'Available balance',
rules: 'Usage rules', rules: 'Usage rules',
details: 'Usage details', details: 'Usage details',
...@@ -1520,13 +1520,13 @@ export default { ...@@ -1520,13 +1520,13 @@ export default {
text2: 'Line data proportion', text2: 'Line data proportion',
text3: 'Line proportion', text3: 'Line proportion',
text4: 'Order source', text4: 'Order source',
text5: 'Big Red Envelope', text5: 'Cashback',
text6: 'Revenue in the past six months', text6: 'Revenue in the past six months',
text7: 'Time selection', text7: 'Time selection',
text8: 'Select month', text8: 'Select month',
text9: 'Accumulated transaction total for this year', text9: 'Accumulated number of transactions this year',
text10: 'Accumulated revenue', text10: 'Accumulated revenue',
text11: 'Current transaction amount', text11: 'Month Number',
text12: 'Activated, expected revenue', text12: 'Activated, expected revenue',
text13: 'Still lacking', text13: 'Still lacking',
text14: 'Estimated Revenue', text14: 'Estimated Revenue',
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
> >
<template v-if="MonthObj&&datainfo"> <template v-if="MonthObj&&datainfo">
<passbookHead :dataNum="datainfo?datainfo.Client_Balance:0"/> <passbookHead :dataNum="datainfo?datainfo.Client_Balance:0"/>
<rebate/> <!-- <rebate/> -->
<redEnvelope :Obj="MonthObj" :info="datainfo"/> <redEnvelope :Obj="MonthObj" :info="datainfo"/>
</template> </template>
</transition-group> </transition-group>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
components: { passbookHead,rebate,redEnvelope,useDetails }, components: { passbookHead,rebate,redEnvelope,useDetails },
props: {}, props: {},
setup() { setup() {
const $router = useRouter(); const $router = useRouter();
const $q = useQuasar() const $q = useQuasar()
const data=reactive({ const data=reactive({
...@@ -62,7 +62,24 @@ ...@@ -62,7 +62,24 @@
const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any
pageTitle.value = t('v104.passbook.pageTitle') pageTitle.value = t('v104.passbook.pageTitle')
setTitle(pageTitle.value) setTitle(pageTitle.value)
const ratioListBase = ref([
{
Money:5,
Ratio:100000,
},
{
Money:11,
Ratio:150000,
},
{
Money:16,
Ratio:200000,
},
{
Money:21,
Ratio:250000,
},
])
const isUseDetails = ref(false) const isUseDetails = ref(false)
provide(DirtionmaryHelper.PASSBOOK_DETAILS,isUseDetails) provide(DirtionmaryHelper.PASSBOOK_DETAILS,isUseDetails)
const methods = { const methods = {
...@@ -88,10 +105,13 @@ ...@@ -88,10 +105,13 @@
data.yMoney2=arr1.concat(newarr); data.yMoney2=arr1.concat(newarr);
} }
}) })
data.datainfo.RatioList = ratioListBase.value
data.datainfo.RatioList.forEach(item=>{ data.datainfo.RatioList.forEach(item=>{
item.percent=data.datainfo.Amount/item.Money; item.percent=data.datainfo.Amount/item.Money;
item.width=(item.percent)*100; item.width=(item.percent)*100;
}) })
console.log(data.datainfo.RatioList)
data.yMoney1=data.yMoney1.concat(["-"]); data.yMoney1=data.yMoney1.concat(["-"]);
data.MonthObj ={ data.MonthObj ={
xMonth: data.xMonth, xMonth: data.xMonth,
......
...@@ -159,6 +159,21 @@ const useMenus = { ...@@ -159,6 +159,21 @@ const useMenus = {
} }
] ]
}) })
menus.push({
name: t('v104.passbook.pageTitle'),
url: '/passbook',
id: 25,
parentId: 0,
icon: 'Shopping/Box1.svg',
childs: [
{
name: t('v104.passbook.pageTitle'),
url: '/passbook',
id: 26,
parentId: 25,
}
]
})
// menus.push({ // menus.push({
// name: t('menu.finance.first'), // name: t('menu.finance.first'),
// url: '', // url: '',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment