Merge branch 'feature/营销' into dev

src/styles/component.less

@@ -16,6 +16,9 @@
 .ml10 {
   margin-left: 10px;
 }
+.mt6 {
+  margin-top: 6px;
+}
 .mt10 {
   margin-top: 10px;
 }
@@ -56,13 +59,7 @@
 .border-bottom{
   border-bottom: 1px solid #E4E7ED;
 }
-.image-tip {
-  margin: 6px 0 14px;
-  font-size: 12px;
-  color: #909399;
-  line-height: 17px;
-  cursor: default;
-}
+
 [class^="dm-status--"]::before {
   display: inline-block;
   width: 6px;

src/utils/request.js

@@ -6,7 +6,6 @@ import { origin } from '@/config/index.js';
 axios.defaults.baseURL = origin;
 
 const request = (opt, params) => {
-  console.log(opt, params);
   params = typeof params === 'object' ? JSON.parse(JSON.stringify(params)) : params;
   opt = Object.assign({}, opt);
   let requestConfig = {

src/views/activity/component/NewActivity.vue

@@ -214,6 +214,13 @@ export default {
     color: #303133;
   }
 }
+.image-tip {
+  margin: 6px 0 14px;
+  font-size: 12px;
+  color: #909399;
+  line-height: 17px;
+  cursor: default;
+}
 
 /deep/.el-input-number.is-controls-right:hover .el-input-number__decrease,
 /deep/.el-input-number.is-controls-right:hover .el-input-number__increase {

src/views/activity/template-list.vue

@@ -53,7 +53,8 @@ export default {
     return {
       searchParams: {
         templateName: '',
-        statusFlag: ''
+        statusFlag: '',
+        templateType: this.$route.query.type
       },
       loading: false,
       list: [],
@@ -118,21 +119,20 @@ export default {
           sort.option('sort', isSortIcon);
         },
         onEnd({ newIndex, oldIndex }) {
-          console.log(newIndex);
-          // const currRow = that.list.splice(oldIndex, 1)[0];
-          // that.list.splice(newIndex, 0, currRow);
+          // console.log(newIndex);
+          const currRow = that.list.splice(oldIndex, 1)[0];
+          that.list.splice(newIndex, 0, currRow);
+          console.log( that.list);
           const arr = that.list.map((item, index) => {
             return { sort: index, templateId: item.templateId };
           });
-          console.log(arr);
-          // that.batchupdateTemplateSort({ sort: newIndex, templateId: currRow.templateId });
+          // console.log(arr);
           that.batchupdateTemplateSort(arr);
         }
       });
     },
     batchupdateTemplateSort(arr) {
       fetch.batchupdateTemplateSort(arr).then((res) => {
-        console.log(res);
         this.getList();
       });
     }