Merge remote-tracking branch 'origin/feature/develop_0713' into feature/develop_0713

config/dev.env.js

@@ -2,4 +2,5 @@ module.exports = {
     NODE_ENV: '"development"',
     ENV_CONFIG: '"dev"',
     BASE_API: '"http://quanku-system-dev.wanwudezhi.com/admin"'
+    // BASE_API: '"http://10.10.56.84:8085/admin"'
 }

package.json

@@ -27,7 +27,7 @@
     "clipboard": "1.7.1",
     "connect": "3.6.6",
     "echarts": "4.1.0",
-    "element-ui": "2.4.6",
+    "element-ui": "^2.15.3",
     "file-saver": "1.3.8",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",

src/views/mall/dealRecord.vue

 <template>
   <div class="app-container">
-    <div class="page__header flex f-ai-c f-jc-sb">
-      <el-button type="primary" size="mini" class="mr10" @click="onBack">返回</el-button>
+    <div class="page__header flex f-ai-c f-jc-e">
+      <!-- <el-button type="primary" size="mini" class="mr10" @click="onBack">返回</el-button> -->
       <el-button type="danger" size="mini" class="mr10" @click="onAdd">添加成交记录</el-button>
     </div>
     <el-form ref="searchForm" :inline="true" :model="searchForm" class="demo-form-inline">
       <el-form-item label="价格范围" prop="startPrice">
-        <el-input-number v-model="searchForm.startPrice" :step="1" placeholder="最小价格" controls-position="right" size="small" />
+        <el-input-number v-model="searchForm.startPrice" :min="1" :step="1" placeholder="最小价格" controls-position="right" size="small" />
       </el-form-item>
       <el-form-item prop="endPrice">
         ~
-        <el-input-number v-model="searchForm.endPrice" :step="1" placeholder="最大价格" controls-position="right" size="small" />
+        <el-input-number v-model="searchForm.endPrice" :min="1" :step="1" placeholder="最大价格" controls-position="right" size="small" />
       </el-form-item>
       <el-form-item label="交易日期" prop="dateRange">
         <el-date-picker