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

config/dev.env.js

 module.exports = {
     NODE_ENV: '"development"',
-  BASE_API: '"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
+  BASE_API: '"http://10.1.37.246:8765"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
     APP_ORIGIN: '"https://wallstreetcn.com"'
 }

src/views/vehicleType/modal/oneType.vue

@@ -3,10 +3,18 @@
   <div>
     <h4>{{title}}</h4>
     <el-form :model="form" :rules="rules" ref="form" label-width="90px">
+
       <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>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="车型简介" prop="intro">
+            <el-input v-model="form.intro"   placeholder="请输入车型简介" ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -124,6 +132,7 @@
           </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-col v-for="(item, index) in form.modelParam" :key="item.id">
@@ -308,6 +317,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
           rentDiscountStatus:"0",//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值
           rentDiscountPrice: 0,//租车优惠价格  固定优化价格
           buyPrice: 0,//购买价格
+          intro:''
         },
         showDestinationVisible: false,//编辑目的地
         showPathWayVisible: false,//编辑途径地
@@ -495,6 +505,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
               rentDiscountStatus: this.form.rentDiscountStatus,//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值
               buyPrice: this.form.buyPrice,//购买价格
                 alt:this.form.alt,//seo 标签优化
+              intro:this.form.intro
             };
             if(this.form.rentDiscountStatus == 2){
               params.rentDiscountPrice = this.form.pPrice+","+this.form.hPrice+","+this.form.zPrice//租车优惠价格  固定优化价格
@@ -551,6 +562,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
 //          rentDiscountPrice:this.form.pPrice+","+this.form.hPrice+","+this.form.zPrice,//租车优惠价格  固定优化价格
               buyPrice: this.form.buyPrice,//购买价格
                 alt:this.form.alt,//seo 标签优化
+              intro:this.form.intro
             };
             if(this.form.rentDiscountStatus == 2){
               params.rentDiscountPrice = this.form.pPrice+","+this.form.hPrice+","+this.form.zPrice//租车优惠价格  固定优化价格

src/views/xxOfficialWebsite/modal/popup.vue

@@ -17,6 +17,27 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="title" prop="tagTitle">
+            <el-input v-model="form.tagTitle" type="text"  placeholder="请输入文章摘要"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="description" prop="description">
+            <el-input v-model="form.description" type="text"  placeholder="请输入文章摘要"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="keywords" prop="keywords">
+            <el-input v-model="form.keywords" type="text"  placeholder="请输入文章摘要"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="8">
           <el-form-item label="作者" prop="author">