Merge branch 'clickCopyv1.4' into lazyRouter

src/components/gird/main.css

@@ -159,8 +159,6 @@
   opacity: 1;
   width: 100%;
   height: 100px;
-  display: flex !important ;
-  justify-content: center;
 }
 
 .grid-loading.show .loading-bar {

src/components/gird/main.js

@@ -312,12 +312,7 @@ export default class menu extends React.Component {
     this.props.countChange(e)
     this.setState({ pageCount: e })
   }
-  gridPageLoad() {
+
-    this.setState({ pageLoading: true })
-    setTimeout(() => {
-      this.setState({ pageLoading: false })
-    }, 500)
-  }
   pageShow(e) {}
   gridEditChange(e) {}
   getSelectData() {

src/pages/order/list/list.js

@@ -190,10 +190,10 @@ export default class orderlist extends React.Component {
           prop: 'status',
           menuList: [
             { id: 999, name: '全部' },
-            { id: 1, name: '商品-充值中' },
+            { id: 1, name: '直充-充值中' },
-            { id: 2, name: '商品-已完成' },
+            { id: 2, name: '直充-已完成' },
-            { id: 3, name: '商品-充值失败' },
+            { id: 3, name: '直充-充值失败' },
-            { id: 4, name: '商品-已取消' },
+            { id: 4, name: '直充-已取消' },
             { id: 111, name: '立减金-待领取' },
             { id: 222, name: '立减金-已领取' },
             { id: 5, name: '立减金-已过期' }
@@ -778,7 +778,7 @@ export default class orderlist extends React.Component {
                   )
                 }
                 if (com === 'type_text') {
-                  return <span>{rowData.type === 1 ? '商品' : '立减金'}</span>
+                  return <span>{rowData.type === 1 ? '直充' : '立减金'}</span>
                 }
                 if (com == 'channel_activity_id') {
                   return (
@@ -797,7 +797,8 @@ export default class orderlist extends React.Component {
                         onClick={(e) => this.moreFn(e, rowData)}>
                         详情
                       </span>
-                      {rowData.status == 1||rowData.status == 0&&rowData.type==1 ? (
+                      {rowData.status == 1 ||
+                      (rowData.status == 0 && rowData.type == 1) ? (
                         <span
                           className='grid-link'
                           onClick={(e) => this.deleteFn(e, rowData)}>