解决冲突

44405c90 · hanfeng · 71cba7fa · 44405c90
Commit 44405c90 authored Oct 16, 2019 by hanfeng
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

index.vue src/views/vehicle/vehicleInfo/index.vue +5 -5

No files found.
--- a/src/views/vehicle/vehicleInfo/index.vue
+++ b/src/views/vehicle/vehicleInfo/index.vue
@@ -1458,11 +1458,11 @@
            },
            queryVehicleModelSearch(queryString, cb) {
                let selectArry = [];
-                let iitem = {
-                    value: "全部",
-                    name: "全部"
-                };
-                selectArry.push(iitem);
+              //   let iitem = {
+              //   value: "全部",
+              //   name: "全部"
+              // };
+              //   selectArry.push(iitem);
                this.allVehicleList.map(function (item) {
                    item.value = item.name;
                    selectArry.push(item);