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

src/pages/activity/ActivityManager.vue

@@ -1,18 +1,12 @@
 <template>
   <div class="activityManager">
-    <Spin v-show="loading"
+    <Spin v-show="loading" fix>加载中...</Spin>
-          fix>加载中...</Spin>
     <Row>
-      <i-col class="activityListClass"
+      <i-col class="activityListClass" v-for="(item, index) in activityList" :key="index" span="7" offset="1">
-             v-for="(item, index) in activityList"
-             :key="index"
-             span="7"
-             offset="1">
         <Card>
           <div class="operateAndThemeItem">
             <div class="ThemeItem">
-              <img class="img"
+              <div class="schedule-image"><img class="img" :src="'/kiisoo-ic' + item.logo" alt /></div>
-                   :src="'/kiisoo-ic' + item.logo" />
               <div class="tipItem">
                 <span>{{ item.name }}</span>
                 <span>{{ item.description }}</span>
@@ -51,7 +45,6 @@
 import useTable from "./useTable";
 import addActivity from "./addActivity";
 import ActivityManager from "../../services/ActivityManager/ActivityManager";
-import store from "../../store/index";
 
 export default {
   name: "ActivityManager",
@@ -139,16 +132,14 @@ export default {
 </script>
 
 <style scoped>
+  .activityManager {
+    min-height: 600px;
+  }
 .operateAndThemeItem {
   display: flex;
   justify-content: space-between;
 }
 
-.img {
-  height: 100px;
-  width: 150px;
-}
-
 .operateItem {
   display: flex;
   flex-direction: column;
@@ -173,7 +164,7 @@ export default {
 }
 
 .activityListClass {
-  margin-bottom: 50px;
+  margin-bottom: 20px;
 }
 
 .addactivity {
@@ -183,4 +174,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;
+  }
 </style>

src/pages/activity/useActivityStepThree.vue

@@ -75,14 +75,6 @@ export default {
       });
     }
   },
-  computed: {
-    userData () {
-      return store.getters.userData || {};
-    },
-    store () {
-      return store.getters.store || [];
-    },
-  },
   methods: {
     handleCheckAll () {
       let _this = this;
@@ -187,46 +179,6 @@ export default {
         that.loading = false;
       });
     },
-    isSelectAllCompany () {
-      if (this.allSelect === true) {
-        this.isSelect.forEach((element, index) => {
-          this.isSelect.splice(index, 1, true);
-        });
-        this.shopList.forEach((element, index) => {
-          this.selectValue.splice(index, 1, element.id);
-        });
-      } else {
-        this.isSelect.forEach((element, index) => {
-          this.isSelect.splice(index, 1, "");
-        });
-        this.shopList.forEach((element, index) => {
-          this.selectValue.splice(index, 1, "");
-        });
-      }
-    },
-    selectTag (value, index) {
-      this.isSelect.splice(index, 1, !this.isSelect[index]);
-      if (this.isSelect[index] === true) {
-        this.selectValue.splice(index, 1, value.value);
-      } else if (this.isSelect[index] === false) {
-        this.selectValue.splice(index, 1, "");
-      }
-      let selectShopValue = [];
-      this.isSelect.forEach((element, index) => {
-        if (element === true) {
-          selectShopValue.push(this.selectValue[index]);
-        }
-      });
-      let selectShopValueObject = [];
-      for (let j = 0; j < selectShopValue.length; j++) {
-        for (let i = 0; i < this.shopList.length; i++) {
-          if (this.shopList[i].value === selectShopValue[j]) {
-            selectShopValueObject.push(this.shopListData[i]);
-          }
-        }
-      }
-      store.getters.useData.selectShopValue = selectShopValueObject;
-    },
   },
 };
 </script>
@@ -251,18 +203,4 @@ export default {
 .ivu-checkbox + span {
   margin-left: 4px;
 }
-.tagClass {
-  width: 31%;
-  margin-bottom: 30px;
-  height: 120px;
-  line-height: 120px;
-  border: 1px solid #e3e8ee !important;
-  color: #657180 !important;
-  background: #fff;
-  padding: 0 12px;
-  cursor: pointer;
-}
-.tagColorClass {
-  background: #6ac1d1;
-}
 </style>