diff --git a/src/views/modules/reportList/FullYearCalendarCoin.vue b/src/views/modules/reportList/FullYearCalendarCoin.vue index 8cb5c7d..369a305 100644 --- a/src/views/modules/reportList/FullYearCalendarCoin.vue +++ b/src/views/modules/reportList/FullYearCalendarCoin.vue @@ -175,6 +175,11 @@ export default { val: "kecheng2", realTitle: "购买商品实物、课程" }, + { + title: "购买VIP商品", + val: "vip", + realTitle: "购买商品VIP" + }, {title:'报名培训班',val:'train',realTitle: "购买商品培训班"}, // {title:'报名VIP',val:'vip'}, { title: "后台扣费", val: "deduction" } diff --git a/src/views/modules/reportList/FullYearCalendarCourse.vue b/src/views/modules/reportList/FullYearCalendarCourse.vue index 2c44ae9..f1fee90 100644 --- a/src/views/modules/reportList/FullYearCalendarCourse.vue +++ b/src/views/modules/reportList/FullYearCalendarCourse.vue @@ -66,14 +66,11 @@ - - {{ getAmount(item,index,month) }} - + {{ getAmount(item,index,month) }} + - - {{ month.total[0][item.val] }} - - + {{ month.total[0][item.val] }} + @@ -136,31 +133,28 @@ export default { showCurrentMonthDate: "", allMonthData: [], list: [ - { title: "收入", val: "jing",bg:'#1bff000a', - list: [ - { title: "后台微信", val: "weixin", realTitle: "后台微信" }, - { title: "后台支付宝", val: "alipay", realTitle: "后台支付宝" }, - { title: "后台海外", val: "haiwai", realTitle: "后台海外支付" }, - { title: "后台银行转账", val: "", realTitle: "后台银行支付" }, - { title: "后台其他", val: "other", realTitle: "后台其他" }, - { title: "App微信", val: "appweixin", realTitle: "微信" }, - { - title: "App支付宝", - val: "appalipay", - realTitle: "支付宝" - }, - { title: "App天医币", val: "appapple", realTitle: "天医币" } + { + title: "收入", val: "jing",bg:'#1bff000a', + list: [ + { title: "后台微信", val: "weixin", realTitle: "后台微信" }, + { title: "后台支付宝", val: "alipay", realTitle: "后台支付宝" }, + { title: "后台海外", val: "haiwai", realTitle: "后台海外支付" }, + { title: "后台银行转账", val: "", realTitle: "后台银行支付" }, + { title: "后台其他", val: "other", realTitle: "后台其他" }, + { title: "后台天医币", val: "", realTitle: "后台天医币" }, + { title: "App微信", val: "appweixin", realTitle: "微信" }, + { title: "App支付宝", val: "appalipay", realTitle: "支付宝" }, + { title: "App天医币", val: "appapple", realTitle: "天医币" } ] - - }, - { title: "摊销", val: "chu",bg:'#ffc1070f',list:[ - {title:'金额',val:'fee'}, - {title:'已摊销',val:'alreadyTanxiao'}, - {title:'月摊销',val:'currentTanxiao'}, - {title:'剩余摊销',val:'surplusTanxiao'}, - - ] }, - + }, + { title: "摊销", val: "chu",bg:'#ffc1070f', + list:[ + {title:'金额',val:'fee'}, + {title:'已摊销',val:'alreadyTanxiao'}, + {title:'月摊销',val:'currentTanxiao'}, + {title:'剩余摊销',val:'surplusTanxiao'}, + ] + }, ], weekDays: ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"], monthNames: [