显示-订单-批量发货、导出按钮；提现金额bug修复

src/views/system/asset/withdraw/index.vue

@@ -189,6 +189,7 @@
         this.form.money = event.target.value;
         let numRegExp = /^[0-9]+(.[0-9]{2})?$/;
         let numberMoney = Number(this.form.money);
+        //debugger
         let numberCash = Number(this.drawableCash);
         if(this.form.money !== '') {
           if(!numRegExp.test(this.form.money)) {
@@ -247,7 +248,6 @@
           if (valid) {
             let numberMoney = Number(this.form.money);
             let numberCash = Number(this.drawableCash);
-
             this.form.sellerId = this.sellerId;
             // 再次校验 提现信息
             if(!this.form.sellerId) {
@@ -258,7 +258,7 @@
               this.$message({type: 'error',message: '提现金额不能小于100'});
               return;
             }
-            if(this.form.money > this.drawableCash ) {
+            if(numberMoney > numberCash ) {
               this.$message({type: 'error',message: '提现金额不足！'});
               return;
             }

src/views/system/goods/add/index.vue

@@ -110,6 +110,7 @@
       },
 
       nextStep() {
+        // 注意数据格式 [1,2,3] 数组，且里面是数字类型
         console.log(111,this.SSQList);
       }
     }
@@ -153,7 +154,7 @@
   .goods-type-options {
     margin: 25px 0;
   }
-  /* 联级面板样式重置  start */
+  /*------------ 联级面板样式重置  start ------------*/
   /deep/.el-cascader-panel.is-bordered {
     border: none;
   }
@@ -166,24 +167,15 @@
   }
   /deep/.el-cascader-menu__wrap {
     width: 280px;
-    height: 504px;
-    /*overflow: hidden;*/
+    height: 500px;
+    overflow: auto;
+    margin: 5px 0!important;
   }
-  /deep/.el-scrollbar {
-    overflow: hidden;
+  /* 很重要,不要问我为什么 */
+  /deep/.el-scrollbar:hover>.el-scrollbar__bar, /deep/.el-scrollbar:active>.el-scrollbar__bar, /deep/.el-scrollbar:focus>.el-scrollbar__bar {
+    opacity: 0;
   }
-  /*/deep/.el-scrollbar:hover .el-scrollbar__bar  {*/
-  /*  background: red;*/
-  /*}*/
-  /*/deep/.el-scrollbar:hover .el-scrollbar__bar  {*/
-  /*  overflow: hidden;*/
-  /*}*/
-  /deep/.el-scrollbar__bar {
-    width: 12px;
-    /*background-color: #c0ccda;*/
-    border-radius: 6px;
-  }
-  /* 联级面板样式重置  end */
+  /*------------ 联级面板样式重置  end ---------------*/
   .next-step {
     padding: 10px 25px;
     margin: 0 auto;

src/views/system/order/index.vue

@@ -79,8 +79,8 @@
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-<!--            <el-button type="warning" plain icon="el-icon-download" @click="handleExport">导出订单</el-button>-->
-<!--            <el-button type="primary" plain icon="el-icon-position" @click="handleDelivery">批量发货</el-button>-->
+            <el-button type="warning" plain icon="el-icon-download" @click="handleExport">导出订单</el-button>
+            <el-button type="primary" plain icon="el-icon-position" @click="handleDelivery">批量发货</el-button>
           </el-form-item>
         </el-form>
       </div>