Merge remote-tracking branch 'origin/master'

src/views/index.vue

@@ -46,15 +46,8 @@
           fit="fill"
         ></el-image>
       </el-col>
-      <el-col :span="3">
-        <el-image
-          style="height: 150px"
-          :src="require('@/assets/QRCode/express.jpg')"
-          fit="fill"
-        ></el-image>
-      </el-col>
 
-      <el-col :span="5">
+      <el-col :span="6">
         <el-card shadow="always" style="padding-bottom: 30px">
           <div slot="header"><span>售后</span></div>
           <ul style="margin-top: 10px">
@@ -73,7 +66,7 @@
           </ul>
         </el-card>
       </el-col>
-      <el-col :span="10">
+      <el-col :span="12">
         <el-card shadow="always" style="padding-bottom: 30px">
           <div slot="header"><span>订单</span></div>
           <div>