Merge branch 'dev' of ssh://gitlab.bigaka.net:2287/Caden/common-templete into dev

.eslintrc.js

@@ -32,5 +32,7 @@ module.exports = {
     'no-mixed-spaces-and-tabs': 0,
     'comma-dangle': 0,
     'space-before-function-paren': [0, 'always'],
+    'semi': 0,
+    'quotes': 0,
   },
 }

src/pages/addmarketing/components/StepInfo.vue

@@ -429,9 +429,6 @@ export default {
        }
      })
 
-
-
-
 			// await this.axios
 			// 	.post(api.add.save, {
 			// 		mediaId: this.currentImgId,

src/pages/marketingCenter/components/MarketingTab/MessageList.vue

@@ -217,7 +217,6 @@ export default {
       if(this.pushCountEnd)
         paramsSearch.pushCountEnd = this.pushCountEnd;
 
-
       this.$emit('search', paramsSearch)
     },
   },