diff --git a/src/pages/activity/ActivityManager.vue b/src/pages/activity/ActivityManager.vue
index 42359ba..6404df5 100644
--- a/src/pages/activity/ActivityManager.vue
+++ b/src/pages/activity/ActivityManager.vue
@@ -1,12 +1,19 @@
 <template>
   <div class="activityManager">
-    <Spin v-show="loading" fix>加载中...</Spin>
+    <Spin v-show="loading"
+          fix>加载中...</Spin>
     <Row>
-      <i-col class="activityListClass" v-for="(item, index) in activityList" :key="index" span="7" offset="1">
+      <i-col class="activityListClass"
+             v-for="(item, index) in activityList"
+             :key="index"
+             span="7"
+             offset="1">
         <Card>
           <div class="operateAndThemeItem">
             <div class="ThemeItem">
-              <div class="schedule-image"><img class="img" :src="'/kiisoo-ic' + item.logo" alt /></div>
+              <div class="schedule-image"><img class="img"
+                     :src="'/kiisoo-ic' + item.logo"
+                     alt /></div>
               <div class="tipItem">
                 <span>{{ item.name }}</span>
                 <span>{{ item.description }}</span>
@@ -94,7 +101,7 @@ export default {
     },
     getActivityTable () {
       let that = this;
-      ActivityManager.getActivityList({}, function (data) {
+      ActivityManager.getActivityList({ categoryCode: "promotion" }, function (data) {
         that.activityList = data.data.results;
       });
     },
@@ -132,9 +139,9 @@ export default {
 </script>
 
 <style scoped>
-  .activityManager {
-    min-height: 600px;
-  }
+.activityManager {
+  min-height: 600px;
+}
 .operateAndThemeItem {
   display: flex;
   justify-content: space-between;
@@ -174,16 +181,16 @@ export default {
   line-height: 100px;
   cursor: pointer;
 }
-  .schedule-image {
-    width: 50px;
-    height: 50px;
-    display: flex;
-    align-items: center;
-    border-radius: 5px;
-    background-color: #eee;
-  }
-  .schedule-image img {
-    width: 100%;
-    height: auto;
-  }
+.schedule-image {
+  width: 50px;
+  height: 50px;
+  display: flex;
+  align-items: center;
+  border-radius: 5px;
+  background-color: #eee;
+}
+.schedule-image img {
+  width: 100%;
+  height: auto;
+}
 </style>
diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
index 1865218..cc36071 100644
--- a/src/pages/activity/ActivityPlan.vue
+++ b/src/pages/activity/ActivityPlan.vue
@@ -64,21 +64,26 @@
                @on-row-dblclick="showDetail"
                :columns="columns1"
                :data="data">
-            <template slot-scope="{row}" slot="qrCodeAction">
-                <img :src="require('../../../static/img/qrCode-init.png')" @click="navigateCode(row)"
-                     class="table-img-qr-code"/>
-            </template>
-            <template slot="action" slot-scope="{row}">
-              <i-col span="12">
-                <Button ghost class="router-btn" 
-                        @click="() => {stop(row)}">终止</Button>
-              </i-col>
-              <i-col span="12">
-                <Button ghost class="router-btn"
-                        @click="() => {modify(row)}">修改</Button>
-              </i-col>
-            </template>
-            
+          <template slot-scope="{row}"
+                    slot="qrCodeAction">
+            <img :src="require('../../../static/img/qrCode-init.png')"
+                 @click="navigateCode(row)"
+                 class="table-img-qr-code" />
+          </template>
+          <template slot="action"
+                    slot-scope="{row}">
+            <i-col span="12">
+              <Button ghost
+                      class="router-btn"
+                      @click="() => {stop(row)}">终止</Button>
+            </i-col>
+            <i-col span="12">
+              <Button ghost
+                      class="router-btn"
+                      @click="() => {modify(row)}">修改</Button>
+            </i-col>
+          </template>
+
         </Table>
         <Page :total="totalSize"
               :current="pageNum"
@@ -103,21 +108,23 @@
                   :detail="detail"></planDetail>
     </Modal>
     <!-- 预览二维码 -->
-    <Modal
-        v-model="isShow"
-        :title="showStoreName"
-        :footer-hide="true"
-        width="230"
-        class-name="vertical-center-modal"
-        @on-ok="ok">
-        <div slot="header">
-            <p></p>
-        </div>
-        <p>{{this.showStoreName}}</p>
-        <img :src="qrCodeImage" style="width:200px;height:200px;"/>
-        <div style="text-align: center;">
-            <Button ghost type="primary" @click="download(rowData)">下载</Button>
-        </div>
+    <Modal v-model="isShow"
+           :title="showStoreName"
+           :footer-hide="true"
+           width="230"
+           class-name="vertical-center-modal"
+           @on-ok="ok">
+      <div slot="header">
+        <p></p>
+      </div>
+      <p>{{this.showStoreName}}</p>
+      <img :src="qrCodeImage"
+           style="width:200px;height:200px;" />
+      <div style="text-align: center;">
+        <Button ghost
+                type="primary"
+                @click="download(rowData)">下载</Button>
+      </div>
     </Modal>
   </div>
 </template>
@@ -139,7 +146,7 @@ export default {
   data () {
     const _this = this;
     return {
-      showStoreName:"",
+      showStoreName: "",
       isShow: false,
       loading: false,
       isShowDetail: false,
@@ -456,6 +463,7 @@ export default {
       if (params.status == 0) {
         params.status = undefined;
       }
+      params.categoryCode = "promotion"
       params.date = undefined;
       http.get("/activity/instance/list", params).then(res => {
         const data = res.data.results.this || {};
@@ -496,7 +504,7 @@ export default {
       debugger
       let fileName = index.name + "-门店码";
       http.downloadImg({
-          url: index.qrCodeAction
+        url: index.qrCodeAction
       }, fileName, function (/*data*/) {
 
       })
@@ -517,7 +525,7 @@ export default {
 }
 .router-btn {
   border: none;
-  color: #3496EB !important;
+  color: #3496eb !important;
   margin-left: -15px;
 }
 .table-img-qr-code {
@@ -526,7 +534,7 @@ export default {
   width: 30px;
   height: 30px;
 }
-button:hover {    
-  background:inherit!important;
+button:hover {
+  background: inherit !important;
 }
 </style>
diff --git a/src/pages/activity/selectStoreStep.vue b/src/pages/activity/selectStoreStep.vue
index 4fa31c3..01c0977 100644
--- a/src/pages/activity/selectStoreStep.vue
+++ b/src/pages/activity/selectStoreStep.vue
@@ -1,41 +1,40 @@
 <template>
   <div class="use_box">
-    <Modal
-      :scrollable="false"
-      v-model="showUse"
-      title="使用活动"
-      @on-cancel="cancel"
-      :loading="true"
-      width="70%"
-    >
-      <Steps style="padding: 40px;" :current="currentStep">
-        <Step :title="isModify ? '修改零售公司' : '选择零售公司'" content></Step>
-        <Step :title="isModify ? '修改店铺' : '选择店铺'" content></Step>
+    <Modal :scrollable="false"
+           v-model="showUse"
+           title="使用活动"
+           @on-cancel="cancel"
+           :loading="true"
+           width="70%">
+      <Steps style="padding: 40px;"
+             :current="currentStep">
+        <Step :title="isModify ? '修改零售公司' : '选择零售公司'"
+              content></Step>
+        <Step :title="isModify ? '修改店铺' : '选择店铺'"
+              content></Step>
       </Steps>
-      <useActivityStepTwo :schedule="schedule" :isModify="isModify" v-if="currentStep == 0"></useActivityStepTwo>
-      <useActivityStepThree :schedule="schedule" :isModify="isModify" v-if="currentStep == 1"></useActivityStepThree>
+      <useActivityStepTwo :schedule="schedule"
+                          :isModify="isModify"
+                          v-if="currentStep == 0"></useActivityStepTwo>
+      <useActivityStepThree :schedule="schedule"
+                            :isModify="isModify"
+                            v-if="currentStep == 1"></useActivityStepThree>
       <div slot="footer">
-        <Button
-          v-if="currentStep !== 0"
-          type="primary"
-          shape="circle"
-          :loading="modal_loading"
-          @click="back"
-        >上一步</Button>
-        <Button
-          v-if="currentStep !== 1"
-          type="primary"
-          shape="circle"
-          :loading="modal_loading"
-          @click="next"
-        >下一步</Button>
-        <Button
-          v-if="currentStep == 1"
-          type="primary"
-          shape="circle"
-          :loading="modal_loading"
-          @click="finish"
-        >完成</Button>
+        <Button v-if="currentStep !== 0"
+                type="primary"
+                shape="circle"
+                :loading="modal_loading"
+                @click="back">上一步</Button>
+        <Button v-if="currentStep !== 1"
+                type="primary"
+                shape="circle"
+                :loading="modal_loading"
+                @click="next">下一步</Button>
+        <Button v-if="currentStep == 1"
+                type="primary"
+                shape="circle"
+                :loading="modal_loading"
+                @click="finish">完成</Button>
       </div>
     </Modal>
   </div>
@@ -56,7 +55,7 @@ export default {
     useActivityStepThree,
     useActivityStepFoure
   },
-  data() {
+  data () {
     return {
       currentStep: -1,
       modal_loading: false,
@@ -73,27 +72,28 @@ export default {
     }
   },
   watch: {
-    show() {
+    show () {
       this.showUse = this.show;
       this.currentStep = 0;
+      this.modal_loading = false;
     },
-    schedule() {
+    schedule () {
       store.getters.useData.scheduleId = this.schedule.id;
     }
   },
-  mounted() {},
+  mounted () { },
   methods: {
-    cancel() {
+    cancel () {
       this.currentStep = 0;
-      if (!this.isModify) {
-        store.commit("RSET_useData");
-      }
+      // if (!this.isModify) {
+      //   store.commit("RSET_useData");
+      // }
       this.$emit("doShow", false);
       this.modal_loading = false;
       this.showUse = false;
       this.currentStep = 0;
     },
-    next() {
+    next () {
       let data = store.getters.useData;
       console.log("data1", data);
       if (this.currentStep === 0) {
@@ -118,10 +118,10 @@ export default {
       store.commit("SET_useData", data);
       this.currentStep = this.currentStep + 1;
     },
-    back() {
+    back () {
       this.currentStep = this.currentStep - 1;
     },
-    finish() {
+    finish () {
       let that = this;
       this.modal_loading = true;
       that.$emit("doShow", false);
diff --git a/src/pages/shop/IncreaseWelcomeEdit.vue b/src/pages/shop/IncreaseWelcomeEdit.vue
index 0527a13..e066f0b 100644
--- a/src/pages/shop/IncreaseWelcomeEdit.vue
+++ b/src/pages/shop/IncreaseWelcomeEdit.vue
@@ -44,9 +44,15 @@
           </FormItem>
           <FormItem label="配置范围: ">
             <span
+              @click="showStores"
               v-if="welcome.stores.length > 0"
             >{{ welcome.stores[0].name }}等{{ welcome.stores.length }}家店铺</span>
-            <Button type="text" @click="showStores" icon="md-add">全部店铺</Button>
+            <Button
+              type="text"
+              v-if="welcome.stores.length <= 0"
+              @click="showStores"
+              icon="md-add"
+            >全部店铺</Button>
           </FormItem>
           <FormItem>
             <Button type="primary" long @click="submit">确定</Button>
@@ -63,6 +69,7 @@
             :on-success="uploadImgSuccess"
             :format="['jpg', 'jpeg', 'png']"
             :max-size="2048"
+            :on-exceeded-size="onExceededSize"
             :before-upload="handleBeforeUpload"
             multiple
             type="drag"
@@ -70,7 +77,7 @@
             style="width: 100%;"
           >
             <div style="width: 100%;">
-              <Button long type="primary">图片</Button>
+              <Button long type="primary">{{imageUploading ? "上传中..." : "图片"}}</Button>
             </div>
           </Upload>
         </i-col>
@@ -133,6 +140,7 @@ export default {
       showMini: false,
       id: 0,
       showMessageTypes: false,
+      imageUploading: false,
       welcome: {
         content: "",
         params: [],
@@ -194,6 +202,9 @@ export default {
       this.showStoreCheck = false;
       this.welcome = store.getters.useData;
     },
+    onExceededSize() {
+      console.log("失败");
+    },
     getDetail(instanceId) {
       let _this = this;
       ActivityManager.instanceDetail(
@@ -283,6 +294,8 @@ export default {
       const me = this;
       let data = new FormData();
       data.append("file", res);
+      console.log(data);
+      this.imageUploading = true;
       axios({
         method: "post",
         url: "/upload",
@@ -291,6 +304,7 @@ export default {
           "Content-Type": "multipart/form-data"
         }
       }).then(function(res) {
+        me.imageUploading = false;
         if (res.data.success) {
           // me.formValidate.logo = res.data.results;
           me.welcome.params.push({
@@ -312,10 +326,12 @@ export default {
     submit() {
       let _this = this;
       if (this.welcome.params.length <= 0) {
-        _this.$Message.error("请添加图片/网页/小程序消息");
+        _this.$Message.error("图片/网页/小程序消息至少添加一个");
+        return false;
       }
       if (this.welcome.stores.length <= 0) {
         _this.$Message.error("请至少选择一个店铺");
+        return false;
       }
       this.$refs["welcomeForm"].validate(valid => {
         if (valid) {
diff --git a/src/pages/shop/IncreaseWelcomeList.vue b/src/pages/shop/IncreaseWelcomeList.vue
index 526c06d..7141655 100644
--- a/src/pages/shop/IncreaseWelcomeList.vue
+++ b/src/pages/shop/IncreaseWelcomeList.vue
@@ -1,61 +1,77 @@
 <template>
   <div>
     <Row class="search-row">
-      <i-col span="24" class="search-col">
+      <i-col span="24"
+             class="search-col">
         <Row class="row-style">
-          <Button @click="handleEdit" type="primary">配置欢迎语</Button>
+          <Button @click="handleEdit"
+                  type="primary">配置欢迎语</Button>
         </Row>
       </i-col>
     </Row>
-    <Table
-      :columns="columns1"
-      :data="data"
-      :loading="loading"
-      style="margin-top: 20px;"
-      size="small"
-    >
-      <template slot-scope="{ row, index }" slot="action">
-        <Button type="primary" size="small" @click="handleEdit(row, index)">修改</Button>
-        <Button type="error" size="small" @click="handleDelete(row, index)">删除</Button>
+    <Table :columns="columns1"
+           :data="data"
+           :loading="loading"
+           @on-cell-click="clickCell"
+           style="margin-top: 20px;"
+           size="small">
+      <template slot-scope="{ row, index }"
+                slot="action">
+        <Button type="primary"
+                size="small"
+                @click="handleEdit(row, index)">修改</Button>
+        <Button type="error"
+                size="small"
+                @click="handleDelete(row, index)">删除</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>
+    <Modal v-model="showDetail"
+           title="配置范围"
+           width="70%"
+           :footer-hide="true">
+      <welcomeDetail v-if="showDetail"
+                     :detail="detail"></welcomeDetail>
+    </Modal>
   </div>
 </template>
 
 <script>
+import ActivityManager from "../../services/ActivityManager/ActivityManager";
 import data from "../../utils/PhoneRegionData";
 import http from "../../services/store/IncreaseStoreManager";
 
 import staff from "../../services/staff/staff";
+import welcomeDetail from "./WelcomeDetail";
 
 export default {
   name: "IncreaseWelcomeList",
   inject: ["setMenuName"],
-  data() {
+  components: { welcomeDetail },
+  data () {
     let _this = this;
     return {
       loading: false,
       // 分页
       total: 0,
       pageSize: 10,
+      showDetail: false,
       data: [],
       pageNum: 1,
+      detail: {},
       columns1: [
         {
           width: 60,
           align: "center",
           title: "序号",
-          render(h, params) {
+          render (h, params) {
             console.log(params);
             let num = parseInt(params.index) + 1;
             console.log(_this.pageSize);
@@ -68,23 +84,20 @@ export default {
         {
           title: "欢迎语",
           key: "scheduleVO.description",
-          render(h, params) {
+          render (h, params) {
             return h("span", params.row.content);
           }
         },
         {
           title: "配置范围",
           key: "shop",
-          render(h, params) {
-            if (params.row.storeName == null) {
-              return h("span", "店铺插入中...");
-            }
+          render (h, params) {
             return h(
               "span",
-              params.row.storeName +
-                "等" +
-                (params.row.storeCount || 0) +
-                "家公司"
+              (params.row.companyCount || 0) +
+              "家零售公司, " +
+              (params.row.storeCount || 0) +
+              "家店铺"
             );
           }
         },
@@ -95,13 +108,34 @@ export default {
       formValidate: {}
     };
   },
-  mounted() {
+  mounted () {
     this.setMenuName("门店推广", "欢迎语");
     this.handlePaginate();
   },
   methods: {
+    clickCell (row, column, data, event) {
+      if (column.key === "shop") {
+        let _this = this;
+        this.getDetail(row.id).then(res => {
+          _this.detail = res;
+          _this.showDetail = true;
+        });
+      }
+    },
+    getDetail (instanceId) {
+      return new Promise((resolve, reject) => {
+        ActivityManager.instanceDetail(
+          {
+            instanceId
+          },
+          res => {
+            resolve(res.data.results);
+          }
+        );
+      });
+    },
     // 分页刷新
-    handlePaginate() {
+    handlePaginate () {
       this.loading = true;
       let params = {
         pageNum: this.pageNum,
@@ -117,27 +151,36 @@ export default {
       });
     },
     //切页处理
-    handlePage: function(value) {
+    handlePage: function (value) {
       this.pageNum = value;
       this.handlePaginate();
     },
     // 新增或修改
-    handleEdit(row) {
+    handleEdit (row) {
       this.$router.push({
         path: "/shop/increase/welcome/edit",
         query: { id: row.id }
       });
     },
     // 删除
-    handleDelete(row) {
+    handleDelete (row) {
       let _this = this;
       this.$Modal.confirm({
         title: "删除欢迎语",
         content: "您确定要删除该欢迎语?",
         onOk: () => {
-          http.deleteWelcome({ id: row.scheduleId }).then(_this.handlePaginate);
+          http.deleteWelcome({ id: row.scheduleId }).then(res => {
+            if (_this.data.length <= 1) {
+              if (_this.pageNum > 1) {
+                _this.pageNum = _this.pageNum - 1;
+              } else {
+                _this.pageNum = 1;
+              }
+            }
+            _this.handlePaginate()
+          });
         },
-        onCancel: () => {}
+        onCancel: () => { }
       });
     }
   }
diff --git a/src/pages/shop/WelcomeDetail.vue b/src/pages/shop/WelcomeDetail.vue
new file mode 100644
index 0000000..228f828
--- /dev/null
+++ b/src/pages/shop/WelcomeDetail.vue
@@ -0,0 +1,92 @@
+<template>
+  <div style="padding: 0 40px;">
+    <Form ref="formValidate"
+          :model="useData"
+          :label-width="80">
+      <Row>
+        <i-col span="22"
+               offset="2">
+          <FormItem label="配置范围"
+                    prop="activityRange">
+            <Collapse simple>
+              <Panel :key="index"
+                     v-for="(item, index) in groups">
+                {{
+                  item.name
+                }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
+                  item.stores.length
+                }}家店铺
+                <div slot="content">
+                  <div class="activityShopClass">
+                    <div class="mr10"
+                         v-for="(item, index) in item.stores"
+                         :key="index">
+                      <Tag class="tagClass"
+                           color="blue">{{ item.name }}</Tag>
+                    </div>
+                  </div>
+                </div>
+              </Panel>
+            </Collapse>
+          </FormItem>
+        </i-col>
+      </Row>
+    </Form>
+  </div>
+</template>
+<script>
+import store from "../../store/index";
+export default {
+  name: "useActivityStepFoure",
+  data () {
+    return {
+      useData: store.getters.useData,
+      operate: "收起",
+      displayActivityShopFlag: false,
+      groups: [],
+    };
+  },
+  props: {
+    detail: Object
+  },
+  created () {
+    let _this = this;
+    this.$nextTick(() => {
+      console.log(123, this.detail)
+      _this.detail.organizations.forEach((item) => {
+        item.stores = _this._.filter(
+          _this.detail.stores,
+          (s) => s.companyId == item.id || s.parentId == item.id
+        );
+        console.log(item.stores)
+        _this.groups.push(item);
+      });
+    });
+  },
+  methods: {
+    isDisplay () {
+      if (this.operate === "展开") {
+        this.operate = "收起";
+        this.displayActivityShopFlag = false;
+      } else {
+        this.operate = "展开";
+        this.displayActivityShopFlag = true;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.activityShopClass {
+  display: flex;
+  justify-content: start;
+  flex-wrap: wrap;
+}
+.mr10 {
+  margin-right: 20px;
+}
+.tagClass {
+  text-align: center;
+}
+</style>
diff --git a/src/services/CommonHttp.js b/src/services/CommonHttp.js
index 2ceec20..c9ae297 100755
--- a/src/services/CommonHttp.js
+++ b/src/services/CommonHttp.js
@@ -7,9 +7,7 @@ import commonUtils from '../utils/Common'
 // http://mf.kiisoo.com:58080/
 // axios.defaults.baseURL = 'https://wxtk.bsdits.com/kiisoo-ic/';
 axios.defaults.baseURL =
-  process.env.NODE_ENV === 'production'
-    ? 'http://111.231.218.44:8080/kiisoo-ic'
-    : '/kiisoo-ic'
+  process.env.NODE_ENV === 'production' ? '/kiisoo-ic' : '/kiisoo-ic'
 
 //响应时间
 axios.defaults.timeout = 120000