123

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css

@@ -117,9 +117,9 @@
 }
 
 .jdindentlist-inquire>div:nth-child(2)>button {
-    background: #3171ff;
-    color: #fff;
-    border: 1px solid #dee0eb;
+    background: rgba(255, 255, 255, 1);
+    color: #333333;
+    border: 1px solid #3071fe;
     border-radius: 100px;
     width: 58px;
     height: 28px;
@@ -128,10 +128,9 @@
 }
 
 .jdindentlist-inquire>div:nth-child(2)>button:nth-child(2) {
-
-    background: rgba(255, 255, 255, 1) !important;
-    color: #333333 !important;
-    border: 1px solid #3071fe !important;
+    background: #3171ff !important;
+    color: #fff !important;
+    border: 1px solid #dee0eb !important;
     border-radius: 100px;
     width: 58px;
     height: 28px;
@@ -170,6 +169,11 @@
     border: 1px solid rgba(225, 225, 225, 1);
 }
 
+
+.jdindentlist-icbc-warpper .jdindentlist-inquire {
+    height: 96px;
+}
+
 .jdindentlist-list {
     margin-top: 0px;
     background: #ffffff;
@@ -288,6 +292,6 @@
 }
 
 
-.jdindentlist-icbc-warpper .jdindentlist-inquire  .jdicbc-find {
-    padding-top: 4px ;
+.jdindentlist-icbc-warpper .jdindentlist-inquire .jdicbc-find {
+    padding-top: 4px;
 }
\ No newline at end of file

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js

@@ -472,6 +472,10 @@
 
                 icbcOrderStatusNameList: [
                     {
+                        value: '',
+                        label: '全部'
+                    },
+                    {
                         value: '1',
                         label: '待付款'
                     },
@@ -521,12 +525,40 @@
         });
         if (this.$root.channelUserId != "") {
             this.handleSizeChange();
-
         }
+        if (location.hostname == "gs.plus.jdcloud.com") {
+            this.navActive = 'second';
+            this.getIcbcList();
+        }
+
         this.getChannelFrom();
     },
 
     methods: {
+        /*
+            底部线条  数据请求后调用
+        */
+        modifyTableBorder(){
+            switch (this.navActive) {
+                case 'first':
+                    if (this.tableData.length > 0) {
+                        $('.el-table').css({ "border-bottom": '1px solid #ebeef5' });
+                    } else {
+                        $('.el-table').css({ "border-bottom": 'none' });
+                    }
+                    break;
+                case 'second':
+                    if (this.icbcData.length > 0) {
+                        $('.el-table').css({ "border-bottom": '1px solid #ebeef5' });
+                    } else {
+                        $('.el-table').css({ "border-bottom": 'none' });
+                    }
+                    break;
+                default:
+                    break;
+            }
+
+        },
         getChannelFrom(){
             this.channelFrom = this.$root.getChannelPath();
         },
@@ -601,8 +633,16 @@
         },
         navClick(tab, e){
             console.log(tab, e, this.navActive);
-            if (this.navActive == 'second') {
-                this.getIcbcList();
+            switch (this.navActive) {
+                case 'first':
+                    this.handleSizeChange();
+                    break;
+                case 'second':
+                    this.getIcbcList();
+                    break;
+
+                default:
+                    break;
             }
         },
         tableRowClassName({ row, rowIndex }) {
@@ -778,7 +818,6 @@
                             });
                         }
 
-
                     } else {
                         console.log(d, "getTmOrderList...........");
                     }
@@ -794,6 +833,8 @@
             this.itemName = null;
             this.tmName = null;
             this.CreateDate = null;
+            this.startTime = null;
+            this.entTime = null;
             console.log(this.CreateDate);
             this.deliveryStatus = null;
             this.paymentStatus = null;
@@ -818,6 +859,7 @@
             this.icbcOrderStatusName = null;
             this.icbcStartTime = null;
             this.icbcEntTime = null;
+            this.icbcCreateDate = null;
 
         },
         icbcFind(){