Commit 3949c939 authored by 黄媛媛's avatar 黄媛媛

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

parents a02bdd64 ae326b4f
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
@import './assets/css/tablevoerride.css'; @import './assets/css/tablevoerride.css';
@import './assets/global/font.css'; @import './assets/global/font.css';
@import '//at.alicdn.com/t/font_1627123_79sjd75n6du.css'; @import '//at.alicdn.com/t/font_1627123_c80k77dlq7f.css';
@import url('//at.alicdn.com/t/font_1627123_grz80mbm3sv.css'); @import url('//at.alicdn.com/t/font_1627123_grz80mbm3sv.css');
/* @import './assets/css/common.css'; */ /* @import './assets/css/common.css'; */
@import './assets/css/init.css'; @import './assets/css/init.css';
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
.customerManage .tools h1{ .customerManage .tools h1{
font-weight: bold; font-weight: bold;
font-size: 18px; font-size: 18px;
font-family: perfectFont;
} }
.customerManage .tools .rightmenu{ .customerManage .tools .rightmenu{
display: flex; display: flex;
......
This diff is collapsed.
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<span>直客营销事件</span> <span>直客营销事件</span>
</div> </div>
<div class="events"> <div class="events">
<el-badge :value="2" :max="99" class="item"> <el-badge :value="r[0]" :max="9999" class="item">
<div class="event"> <div class="event" @click="goBirth">
<img src="../../assets/img/event/shengri.png" /> <img src="../../assets/img/event/shengri.png" />
<div class="content"> <div class="content">
<div class="ti">生日事件</div> <div class="ti">生日事件</div>
...@@ -20,17 +20,19 @@ ...@@ -20,17 +20,19 @@
</div> </div>
</div> </div>
</el-badge> </el-badge>
<div class="event"> <el-badge :value="r[1]" :max="9999" class="item">
<img src="../../assets/img/event/biye.png" /> <div class="event">
<div class="content"> <img src="../../assets/img/event/biye.png" />
<div class="ti">毕业季事件</div> <div class="content">
<el-tooltip class="item" effect="dark" content="进入毕业季6-8月份正值初中,高中,大学学生毕业的客户名单,可以向客户或在关联同行发出恭贺函,并且关联部分产品信息" placement="top"> <div class="ti">毕业季事件</div>
<div class="desc"> <el-tooltip class="item" effect="dark" content="进入毕业季6-8月份正值初中,高中,大学学生毕业的客户名单,可以向客户或在关联同行发出恭贺函,并且关联部分产品信息" placement="top">
进入毕业季6-8月份正值初中,高中,大学学生毕业的客户名单,可以向客户或在关联同行发出恭贺函,并且关联部分产品信息 <div class="desc">
</div> 推荐3-6月发送一次,为考试前的加油函,6-9月发送一次为考试后的毕业恭喜函,提供初中,高中,大学学生毕业的客户名单,可以向客户或在关联同行发出恭贺函,并且关联部分产品信息
</el-tooltip> </div>
</el-tooltip>
</div>
</div> </div>
</div> </el-badge>
<div class="event"> <div class="event">
<img src="../../assets/img/event/jieri.png" /> <img src="../../assets/img/event/jieri.png" />
<div class="content"> <div class="content">
...@@ -75,6 +77,7 @@ ...@@ -75,6 +77,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -128,6 +131,7 @@ ...@@ -128,6 +131,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="event" style="cursor:default;">&nbsp;</div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -136,7 +140,27 @@ ...@@ -136,7 +140,27 @@
<script> <script>
export default { export default {
data() {
return {
r:[0,0]
}
},
created() {
this.init();
},
methods:{
init(){
this.apipost("/api/SellEvent/GetSellEventToCCount",{},r=>{
console.log(r.data)
if(r.data.resultCode==1){
this.r=r.data.data
}
})
},
goBirth(){
this.$router.push('/birthdayEvent');
}
}
} }
</script> </script>
...@@ -170,6 +194,7 @@ export default { ...@@ -170,6 +194,7 @@ export default {
height:370px; height:370px;
background:rgba(244,245,249,1); background:rgba(244,245,249,1);
margin-bottom: 30px; margin-bottom: 30px;
cursor: pointer;
} }
.event-box .events .event img{ .event-box .events .event img{
width:100%; width:100%;
......
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>数据说明</span> <span>数据说明</span>
</div> </div>
<div class="sjsm"> <div class="sjsm" style="height:225px;">
<div v-for="(item,index) in dataList" :key="index"> <div v-for="(item,index) in dataList" :key="index">
<div class="left"> <div class="left">
<img :src="getImgSrc(item.FestivalName)" alt=""> <img :src="getImgSrc(item.FestivalName)" alt="">
...@@ -279,6 +279,7 @@ export default { ...@@ -279,6 +279,7 @@ export default {
this.totalCount+=x.OrderCount; this.totalCount+=x.OrderCount;
}) })
} }
}); });
}, },
//获取对应节日图片 //获取对应节日图片
......
...@@ -194,59 +194,24 @@ export default { ...@@ -194,59 +194,24 @@ export default {
GetSexOrderList(){ GetSexOrderList(){
this.loading = true this.loading = true
this.apipost("/api/Statistic/GetDutyTypeOrderList", {}, res => { this.apipost("/api/Statistic/GetDutyTypeOrderList", {}, res => {
console.log("fdff",res)
this.strArr=[];
let data=res.data.data;
data.forEach(item=>{
this.strArr.push(item.DutyTypeName)
})
this.loading = false this.loading = false
let contShop = res.data.data[0].ShopMoney + res.data.data[1].ShopMoney+ res.data.data[2].ShopMoney, if(res.data.resultCode==1){
one = res.data.data[0].ShopMoney, this.strArr=[];
two = res.data.data[1].ShopMoney, let data=res.data.data;
three = res.data.data[2].ShopMoney, var totalOrder=0;
contNum = res.data.data[0].OrderCount + res.data.data[1].OrderCount+ res.data.data[2].OrderCount, var totalMoney=0;
zaiN = res.data.data[0].OrderCount, data.forEach(item=>{
twoN = res.data.data[1].OrderCount, this.strArr.push(item.DutyTypeName);
threeN = res.data.data[2].OrderCount; totalOrder+=item.OrderCount;
let chartData = [], shopChartData = []; totalMoney+=item.ShopMoney;
chartData.push( })
((zaiN/contNum)*100).toFixed(2) data.forEach(item=>{
) this.chartData.push(((item.OrderCount/totalOrder)*100).toFixed(2));
chartData.push( })
((twoN/contNum)*100).toFixed(2) this.orders=res.data.data;
) }else{
chartData.push( this.$message.error(res.data.message);
((threeN/contNum)*100).toFixed(2) }
)
shopChartData.push(
{
num: Number(((one/contShop)*100).toFixed(2)),
color: "#0D2481",
text: '娱乐'
}
)
shopChartData.push(
{
num: Number(((two/contShop)*100).toFixed(2)),
color: "#FFA475",
text: '教育'
}
)
shopChartData.push(
{
num: Number(((three/contShop)*100).toFixed(2)),
color: "#999",
text: '服务'
}
)
this.chartData = chartData
this.shopChartData = shopChartData
this.orders=res.data.data;
console.log("this.chartData",this.chartData)
}); });
} }
} }
......
...@@ -26,8 +26,17 @@ ...@@ -26,8 +26,17 @@
<div> <div>
累计报名 累计报名
<b>{{item.AgeCount}}</b> 人,关联购物金额 <b>{{item.AgeCount}}</b> 人,关联购物金额
<b>{{(item.TotalMoney/10000).toFixed(2)}}</b>,报名均价为: <b>
<b>{{item.Unit_Price.toFixed(0)}}</b> <template v-if="item.TotalMoney">
{{(item.TotalMoney/10000).toFixed(2)}}
</template>
</b>,报名均价为:
<b>
<template v-if="item.Unit_Price">
{{item.Unit_Price.toFixed(0)}}
</template>
</b>
</div> </div>
<div> <div>
最喜爱的产品 最喜爱的产品
......
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
name:'' name:''
} }
// obj.value=((x.OrderCount / this.totalCount * 10000) / 100.00).toFixed(1); // obj.value=((x.OrderCount / this.totalCount * 10000) / 100.00).toFixed(1);
obj.value=x.OrderCount; obj.value=x.ShopMoney;
obj.name=x.FestivalName obj.name=x.FestivalName
this.data.push(obj); this.data.push(obj);
}); });
......
...@@ -26,8 +26,16 @@ ...@@ -26,8 +26,16 @@
<div> <div>
累计报名 累计报名
<b>{{item.AgeCount}}</b> 人,关联购物金额 <b>{{item.AgeCount}}</b> 人,关联购物金额
<b>{{(item.TotalMoney/10000).toFixed(2)}}</b>,报名均价为: <b>
<b>{{item.Unit_Price.toFixed(0)}}</b> <template v-if="item.TotalMoney">
{{(item.TotalMoney/10000).toFixed(2)}}
</template>
</b>,报名均价为:
<b>
<template v-if="item.Unit_Price">
{{item.Unit_Price.toFixed(0)}}
</template>
</b>
</div> </div>
<div> <div>
最喜爱的产品 最喜爱的产品
......
This diff is collapsed.
...@@ -11,7 +11,7 @@ export default { ...@@ -11,7 +11,7 @@ export default {
}, },
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = "http://testcrm.oytour.com" let domainUrl = "https://localhost:5001"
let locationName = window.location.hostname; let locationName = window.location.hostname;
let domainPostUrl = "http://testapi.oytour.com" let domainPostUrl = "http://testapi.oytour.com"
if (this.isOnline()) { if (this.isOnline()) {
......
...@@ -179,6 +179,14 @@ export default new Router({ ...@@ -179,6 +179,14 @@ export default new Router({
title: "营销事件" title: "营销事件"
} }
}, },
{
path: "/birthdayEvent",
name: "birthdayEvent",
component: ()=>import('./components/sellevent/brithday.vue'),
meta: {
title: "生日事件"
}
},
{ {
path: "/gaoxiao", path: "/gaoxiao",
name: "gaoxiao", name: "gaoxiao",
...@@ -203,6 +211,14 @@ export default new Router({ ...@@ -203,6 +211,14 @@ export default new Router({
title: "资产" title: "资产"
} }
}, },
{
path: "/roomStatistical",
name: "roomStatistical",
component: ()=>import('./components/statistics/roomStatistical.vue'),
meta: {
title: "住房统计"
}
},
{ {
path: "/season", path: "/season",
name: "season", name: "season",
......
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