From c6698fc87f8c10f2a81f4614e281a3bbea65369b Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Wed, 15 Apr 2020 19:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shop/IncreaseData.vue            |   5 +-
 src/pages/shop/IncreaseDataCompany.vue     | 147 +++++++++++++++++
 src/pages/shop/IncreaseDataRegion.vue      | 123 --------------
 src/pages/shop/IncreaseDataStaff.vue       | 183 ++++++++++++++++-----
 src/pages/shop/IncreaseDataStore.vue       | 155 ++++++++++++-----
 src/pages/user/AccountManagementModify.vue |   8 -
 src/pages/user/AccountManager.vue          |  16 --
 src/pages/user/AccountManagerAdd.vue       |  12 --
 src/pages/user/RoleManager.vue             |  12 --
 src/router/index.js                        |   6 +-
 src/services/CommonHttp.js                 |  22 +--
 src/services/generalize/IncreaseData.js    |  97 +++++++++++
 12 files changed, 521 insertions(+), 265 deletions(-)
 create mode 100644 src/pages/shop/IncreaseDataCompany.vue
 delete mode 100644 src/pages/shop/IncreaseDataRegion.vue
 create mode 100644 src/services/generalize/IncreaseData.js

diff --git a/src/pages/shop/IncreaseData.vue b/src/pages/shop/IncreaseData.vue
index da35e7d..37fd5e5 100644
--- a/src/pages/shop/IncreaseData.vue
+++ b/src/pages/shop/IncreaseData.vue
@@ -3,7 +3,7 @@
         <Menu mode="horizontal" active-name="1">
             <MenuItem name="1" to="/shop/increase/data/region">
                 <Icon type="ios-paper" />
-                区域
+                零售公司
             </MenuItem>
             <MenuItem name="2" to="/shop/increase/data/store">
                 <Icon type="ios-people" />
@@ -13,6 +13,9 @@
                 <Icon type="ios-construct" />
                 导购
             </MenuItem>
+            <div style="text-align: right;padding-right: 20px;float: right">
+                <Button type="primary">导出数据</Button>
+            </div>
         </Menu>
         <div>
             <router-view/>
diff --git a/src/pages/shop/IncreaseDataCompany.vue b/src/pages/shop/IncreaseDataCompany.vue
new file mode 100644
index 0000000..2626518
--- /dev/null
+++ b/src/pages/shop/IncreaseDataCompany.vue
@@ -0,0 +1,147 @@
+<template>
+    <div>
+        <Row style="margin-top: 20px;width: 100%;background-color: #F7F8FA;">
+            <i-col span="24" style="text-align: left;padding-left: 10px;">
+                <Row class="row-style">
+                    <i-col span="1" style="text-align: right;">
+                        <p class="region">选择日期</p>
+                    </i-col>
+                    <i-col span="3" style="padding-left: 10px;">
+                        <DatePicker type="date" placement="bottom-end" placeholder="请选择日期" style="width: 200px"
+                                    @on-change="onChangeDateLister"></DatePicker>
+                    </i-col>
+                    <i-col span="2" style="text-align: right;">
+                        <span class="region">零售公司选择</span>
+                    </i-col>
+                    <i-col span="4" style="padding-left: 10px;">
+                        <Select v-model="selectedCompany" filterable style="width: 200px;">
+                            <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
+                        </Select>
+                    </i-col>
+                    <i-col span="4">
+                        <Button type="primary" @click="generalizeOfRetail">查询</Button>
+                    </i-col>
+                </Row>
+            </i-col>
+        </Row>
+
+        <Table :columns="columns1" :data="data1" style="margin-top: 20px;"></Table>
+        <Page :total="totalSize" :current="pageNum" :page-size="pageSize" show-elevator show-total
+              placement="top" style="float: right;margin-top: 20px"></Page>
+    </div>
+</template>
+
+<script>
+    import IncreaseData from "../../services/generalize/IncreaseData";
+    export default {
+        name: "IncreaseDataCompany",
+        data() {
+            return {
+                selectedCompany: null,
+                companyList: [],
+                columns1: [
+                    {
+                        type: 'index',
+                        title: '序号',
+                        key: 'id'
+                    },
+                    {
+                        title: '零售公司名称',
+                        key: 'retailCompany'
+                    },
+                    {
+                        title: '总客户数',
+                        key: 'allCustomer'
+                    },
+                    {
+                        title: '有效客户总数',
+                        key: 'effectiveCustomer'
+                    },
+                    {
+                        title: '新增客户数',
+                        key: 'newCustomer'
+                    },
+                    {
+                        title: '新增有效客户数',
+                        key: 'newEffectiveCustomer'
+                    },
+                    {
+                        title: '日增有效好友平均',
+                        key: 'avgNewCustomer'
+                    },
+                    {
+                        title: '删除/拉黑成员客户数（累计）',
+                        key: 'delCustomer'
+                    },
+                    {
+                        title: '拉黑率（累计）',
+                        key: 'delRate'
+                    }
+                ],
+                data1: [],
+                //分页内容
+                totalSize: 0,
+                pageNum: 1,
+                pageSize: 20,
+                date:null,
+            }
+        },
+        mounted: function () {
+            this.allCompany();
+            this.generalizeOfRetail();
+        },
+        methods: {
+            onChangeDateLister(date) {
+                this.date = date;
+            },
+            allCompany(){
+                let that = this;
+                let request = {
+                    userId:JSON.parse(sessionStorage.getItem("loginInfo")).userId
+                };
+                this.companyList = [];
+                IncreaseData.listOfRetailCompany(request,function (data) {
+                    data = data.data;
+                    if (data.code === '0001') {
+                        that.$Message.error("查询零售公司出错!");
+                        return;
+                    }
+                    if (data.code === '0000') {
+                        that.companyList = data.results;
+                    }
+                })
+            },
+            generalizeOfRetail(){
+                let request = {
+                    date:this.date,
+                    orgId:this.selectedCompany,
+                    pageNum:this.pageNum,
+                    pageSize:this.pageSize
+                };
+                let that = this;
+                that.data1 = [];
+                IncreaseData.generalizeOfRetail(request,function (data) {
+                    data = data.data;
+                    if(data.code === '0001'){
+                        that.$Message.info("查询推广数据失败！");
+                        return;
+                    }
+                    if(data.code === '0000'){
+                        that.data1 = data.results;
+                    }
+                })
+            },
+        }
+    }
+</script>
+
+<style scoped>
+    .region {
+        font-size: 14px;
+        line-height: 32px;
+    }
+    .row-style {
+        padding-top: 20px;
+        padding-bottom: 20px;
+    }
+</style>
diff --git a/src/pages/shop/IncreaseDataRegion.vue b/src/pages/shop/IncreaseDataRegion.vue
deleted file mode 100644
index 1da9ee6..0000000
--- a/src/pages/shop/IncreaseDataRegion.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-    <div>
-        <Row style="margin-top: 20px;width: 100%;background-color: #F7F8FA;">
-            <i-col span="24" style="text-align: left;padding-left: 10px;">
-                <Row class="row-style">
-                    <i-col span="1" style="text-align: right;">
-                        <span class="region">区域选择</span>
-                    </i-col>
-                    <i-col span="4" style="padding-left: 10px;">
-                        <Select v-model="selectedRegion" filterable style="width: 200px;">
-                            <Option v-for="item in regionList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-                        </Select>
-                    </i-col>
-                    <i-col span="1" style="text-align: right;">
-                        <p class="region">时间</p>
-                    </i-col>
-                    <i-col span="4" style="padding-left: 10px;">
-                        <DatePicker type="daterange" placement="bottom-end" placeholder="请选择日期" style="width: 200px"
-                                    @on-change="onChangeDateLister"></DatePicker>
-                    </i-col>
-                    <i-col span="4">
-                        <Button type="primary">查询</Button>
-                    </i-col>
-                    <i-col span="10" style="text-align: right;padding-right: 20px;">
-                        <Button type="primary">导出数据</Button>
-
-                    </i-col>
-                </Row>
-            </i-col>
-        </Row>
-
-        <Table :columns="columns1" :data="data1" style="margin-top: 20px;"></Table>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: "IncreaseDataRegion",
-        data() {
-            return {
-                selectedRegion: null,
-                regionList: [],
-                columns1: [
-                    {
-                        title: '序号',
-                        key: 'id'
-                    },
-                    {
-                        title: '区域名称',
-                        key: 'regionName'
-                    },
-                    {
-                        title: '总客户数',
-                        key: 'customerNum'
-                    },
-                    {
-                        title: '新增客户数',
-                        key: 'addNum'
-                    },
-                    {
-                        title: '日增好友平均',
-                        key: 'avg'
-                    },
-                    {
-                        title: '删除/拉黑成员客户数（累计）',
-                        key: 'rate'
-                    }
-                ],
-                data1: [
-                    {
-                        id: 1,
-                        regionName: '区域1',
-                        customerNum: 18,
-                        addNum: 99,
-                        avg: 80,
-                        rate: '2%'
-                    },
-                    {
-                        id: 2,
-                        regionName: '区域2',
-                        customerNum: 18,
-                        addNum: 99,
-                        avg: 80,
-                        rate: '2%'
-                    },
-                    {
-                        id: 3,
-                        regionName: '区域3',
-                        customerNum: 18,
-                        addNum: 99,
-                        avg: 80,
-                        rate: '2%'
-                    },
-                    {
-                        id: 4,
-                        regionName: '区域4',
-                        customerNum: 18,
-                        addNum: 99,
-                        avg: 80,
-                        rate: '2%'
-                    }
-                ]
-            }
-        },
-        methods: {
-            onChangeDateLister: function () {
-
-
-            }
-        }
-    }
-</script>
-
-<style scoped>
-    .region {
-        font-size: 14px;
-        line-height: 32px;
-    }
-    .row-style {
-        padding-top: 20px;
-        padding-bottom: 20px;
-    }
-</style>
diff --git a/src/pages/shop/IncreaseDataStaff.vue b/src/pages/shop/IncreaseDataStaff.vue
index 7d16b6b..39dda94 100644
--- a/src/pages/shop/IncreaseDataStaff.vue
+++ b/src/pages/shop/IncreaseDataStaff.vue
@@ -4,11 +4,18 @@
             <i-col span="24" style="text-align: left;padding-left: 10px;">
                 <Row class="row-style">
                     <i-col span="1" style="text-align: right;">
-                        <span class="region">区域选择</span>
+                        <p class="region">选择日期</p>
+                    </i-col>
+                    <i-col span="3" style="padding-left: 10px;">
+                        <DatePicker type="date" placement="bottom-end" placeholder="请选择日期" style="width: 200px"
+                                    @on-change="onChangeDateLister"></DatePicker>
+                    </i-col>
+                    <i-col span="2" style="text-align: right;">
+                        <span class="region">零售公司选择</span>
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
-                        <Select v-model="selectedRegion" filterable style="width: 200px;">
-                            <Option v-for="item in regionList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+                        <Select v-model="selectedCompany" filterable style="width: 200px;">
+                            <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
                         </Select>
                     </i-col>
                     <i-col span="1" style="text-align: right;">
@@ -16,7 +23,7 @@
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
                         <Select v-model="selectedStore" filterable style="width: 200px;">
-                            <Option v-for="item in storeList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+                            <Option v-for="item in storeList" :value="item.id" :key="item.id">{{ item.name }}</Option>
                         </Select>
                     </i-col>
 
@@ -25,108 +32,208 @@
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
                         <Select v-model="selectedStaff" filterable style="width: 200px;">
-                            <Option v-for="item in staffList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+                            <Option v-for="item in staffList" :value="item.id" :key="item.id">{{ item.name }}</Option>
                         </Select>
                     </i-col>
 
-                    <i-col span="1" style="text-align: right;">
-                        <p class="region">时间</p>
-                    </i-col>
-                    <i-col span="4" style="padding-left: 10px;">
-                        <DatePicker type="daterange" placement="bottom-end" placeholder="请选择日期" style="width: 200px"
-                                    @on-change="onChangeDateLister"></DatePicker>
-                    </i-col>
                     <i-col span="2">
                         <Button type="primary">查询</Button>
                     </i-col>
-                    <i-col span="2" style="text-align: right;padding-right: 20px;">
-                        <Button type="primary">导出数据</Button>
-                    </i-col>
                 </Row>
             </i-col>
         </Row>
 
         <Table :columns="columns1" :data="data1" style="margin-top: 20px;"></Table>
+        <Page :total="totalSize" :current="pageNum" :page-size="pageSize" show-elevator show-total
+              placement="top" style="float: right;margin-top: 20px"></Page>
     </div>
 </template>
 
 <script>
+    import IncreaseData from "../../services/generalize/IncreaseData";
     export default {
         name: "IncreaseDataStaff",
         data () {
             return {
-                selectedRegion: null,
-                regionList: [],
+                selectedCompany: null,
+                companyList: [],
                 selectedStore: null,
                 storeList: [],
                 selectedStaff: null,
                 staffList: [],
                 columns1: [
                     {
+                        type: 'index',
                         title: '序号',
                         key: 'id'
                     },
                     {
-                        title: '区域名称',
-                        key: 'regionName'
+                        title: '导购名称',
+                        key: 'sellerName'
+                    },
+                    {
+                        title: '所属零售公司',
+                        key: 'retailName'
+                    },
+                    {
+                        title: '所属门店',
+                        key: 'storeName'
                     },
                     {
                         title: '总客户数',
                         key: 'customerNum'
                     },
+                    {
+                        title: '有效客户总数',
+                        key: 'effectiveNum'
+                    },
                     {
                         title: '新增客户数',
                         key: 'addNum'
                     },
                     {
-                        title: '日增好友平均',
-                        key: 'avg'
+                        title: '新增有效客户数',
+                        key: 'addEffectiveNum'
                     },
                     {
-                        title: '删除/拉黑成员客户数（累计）',
-                        key: 'rate'
+                        title: '日增有效好友平均',
+                        key: 'avg'
                     }
                 ],
                 data1: [
                     {
-                        id: 1,
-                        regionName: '区域1',
+                        sellerName: '零售公司',
+                        retailName: '零售公司',
+                        storeName: '零售公司',
                         customerNum: 18,
+                        effectiveNum: 18,
                         addNum: 99,
+                        addEffectiveNum: 99,
                         avg: 80,
-                        rate: '2%'
                     },
                     {
-                        id: 2,
-                        regionName: '区域2',
+                        sellerName: '零售公司',
+                        retailName: '零售公司',
+                        storeName: '零售公司',
                         customerNum: 18,
+                        effectiveNum: 18,
                         addNum: 99,
+                        addEffectiveNum: 99,
                         avg: 80,
-                        rate: '2%'
                     },
                     {
-                        id: 3,
-                        regionName: '区域3',
+                        sellerName: '零售公司',
+                        retailName: '零售公司',
+                        storeName: '零售公司',
                         customerNum: 18,
+                        effectiveNum: 18,
                         addNum: 99,
+                        addEffectiveNum: 99,
                         avg: 80,
-                        rate: '2%'
                     },
                     {
-                        id: 4,
-                        regionName: '区域4',
+                        sellerName: '零售公司',
+                        retailName: '零售公司',
+                        storeName: '零售公司',
                         customerNum: 18,
+                        effectiveNum: 18,
                         addNum: 99,
+                        addEffectiveNum: 99,
                         avg: 80,
-                        rate: '2%'
-                    }
-                ]
+                    },
+                ],
+                //分页内容
+                totalSize: 0,
+                pageNum: 1,
+                pageSize: 20,
             }
         },
+        mounted: function () {
+            this.allCompany();
+            this.storeInit();
+            this.sellerInit();
+        },
         methods: {
             onChangeDateLister: function () {
 
-            }
+            },
+            allCompany(){
+                let that = this;
+                let request = {
+                    userId:JSON.parse(sessionStorage.getItem("loginInfo")).userId
+                };
+                this.regionList = [];
+                IncreaseData.listOfRetailCompany(request,function (data) {
+                    data = data.data;
+                    if (data.code === '0001') {
+                        that.$Message.error("查询零售公司出错!");
+                        return;
+                    }
+                    if (data.code === '0000') {
+                        that.regionList = data.results;
+                    }
+                })
+            },
+            storeInit(){
+                let that = this;
+                let request = {};
+                this.storeList = [];
+                IncreaseData.storeInit(request,function (data) {
+                    data = data.data;
+                    if (data.code === '0001') {
+                        that.$Message.error("查询零售公司的店铺出错!");
+                        return;
+                    }
+                    if (data.code === '0000') {
+                        that.storeList = data.results;
+                    }
+                })
+            },
+            sellerInit(){
+                let that = this;
+                let request = {};
+                this.staffList = [];
+                IncreaseData.sellerInit(request,function (data) {
+                    data = data.data;
+                    if (data.code === '0001') {
+                        that.$Message.error("查询零售公司的店铺出错!");
+                        return;
+                    }
+                    if (data.code === '0000') {
+                        that.staffList = data.results;
+                    }
+                })
+            },
+            storeOfCompany(){
+                let that = this;
+                let request = {};
+                this.selectedStore = [];
+                IncreaseData.listOfStoreByCompany(request,function (data) {
+                    data = data.data;
+                    if (data.code === '0001') {
+                        that.$Message.error("查询零售公司的店铺出错!");
+                        return;
+                    }
+                    if (data.code === '0000') {
+                        that.selectedStore = data.results;
+                    }
+                })
+            },
+            sellerOfStore(){
+                let that = this;
+                let request = {};
+                this.selectedStaff = [];
+                IncreaseData.listOfSellerByStore(request,function (data) {
+                    data = data.data;
+                    if (data.code === '0001') {
+                        that.$Message.error("查询零售公司的店铺出错!");
+                        return;
+                    }
+                    if (data.code === '0000') {
+                        that.selectedStaff = data.results;
+                    }
+                })
+            },
         }
     }
 </script>
diff --git a/src/pages/shop/IncreaseDataStore.vue b/src/pages/shop/IncreaseDataStore.vue
index 7acbc45..a8faa12 100644
--- a/src/pages/shop/IncreaseDataStore.vue
+++ b/src/pages/shop/IncreaseDataStore.vue
@@ -4,118 +4,191 @@
             <i-col span="24" style="text-align: left;padding-left: 10px;">
                 <Row class="row-style">
                     <i-col span="1" style="text-align: right;">
-                        <span class="region">区域选择</span>
+                        <p class="region">选择日期</p>
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
-                        <Select v-model="selectedRegion" filterable style="width: 200px;">
-                            <Option v-for="item in regionList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-                        </Select>
+                        <DatePicker type="date" placement="bottom-end" placeholder="请选择日期" style="width: 200px"
+                                    @on-change="onChangeDateLister"></DatePicker>
                     </i-col>
-                    <i-col span="1" style="text-align: right;">
-                        <span class="region">店铺选择</span>
+                    <i-col span="2" style="text-align: right;">
+                        <span class="region">零售公司选择</span>
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
-                        <Select v-model="selectedStore" filterable style="width: 200px;">
-                            <Option v-for="item in storeList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+                        <Select v-model="selectedCompany" filterable style="width: 200px;">
+                            <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
                         </Select>
                     </i-col>
                     <i-col span="1" style="text-align: right;">
-                        <p class="region">时间</p>
+                        <span class="region">店铺选择</span>
                     </i-col>
                     <i-col span="4" style="padding-left: 10px;">
-                        <DatePicker type="daterange" placement="bottom-end" placeholder="请选择日期" style="width: 200px"
-                                    @on-change="onChangeDateLister"></DatePicker>
+                        <Select v-model="selectedStore" filterable style="width: 200px;">
+                            <Option v-for="item in storeList" :value="item.id" :key="item.id">{{ item.name }}</Option>
+                        </Select>
                     </i-col>
+
                     <i-col span="4">
                         <Button type="primary">查询</Button>
                     </i-col>
-                    <i-col span="5" style="text-align: right;padding-right: 20px;">
-                        <Button type="primary">导出数据</Button>
-
-                    </i-col>
                 </Row>
             </i-col>
         </Row>
 
         <Table :columns="columns1" :data="data1" style="margin-top: 20px;"></Table>
+        <Page :total="totalSize" :current="pageNum" :page-size="pageSize" show-elevator show-total
+              placement="top" style="float: right;margin-top: 20px"></Page>
     </div>
 </template>
 
 <script>
+    import IncreaseData from "../../services/generalize/IncreaseData";
     export default {
         name: "IncreaseDataStore",
         data () {
             return {
-                selectedRegion: null,
-                regionList: [],
+                selectedCompany: null,
+                companyList: [],
                 selectedStore: null,
                 storeList: [],
                 columns1: [
                     {
                         title: '序号',
-                        key: 'id'
+                        key: 'id',
+                        type: 'index'
+                    },
+                    {
+                        title: '零售公司名称',
+                        key: 'retailName'
                     },
                     {
-                        title: '区域名称',
-                        key: 'regionName'
+                        title: '所属区域',
+                        key: 'region'
                     },
                     {
                         title: '总客户数',
                         key: 'customerNum'
                     },
+                    {
+                        title: '有效客户总数',
+                        key: 'effectiveNum'
+                    },
                     {
                         title: '新增客户数',
                         key: 'addNum'
                     },
                     {
-                        title: '日增好友平均',
+                        title: '新增有效客户数',
+                        key: 'addEffectiveNum'
+                    },
+                    {
+                        title: '日增有效好友平均',
                         key: 'avg'
                     },
                     {
                         title: '删除/拉黑成员客户数（累计）',
-                        key: 'rate'
+                        key: 'delNum'
+                    },
+                    {
+                        title: '拉黑率（累计）',
+                        key: 'delRate'
                     }
                 ],
                 data1: [
                     {
-                        id: 1,
-                        regionName: '区域1',
+                        retailName: '零售公司',
+                        region: '区域',
                         customerNum: 18,
+                        effectiveNum: 18,
                         addNum: 99,
+                        addEffectiveNum: 99,
                         avg: 80,
-                        rate: '2%'
+                        delNum: 80,
+                        delRate: '2%'
                     },
                     {
-                        id: 2,
-                        regionName: '区域2',
+                        retailName: '零售公司',
+                        region: '区域',
                         customerNum: 18,
+                        effectiveNum: 18,
                         addNum: 99,
+                        addEffectiveNum: 99,
                         avg: 80,
-                        rate: '2%'
+                        delNum: 80,
+                        delRate: '2%'
                     },
                     {
-                        id: 3,
-                        regionName: '区域3',
+                        retailName: '零售公司',
+                        region: '区域',
                         customerNum: 18,
+                        effectiveNum: 18,
                         addNum: 99,
+                        addEffectiveNum: 99,
                         avg: 80,
-                        rate: '2%'
+                        delNum: 80,
+                        delRate: '2%'
                     },
-                    {
-                        id: 4,
-                        regionName: '区域4',
-                        customerNum: 18,
-                        addNum: 99,
-                        avg: 80,
-                        rate: '2%'
-                    }
-                ]
+                ],
+                //分页内容
+                totalSize: 0,
+                pageNum: 1,
+                pageSize: 20,
             }
         },
+        mounted: function () {
+            this.allCompany();
+            this.storeInit();
+        },
         methods: {
             onChangeDateLister: function () {
 
-            }
+            },
+            allCompany(){
+                let that = this;
+                let request = {
+                    userId:JSON.parse(sessionStorage.getItem("loginInfo")).userId
+                };
+                this.regionList = [];
+                IncreaseData.listOfRetailCompany(request,function (data) {
+                    data = data.data;
+                    if (data.code === '0001') {
+                        that.$Message.error("查询零售公司出错!");
+                        return;
+                    }
+                    if (data.code === '0000') {
+                        that.regionList = data.results;
+                    }
+                })
+            },
+            storeInit(){
+                let that = this;
+                let request = {};
+                this.storeList = [];
+                IncreaseData.storeInit(request,function (data) {
+                    data = data.data;
+                    if (data.code === '0001') {
+                        that.$Message.error("查询零售公司的店铺出错!");
+                        return;
+                    }
+                    if (data.code === '0000') {
+                        that.storeList = data.results;
+                    }
+                })
+            },
+            storeOfCompany(){
+                let that = this;
+                let request = {};
+                this.selectedStore = [];
+                IncreaseData.listOfStoreByCompany(request,function (data) {
+                    data = data.data;
+                    if (data.code === '0001') {
+                        that.$Message.error("查询零售公司的店铺出错!");
+                        return;
+                    }
+                    if (data.code === '0000') {
+                        that.selectedStore = data.results;
+                    }
+                })
+            },
         }
     }
 </script>
diff --git a/src/pages/user/AccountManagementModify.vue b/src/pages/user/AccountManagementModify.vue
index 250a874..0a2eae9 100644
--- a/src/pages/user/AccountManagementModify.vue
+++ b/src/pages/user/AccountManagementModify.vue
@@ -126,10 +126,6 @@
           that.roleList = [];
           accountManagement.listRoleInfoApi({}, function (data) {
             data = data.data;
-            if (data.code === '9999') {
-              that.$router.push('/login');
-              that.$Message.error("会话超时请重新登陆!");
-            }
             if(data.code === '0001') {
               that.$Message.error("查询失败");
               return;
@@ -218,10 +214,6 @@
           that.shopList = [];
           accountManagementModify.listShopApi({}, function (data) {
             data = data.data;
-            if (data.code === '9999') {
-              that.$router.push('/login');
-              that.$Message.error("会话超时请重新登陆!");
-            }
             if(data.code === '0001') {
               that.$Message.error("查询店铺失败");
               return;
diff --git a/src/pages/user/AccountManager.vue b/src/pages/user/AccountManager.vue
index 3b35ed2..fcea56d 100644
--- a/src/pages/user/AccountManager.vue
+++ b/src/pages/user/AccountManager.vue
@@ -215,10 +215,6 @@
                 that.roleList = [];
                 accountManagement.listRoleInfoApi({}, function (data) {
                     data = data.data;
-                    if (data.code === '9999') {
-                        that.$router.push('/login');
-                        that.$Message.error("会话超时请重新登陆!");
-                    }
                     if (data.code === '0001') {
                         that.$Message.error("查询角色失败!");
                         return;
@@ -241,10 +237,6 @@
                 };
                 accountManagement.listAllShopApi(request, function (data) {
                     data = data.data;
-                    if (data.code === '9999') {
-                        that.$router.push('/login');
-                        that.$Message.error("会话超时请重新登陆!");
-                    }
                     if (data.code === '0001') {
                         that.$Message.error("查询店铺失败!");
                         return;
@@ -271,10 +263,6 @@
                 };
                 accountManagement.listAccountInfoApi(request, function (data) {
                     data = data.data;
-                    if (data.code === '9999') {
-                        that.$router.push('/login');
-                        that.$Message.error("会话超时请重新登陆!");
-                    }
                     if (data.code === '0001') {
                         that.$Message.error("系统繁忙!");
                         return
@@ -318,10 +306,6 @@
                     userId: that.updateUserId
                 };
                 accountManagement.removeAccountApi(request, function (data) {
-                    if (data.code === '9999') {
-                        that.$router.push('/login');
-                        that.$Message.error("会话超时请重新登陆!");
-                    }
                     if (data.data.code === '0001') {
                         that.$Message.info("删除失败");
                         return
diff --git a/src/pages/user/AccountManagerAdd.vue b/src/pages/user/AccountManagerAdd.vue
index 2307a48..28b2e45 100644
--- a/src/pages/user/AccountManagerAdd.vue
+++ b/src/pages/user/AccountManagerAdd.vue
@@ -145,10 +145,6 @@
                 that.roleList = [];
                 accountManagement.listRoleInfoApi({}, function (data) {
                     data = data.data;
-                    if (data.code === '9999') {
-                        that.$router.push('/login');
-                        that.$Message.error("会话超时请重新登陆!");
-                    }
                     if (data.code === '0001') {
                         that.$Message.error("查询角色失败!");
                         return;
@@ -200,10 +196,6 @@
                 };
                 accountManagementAdd.saveAccountInputApi(request, function (data) {
                     data = data.data;
-                    if (data.code === '9999') {
-                        that.$router.push('/login');
-                        that.$Message.error("会话超时请重新登陆!");
-                    }
                     if(data.code === '0001') {
                       that.$Message.error("保存账号失败");
                       return;
@@ -244,10 +236,6 @@
                 };
                 accountManagement.listAllShopApi(request, function (data) {
                     data = data.data;
-                    if (data.code === '9999') {
-                        that.$router.push('/login');
-                        that.$Message.error("会话超时请重新登陆!");
-                    }
                     if (data.code === '0001') {
                         that.$Message.error("查询店铺失败!");
                         return;
diff --git a/src/pages/user/RoleManager.vue b/src/pages/user/RoleManager.vue
index 9b0cac2..498a270 100644
--- a/src/pages/user/RoleManager.vue
+++ b/src/pages/user/RoleManager.vue
@@ -476,10 +476,6 @@
                 let that = this;
                 RoleManager.saveRolePermission(request, function (data) {
                     data = data.data;
-                    if (data.code === '9999') {
-                        that.$router.push('/login');
-                        that.$Message.error("会话超时请重新登陆!");
-                    }
                     if (data.code === '0001') {
                         that.$Message.error("保存角色失败!");
                         return;
@@ -495,10 +491,6 @@
                 that.roleList = [];
                 RoleManager.listRoleInfoApi({}, function (data) {
                     data = data.data;
-                    if (data.code === '9999') {
-                        that.$router.push('/login');
-                        that.$Message.error("会话超时请重新登陆!");
-                    }
                     if (data.code === '0001') {
                         that.$Message.error("查询角色失败!");
                         return;
@@ -530,10 +522,6 @@
                 let that = this;
                 RoleManager.rolePermissionList(request, function (data) {
                     data = data.data;
-                    if (data.code === '9999') {
-                        that.$router.push('/login');
-                        that.$Message.error("会话超时请重新登陆!");
-                    }
                     if (data.code === '0001') {
                         that.$Message.error("查询角色权限失败!");
                         return;
diff --git a/src/router/index.js b/src/router/index.js
index 7a60ceb..c8aa838 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -12,7 +12,7 @@ import IncreaseManager from '@/pages/shop/IncreaseManager';
 import CustomerView from "@/pages/CustomerView";
 import CustomerDetail from "@/pages/CustomerDetail";
 import IncreaseData from '@/pages/shop/IncreaseData';
-import IncreaseDataRegion from '@/pages/shop/IncreaseDataRegion';
+import IncreaseDataCompany from '@/pages/shop/IncreaseDataCompany';
 import IncreaseDataStaff from '@/pages/shop/IncreaseDataStaff';
 import IncreaseDataStore from '@/pages/shop/IncreaseDataStore';
 import IncreaseStaffManager from '@/pages/shop/IncreaseStaffManager';
@@ -137,8 +137,8 @@ const router = new Router({
             },
             {
               path: '/shop/increase/data/region',
-              name: 'IncreaseDataRegion',
-              component: IncreaseDataRegion
+              name: 'IncreaseDataCompany',
+              component: IncreaseDataCompany
             },
             {
               path: '/shop/increase/data/store',
diff --git a/src/services/CommonHttp.js b/src/services/CommonHttp.js
index d0a7c72..da2dd25 100755
--- a/src/services/CommonHttp.js
+++ b/src/services/CommonHttp.js
@@ -42,7 +42,7 @@ axios.interceptors.request.use((config) => {
 axios.interceptors.response.use((res) =>{
     let data = res.data.results;
 
-    if(res.data.code == '9999' && sessionStorage.getItem("logout")){
+    if(res.data.code === '9999' || sessionStorage.getItem("logout")){
         // iView.Message.error('会话超时，请重新登录');
         // store.commit('LOGOUT');
         commonUtils.goToLogin();
@@ -54,51 +54,51 @@ axios.interceptors.response.use((res) =>{
         return Promise.resolve(res);
     }
 
-    if(data.code == "1001"){
+    if(data.code === "1001"){
         // iView.Message.error("账号不存在");
         return Promise.resolve(res);
     }
 
-    if(data.code == "1002"){
+    if(data.code === "1002"){
         // iView.Message.error("账号已停用");
         return Promise.resolve(res);
     }
 
-    if(data.code == "1003"){
+    if(data.code === "1003"){
         // iView.Message.error("密码错误");
         return Promise.resolve(res);
     }
 
-    if(data.code == "1004"){
+    if(data.code === "1004"){
         // iView.Message.error("账号已注销");
         return Promise.resolve(res);
     }
 
-    if(data.code == "1005"){
+    if(data.code === "1005"){
         // iView.Message.error("账号未绑定品牌");
         return Promise.resolve(res);
     }
 
-    if(data.code == "1006"){
+    if(data.code === "1006"){
         // iView.Message.error("账号未绑定店铺");
         return Promise.resolve(res);
     }
 
-    if(data.code == "1007"){
+    if(data.code === "1007"){
         // iView.Message.error("账号无权限");
         return Promise.resolve(res);
     }
-    if(data.code == "1009"){
+    if(data.code === "1009"){
         // iView.Message.error("账号已过时");
         return Promise.resolve(res);
     }
 
-    if(data.code == "0001"){
+    if(data.code === "0001"){
         // this.$Message.error("系统繁忙，请重试");
         return Promise.resolve(res);
     }
 
-    if(data.code != "0000") {
+    if(data.code !== "0000") {
         // this.$Message.error(data.errorMsg);
         return Promise.resolve(res);
     }
diff --git a/src/services/generalize/IncreaseData.js b/src/services/generalize/IncreaseData.js
new file mode 100644
index 0000000..85a39b8
--- /dev/null
+++ b/src/services/generalize/IncreaseData.js
@@ -0,0 +1,97 @@
+/**
+ * home请求数据
+ * @author wangyinjia
+ * @date 2020/2/24
+ */
+
+import http from '../CommonHttp'
+
+/**
+ * 查询所有的零售公司信息
+ * @param params
+ * @param call
+ * @returns {Promise<any>}
+ */
+export function listOfRetailCompany(params, call) {
+    return http.get('/retail/company', params).then(call)
+}
+
+/**
+ * 查询零售公司下的店铺
+ * @param params
+ * @param call
+ * @returns {Promise<any>}
+ */
+export function listOfStoreByCompany(params, call) {
+    return http.get('/retail/store/company', params).then(call)
+}
+
+/**
+ * 查询店铺下的导购
+ * @param params
+ * @param call
+ * @returns {Promise<any>}
+ */
+export function listOfSellerByStore(params, call) {
+    return http.get('/retail/seller/store', params).then(call)
+}
+
+/**
+ * 零售公司的推广数据
+ * @param params
+ * @param call
+ * @returns {Promise<any>}
+ */
+export function generalizeOfRetail(params, call) {
+    return http.get('/retail/retail', params).then(call)
+}
+
+/**
+ * 门店的推广数据
+ * @param params
+ * @param call
+ * @returns {Promise<any>}
+ */
+export function generalizeOfStore(params, call) {
+    return http.get('/retail/store', params).then(call)
+}
+
+/**
+ * 导购的推广数据
+ * @param params
+ * @param call
+ * @returns {Promise<any>}
+ */
+export function generalizeOfSeller(params, call) {
+    return http.get('/retail/seller', params).then(call)
+}
+
+/**
+ * 门店信息
+ * @param params
+ * @param call
+ * @returns {Promise<any>}
+ */
+export function storeInit(params, call) {
+    return http.get('/poi/store/user/shop', params).then(call)
+}
+/**
+ * 导购信息
+ * @param params
+ * @param call
+ * @returns {Promise<any>}
+ */
+export function sellerInit(params, call) {
+    return http.get('/poi/seller/user/seller', params).then(call)
+}
+
+export default {
+    listOfRetailCompany,
+    listOfStoreByCompany,
+    listOfSellerByStore,
+    generalizeOfRetail,
+    generalizeOfStore,
+    generalizeOfSeller,
+    storeInit,
+    sellerInit
+}