Merge remote-tracking branch 'origin/base-modify' into base-modify

# Conflicts:
#	src/views/vehicleType/modal/oneType.vue

src/views/vehicleType/modal/oneType.vue

@@ -7,7 +7,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="车型名称" prop="name">
-            <el-input v-model="form.name" placeholder="请输入车型名称" ></el-input>
+            <el-input v-model="form.name" placeholder="请输入车型名称"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -94,25 +94,27 @@
 
       <el-form-item label="房车配置"></el-form-item>
       <el-row>
-        <el-col :span="8"  v-for="(item, index) in labelList" :key="item.id">
+        <el-col :span="8" v-for="(item, index) in labelList" :key="item.id">
           <el-form-item>
-            <span style="width: 150px;text-align:right;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;padding-right: 10px;">{{item.parent.name}}</span>
-            <el-input v-model="item.selectChild" readonly icon="edit" @click="editConfig(item)" style="width: 70%;"></el-input>
+            <span
+              style="width: 150px;text-align:right;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;padding-right: 10px;">{{item.parent.name}}</span>
+            <el-input v-model="item.selectChild" readonly icon="edit" @click="editConfig(item)"
+                      style="width: 70%;"></el-input>
             <!--<el-select v-model="item.childNameLists" style="width: 80%" v-if="item.parent.isMore==1" multiple placeholder="请选择" @change = "selectItem">-->
-              <!--<el-option-->
-                <!--v-for="iitem in item.children"-->
-                <!--:key="iitem.name"-->
-                <!--:label="iitem.name"-->
-                <!--:value="iitem.id">-->
-              <!--</el-option>-->
+            <!--<el-option-->
+            <!--v-for="iitem in item.children"-->
+            <!--:key="iitem.name"-->
+            <!--:label="iitem.name"-->
+            <!--:value="iitem.id">-->
+            <!--</el-option>-->
             <!--</el-select>-->
             <!--<el-select v-model="item.childNameLists" v-else placeholder="请选择" @change = "selectItem">-->
-              <!--<el-option-->
-                <!--v-for="iitem in item.children"-->
-                <!--:key="iitem.id"-->
-                <!--:label="iitem.name"-->
-                <!--:value="iitem.id">-->
-              <!--</el-option>-->
+            <!--<el-option-->
+            <!--v-for="iitem in item.children"-->
+            <!--:key="iitem.id"-->
+            <!--:label="iitem.name"-->
+            <!--:value="iitem.id">-->
+            <!--</el-option>-->
             <!--</el-select>-->
           </el-form-item>
         </el-col>
@@ -120,25 +122,27 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="关键标签">
-              <!--<el-select v-model="value5" multiple placeholder="请选择" style="width: 100%;">-->
-                <!--<el-option-->
-                  <!--v-for="item in options"-->
-                  <!--:key="item.value"-->
-                  <!--:label="item.label"-->
-                  <!--:value="item.value">-->
-                <!--</el-option>-->
-              <!--</el-select>-->
-            <el-input v-model="form.keyword" placeholder="请输入关键标签" readonly icon="edit"  @click="editLabe"></el-input>
+            <!--<el-select v-model="value5" multiple placeholder="请选择" style="width: 100%;">-->
+            <!--<el-option-->
+            <!--v-for="item in options"-->
+            <!--:key="item.value"-->
+            <!--:label="item.label"-->
+            <!--:value="item.value">-->
+            <!--</el-option>-->
+            <!--</el-select>-->
+            <el-input v-model="form.keyword" placeholder="请输入关键标签" readonly icon="edit" @click="editLabe"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-form-item label="房车参数">
-        <el-button size="small" class="el-button el-button--primary" type="button" icon="plus" @click="addModelParam()">添加</el-button>
+        <el-button size="small" class="el-button el-button--primary" type="button" icon="plus" @click="addModelParam()">
+          添加
+        </el-button>
         <el-col v-for="(item, index) in form.modelParam" :key="index">
           <el-form-item label="参数名称" style="margin: 10px 5px;">
-            <el-input style="width: 30%;"  v-model="item.key"></el-input>
-            <el-input style="width: 30%;"  v-model="item.val"></el-input>
+            <el-input style="width: 30%;" v-model="item.key"></el-input>
+            <el-input style="width: 30%;" v-model="item.val"></el-input>
             <el-button type="danger" size="small" @click="delModelParam(index)">删除</el-button>
           </el-form-item>
         </el-col>
@@ -924,11 +928,4 @@ import UE from '../../modal/Ueditor';//百度ue富文本
     border-bottom: 1px solid #999;
     padding: 3px;
   }
-
-  .cx{
-    margin-top: 0px;
-    margin-bottom: 0px;
-    height: 180px;
-  }
-
 </style>