去除xlsx插件

src/components/wechatmembers/bulkIntegral.vue

 <template>
-  <div id="bulkIntegral">
+  <div class="bulkIntegral">
     <nav-path :navpath="navpath"></nav-path>
     <div class="content">
       <div class="contentInfo">
@@ -95,8 +95,8 @@
           :total="page.totalCount">
         </el-pagination>
       </div>
-      <vue-gic-footer></vue-gic-footer>
     </div>
+    <vue-gic-footer></vue-gic-footer>
 
     <!-- 新建导入 -->
     <el-dialog
@@ -199,6 +199,10 @@
 import { doFetch, doFetchqs } from "../../components/axios/api";
 import NavPath from "@/common/navbar/navbar.vue";
 import url from "../../components/axios/url";
+<<<<<<< HEAD
+=======
+// import XLSX from 'xlsx';
+>>>>>>> 8fd6a4fab60ad3ae0c7e3ca6ebd1d41efd961de4
 import {
   checkFalse,
   checkStatus,
@@ -456,9 +460,9 @@ export default {
   }
 }
 </script>
-<style lang="stylus" scoped>
-#bulkIntegral {
-  // height: 100%;
+<style lang="scss" scoped>
+.bulkIntegral {
+  height: 100%;
   .el-table{
     width:99.9%;
   }
@@ -466,17 +470,17 @@ export default {
     padding: 22px 24px;
     .contentInfo {
       padding: 24px;
-      background-color #fff;
+      background-color:#fff;
       .flex {
         padding-bottom: 22px;
       }
-      >>> .el-table th>.cell {
+      /deep/ .el-table th>.cell {
         font-weight: 700;
         color: #303133;
       }
     }
   }
-  >>>.el-dialog__footer {
+  /deep/ .el-dialog__footer {
     border: none;
   }
   .importBox {
@@ -490,7 +494,7 @@ export default {
     border-top: 1px solid #E4E7ED;
     color: #909399;
     h3 {
-      font-weight normal;
+      font-weight: normal;
       font-size: 14px;
       margin-bottom: 10px;
     }
@@ -504,29 +508,29 @@ export default {
     font-size: 47px;
   }
   .successHeader {
-    text-align center;
+    text-align: center;
     color: #303133;
     font-size: 16px;
     line-height: 39px;
   }
   .successCon {
-    text-align center;
+    text-align: center;
     color: #606266;
     font-size: 12px;
   }
   .member-wechat-timer {
-    width 20px;
-    height 20px;
+    width: 20px;
+    height: 20px;
     font-size: 10px;
     line-height: 20px;
     padding: 0;
   }
-  .dialogSuccess >>>.el-dialog__footer {
-    text-align center;
+  .dialogSuccess /deep/ .el-dialog__footer {
+    text-align: center;
     padding-bottom: 22px;
   }
-  >>>.el-pagination {
-    text-align right;
+  /deep/ .el-pagination {
+    text-align: right;
     margin: 20px 0 40px;
   }
 }

src/components/wechatmembers/bulkLogsDetail.vue

@@ -30,14 +30,14 @@
             prop="address"
             label="成本主体">
             <template slot-scope="{ row }">
-              {{ operation || '——' }}
+              {{ row.costStoreName || '--' }}
             </template>
           </el-table-column>
           <el-table-column
             prop="remark"
             label="原因备注">
             <template slot-scope="{ row }">
-              {{ row.remark || '——' }}
+              {{ row.remark || '--' }}
             </template>
           </el-table-column>
         </el-table>
@@ -55,8 +55,8 @@
           :total="page.totalCount">
         </el-pagination>
       </div>
-      <vue-gic-footer></vue-gic-footer>
     </div>
+    <vue-gic-footer></vue-gic-footer>
   </div>
 </template>
 <script>
@@ -144,6 +144,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 #bulkLogsDetail {
+  height: 100%;
   .el-table{
     width:99.9%;
   }