Merge branch 'yuantest' into test

src/views/system/freight/freight_list/index.vue

@@ -321,7 +321,7 @@
             this.$message({type: 'success',message: '删除成功'});
             this.getList();
           } else {
-            this.$message({type: 'error',message: delResult.msg ? delResult.msg : '删除失败'});
+            this.$message({type: 'error',message: delResult.message ? delResult.message : '删除失败'});
           }
         }).catch(()=> {});
       },

src/views/system/freight/freight_list/indexbtn.vue

@@ -422,7 +422,6 @@ export default {
       //正则替换
       str = str.replace(/[^\d^\.]+/g, ""); // 保留数字和小数点
       str = str.replace(/^\D*([0-9]\d*\.?\d{0,2})?.*$/, "$1"); // 小数点后只能输 2 位
-      console.log(str,'看看输的数字')
       return str;
     },
     proving(e) {
@@ -435,7 +434,6 @@ export default {
       }
       str = str.replace(/[^\.\d]/g,'');
       str = str.replace('.','');
-      console.log(str,'看看输的数字')
       return str
 },
   },