Merge branch 'master' of http://119.23.72.7/xiaokang/cloudSystem

# Conflicts:
#	src/assets/css/public/common.min.css
css

src/ajax/index.js

@@ -15,7 +15,7 @@ let NODE_ENVS = "/";
 switch (envs) {
 switch (envs) {
   case 'development':
   case 'development':
     //开发环境
     //开发环境
-    NODE_ENVS = 'http://192.168.2.142:8080';
+    NODE_ENVS = 'http://192.168.2.164:8080';
     break;
     break;
   case 'test':
   case 'test':
     //测试环境
     //测试环境

src/assets/css/public/common.less

@@ -324,34 +324,21 @@ body {
     box-shadow: 1px 2px 10px 3px rgba(119, 135, 145, 0.5);
     box-shadow: 1px 2px 10px 3px rgba(119, 135, 145, 0.5);
   }
   }
 
 
-  .el-table td,
-  .el-table th.is-leaf {
-    border-bottom: 1px solid #D2D9E7;
-  }
-  .el-table--border{
-    border-bottom:0px!important;
-    position: relative;
-    &::after{
-      content:"";
-      position: absolute;
-      width:100%;
-      height:1px;
-      background: red;
-      left:0px;
-      bottom:-1px;
-      z-index: 3;
-    }
-  }
-  .el-table--border td,
-  .el-table--border th,
-  .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
-    border-right: 1px solid #D2D9E7;
-  }
-
-  .el-table--border,
-  .el-table--group {
-    border: 1px solid #D2D9E7;
-  }
+  // .el-table td,
+  // .el-table th.is-leaf {
+  //   border-bottom: 1px solid #D2D9E7;
+  // }
+  
+  // .el-table--border td,
+  // .el-table--border th,
+  // .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
+  //   border-right: 1px solid #D2D9E7;
+  // }
+
+  // .el-table--border,
+  // .el-table--group {
+  //   border: 1px solid #D2D9E7;
+  // }
 
 
   .el-table__body-wrapper::-webkit-scrollbar {
   .el-table__body-wrapper::-webkit-scrollbar {
     width: 18px;
     width: 18px;

src/assets/css/store/enter.min.css.map

+{"version":3,"sources":["enter.less"],"names":[],"mappings":"AAAA,MACI;EACI,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AALR,MAOI;EACI,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AACA,MAVJ,YAUK;EACG,mBAAA;;AAlBZ,MAqBI;EACI,gBAAA;EACA,mBAAA;;AAvBR,MAqBI,SAII;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,kBAAA;EACA,eAAA;EACA,oBAAA;;AACA,MAhBR,SAII,KAYK;EAAM,WAAA;;AACP,MAjBR,SAII,KAaK;EACG,mBAAA;EACA,eAAA;EACA,WAAA;;AAEJ,MAtBR,SAII,KAkBK;EACG,yBAAA;EACA,mBAAA;EACA,cAAA;;AACA,MA1BZ,SAII,KAkBK,OAII;EACG,mBAAA;EACA,WAAA","file":"enter.min.css"}
\ No newline at end of file

src/assets/css/store/list.min.css.map

+{"version":3,"sources":["list.less"],"names":[],"mappings":"AAAA;EACI,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AAJJ,UAKI;EACI,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AACA,UAVJ,YAUK;EACG,mBAAA;;AAhBZ,UAmBI;EACI,gBAAA;EACA,mBAAA;;AArBR,UAmBI,SAGI;EAEI,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,eAAA;EACA,WAAA;;AAjCZ,UAmBI,SAGI,QAYI;EAAE,gBAAA;;AACF,UAhBR,SAGI,QAaK;EAEG,mBAAA;EACA,WAAA;;AAtChB,UAmBI,SAuBI;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,mBAAA;EACA,cAAA;EACA,iBAAA;EACA,eAAA;EACA,oBAAA;;AACA,UAnCR,SAuBI,KAYK;EACG,mBAAA;EACA,eAAA;EACA,WAAA;;AAEJ,UAxCR,SAuBI,KAiBK;EACG,WAAA;EACA,gBAAA;;AACA,UA3CZ,SAuBI,KAiBK,KAGI;EACG,mBAAA;EACA,cAAA;;AAGR,UAhDR,SAuBI,KAyBK;EACG,kBAAA;EACA,WAAA;EACA,8BAAA;;AACA,UApDZ,SAuBI,KAyBK,IAII;EACG,8BAAA;;AAxEpB,UA6EI;EACI,kBAAA;;AA9ER,UA6EI,WAEI;EACI,YAAA;EACA,WAAA;EAEA,kBAAA;EACA,QAAA;EACA,UAAA;;AArFZ,UA6EI,WAEI,UAOI;EACI,WAAA;EACA,8BAAA;;AAxFhB,UA6EI,WAEI,UAOI,WAGI;EACI,WAAA;EACA,YAAA;EACA,YAAA;EACA,WAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AAhGpB,UA6EI,WAEI,UAOI,WAaI;AAnGhB,UA6EI,WAEI,UAOI,WAauB;EAAkB,uBAAA","file":"list.min.css"}
\ No newline at end of file

src/views/Store/enter.vue

@@ -8,6 +8,8 @@
             <el-option label="待处理" value="1"></el-option>
             <el-option label="待处理" value="1"></el-option>
             <el-option label="处理中" value="2"></el-option>
             <el-option label="处理中" value="2"></el-option>
             <el-option label="已处理" value="3"></el-option>
             <el-option label="已处理" value="3"></el-option>
+            <el-option label="其他失败" value="4"></el-option>
+            
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
         <el-form-item label="更新日期">
         <el-form-item label="更新日期">
@@ -77,6 +79,8 @@
 
 
     data() {
     data() {
       return {
       return {
+        
+        page:10,
         formInline: {
         formInline: {
           status: '',
           status: '',
           date: ''
           date: ''
@@ -92,10 +96,25 @@
     },
     },
     watch: {},
     watch: {},
     created() {
     created() {
-
+        this.getData();
     },
     },
     computed: {},
     computed: {},
     methods: {
     methods: {
+      getData(){
+   
+        this.$http('GET', "/api/uploadSku/list", {
+         page:1,
+         status:1,
+         action_time:1,
+         end_time:1
+        }).then(res => {
+          if (res.err_code === 0) {
+            console.log(res)
+          } else {
+            Message(res.err_msg);
+          }
+        })
+      },
       handleSelectionChange(val) {
       handleSelectionChange(val) {
         this.multipleSelection = val;
         this.multipleSelection = val;
         console.log(this.multipleSelection)
         console.log(this.multipleSelection)