From 7f22740d54fb44349121993cd6ae10b13d8ee4f4 Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Thu, 14 May 2020 23:44:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8F=9C=E5=8D=95=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/activity/ActivityAnalysis.vue       | 13 ++++++++
 src/pages/activity/ActivityManager.vue        | 13 ++++++++
 src/pages/activity/ActivityPlan.vue           | 13 ++++++++
 src/pages/{ => analysis}/AddCustomerTable.vue |  4 +--
 .../{ => analysis}/ApplyCustomerTable.vue     |  4 +--
 src/pages/{ => home}/CustomerDetail.vue       |  8 ++---
 src/pages/{ => home}/CustomerView.vue         |  6 ++--
 src/pages/{ => home}/CustomerViewHome.vue     | 22 ++++++-------
 src/pages/{ => home}/ZeroExtendDetail.vue     |  4 +--
 src/router/index.js                           | 31 ++++++++++++++-----
 10 files changed, 87 insertions(+), 31 deletions(-)
 create mode 100644 src/pages/activity/ActivityAnalysis.vue
 create mode 100644 src/pages/activity/ActivityManager.vue
 create mode 100644 src/pages/activity/ActivityPlan.vue
 rename src/pages/{ => analysis}/AddCustomerTable.vue (99%)
 rename src/pages/{ => analysis}/ApplyCustomerTable.vue (99%)
 rename src/pages/{ => home}/CustomerDetail.vue (99%)
 rename src/pages/{ => home}/CustomerView.vue (99%)
 rename src/pages/{ => home}/CustomerViewHome.vue (97%)
 rename src/pages/{ => home}/ZeroExtendDetail.vue (98%)

diff --git a/src/pages/activity/ActivityAnalysis.vue b/src/pages/activity/ActivityAnalysis.vue
new file mode 100644
index 0000000..563728b
--- /dev/null
+++ b/src/pages/activity/ActivityAnalysis.vue
@@ -0,0 +1,13 @@
+<template>
+    <div>活动分析</div>
+</template>
+
+<script>
+    export default {
+        name: "ActivityAnalysis"
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/activity/ActivityManager.vue b/src/pages/activity/ActivityManager.vue
new file mode 100644
index 0000000..d6e3107
--- /dev/null
+++ b/src/pages/activity/ActivityManager.vue
@@ -0,0 +1,13 @@
+<template>
+    <div>活动管理</div>
+</template>
+
+<script>
+    export default {
+        name: "ActivityManager"
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
new file mode 100644
index 0000000..db9efe6
--- /dev/null
+++ b/src/pages/activity/ActivityPlan.vue
@@ -0,0 +1,13 @@
+<template>
+    <div>活动计划</div>
+</template>
+
+<script>
+    export default {
+        name: "ActivityPlan"
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/AddCustomerTable.vue b/src/pages/analysis/AddCustomerTable.vue
similarity index 99%
rename from src/pages/AddCustomerTable.vue
rename to src/pages/analysis/AddCustomerTable.vue
index 9835503..cb26639 100644
--- a/src/pages/AddCustomerTable.vue
+++ b/src/pages/analysis/AddCustomerTable.vue
@@ -27,7 +27,7 @@
                 <DatePicker v-model="selectEndTime" type="date" placeholder="请选择时间"
                             class="date-picker" size="small" @on-change="diyDateChange"></DatePicker>
               </span>
-              <img src="../../static/img/bsd-logo.png" class="title-logo"/>
+              <img src="../../../static/img/bsd-logo.png" class="title-logo"/>
             </span>
                     </row>
                     <!--柱状图-->
@@ -56,7 +56,7 @@
 </template>
 <script>
 
-    import customerView  from "../services/datacenter/customerView";
+    import customerView  from "../../services/datacenter/customerView";
     import 'echarts/lib/component/markLine'
     import 'echarts/lib/component/dataZoom'
     import 'echarts/lib/component/toolbox'
diff --git a/src/pages/ApplyCustomerTable.vue b/src/pages/analysis/ApplyCustomerTable.vue
similarity index 99%
rename from src/pages/ApplyCustomerTable.vue
rename to src/pages/analysis/ApplyCustomerTable.vue
index 20c2e18..375ff5e 100644
--- a/src/pages/ApplyCustomerTable.vue
+++ b/src/pages/analysis/ApplyCustomerTable.vue
@@ -27,7 +27,7 @@
                 <DatePicker v-model="selectEndTime" type="date" placeholder="请选择时间"
                             class="date-picker" size="small" @on-change="diyDateChange"></DatePicker>
               </span>
-              <img src="../../static/img/bsd-logo.png" class="title-logo"/>
+              <img src="../../../static/img/bsd-logo.png" class="title-logo"/>
             </span>
                     </row>
                     <!--柱状图-->
@@ -49,7 +49,7 @@
 </template>
 <script>
 
-    import customerView from "../services/datacenter/customerView";
+    import customerView from "../../services/datacenter/customerView";
     import 'echarts/lib/chart/line'
     import 'echarts/lib/component/toolbox'
     export default {
diff --git a/src/pages/CustomerDetail.vue b/src/pages/home/CustomerDetail.vue
similarity index 99%
rename from src/pages/CustomerDetail.vue
rename to src/pages/home/CustomerDetail.vue
index dd634ed..fd75f81 100644
--- a/src/pages/CustomerDetail.vue
+++ b/src/pages/home/CustomerDetail.vue
@@ -132,9 +132,9 @@
     </div>
 </template>
 <script>
-    import customerDetail from "../services/datacenter/DataCenter";
-    import zeroExtend from "../services/customer/zeroExtend";
-    import staff from "../services/staff/staff";
+    import customerDetail from "../../services/datacenter/DataCenter";
+    import zeroExtend from "../../services/customer/zeroExtend";
+    import staff from "../../services/staff/staff";
 
     export default {
         inject: ['checkParamBlank'],
@@ -347,7 +347,7 @@
 
                         let title = "客户明细";
                         require.ensure([], () => {
-                            const {export_json_to_excel} = require('../excel/Export2Excel');
+                            const {export_json_to_excel} = require('../../excel/Export2Excel');
                             const tHeader = ['序号', '好友名称', '所属门店', '店铺编号', '所属导购', '工号', '创建时间', '好友手机号', '关联会员', '会员等级', '会员生日'];
                             // 属性名
                             const filterVal = ['number', 'name', 'shopName', 'shopCode', 'sellerName', 'sellerCode', 'createTime', 'phone', 'vipName', 'vipLevel', 'birthday'];
diff --git a/src/pages/CustomerView.vue b/src/pages/home/CustomerView.vue
similarity index 99%
rename from src/pages/CustomerView.vue
rename to src/pages/home/CustomerView.vue
index ff2ea7b..9bf72b6 100644
--- a/src/pages/CustomerView.vue
+++ b/src/pages/home/CustomerView.vue
@@ -30,7 +30,7 @@
                     <Icon type="ios-alert-outline" style="margin-left: 5px"/>
                 </Tooltip>
               </span>
-              <img src="../../static/img/bsd-logo.png" class="title-logo"/>
+              <img src="../../../static/img/bsd-logo.png" class="title-logo"/>
             </span>
                     </row>
                     <!--5块客户数-->
@@ -158,7 +158,7 @@
                                 <span class="chart-top-10-title-span">推广为0的店铺数</span>
                                 <span style="position: absolute;right: 5px;cursor: pointer"
                                       @click="zeroExtendMore"><span style="vertical-align: top">更多</span><img
-                                        src="../../static/img/right-angle.png"/></span>
+                                        src="../../../static/img/right-angle.png"/></span>
                                 <row v-if="customerViewVO.zeroExtendList.length === 0" class="text-center">暂无数据</row>
                                 <row v-if="customerViewVO.zeroExtendList.length > 0" class="padding-12">
                                     <row>
@@ -185,7 +185,7 @@
 </template>
 <script>
 
-    import customerView from "../services/datacenter/customerView";
+    import customerView from "../../services/datacenter/customerView";
 
     export default {
         inject: ['setMenuName'],
diff --git a/src/pages/CustomerViewHome.vue b/src/pages/home/CustomerViewHome.vue
similarity index 97%
rename from src/pages/CustomerViewHome.vue
rename to src/pages/home/CustomerViewHome.vue
index 491a8c5..a0f507e 100644
--- a/src/pages/CustomerViewHome.vue
+++ b/src/pages/home/CustomerViewHome.vue
@@ -1,11 +1,11 @@
 <template>
     <div style="width: 100%;height: 100%;background-color: #000d4a;">
         <div class="loading">
-            <div class="loadbox"><img src="../../public/images/loading.gif"> 页面加载中...</div>
+            <div class="loadbox"><img src="../../../public/images/loading.gif"> 页面加载中...</div>
         </div>
         <div class="head">
             <h1>
-                <img src="../../static/img/bsd-logo.png" class="title-logo"/>
+                <img src="../../../static/img/bsd-logo.png" class="title-logo"/>
             </h1>
         </div>
         <div class="mainbox">
@@ -63,9 +63,9 @@
                         <!--                        </div>-->
                     </div>
                     <div class="map">
-                        <div class="map1"><img src="../../public/images/lbx.png"></div>
-                        <div class="map2"><img src="../../public/images/jt.png"></div>
-                        <div class="map3"><img src="../../public/images/map.png"></div>
+                        <div class="map1"><img src="../../../public/images/lbx.png"></div>
+                        <div class="map2"><img src="../../../public/images/jt.png"></div>
+                        <div class="map3"><img src="../../../public/images/map.png"></div>
                         <!--                        <div class="map4" id="map_1"></div>-->
 
                         <div class="map">
@@ -122,9 +122,9 @@
 </template>
 <script>
     import $ from 'jquery';
-    import AreaMap from '../components/AreaMap';
+    import AreaMap from '../../components/AreaMap';
     import countTo from 'vue-count-to';
-    import http from '../services/customer/CustomerViewHomeService'
+    import http from '../../services/customer/CustomerViewHomeService'
     export default {
         components: {
             AreaMap,
@@ -541,11 +541,11 @@
 
     @font-face {
         font-family: electronicFont;
-        src: url('../../public/font/DS-DIGIT.TTF')
+        src: url('../../../public/font/DS-DIGIT.TTF')
     }
 
     body {
-        background: #000d4a url('../../public/images/bg.jpg') center top;
+        background: #000d4a url('../../../public/images/bg.jpg') center top;
         background-size: cover;
         color: #666;
         font-size: .1rem;
@@ -679,7 +679,7 @@
 
     .head {
         height: 180px;
-        background: url(../../public/images/head_bg.png) no-repeat center center;
+        background: url(../../../public/images/head_bg.png) no-repeat center center;
         background-size: 100% 100%;
         position: relative;
         z-index: 100;
@@ -742,7 +742,7 @@
     .boxall {
         border: 1px solid rgba(25, 186, 139, .17);
         padding: 0 .2rem .4rem .15rem;
-        background: rgba(255, 255, 255, .04) url(../../public/images/line.png);
+        background: rgba(255, 255, 255, .04) url(../../../public/images/line.png);
         background-size: 100% auto;
         position: relative;
         margin-bottom: .15rem;
diff --git a/src/pages/ZeroExtendDetail.vue b/src/pages/home/ZeroExtendDetail.vue
similarity index 98%
rename from src/pages/ZeroExtendDetail.vue
rename to src/pages/home/ZeroExtendDetail.vue
index 58b8bc4..ea3ed5b 100644
--- a/src/pages/ZeroExtendDetail.vue
+++ b/src/pages/home/ZeroExtendDetail.vue
@@ -38,7 +38,7 @@
 </template>
 <script>
 
-  import zeroExtend from "../services/customer/zeroExtend";
+  import zeroExtend from "../../services/customer/zeroExtend";
     export default {
         inject:['checkParamBlank'],
         data() {
@@ -200,7 +200,7 @@
                   that.originAllData.push(entity);
                 }
                 require.ensure([], () => {
-                  const { export_json_to_excel } = require('../excel/Export2Excel');
+                  const { export_json_to_excel } = require('../../excel/Export2Excel');
                   const tHeader = ['序号', '店铺名称', '店铺编码', '大区', '零售公司', '客户'];
                   // 属性名
                   const filterVal = ['number', 'shopName', 'shopCode', 'region', 'company', 'customer'];
diff --git a/src/router/index.js b/src/router/index.js
index fe82bc7..8de1026 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,12 +9,12 @@ import AccountManagementModify from '@/pages/user/AccountManagementModify';
 import AccountManagerUpload from '@/pages/user/AccountManagerUpload';
 import RoleManager from '@/pages/user/RoleManager';
 import IncreaseManager from '@/pages/shop/IncreaseManager';
-import CustomerView from "@/pages/CustomerView";
+import CustomerView from "@/pages/home/CustomerView";
 import TableAnalysis from "@/pages/TableAnalysis";
-import AddCustomerTable from "@/pages/AddCustomerTable";
-import ApplyCustomerTable from "@/pages/ApplyCustomerTable";
-import ZeroExtendDetail from "@/pages/ZeroExtendDetail";
-import CustomerDetail from "@/pages/CustomerDetail";
+import AddCustomerTable from "@/pages/analysis/AddCustomerTable";
+import ApplyCustomerTable from "@/pages/analysis/ApplyCustomerTable";
+import ZeroExtendDetail from "@/pages/home/ZeroExtendDetail";
+import CustomerDetail from "@/pages/home/CustomerDetail";
 import IncreaseData from '@/pages/shop/IncreaseData';
 import IncreaseDataCompany from '@/pages/shop/IncreaseDataCompany';
 import IncreaseDataStaff from '@/pages/shop/IncreaseDataStaff';
@@ -27,7 +27,10 @@ import IncreaseGroupSendConfigure from '@/pages/shop/IncreaseGroupSendConfigure'
 import IncreaseWelcomeConfigure from '@/pages/shop/IncreaseWelcomeConfigure';
 import IncreaseGroupSendConfigureAdd from '@/pages/shop/IncreaseGroupSendConfigureAdd';
 import NoPermission from '@/pages/shop/NoPermission';
-import CustomerViewHome from "@/pages/CustomerViewHome";
+import CustomerViewHome from '@/pages/home/CustomerViewHome';
+import ActivityAnalysis from "@/pages/activity/ActivityAnalysis";
+import ActivityManager from "@/pages/activity/ActivityManager";
+import ActivityPlan from "@/pages/activity/ActivityPlan";
 
 
 Vue.use(Router);
@@ -54,7 +57,21 @@ const router = new Router({
       name: 'Home',
       component: Home,
       children: [
-
+        {
+          path: '/activity/manager',
+          name: 'ActivityManager',
+          component: ActivityManager
+        },
+        {
+          path: '/activity/plan',
+          name: 'ActivityPlan',
+          component: ActivityPlan
+        },
+        {
+          path: '/activity/analysis',
+          name: 'ActivityAnalysis',
+          component: ActivityAnalysis
+        },
         {
           path: '/account/manager',
           name: 'AccountManager',