lxl

public/js/version.json

-{"commit":"4b64e700aabddfd8a3571739b1bece4194641df5","commitDate":"2021-9-27 18:45","buildDate":"2021-11-11 16:23","version":"2.1.0","info":"【BUG】存储配置导出"}
+{"commit":"6f6a48e2b677829ac314a8a72547c506f9546278","commitDate":"2021-11-11 16:27","buildDate":"2021-11-12 18:36","version":"2.1.0","info":"合并冲突"}
\ No newline at end of file

src/api/baseUrl.js

@@ -9,10 +9,10 @@
 let baseUrl = "/api"; // 本地代理
 import axios from "axios";
 
-  switch (process.env.NODE_ENV) {
+switch (process.env.NODE_ENV) {
   case "development":
     // baseUrl = "http://192.168.9.234:20080"; // 测试环境url
-      baseUrl = window.config.https?"https://192.168.9.245:20070":"http://123.6.38.39:20080"; // 测试环境url
+    baseUrl = window.config.https ? "https://192.168.9.245:20070" : "http://192.168.9.233:20080"; // 测试环境url
     // baseUrl = "http://192.168.9.82:8080"; // 测试环境url
     // baseUrl = "http://192.168.9.61:8086";
     // baseUrl = 'http://vion-panda.51vip.biz:52510';
@@ -21,9 +21,9 @@ import axios from "axios";
     baseUrl = "https://pre-server.feleti.cn"; // 预上线环境url
     break;
   case "production":
-      baseUrl = window.config.https?`https://${location.host}`:`http://${location.host}`; // 生产环境url
+    baseUrl = window.config.https ? `https://${location.host}` : `http://${location.host}`; // 生产环境url
     break;
-  }
+}
 
 
 export default baseUrl;
\ No newline at end of file

src/views/search/xcycle.vue

@@ -107,10 +107,20 @@
           v-show="conditions.event_type == 'xcycle'"
         >
           <span class="inputBox">
-            <el-input
-              placeholder="请输入公司名称"
+             <el-select
+              filterable
+              placeholder="请选择"
+              :popper-append-to-body="false"
               v-model="conditions.company"
-            ></el-input>
+            >
+              <el-option value="" label="全部"></el-option>
+              <el-option
+                v-for="item in companyList"
+                :value="item.code"
+                :key="item.code"
+                :label="item.name"
+              ></el-option>
+            </el-select>
           </span>
         </el-form-item>
         <el-form-item
@@ -192,9 +202,9 @@
               <el-option value="" label="全部"></el-option>
               <el-option
                 v-for="item in bodyColorList"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
+                :value="item.code"
+                :key="item.code"
+                :label="item.name"
               ></el-option>
             </el-select>
           </span>
@@ -213,9 +223,9 @@
               <el-option value="" label="全部"></el-option>
               <el-option
                 v-for="item in bodyColorList"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
+                :value="item.code"
+                :key="item.code"
+                :label="item.name"
               ></el-option>
             </el-select>
           </span>
@@ -502,6 +512,7 @@ export default {
       detailObj: {},
       carImg: require("@/assets/img/home/defaultImg.png"),
       bodyColorList: this.$buildCode.getCodeList("车身颜色"),
+      companyList: this.$buildCode.getCodeList("外卖公司"),
       detailImg: "",
       detailVisible: false,
       loading: false,
@@ -610,7 +621,7 @@ export default {
           this.conditions.task_id +
           "&subtask_id=" +
           this.conditions.subtask_id +
-          "&company_like=" +
+          "&company=" +
           this.conditions.company +
           "&with_hats=" +
           this.conditions.with_hats +
@@ -742,7 +753,7 @@ export default {
       };
       if (this.conditions.event_type == "xcycle") {
         search_params.xcycle_type = this.conditions.xcycle_type;
-        search_params.company_like = this.conditions.company;
+        search_params.company = this.conditions.company;
         search_params.plate_number__like = this.conditions.plate;
       } else {
         search_params.upbodyColor = this.conditions.upbodyColor;