feat:文件夹名称的更改

 import dialogBox from '@/components/DialogBox/dialogBox.vue'
-import lbTable from '@/components/lbTable/lb-table.vue'
+import LbTable from '@/components/LbTable/lb-table.vue'
 import Theme from '@/components/Theme/theme.vue'
 import Popup from '@/components/Popup/index'
 export default {
   install: (Vue) => {
     Vue.component('dialogBox', dialogBox);
-    Vue.component('lbTable', lbTable);
+    Vue.component('lbTable', LbTable);
     Vue.component('Theme', Theme);
     Vue.prototype.$popup = Popup.install
   }

+
+<template>
+  <el-calendar v-model="date">
+    <template slot="dateCell" slot-scope="{date, data}">
+      <div :class="{ selected: isSelected(date, data) }">
+        <div class="solar">{{ data.day.split('-')[2] }}</div>
+        <div class="lunar" :class="{ festival: isFestival(date, data) }">{{ solarToLunar(date, data) }}</div>
+      </div>
+    </template>
+  </el-calendar>
+</template>
+ 
+<script>
+import calendar from './calendar'
+export default {
+  name: 'calendar',
+  data () {
+    return {
+      date: new Date(),
+      // 根据selectedDates设置选中日期
+      selectedDates: []
+    }
+  },
+  methods: {
+    // 是否选中日期
+    isSelected: function (slotDate, slotData) {
+      return this.selectedDates.includes(slotData.day)
+    },
+    // 是否节假日
+    isFestival (slotDate, slotData) {
+      let solarDayArr = slotData.day.split('-');
+      let lunarDay = calendar.solar2lunar(solarDayArr[0], solarDayArr[1], solarDayArr[2])
+
+      // 公历节日\农历节日\农历节气
+      let festAndTerm = [];
+      festAndTerm.push(lunarDay.festival == null ? '' : ' ' + lunarDay.festival)
+      festAndTerm.push(lunarDay.lunarFestival == null ? '' : '' + lunarDay.lunarFestival)
+      festAndTerm.push(lunarDay.Term == null ? '' : '' + lunarDay.Term)
+      festAndTerm = festAndTerm.join('')
+
+      return festAndTerm != ''
+    },
+    // 公历转农历
+    solarToLunar (slotDate, slotData) {
+      let solarDayArr = slotData.day.split('-');
+      let lunarDay = calendar.solar2lunar(solarDayArr[0], solarDayArr[1], solarDayArr[2])
+
+      // 农历日期
+      let lunarMD = lunarDay.IMonthCn + lunarDay.IDayCn
+
+      // 公历节日\农历节日\农历节气
+      let festAndTerm = [];
+      festAndTerm.push(lunarDay.festival == null ? '' : ' ' + lunarDay.festival)
+      festAndTerm.push(lunarDay.lunarFestival == null ? '' : '' + lunarDay.lunarFestival)
+      festAndTerm.push(lunarDay.Term == null ? '' : '' + lunarDay.Term)
+      festAndTerm = festAndTerm.join('')
+
+      return festAndTerm == '' ? lunarMD : festAndTerm
+    }
+  }
+}
+</script>
+ 
+<style scoped>
+/**隐藏上一月、本月、下一月*/
+.el-calendar__button-group {
+  display: none;
+}
+
+/deep/.el-calendar__body {
+  padding: 12px !important;
+}
+
+/deep/.el-calendar-table .el-calendar-day {
+  height: auto;
+  padding: 5px;
+}
+
+/**月份居中*/
+.el-calendar__title {
+  width: 100%;
+  text-align: center;
+}
+
+/**日期div的样式*/
+.el-calendar-table tr td:first-child {
+  border-left: 0px;
+}
+
+.el-calendar-table td {
+  min-height: 110px;
+  min-width: 110px;
+  border-right: 0px;
+}
+
+.el-calendar-table td.is-selected {
+  background-color: white;
+}
+
+.el-calendar-table .el-calendar-day {
+  padding: 0px;
+  text-align: center;
+}
+
+.el-calendar-table .el-calendar-day>div {
+  text-align: center
+}
+
+/**日期div的样式-公历*/
+.el-calendar-table .el-calendar-day>div .solar {
+  text-align: center
+}
+
+/**日期div的样式-农历*/
+.el-calendar-table .el-calendar-day>div .lunar {
+  padding-top: 5px;
+  font-size: 12px;
+  text-align: center
+}
+
+/**日期div的样式-选中*/
+.el-calendar-table .el-calendar-day>div.selected {
+  background-color: #fef2f2;
+  border: 3px solid #fb0;
+  border-radius: 20px;
+  text-align: center
+}
+
+/**本月周末设置为红色*/
+.el-calendar-table .current:nth-last-child(-n+2) .solar {
+  color: red;
+}
+
+/**本月农历设置为灰色*/
+.el-calendar-table .current .lunar {
+  color: #606266;
+  font-size: 12px;
+}
+
+/**本月农历节日设置为红色*/
+.el-calendar-table .current .lunar.festival {
+  color: red;
+}
+
+.el-calendar-table td {
+  border-right: none !important;
+}
+
+/**禁用点击效果*/
+/*.el-calendar-table td {*/
+/*pointer-events: none;*/
+/*}*/
+</style>
\ No newline at end of file

+.dialogBox {
+    border-radius: 8px;
+    overflow: hidden;
+    background: #FFFFFF;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.10);
+
+    .dialog_title {
+        display: flex;
+        position: relative;
+        top: -2px;
+
+        b {
+            @include flex-center;
+            flex: 1;
+            width: 100%;
+        }
+    }
+
+    .dialog_full {
+        position: absolute;
+        top: 0;
+        right: 30px;
+    }
+
+    .el-dialog__body {
+        max-height: 88vh;
+        overflow-x: hidden;
+        overflow-y: hidden;
+    }
+
+    .dialog_footer {
+        margin-top: 8px;
+        @include flex-center;
+    }
+
+
+}
+
+.dialog_title {
+    @include flex;
+    justify-content: space-between;
+    width: 100%;
+}
+
+.el-dialog__header {
+    margin-bottom: 10px;
+    color: #4A4A4A;
+    background-color: #FCFDFD;
+    border-bottom: 1px solid #E4EBF4;
+}
+
+.el-dialog__body {
+    padding-top: 10px;
+    padding-bottom: 0;
+}
+
+.el-dialog__headerbtn .el-dialog__close {
+    color: #6B7A99 !important;
+    position: relative;
+    top: -2px;
+}
+
+
+.el-form-item {
+    @include flex;
+    width: 100%;
+}
+
+.el-dialog__wrapper {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+
+.contentCenter {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(calc(-50% + 85px), -50%);
+}
+
+.mainCenter {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+}
\ No newline at end of file

+<template>
+  <el-dialog :visible.sync="dialogVisible" v-if="dialogVisible" :width="width" :fullscreen="fullscreen" top="0"
+    :append-to-body="appendToBody" :lock-scroll="true" :close-on-click-modal="false" @close="closeDialog" :key="key"
+    :custom-class="isMain ? 'mainCenter dialogBox' : 'contentCenter dialogBox'" :destroy-on-close="true" ref="dialogBox"
+    id="dialogBox">
+    <div slot="title">
+      <div class="dialog_title">
+        <b>{{ title }}</b>
+        <div v-if="isFullscreen" class="dialog_full">
+          <i class="el-icon-rank" v-if="fullscreen" @click="handleFullscreen"></i>
+          <i class="el-icon-full-screen" v-else @click="handleFullscreen" />
+        </div>
+      </div>
+    </div>
+    <div class="dialogBox-content" :style="{ height: scrollerHeight ? scrollerHeight : 'auto' }">
+      <slot></slot>
+    </div>
+    <div slot="footer" class="dialog_footer" v-if="isButton">
+      <el-button @click="closeDialog" v-if="isReset">取消</el-button>
+      <el-button type="primary" plain @click="submitForm" v-if="isSave" :disabled="btnDisabled" :loading="saveloding">
+        {{ saveButton }}</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+export default {
+  props: {
+    value: { type: Boolean, default: false },
+    isMain: {
+      type: Boolean,
+      default: false
+    },
+    appendToBody: {
+      type: Boolean,
+      default: true
+    },
+    isButton: {
+      type: Boolean,
+      default: true,
+    },
+    width: {
+      type: String,
+      default: '70%',
+    },
+    title: {
+      type: String,
+      default: '',
+    },
+    isFullscreen: {
+      type: Boolean,
+      default: true,
+    },
+    isSave: {
+      type: Boolean,
+      default: true,
+    },
+    saveButton: {
+      type: String,
+      default: '提交',
+    },
+    isReset: {
+      type: Boolean,
+      default: true,
+    },
+    saveloding: {
+      type: Boolean,
+      default: false,
+    },
+    btnDisabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      key: 0,
+      dialogVisible: false,
+      fullscreen: false,
+      scrollerHeight: false,
+    }
+  },
+  watch: {
+    value (val) {
+      this.dialogVisible = val
+    }
+  },
+  methods: {
+    handleFullscreen (val) {
+      this.fullscreen = !this.fullscreen
+      let height = document.getElementById('dialogBox').clientHeight
+      if (!this.fullscreen) {
+        this.scrollerHeight = false
+      } else {
+        this.scrollerHeight = (window.innerHeight - 180) + 'px'
+      }
+    },
+    submitForm () {
+      if (this.isButton) {
+        this.$emit('submitForm');
+      }
+    },
+    closeDialog () {
+      this.key++
+      this.$emit('input', false)
+      this.$emit('closeDialog')
+    }
+  },
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" >
+@import "~@/styles/mixin.scss";
+@import "./dialogBox.scss";
+</style>
+<style rel="stylesheet/scss" scoped lang="scss" >
+/deep/.is-fullscreen {
+  position: absolute;
+  top: 50% !important;
+  left: 50% !important;
+  transform: translate(-50%, -50%) !important;
+}
+</style>
\ No newline at end of file

+## 这个是弹框组件，对于element自带的组件进行封装，方便修改全局样式做统一操作
+### 使用时在组件中引用 

+export default {
+  selection: {
+    renderHeader: (h, { store }) => {
+      return (
+        <el-checkbox
+          disabled={store.states.data && store.states.data.length === 0}
+          indeterminate={
+            store.states.selection.length > 0 && !store.states.isAllSelected
+          }
+          nativeOn-click={store.toggleAllSelection}
+          value={store.states.isAllSelected}
+        />
+      )
+    },
+    renderCell: (h, { row, column, store, $index }) => {
+      return (
+        <el-checkbox
+          nativeOn-click={event => event.stopPropagation()}
+          value={store.isSelected(row)}
+          disabled={
+            column.selectable
+              ? !column.selectable.call(null, row, $index)
+              : false
+          }
+          on-input={() => {
+            store.commit('rowSelectedChanged', row)
+          }}
+        />
+      )
+    },
+    sortable: false,
+    resizable: false
+  },
+  index: {
+    renderHeader: (h, scope) => {
+      return <span>{scope.column.label || '#'}</span>
+    },
+    renderCell: (h, { $index, column }) => {
+      let i = $index + 1
+      const index = column.index
+
+      if (typeof index === 'number') {
+        i = $index + index
+      } else if (typeof index === 'function') {
+        i = index($index)
+      }
+
+      return <div>{i}</div>
+    },
+    sortable: false
+  },
+  expand: {
+    renderHeader: (h, scope) => {
+      return <span>{scope.column.label || ''}</span>
+    },
+    renderCell: (h, { row, store }, proxy) => {
+      const expanded = store.states.expandRows.indexOf(row) > -1
+      return (
+        <div
+          class={
+            'el-table__expand-icon ' +
+            (expanded ? 'el-table__expand-icon--expanded' : '')
+          }
+          on-click={e => proxy.handleExpandClick(row, e)}
+        >
+          <i class='el-icon el-icon-arrow-right' />
+        </div>
+      )
+    },
+    sortable: false,
+    resizable: false,
+    className: 'el-table__expand-column'
+  }
+}

+/*
+ * FileName: lb-column.vue
+ * Remark: element-column
+ * Project: lb-element-table
+ * Author: 任超
+ * File Created: Tuesday, 19th March 2019 9:58:23 am
+ * Last Modified: Tuesday, 19th March 2019 10:14:42 am
+ * Modified By: 任超
+ */
+
+<template>
+  <el-table-column v-bind="$attrs"
+    v-on="$listeners"
+    :prop="column.prop"
+    :label="column.label"
+    :type="column.type"
+    :index="column.index"
+    :column-key="column.columnKey"
+    :width="column.width"
+    :min-width="column.minWidth"
+    :fixed="column.fixed"
+    :scoped-slot="column.renderHeader"
+    :sortable="column.sortable || false"
+    :sort-method="column.sortMethod"
+    :sort-by="column.sortBy"
+    :sort-orders="column.sortOrders"
+    :resizable="column.resizable || true"
+    :formatter="column.formatter"
+    :show-overflow-tooltip="column.showOverflowTooltip || false"
+    :align="column.align || align || 'center'"
+    :header-align="column.headerAlign || headerAlign || column.align || align || 'center'"
+    :class-name="column.className"
+    :label-class-name="column.labelClassName"
+    :selectable="column.selectable"
+    :reserve-selection="column.reserveSelection || false"
+    :filters="column.filters"
+    :filter-placement="column.filterPlacement"
+    :filter-multiple="column.filterMultiple"
+    :filter-method="column.filterMethod"
+    :filtered-value="column.filteredValue">
+    <template slot="header"
+      slot-scope="scope">
+      <lb-render v-if="column.renderHeader"
+        :scope="scope"
+        :render="column.renderHeader">
+      </lb-render>
+      <span v-else>{{ scope.column.label }}</span>
+    </template>
+
+    <template slot-scope="scope">
+      <lb-render :scope="scope"
+        :render="column.render">
+      </lb-render>
+    </template>
+
+    <template v-if="column.children">
+      <lb-column v-for="(col, index) in column.children"
+        :key="index"
+        :column="col">
+      </lb-column>
+    </template>
+  </el-table-column>
+</template>
+
+<script>
+import LbRender from './lb-render'
+import forced from './forced.js'
+export default {
+  name: 'LbColumn',
+  props: {
+    column: Object,
+    headerAlign: String,
+    align: String
+  },
+  components: {
+    LbRender
+  },
+  methods: {
+    setColumn () {
+      if (this.column.type) {
+        this.column.renderHeader = forced[this.column.type].renderHeader
+        this.column.render = this.column.render || forced[this.column.type].renderCell
+      }
+      if (this.column.formatter) {
+        this.column.render = (h, scope) => {
+          return <span>{ scope.column.formatter(scope.row, scope.column, scope.row, scope.$index) }</span>
+        }
+      }
+      if (!this.column.render) {
+        this.column.render = (h, scope) => {
+          return <span>{ scope.row[scope.column.property] }</span>
+        }
+      }
+    }
+  },
+  watch: {
+    column: {
+      handler () {
+        this.setColumn()
+      },
+      immediate: true
+    }
+  }
+}
+</script>

+/*
+ * FileName: lb-render.vue
+ * Remark: 自定义render
+ * Project: lb-element-table
+ * Author: 任超
+ * File Created: Tuesday, 19th March 2019 10:15:30 am
+ * Last Modified: Tuesday, 19th March 2019 10:15:32 am
+ * Modified By: 任超
+ */
+<script>
+export default {
+  name: 'LbRender',
+  functional: true,
+  props: {
+    scope: Object,
+    render: Function
+  },
+  render: (h, ctx) => {
+    return ctx.props.render ? ctx.props.render(h, ctx.props.scope) : ''
+  }
+}
+</script>

+/*
+ * FileName: lb-table.vue
+ * Remark: element table
+ * Project: lb-element-table
+ * Author: 任超
+ * File Created: Tuesday, 19th March 2019 9:55:27 am
+ * Last Modified: Tuesday, 19th March 2019 9:55:34 am
+ * Modified By: 任超
+ */
+
+<template>
+  <div :class="['lb-table', customClass]">
+    <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }" ref="elTable"
+      :border='border' :row-class-name="tableRowClassName" :show-header='showHeader'
+      :header-cell-style="{ background: 'rgb(236, 245, 255)' }" v-bind="$attrs" :height="tableHeight" v-on="$listeners"
+      :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod">
+      <lb-column v-bind="$attrs" v-for="(item, index) in column" :key="index" :column="item">
+      </lb-column>
+    </el-table>
+
+    <el-table v-else ref="elTable" class="table-fixed" :row-style="{ height: '50px' }" :border='border'
+      :row-class-name="tableRowClassName" :show-header='showHeader'
+      :header-cell-style="{ background: 'rgb(236, 245, 255)' }" v-bind="$attrs" :max-height="maxHeight"
+      v-on="$listeners" :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod">
+      <lb-column v-bind="$attrs" v-for="(item, index) in column" :key="index" :column="item">
+      </lb-column>
+    </el-table>
+
+    <br>
+    <el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background
+      :page-sizes="[10, 20, 50, 100]" layout="total, sizes, prev, pager, next" @current-change="paginationCurrentChange"
+      :style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import LbColumn from './lb-column'
+export default {
+  props: {
+    column: Array,
+    data: Array,
+    spanMethod: Function,
+    pagination: {
+      type: Boolean,
+      default: true,
+    },
+    border: {
+      type: Boolean,
+      default: true,
+    },
+    showHeader: {
+      type: Boolean,
+      default: true,
+    },
+    paginationTop: {
+      type: String,
+      default: '0',
+    },
+    heightNum: {
+      type: Number,
+      default: 265,
+    },
+    maxHeight: {
+      type: Number,
+      default: 500
+    },
+    heightNumSetting: {
+      type: Boolean,
+      default: false,
+    },
+    customClass: {
+      type: String,
+      default: '',
+    },
+    paginationAlign: {
+      type: String,
+      default: 'left',
+    },
+    merge: Array,
+  },
+  components: {
+    LbColumn,
+  },
+  data () {
+    return {
+      tableHeight: '',
+      mergeLine: {},
+      mergeIndex: {},
+    }
+  },
+  created () {
+    this.getMergeArr(this.data, this.merge)
+    this.getHeight()
+  },
+  computed: {
+    dataLength () {
+      return [] || this.data.length
+    },
+  },
+  methods: {
+    tableRowClassName ({ row, rowIndex }) {
+      if (rowIndex % 2 === 1) {
+        return 'interlaced';
+      }
+    },
+    getHeight () {
+      if (!this.heightNumSetting) {
+        this.tableHeight = window.innerHeight - this.heightNum
+      }
+    },
+    clearSelection () {
+      this.$refs.elTable.clearSelection()
+    },
+    toggleRowSelection (row, selected) {
+      this.$refs.elTable.toggleRowSelection(row, selected)
+    },
+    toggleAllSelection () {
+      this.$refs.elTable.toggleAllSelection()
+    },
+    toggleRowExpansion (row, expanded) {
+      this.$refs.elTable.toggleRowExpansion(row, expanded)
+    },
+    setCurrentRow (row) {
+      this.$refs.elTable.setCurrentRow(row)
+    },
+    clearSort () {
+      this.$refs.elTable.clearSort()
+    },
+    clearFilter (columnKey) {
+      this.$refs.elTable.clearFilter(columnKey)
+    },
+    doLayout () {
+      this.$refs.elTable.doLayout()
+    },
+    sort (prop, order) {
+      this.$refs.elTable.sort(prop, order)
+    },
+    paginationCurrentChange (val) {
+      this.$emit('p-current-change', val)
+    },
+    getMergeArr (tableData, merge) {
+      if (!merge) return
+      this.mergeLine = {}
+      this.mergeIndex = {}
+      merge.forEach((item, k) => {
+        tableData.forEach((data, i) => {
+          if (i === 0) {
+            this.mergeIndex[item] = this.mergeIndex[item] || []
+            this.mergeIndex[item].push(1)
+            this.mergeLine[item] = 0
+          } else {
+            if (data[item] === tableData[i - 1][item]) {
+              this.mergeIndex[item][this.mergeLine[item]] += 1
+              this.mergeIndex[item].push(0)
+            } else {
+              this.mergeIndex[item].push(1)
+              this.mergeLine[item] = i
+            }
+          }
+        })
+      })
+    },
+    mergeMethod ({ row, column, rowIndex, columnIndex }) {
+      const index = this.merge.indexOf(column.property)
+      if (index > -1) {
+        const _row = this.mergeIndex[this.merge[index]][rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col,
+        }
+      }
+    },
+  },
+  watch: {
+    merge () {
+      this.getMergeArr(this.data, this.merge)
+    },
+    dataLength () {
+      this.getMergeArr(this.data, this.merge)
+    }
+  },
+}
+</script>
+<style  rel="stylesheet/scss" scoped lang="scss">
+.lb-table {
+  margin-top: 1px;
+
+  .interlaced {
+    background: #fafcff;
+    border: 1px solid #ebf2fa;
+  }
+}
+
+/deep/.el-table .cell {
+  padding-left: 3px;
+  padding-right: 3px;
+}
+</style>

+## 这是对于element-table 进行的二次封装 
+
+### 文档地址
+
+<!-- table 已经全局注册不需要每个页面单独注册 -->
+
+[Windows/Mac/Linux 全平台客户端](https://github.liubing.me/lb-element-table/zh/guide/)

+import service from './src/index';
+
+export default {
+  install (Vue) {
+    Vue.prototype.$loading = service;
+  },
+  service
+};

+import Vue from 'vue';
+import loadingVue from './loading.vue';
+import { addClass, removeClass, getStyle } from 'element-ui/src/utils/dom';
+import { PopupManager } from 'element-ui/src/utils/popup';
+import afterLeave from 'element-ui/src/utils/after-leave';
+import merge from 'element-ui/src/utils/merge';
+
+const LoadingConstructor = Vue.extend(loadingVue);
+
+const defaults = {
+  text: null,
+  fullscreen: true,
+  body: false,
+  lock: false,
+  customClass: ''
+};
+
+let fullscreenLoading;
+
+LoadingConstructor.prototype.originalPosition = '';
+LoadingConstructor.prototype.originalOverflow = '';
+
+LoadingConstructor.prototype.close = function() {
+  if (this.fullscreen) {
+    fullscreenLoading = undefined;
+  }
+  afterLeave(this, _ => {
+    const target = this.fullscreen || this.body
+      ? document.body
+      : this.target;
+    removeClass(target, 'el-loading-parent--relative');
+    removeClass(target, 'el-loading-parent--hidden');
+    if (this.$el && this.$el.parentNode) {
+      this.$el.parentNode.removeChild(this.$el);
+    }
+    this.$destroy();
+  }, 300);
+  this.visible = false;
+};
+
+const addStyle = (options, parent, instance) => {
+  let maskStyle = {};
+  if (options.fullscreen) {
+    instance.originalPosition = getStyle(document.body, 'position');
+    instance.originalOverflow = getStyle(document.body, 'overflow');
+    maskStyle.zIndex = PopupManager.nextZIndex();
+  } else if (options.body) {
+    instance.originalPosition = getStyle(document.body, 'position');
+    ['top', 'left'].forEach(property => {
+      let scroll = property === 'top' ? 'scrollTop' : 'scrollLeft';
+      maskStyle[property] = options.target.getBoundingClientRect()[property] +
+        document.body[scroll] +
+        document.documentElement[scroll] +
+        'px';
+    });
+    ['height', 'width'].forEach(property => {
+      maskStyle[property] = options.target.getBoundingClientRect()[property] + 'px';
+    });
+  } else {
+    instance.originalPosition = getStyle(parent, 'position');
+  }
+  Object.keys(maskStyle).forEach(property => {
+    instance.$el.style[property] = maskStyle[property];
+  });
+};
+
+const Loading = (options = {}) => {
+  if (Vue.prototype.$isServer) return;
+  options = merge({}, defaults, options);
+  if (typeof options.target === 'string') {
+    options.target = document.querySelector(options.target);
+  }
+  options.target = options.target || document.body;
+  if (options.target !== document.body) {
+    options.fullscreen = false;
+  } else {
+    options.body = true;
+  }
+  if (options.fullscreen && fullscreenLoading) {
+    return fullscreenLoading;
+  }
+
+  let parent = options.body ? document.body : options.target;
+  let instance = new LoadingConstructor({
+    el: document.createElement('div'),
+    data: options
+  });
+
+  addStyle(options, parent, instance);
+  if (instance.originalPosition !== 'absolute' && instance.originalPosition !== 'fixed' && instance.originalPosition !== 'sticky') {
+    addClass(parent, 'el-loading-parent--relative');
+  }
+  if (options.fullscreen && options.lock) {
+    addClass(parent, 'el-loading-parent--hidden');
+  }
+  parent.appendChild(instance.$el);
+  Vue.nextTick(() => {
+    instance.visible = true;
+  });
+  if (options.fullscreen) {
+    fullscreenLoading = instance;
+  }
+  return instance;
+};
+
+export default Loading;

+<template>
+  <transition name="el-loading-fade" @after-leave="handleAfterLeave">
+    <div v-show="visible" class="el-loading-mask" :style="{ backgroundColor: background || '' }"
+      :class="[customClass, { 'is-fullscreen': fullscreen }]">
+      <div class="el-loading-spinner">
+        <!-- <svg v-if="!spinner" class="circular" viewBox="25 25 50 50">
+          <circle class="path" cx="50" cy="50" r="20" fill="none" />
+        </svg>
+        <i v-else :class="spinner"></i> -->
+        <img class="img" src="../../../image/progress.gif" alt="">
+        <p v-if="text" class="el-loading-text">{{ text }}</p>
+      </div>
+    </div>
+  </transition>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      text: null,
+      spinner: null,
+      background: null,
+      fullscreen: true,
+      visible: false,
+      customClass: ''
+    };
+  },
+
+  methods: {
+    handleAfterLeave () {
+      this.$emit('after-leave');
+    },
+    setText (text) {
+      this.text = text;
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.el-loading-spinner {
+  margin-top: -100px !important;
+
+  .img {
+    width: 80px;
+    height: 80px;
+  }
+}
+</style>
\ No newline at end of file

@@ -24,6 +24,7 @@ router.beforeEach(async (to, from, next) => {
         const accessRoutes = await store.dispatch('permission/generateRoutes', getMenuData)
         router.addRoutes([...accessRoutes, { path: '*', redirect: '/404', hidden: true }])
         const routeTo = Cookies.get('routerTo')
+        console.log(routeTo)
         if (routeTo && routeTo !== '/') {
             next({ ...to, replace: true })
         } else {

-import Loading from '@/components/loading/index.js';
+import Loading from '@/components/Loading/index.js';
 // 定义 loading 
 let loading