Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_MY_WEBFRONT into feature_meiyuan

# Conflicts:
#	.env.development

.env.development

@@ -5,4 +5,4 @@ NODE_ENV = 'production'
 
 # base api
 #枚苑正式
-VUE_APP_BASE_API = 'http://8.131.69.197:22000'
+VUE_APP_BASE_API = 'http://8.131.69.197:22000'

src/utils/costum.js

@@ -90,3 +90,8 @@ export function praseStrEmpty(str) {
   }
   return str
 }
+
+
+export function download(str) {
+  location.href=location.host+str
+}

src/views/reportform/currentOldReport.vue

@@ -46,6 +46,7 @@
       <el-form-item label="缴费方式">
         <el-select v-model="searchForm.chargeWay"
                    size="small"
+                   clearable
                    placeholder="请选择">
           <el-option v-for="item in wayArray"
                      :key="item"
@@ -101,7 +102,7 @@ export default {
       searchForm: {
         start: '',
         end: '',
-        chargeWay: '扫码',
+        chargeWay: '',
         chargeType: 1
       },
       feesType: [

vue.config.js

@@ -44,6 +44,10 @@ module.exports = {
       alias: {
         '@': resolve('src')
       }
+    },
+    // 关闭webpack的性能提示
+    performance: {
+      hints: false,
     }
   },
   chainWebpack(config) {