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

src/App.vue

@@ -30,7 +30,7 @@ export default {
 
 @import './assets/css/tablevoerride.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 './assets/css/common.css'; */
 @import './assets/css/init.css';

src/assets/css/customerManage.css

@@ -8,6 +8,7 @@
 .customerManage .tools h1{
     font-weight: bold;
     font-size: 18px;
+    font-family: perfectFont;
 }
 .customerManage .tools .rightmenu{
     display: flex;

src/components/sellevent/index.vue

@@ -7,8 +7,8 @@
                 <span>直客营销事件</span>
             </div>
             <div class="events">
-                <el-badge :value="2" :max="99" class="item">
-                    <div class="event">
+                <el-badge :value="r[0]" :max="9999" class="item">
+                    <div class="event" @click="goBirth">
                         <img src="../../assets/img/event/shengri.png" />
                         <div class="content">
                             <div class="ti">生日事件</div>
@@ -20,17 +20,19 @@
                         </div>
                     </div>
                 </el-badge>
-                <div class="event">
-                    <img src="../../assets/img/event/biye.png" />
-                    <div class="content">
-                        <div class="ti">毕业季事件</div>
-                        <el-tooltip class="item" effect="dark" content="进入毕业季6-8月份正值初中，高中，大学学生毕业的客户名单，可以向客户或在关联同行发出恭贺函，并且关联部分产品信息" placement="top">
-                            <div class="desc">
-                                进入毕业季6-8月份正值初中，高中，大学学生毕业的客户名单，可以向客户或在关联同行发出恭贺函，并且关联部分产品信息
-                            </div>
-                        </el-tooltip>
+                <el-badge :value="r[1]" :max="9999" class="item">
+                    <div class="event">
+                        <img src="../../assets/img/event/biye.png" />
+                        <div class="content">
+                            <div class="ti">毕业季事件</div>
+                            <el-tooltip class="item" effect="dark" content="进入毕业季6-8月份正值初中，高中，大学学生毕业的客户名单，可以向客户或在关联同行发出恭贺函，并且关联部分产品信息" placement="top">
+                                <div class="desc">
+                                    推荐3-6月发送一次，为考试前的加油函，6-9月发送一次为考试后的毕业恭喜函，提供初中，高中，大学学生毕业的客户名单，可以向客户或在关联同行发出恭贺函，并且关联部分产品信息
+                                </div>
+                            </el-tooltip>
+                        </div>
                     </div>
-                </div>
+                </el-badge>
                 <div class="event">
                     <img src="../../assets/img/event/jieri.png" />
                     <div class="content">
@@ -75,6 +77,7 @@
                         </el-tooltip>
                     </div>
                 </div>
+                
             </div>
         </el-col>
         <el-col :span="12">
@@ -128,6 +131,7 @@
                         </div>
                     </div>
                 </div>
+                <div class="event" style="cursor:default;">&nbsp;</div>
             </div>
         </el-col>
     </el-row>
@@ -136,7 +140,27 @@
 
 <script>
 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>
 
@@ -170,6 +194,7 @@ export default {
     height:370px;
     background:rgba(244,245,249,1);
     margin-bottom: 30px;
+    cursor: pointer;
 }
 .event-box .events .event img{
     width:100%;

src/components/statistics/festivalOrderList.vue

@@ -197,7 +197,7 @@
                     <div slot="header" class="clearfix">
                         <span>数据说明</span>
                     </div>
-                    <div class="sjsm">
+                    <div class="sjsm" style="height:225px;">
                         <div v-for="(item,index) in dataList" :key="index">
                             <div class="left">
                                 <img :src="getImgSrc(item.FestivalName)" alt="">
@@ -279,6 +279,7 @@ export default {
                         this.totalCount+=x.OrderCount;
                     })
                 }
+
             });
         },
         //获取对应节日图片

src/components/statistics/job.vue

@@ -194,59 +194,24 @@ export default {
         GetSexOrderList(){
             this.loading = true
             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
-                let contShop = res.data.data[0].ShopMoney + res.data.data[1].ShopMoney+ res.data.data[2].ShopMoney, 
-                    one = res.data.data[0].ShopMoney, 
-                    two = res.data.data[1].ShopMoney,
-                    three = res.data.data[2].ShopMoney,
-                    contNum = res.data.data[0].OrderCount + res.data.data[1].OrderCount+ res.data.data[2].OrderCount, 
-                    zaiN = res.data.data[0].OrderCount, 
-                    twoN = res.data.data[1].OrderCount,
-                    threeN = res.data.data[2].OrderCount;
-                let chartData = [], shopChartData = [];
-                chartData.push(
-                    ((zaiN/contNum)*100).toFixed(2)
-                )
-                chartData.push(
-                    ((twoN/contNum)*100).toFixed(2)
-                )
-                chartData.push(
-                    ((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)
+                if(res.data.resultCode==1){
+                    this.strArr=[];
+                    let data=res.data.data;
+                    var totalOrder=0;
+                    var totalMoney=0;
+                    data.forEach(item=>{
+                        this.strArr.push(item.DutyTypeName);
+                        totalOrder+=item.OrderCount;
+                        totalMoney+=item.ShopMoney;
+                    })
+                    data.forEach(item=>{
+                        this.chartData.push(((item.OrderCount/totalOrder)*100).toFixed(2));
+                    })
+                    this.orders=res.data.data;
+                }else{
+                    this.$message.error(res.data.message);
+                }
             });
         }        
     }

src/components/statistics/marital.vue

@@ -26,8 +26,17 @@
                   <div>
                     累计报名
                     <b>{{item.AgeCount}}</b> 人，关联购物金额
-                    <b>{{(item.TotalMoney/10000).toFixed(2)}}万</b>，报名均价为：
-                    <b>{{item.Unit_Price.toFixed(0)}}元</b>
+                    <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>
                     最喜爱的产品

src/components/statistics/model/festivalChart.vue

@@ -30,7 +30,7 @@ export default {
                     name:''
                 }
                 // obj.value=((x.OrderCount / this.totalCount * 10000) / 100.00).toFixed(1);
-                obj.value=x.OrderCount;
+                obj.value=x.ShopMoney;
                 obj.name=x.FestivalName
                 this.data.push(obj);
             });

src/components/statistics/old.vue

@@ -26,8 +26,16 @@
                   <div>
                     累计报名
                     <b>{{item.AgeCount}}</b> 人，关联购物金额
-                    <b>{{(item.TotalMoney/10000).toFixed(2)}}万</b>，报名均价为：
-                    <b>{{item.Unit_Price.toFixed(0)}}元</b>
+                    <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>
                     最喜爱的产品

src/plugins/index.js

@@ -11,7 +11,7 @@ export default {
             },
             //域名管理对象
             Vue.prototype.domainManager = function () {
-                let domainUrl = "http://testcrm.oytour.com"
+                let domainUrl = "https://localhost:5001"
                 let locationName = window.location.hostname;
                 let domainPostUrl = "http://testapi.oytour.com"
                 if (this.isOnline()) {

src/router.js

@@ -179,6 +179,14 @@ export default new Router({
             title: "营销事件"
           }
         },
+        {
+          path: "/birthdayEvent",
+          name: "birthdayEvent",
+          component: ()=>import('./components/sellevent/brithday.vue'),
+          meta: {
+            title: "生日事件"
+          }
+        },
         {
           path: "/gaoxiao",
           name: "gaoxiao",
@@ -203,6 +211,14 @@ export default new Router({
             title: "资产"
           }
         },
+        {
+          path: "/roomStatistical",
+          name: "roomStatistical",
+          component: ()=>import('./components/statistics/roomStatistical.vue'),
+          meta: {
+            title: "住房统计"
+          }
+        },
         {
           path: "/season",
           name: "season",