Commit 63575108 authored by 罗超's avatar 罗超

修改

parent 82c244d8
...@@ -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>
...@@ -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