Merge branch 'feature/9月迭代' into dev

index.html

@@ -29,7 +29,7 @@
     <script src="//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js"></script>
     <!-- <script src="//web-1251519181.file.myqcloud.com/components/card.2.0.18.js"></script> --><!-- 卡券选择器其实并没有用到 -->
     <script src="//web-1251519181.file.myqcloud.com/components/selector.1.2.27.js"></script>
-    <script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.21.js"></script>
+    <script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.24.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script>
   </body>
 </html>

src/view/manualTag/syncTagHistory.vue

@@ -17,7 +17,7 @@
             <el-table-column label="添加时间" prop="flagUpdateTime">
               <template slot-scope="{ row }">{{ row.flagUpdateTime ? dateformat(new Date(row.flagUpdateTime), 'yyyy-MM-dd hh:mm:ss') : '--' }}</template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" v-if="false">
               <template slot-scope="{ row }"><el-button type="text" @click="cancelSync(row)">取消同步</el-button></template>
             </el-table-column>
           </el-table>