a

admin/src/components/Breadcrumb/index.vue

@@ -70,7 +70,7 @@ export default {
 <style lang="scss" scoped>
 .app-breadcrumb.el-breadcrumb {
   display: inline-block;
-  font-size: 14px;
+  font-size: 15px;/*14*/
   line-height: 50px;
   margin-left: 8px;
 

admin/src/layout/components/TagsView/ScrollPane.vue

@@ -87,7 +87,7 @@ export default {
       bottom: 0px;
     }
     .el-scrollbar__wrap {
-      height: 49px;
+      height: 59px;/*49*/
     }
   }
 }

admin/src/layout/components/TagsView/index.vue

@@ -199,7 +199,7 @@ export default {
 
 <style lang="scss" scoped>
 .tags-view-container {
-  height: 34px;
+  height: 42px; /*34*/
   width: 100%;
   background: #fff;
   border-bottom: 1px solid #d8dce5;
@@ -209,13 +209,13 @@ export default {
       display: inline-block;
       position: relative;
       cursor: pointer;
-      height: 26px;
-      line-height: 26px;
+      height: 36px;/*26*/
+      line-height: 36px;/*26*/
       border: 1px solid #d8dce5;
       color: #495060;
       background: #fff;
       padding: 0 8px;
-      font-size: 12px;
+      font-size: 15px;/*12*/
       margin-left: 5px;
       margin-top: 4px;
       &:first-of-type {

admin/src/views/admin/index.vue

@@ -33,11 +33,11 @@
 
       <el-table-column align="center" label="手机" width="160" prop="mobile"></el-table-column>
 
-      <el-table-column align="center" label="头像">
+<!--      <el-table-column align="center" label="头像">
         <template slot-scope="scope">
           <el-avatar :size="50" :src="scope.row.avatar"></el-avatar>
         </template>
-      </el-table-column>
+      </el-table-column>-->
 
       <el-table-column class-name="status-col" label="状态" width="180">
         <template slot-scope="{row}">

admin/src/views/admin/works.vue

@@ -46,11 +46,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" width="100px" label="头像">
+<!--      <el-table-column align="center" width="100px" label="头像">
         <template slot-scope="scope">
           <el-avatar :size="50" :src="scope.row.admin.avatar"></el-avatar>
         </template>
-      </el-table-column>
+      </el-table-column>-->
 
       <el-table-column align="center" label="排班时间">
         <template slot-scope="scope">

service/app/model/Orders.php

@@ -17,6 +17,8 @@ class Orders extends base
     const DouyinStatus = [1 => '未核销', 2 => '已核销', 3 => '申请退款中', 4 => '已退款', 5 => '部分核销'];
 
     const AllOssStatus = [1 => '待使用', 2 => '已核销', 3 => '已退款'];
+    // 全部 未核销 已核销 已退款 未付款 已取消 待支付 申请退款中 部分核销
+    // 0   1     2     3     4     5     6     7        8
 
     const AllOssStatusSql = [
         1 => '((os=1 and order_status=3) or (os=2 and order_status=4) or (os=3 and order_status=1))', //待使用