diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
index 2228742..6c08fd5 100644
--- a/src/pages/activity/ActivityPlan.vue
+++ b/src/pages/activity/ActivityPlan.vue
@@ -6,32 +6,17 @@
           :model="formValidate"
           :label-width="80">
       <Row :gutter="10">
-        <i-col span="4">
-          <FormItem label="开始日期"
-                    prop>
-            <Date-picker v-model="formValidate.startDate"
-                         :options='startDateOptions'
-                         type="date"
-                         placement="bottom-end"
-                         placeholder="选择日期区间"
-                         format="yyyy-MM-dd"
-                         @on-change="startDateChange"></Date-picker>
-          </FormItem>
-        </i-col>
-
-        <i-col span="4">
-          <FormItem label="结束日期"
-                    prop>
-            <Date-picker v-model="formValidate.endDate"
-                         :options='endDateOptions'
-                         type="date"
+        <i-col span="6">
+          <FormItem label="选择日期"
+                    prop="">
+            <Date-picker style="width: 100%"
+                         v-model="formValidate.date"
+                         type="daterange"
                          placement="bottom-end"
-                         placeholder="选择结束日期"
-                         format="yyyy-MM-dd"
-                         @on-change="endDateChange"></Date-picker>
+                         placeholder="选择日期区间"></Date-picker>
           </FormItem>
         </i-col>
-        <i-col span="4">
+        <i-col span="6">
           <FormItem label="零售公司"
                     prop>
             <Select v-model="formValidate.organizationId"
@@ -452,15 +437,20 @@ export default {
     },
     searchTable (params = {}) {
       this.loading = true;
-      if (this.formValidate.startDate) {
-        this.formValidate.startDate = formatDate(this.formValidate.startDate);
-      } else {
-        this.formValidate.startDate = undefined;
-      }
-      if (this.formValidate.endDate) {
-        this.formValidate.endDate = formatDate(this.formValidate.endDate);
-      } else {
-        this.formValidate.endDate = undefined;
+      if (
+        this.formValidate.date !== null &&
+        this.formValidate.date.length > 1
+      ) {
+        if (this.formValidate.date[0] !== "") {
+          this.formValidate.startDate = formatDate(this.formValidate.date[0]);
+        } else {
+          this.formValidate.startDate = undefined;
+        }
+        if (this.formValidate.date[1] !== "") {
+          this.formValidate.endDate = formatDate(this.formValidate.date[1]);
+        } else {
+          this.formValidate.endDate = undefined;
+        }
       }
       params.pageNum = this.pageNum;
       params.pageSize = this.pageSize;
diff --git a/src/pages/shop/IncreaseWelcomeEdit.vue b/src/pages/shop/IncreaseWelcomeEdit.vue
new file mode 100644
index 0000000..b5d23ee
--- /dev/null
+++ b/src/pages/shop/IncreaseWelcomeEdit.vue
@@ -0,0 +1,21 @@
+<template>
+  <div class="">
+
+  </div>
+</template>
+
+<script type="text/javascript">
+export default {
+  data () {
+    return {
+
+    }
+  },
+  components: {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/pages/shop/IncreaseWelcomeList.vue b/src/pages/shop/IncreaseWelcomeList.vue
index ba6bb2d..fbb5e42 100644
--- a/src/pages/shop/IncreaseWelcomeList.vue
+++ b/src/pages/shop/IncreaseWelcomeList.vue
@@ -1,80 +1,113 @@
 <template>
   <div>
     <Row class="search-row">
-      <i-col span="24" class="search-col">
-        <Row class="row-style"></Row>
+      <i-col span="24"
+             class="search-col">
+        <Row class="row-style">
+          <Button @click="handleEdit"
+                  type="primary">配置欢迎语</Button>
+        </Row>
       </i-col>
     </Row>
-    <Table :columns="columns1" style="margin-top: 20px;" size="small">
-      <template slot-scope="{s}" slot="action">
-        <Button type="primary" size="small" @click="handleEdit(s)">修改</Button>
-        <Button type="error" size="small" @click="handleDelete(s)">删除</Button>
+    <Table :columns="columns1"
+           style="margin-top: 20px;"
+           size="small">
+      <template slot-scope="{s}"
+                slot="action">
+        <Button type="primary"
+                size="small"
+                @click="handleEdit(s)">修改</Button>
+        <Button type="error"
+                size="small"
+                @click="handleDelete(s)">删除</Button>
       </template>
     </Table>
-    <Page
-      :total="total"
-      :current="pageNum"
-      :page-size="pageSize"
-      show-elevator
-      show-total
-      placement="top"
-      @on-change="handlePage"
-      class="ks-page"
-    ></Page>
+    <Page :total="total"
+          :current="pageNum"
+          :page-size="pageSize"
+          show-elevator
+          show-total
+          placement="top"
+          @on-change="handlePage"
+          class="ks-page"></Page>
   </div>
 </template>
 
 <script>
-  import data from "../../utils/PhoneRegionData";
-  import http from "../../services/store/IncreaseStoreManager";
+import data from "../../utils/PhoneRegionData";
+import http from "../../services/store/IncreaseStoreManager";
 
-  import staff from "../../services/staff/staff";
+import staff from "../../services/staff/staff";
 
-  export default {
-    name: "IncreaseWelcomeList",
-    inject: ["setMenuName"],
-    data() {
-      return {
-        loading: true,
-        // 分页
-        total: 0,
-        pageSize: 10,
-        pageNum: 1,
-        columns1: [
-          { title: "序号", key: "id" },
-          { title: "欢迎语", key: "content" },
-          { title: "配置范围", key: "range" },
-          { title: "配置时间", key: "createdate" },
-          { title: "修改时间", key: "updatedate" },
-          { title: "操作", slot: "action" },
-        ],
-        formValidate: {
-        },
-      };
+export default {
+  name: "IncreaseWelcomeList",
+  inject: ["setMenuName"],
+  data () {
+    return {
+      loading: true,
+      // 分页
+      total: 0,
+      pageSize: 10,
+      pageNum: 1,
+      columns1: [
+        { title: "序号", key: "id" },
+        { title: "欢迎语", key: "content" },
+        { title: "配置范围", key: "range" },
+        { title: "配置时间", key: "createdate" },
+        { title: "修改时间", key: "updatedate" },
+        { title: "操作", slot: "action" },
+      ],
+      formValidate: {
+      },
+    };
+  },
+  mounted () {
+    this.setMenuName("门店推广", "欢迎语");
+    this.handlePaginate();
+  },
+  methods: {
+    // 分页刷新
+    handlePaginate () {
+      this.loading = true;
+      if (this.formValidate.startDate) {
+        this.formValidate.startDate = formatDate(this.formValidate.startDate);
+      } else {
+        this.formValidate.startDate = undefined;
+      }
+      if (this.formValidate.endDate) {
+        this.formValidate.endDate = formatDate(this.formValidate.endDate);
+      } else {
+        this.formValidate.endDate = undefined;
+      }
+      params.pageNum = this.pageNum;
+      params.pageSize = this.pageSize;
+      params = { ...params, ...this.formValidate };
+      params.userId = JSON.parse(sessionStorage.getItem("loginInfo")).userId;
+      if (params.status == 0) {
+        params.status = undefined;
+      }
+      params.date = undefined;
+      http.get("/activity/instance/list", params).then(res => {
+        const data = res.data.results.this || {};
+        this.data = data.list || [];
+        this.totalSize = data.total || 0;
+        this.loading = false;
+      });
     },
-    mounted() {
-      this.setMenuName("门店推广", "欢迎语");
-      this.handlePaginate();
+    //切页处理
+    handlePage: function (value) {
+      this.pageNum = value;
     },
-    methods: {
-      // 分页刷新
-      handlePaginate() {
-
-      },
-      //切页处理
-      handlePage: function(value) {
-        this.pageNum = value;
-      },
-      // 新增或修改
-      handleEdit(row) {
-
-      },
-      // 删除
-      handleDelete(row) {
+    // 新增或修改
+    handleEdit (row) {
+      this.$router.push({ path: "/shop/increase/welcome/edit", query: row.id })
+    },
+    // 删除
+    handleDelete (row) {
 
-      },
     },
-  };
+  },
+};
 </script>
 
 <style scoped>
diff --git a/src/router/index.js b/src/router/index.js
index 031cb64..a03512b 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,213 +1,217 @@
-import Vue from "vue";
-import Router from "vue-router";
-import Login from "@/pages/Login";
-import ExternalContact from "@/pages/ExternalContact";
-import Home from "@/pages/Home";
-import AccountManager from "@/pages/user/AccountManager";
-import AccountManagerAdd from "@/pages/user/AccountManagerAdd";
-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/home/CustomerView";
-import TableAnalysis from "@/pages/TableAnalysis";
-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";
-import IncreaseDataStore from "@/pages/shop/IncreaseDataStore";
-import IncreaseStaffManager from "@/pages/shop/IncreaseStaffManager";
-import IncreaseStaffManagerBatchAdd from "@/pages/shop/IncreaseStaffManagerBatchAdd";
-import IncreaseStoreManager from "@/pages/shop/IncreaseStoreManager";
-import IncreaseConfigure from "@/pages/shop/IncreaseConfigure";
-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/home/CustomerViewHome";
-import ActivityAnalysis from "@/pages/activity/ActivityAnalysis";
-import ActivityManager from "@/pages/activity/ActivityManager";
-import ActivityPlan from "@/pages/activity/ActivityPlan";
-import ActivityCode from "@/pages/activity/ActivityCode";
-import GuideCode from "@/pages/activity/GuideCode";
+import Vue from 'vue'
+import Router from 'vue-router'
+import Login from '@/pages/Login'
+import ExternalContact from '@/pages/ExternalContact'
+import Home from '@/pages/Home'
+import AccountManager from '@/pages/user/AccountManager'
+import AccountManagerAdd from '@/pages/user/AccountManagerAdd'
+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/home/CustomerView'
+import TableAnalysis from '@/pages/TableAnalysis'
+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'
+import IncreaseDataStore from '@/pages/shop/IncreaseDataStore'
+import IncreaseStaffManager from '@/pages/shop/IncreaseStaffManager'
+import IncreaseStaffManagerBatchAdd from '@/pages/shop/IncreaseStaffManagerBatchAdd'
+import IncreaseStoreManager from '@/pages/shop/IncreaseStoreManager'
+import IncreaseConfigure from '@/pages/shop/IncreaseConfigure'
+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/home/CustomerViewHome'
+import ActivityAnalysis from '@/pages/activity/ActivityAnalysis'
+import ActivityManager from '@/pages/activity/ActivityManager'
+import ActivityPlan from '@/pages/activity/ActivityPlan'
+import ActivityCode from '@/pages/activity/ActivityCode'
+import GuideCode from '@/pages/activity/GuideCode'
 
-Vue.use(Router);
+Vue.use(Router)
 const router = new Router({
-  mode: "history",
-  base: "/youke",
+  mode: 'history',
+  base: '/youke',
   routes: [
     {
-      path: "/",
-      redirect: "/login",
+      path: '/',
+      redirect: '/login',
     },
     {
-      path: "/login",
-      name: "login",
+      path: '/login',
+      name: 'login',
       component: Login,
     },
     {
-      path: "/external/contact",
-      name: "externalContact",
+      path: '/external/contact',
+      name: 'externalContact',
       component: ExternalContact,
     },
     {
-      path: "/home",
-      name: "Home",
+      path: '/home',
+      name: 'Home',
       component: Home,
       children: [
         {
-          path: "/activity/manager",
-          name: "ActivityManager",
+          path: '/activity/manager',
+          name: 'ActivityManager',
           component: ActivityManager,
         },
         {
-          path: "/activity/plan",
-          name: "ActivityPlan",
+          path: '/activity/plan',
+          name: 'ActivityPlan',
           component: ActivityPlan,
           children: [],
         },
         {
-          path: "/activity/plan/code",
-          name: "ActivityCode",
+          path: '/activity/plan/code',
+          name: 'ActivityCode',
           component: ActivityCode,
         },
         {
-          path: "/activity/plan/GuideCode",
-          name: "GuideCode",
+          path: '/activity/plan/GuideCode',
+          name: 'GuideCode',
           component: GuideCode,
         },
         {
-          path: "/activity/analysis",
-          name: "ActivityAnalysis",
+          path: '/activity/analysis',
+          name: 'ActivityAnalysis',
           component: ActivityAnalysis,
         },
         {
-          path: "/account/manager",
-          name: "AccountManager",
+          path: '/account/manager',
+          name: 'AccountManager',
           component: AccountManager,
         },
         {
-          path: "/account/management/add",
-          name: "AccountManagerAdd",
+          path: '/account/management/add',
+          name: 'AccountManagerAdd',
           component: AccountManagerAdd,
         },
         {
-          path: "/account/management/modify",
-          name: "AccountManagementModify",
+          path: '/account/management/modify',
+          name: 'AccountManagementModify',
           component: AccountManagementModify,
         },
         {
-          path: "/account/upload",
-          name: "AccountManagerUpload",
+          path: '/account/upload',
+          name: 'AccountManagerUpload',
           component: AccountManagerUpload,
         },
         {
-          path: "/role/manager",
-          name: "RoleManager",
+          path: '/role/manager',
+          name: 'RoleManager',
           component: RoleManager,
         },
         {
-          path: "/shop/increase/manager",
-          name: "IncreaseManager",
+          path: '/shop/increase/manager',
+          name: 'IncreaseManager',
           component: IncreaseManager,
           children: [
             {
-              path: "/",
-              redirect: "/shop/increase/manager/store",
+              path: '/',
+              redirect: '/shop/increase/manager/store',
             },
             {
-              path: "/shop/increase/manager/store",
-              name: "IncreaseStoreManager",
+              path: '/shop/increase/manager/store',
+              name: 'IncreaseStoreManager',
               component: IncreaseStoreManager,
             },
             {
-              path: "/shop/increase/manager/staff",
-              name: "IncreaseStaffManager",
+              path: '/shop/increase/manager/staff',
+              name: 'IncreaseStaffManager',
               component: IncreaseStaffManager,
             },
             {
-              path: "/shop/increase/manager/staff/batch/add",
-              name: "IncreaseStaffManagerBatchAdd",
+              path: '/shop/increase/manager/staff/batch/add',
+              name: 'IncreaseStaffManagerBatchAdd',
               component: IncreaseStaffManagerBatchAdd,
             },
             {
-              path: "/shop/increase/welcome/list",
+              path: '/shop/increase/welcome/list',
               component: () => import('@/pages/shop/IncreaseWelcomeList'),
             },
+            {
+              path: '/shop/increase/welcome/edit',
+              component: () => import('@/pages/shop/IncreaseWelcomeEdit'),
+            },
           ],
         },
         {
-          path: "/table/analysis",
-          name: "TableAnalysis",
+          path: '/table/analysis',
+          name: 'TableAnalysis',
           component: TableAnalysis,
           children: [
             {
-              path: "/",
-              redirect: "/table/analysis/customer/add",
+              path: '/',
+              redirect: '/table/analysis/customer/add',
             },
             {
-              path: "/table/analysis/customer/add",
-              name: "AddCustomerTable",
+              path: '/table/analysis/customer/add',
+              name: 'AddCustomerTable',
               component: AddCustomerTable,
             },
             {
-              path: "/table/analysis/customer/apply",
-              name: "ApplyCustomerTable",
+              path: '/table/analysis/customer/apply',
+              name: 'ApplyCustomerTable',
               component: ApplyCustomerTable,
             },
           ],
         },
         {
-          path: "/shop/increase/configure",
-          name: "IncreaseConfigure",
+          path: '/shop/increase/configure',
+          name: 'IncreaseConfigure',
           component: IncreaseConfigure,
           children: [
             {
-              path: "/",
-              redirect: "/shop/increase/configure/welcome",
+              path: '/',
+              redirect: '/shop/increase/configure/welcome',
             },
             {
-              path: "/shop/increase/configure/group",
-              name: "IncreaseGroupSendConfigure",
+              path: '/shop/increase/configure/group',
+              name: 'IncreaseGroupSendConfigure',
               component: IncreaseGroupSendConfigure,
             },
             {
-              path: "/shop/increase/configure/welcome",
-              name: "IncreaseWelcomeConfigure",
+              path: '/shop/increase/configure/welcome',
+              name: 'IncreaseWelcomeConfigure',
               component: IncreaseWelcomeConfigure,
             },
             {
-              path: "/shop/increase/configure/group/add",
-              name: "IncreaseGroupSendConfigureAdd",
+              path: '/shop/increase/configure/group/add',
+              name: 'IncreaseGroupSendConfigureAdd',
               component: IncreaseGroupSendConfigureAdd,
             },
           ],
         },
         {
-          path: "/shop/increase/data",
-          name: "IncreaseData",
+          path: '/shop/increase/data',
+          name: 'IncreaseData',
           component: IncreaseData,
           children: [
             {
-              path: "/",
-              redirect: "/shop/increase/data/region",
+              path: '/',
+              redirect: '/shop/increase/data/region',
             },
             {
-              path: "/shop/increase/data/region",
-              name: "IncreaseDataCompany",
+              path: '/shop/increase/data/region',
+              name: 'IncreaseDataCompany',
               component: IncreaseDataCompany,
             },
             {
-              path: "/shop/increase/data/store",
-              name: "IncreaseDataStore",
+              path: '/shop/increase/data/store',
+              name: 'IncreaseDataStore',
               component: IncreaseDataStore,
             },
             {
-              path: "/shop/increase/data/staff",
-              name: "IncreaseDataStaff",
+              path: '/shop/increase/data/staff',
+              name: 'IncreaseDataStaff',
               component: IncreaseDataStaff,
             },
           ],
@@ -228,42 +232,42 @@ const router = new Router({
               path: '/recruit/promoter/list',
               component: () => import('@/pages/recruit/PromoterList'),
             },
-          ]
+          ],
         },
         {
-          path: "/customer/view",
-          name: "CustomerView",
+          path: '/customer/view',
+          name: 'CustomerView',
           component: CustomerView,
         },
         {
-          path: "/zero/extend/detail",
-          name: "ZeroExtendDetail",
+          path: '/zero/extend/detail',
+          name: 'ZeroExtendDetail',
           component: ZeroExtendDetail,
         },
         {
-          path: "/customer/data/detail",
-          name: "CustomerDetail",
+          path: '/customer/data/detail',
+          name: 'CustomerDetail',
           component: CustomerDetail,
         },
         {
-          path: "/no/permission",
-          name: "NoPermission",
+          path: '/no/permission',
+          name: 'NoPermission',
           component: NoPermission,
         },
       ],
     },
     {
-      path: "/customer/view/home",
-      name: "CustomerViewHome",
+      path: '/customer/view/home',
+      name: 'CustomerViewHome',
       component: CustomerViewHome,
     },
   ],
-});
+})
 /*
  * 跳转前的处理事件
  * */
 router.beforeEach(function(to, from, next) {
-  next();
-});
+  next()
+})
 
-export default router;
+export default router
diff --git a/src/services/store/Welcome.js b/src/services/store/Welcome.js
new file mode 100644
index 0000000..920b969
--- /dev/null
+++ b/src/services/store/Welcome.js
@@ -0,0 +1,10 @@
+import http from '../CommonHttp'
+import axios from 'axios'
+
+export function getList(params, call) {
+  return http.get('/retail/company', params).then(call)
+}
+
+export default {
+  getList,
+}