Merge branch 'http_mock' into http_test

src/views/monthlyReport/childrenPage/editReport/components/VarText.vue

@@ -13,7 +13,7 @@
             show-word-limit
           />
           <el-button
-            style="margin-left: 20px;margin-right: 20px;font-size: 14px;font-weight: 400;"
+            style="margin-left: 20px;font-size: 14px;font-weight: 400;"
             type="text"
             @click="markingIssues"
           >

src/views/monthlyReport/childrenPage/editReport/components/core.vue

@@ -74,11 +74,11 @@
         :title="baseData.title"
         :dom-key="baseData.domKey"
         :style="{marginLeft: baseData.title.search(/线上问题/) > -1 ? '5px' : '5px'}" />
-      <span><el-button
+      <!--<span><el-button
         v-if="headerTitle.indexOf('线下缺陷') > -1 && pageDate.status < 20 && !isHistory"
         type="text"
         style="margin-left: 15px;font-weight: 400;"
-        @click.stop="marking">标记</el-button></span>
+        @click.stop="marking">标记</el-button></span>-->
     </div>
     <div
       v-if="baseData.content && baseData.content.length"