Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

2 天以前 df1406d0f571972d033dffd6a93fb4b94febeb56

 src/views/index.vue

@@ -88,8 +88,8 @@
        <div class="card-header">
          <h3>销售数据</h3>
        </div>
        <el-table 
          :data="salesData" 
        <el-table
          :data="salesData"
          style="width: 100%"
          :header-cell-style="tableHeaderStyle"
        >
@@ -98,7 +98,7 @@
          <el-table-column prop="amount" label="金额" width="90"></el-table-column>
          <el-table-column prop="status" label="状态" width="70">
            <template #default="scope">
              <el-tag 
              <el-tag
                :type="scope.row.status === '已完成' ? 'success' : 'warning'"
                size="small"
              >