Merge branch 'master' into dev

src/order_pages/orderDetail/index.module.scss

@@ -24,6 +24,10 @@
   padding: 20px;
   box-sizing: border-box;
   background-color: #fafafa;
+
+  .titleClassName {
+    color: #000;
+  }
 }
 
 .gameInfoContainer {

src/order_pages/orderList/index.module.scss

@@ -16,6 +16,10 @@
   width: 100%;
   box-sizing: border-box;
 
+  .titleClassName {
+    color: #000;
+  }
+
   .list {
     height: 100%;
     width: 100%;

src/order_pages/orderList/index.tsx

@@ -266,8 +266,8 @@ const OrderList = () => {
       style={{ paddingTop: `${totalHeight + 8}px` }}
     >
       <GeneralNavbar
-        title="订单列表"
-        titlePosition="left"
+        title="球局订单"
+        backgroundColor="transparent"
         titleClassName={styles.titleClassName}
         className={styles.navbar}
       />