Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521

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;
       });
     },

src/pages/activity/ActivityPlan.vue

@@ -64,17 +64,22 @@
                @on-row-dblclick="showDetail"
                :columns="columns1"
                :data="data">
-            <template slot-scope="{row}" slot="qrCodeAction">
+          <template slot-scope="{row}"
-                <img :src="require('../../../static/img/qrCode-init.png')" @click="navigateCode(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}">
+          <template slot="action"
+                    slot-scope="{row}">
             <i-col span="12">
-                <Button ghost class="router-btn" 
+              <Button ghost
+                      class="router-btn"
                       @click="() => {stop(row)}">终止</Button>
             </i-col>
             <i-col span="12">
-                <Button ghost class="router-btn"
+              <Button ghost
+                      class="router-btn"
                       @click="() => {modify(row)}">修改</Button>
             </i-col>
           </template>
@@ -103,8 +108,7 @@
                   :detail="detail"></planDetail>
     </Modal>
     <!-- 预览二维码 -->
-    <Modal
+    <Modal v-model="isShow"
-        v-model="isShow"
            :title="showStoreName"
            :footer-hide="true"
            width="230"
@@ -114,9 +118,12 @@
         <p></p>
       </div>
       <p>{{this.showStoreName}}</p>
-        <img :src="qrCodeImage" style="width:200px;height:200px;"/>
+      <img :src="qrCodeImage"
+           style="width:200px;height:200px;" />
       <div style="text-align: center;">
-            <Button ghost type="primary" @click="download(rowData)">下载</Button>
+        <Button ghost
+                type="primary"
+                @click="download(rowData)">下载</Button>
       </div>
     </Modal>
   </div>
@@ -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 || {};
@@ -517,7 +525,7 @@ export default {
 }
 .router-btn {
   border: none;
-  color: #3496EB !important;
+  color: #3496eb !important;
   margin-left: -15px;
 }
 .table-img-qr-code {

src/pages/activity/selectStoreStep.vue

@@ -1,41 +1,40 @@
 <template>
   <div class="use_box">
-    <Modal
+    <Modal :scrollable="false"
-      :scrollable="false"
            v-model="showUse"
            title="使用活动"
            @on-cancel="cancel"
            :loading="true"
-      width="70%"
+           width="70%">
-    >
+      <Steps style="padding: 40px;"
-      <Steps style="padding: 40px;" :current="currentStep">
+             :current="currentStep">
-        <Step :title="isModify ? '修改零售公司' : '选择零售公司'" content></Step>
+        <Step :title="isModify ? '修改零售公司' : '选择零售公司'"
-        <Step :title="isModify ? '修改店铺' : '选择店铺'" content></Step>
+              content></Step>
+        <Step :title="isModify ? '修改店铺' : '选择店铺'"
+              content></Step>
       </Steps>
-      <useActivityStepTwo :schedule="schedule" :isModify="isModify" v-if="currentStep == 0"></useActivityStepTwo>
+      <useActivityStepTwo :schedule="schedule"
-      <useActivityStepThree :schedule="schedule" :isModify="isModify" v-if="currentStep == 1"></useActivityStepThree>
+                          :isModify="isModify"
+                          v-if="currentStep == 0"></useActivityStepTwo>
+      <useActivityStepThree :schedule="schedule"
+                            :isModify="isModify"
+                            v-if="currentStep == 1"></useActivityStepThree>
       <div slot="footer">
-        <Button
+        <Button v-if="currentStep !== 0"
-          v-if="currentStep !== 0"
                 type="primary"
                 shape="circle"
                 :loading="modal_loading"
-          @click="back"
+                @click="back">上一步</Button>
-        >上一步</Button>
+        <Button v-if="currentStep !== 1"
-        <Button
-          v-if="currentStep !== 1"
                 type="primary"
                 shape="circle"
                 :loading="modal_loading"
-          @click="next"
+                @click="next">下一步</Button>
-        >下一步</Button>
+        <Button v-if="currentStep == 1"
-        <Button
-          v-if="currentStep == 1"
                 type="primary"
                 shape="circle"
                 :loading="modal_loading"
-          @click="finish"
+                @click="finish">完成</Button>
-        >完成</Button>
       </div>
     </Modal>
   </div>
@@ -76,6 +75,7 @@ export default {
     show () {
       this.showUse = this.show;
       this.currentStep = 0;
+      this.modal_loading = false;
     },
     schedule () {
       store.getters.useData.scheduleId = this.schedule.id;
@@ -85,9 +85,9 @@ export default {
   methods: {
     cancel () {
       this.currentStep = 0;
-      if (!this.isModify) {
+      // if (!this.isModify) {
-        store.commit("RSET_useData");
+      //   store.commit("RSET_useData");
-      }
+      // }
       this.$emit("doShow", false);
       this.modal_loading = false;
       this.showUse = false;

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) {

src/pages/shop/IncreaseWelcomeList.vue

@@ -1,46 +1,60 @@
 <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
+    <Table :columns="columns1"
-      :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>
-      <template slot-scope="{ row, index }" slot="action">
+        <Button type="error"
-        <Button type="primary" size="small" @click="handleEdit(row, index)">修改</Button>
+                size="small"
-        <Button type="error" size="small" @click="handleDelete(row, index)">删除</Button>
+                @click="handleDelete(row, index)">删除</Button>
       </template>
     </Table>
-    <Page
+    <Page :total="total"
-      :total="total"
           :current="pageNum"
           :page-size="pageSize"
           show-elevator
           show-total
           placement="top"
           @on-change="handlePage"
-      class="ks-page"
+          class="ks-page"></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"],
+  components: { welcomeDetail },
   data () {
     let _this = this;
     return {
@@ -48,8 +62,10 @@ export default {
       // 分页
       total: 0,
       pageSize: 10,
+      showDetail: false,
       data: [],
       pageNum: 1,
+      detail: {},
       columns1: [
         {
           width: 60,
@@ -76,15 +92,12 @@ export default {
           title: "配置范围",
           key: "shop",
           render (h, params) {
-            if (params.row.storeName == null) {
-              return h("span", "店铺插入中...");
-            }
             return h(
               "span",
-              params.row.storeName +
+              (params.row.companyCount || 0) +
-                "等" +
+              "家零售公司, " +
               (params.row.storeCount || 0) +
-                "家公司"
+              "家店铺"
             );
           }
         },
@@ -100,6 +113,27 @@ export default {
     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 () {
       this.loading = true;
@@ -135,7 +169,16 @@ export default {
         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: () => { }
       });

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>

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'
+  process.env.NODE_ENV === 'production' ? '/kiisoo-ic' : '/kiisoo-ic'
-    ? 'http://111.231.218.44:8080/kiisoo-ic'
-    : '/kiisoo-ic'
 
 //响应时间
 axios.defaults.timeout = 120000