Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/api/vehicle/bookRecord/index.js

@@ -32,7 +32,7 @@ export function reject(obj) {
   });
 }
 
-export function unbookunbook(obj) {
+export function unbook(obj) {
   return fetch({
     url: '/vehicle/vehicleInfo/unbook/4employee',
     method: 'delete',

src/views/vehicle/bookRecord/index.vue

@@ -1485,7 +1485,8 @@
         }).then(() => {
           var obj = {
             vehicleBookRecordId:row.id
-          }
+          };
+					
           unbook(obj)
             .then(response => {
               if(response.code==1){

src/views/xxOfficialWebsite/modal/oneCampsiteModal.vue

@@ -6,14 +6,14 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="标题" prop="title">
-            <el-input v-model="form.title" placeholder="请输入活动标题" maxlength="255"></el-input>
+            <el-input v-model="form.title" placeholder="请输入活动标题"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
        <el-row>
         <el-col :span="8">
           <el-form-item label="副标题" prop="subtitle">
-            <el-input v-model="form.subtitle" placeholder="请输入活动副标题" maxlength="255"></el-input>
+            <el-input v-model="form.subtitle" placeholder="请输入活动副标题"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -33,7 +33,7 @@
 			<el-row>
 			  <el-col :span="8">
 			    <el-form-item label="总人数" prop="limitNum">
-			      <el-input v-model="form.limitNum" placeholder="请输入总人数" type="number" maxlength="8"></el-input>
+			      <el-input v-model="form.limitNum" placeholder="请输入总人数" type="number" :maxlength=8></el-input>
 			    </el-form-item>
 			  </el-col>
 			</el-row>
@@ -59,14 +59,14 @@
 			<el-row>
 			  <el-col :span="8">
 			    <el-form-item label="活动说明" prop="actDesc">
-			      <el-input v-model="form.actDesc" placeholder="请输入活动说明" maxlength="255"></el-input>
+			      <el-input v-model="form.actDesc" placeholder="请输入活动说明"></el-input>
 			    </el-form-item>
 			  </el-col>
 			</el-row>
 			<el-row>
 			  <el-col :span="8">
 			    <el-form-item label="排序" prop="rank">
-			      <el-input v-model="form.rank" placeholder="请输入活动说明" type="number" maxlength="11"></el-input>
+			      <el-input v-model="form.rank" placeholder="请输入活动说明" type="number" :maxlength=11></el-input>
 			    </el-form-item>
 			  </el-col>
 			</el-row>
@@ -297,7 +297,7 @@
       handleClick(tab, event) {
         console.log(tab, event);
       },
-			
+
 			handleChange(id) {
 				console.log(id)
       },
@@ -308,7 +308,7 @@
         console.log(list);
         this.editLableVisible = true;
       },
-			
+
 isExistCampsiteShop(type, datas){
 				console.log(datas)
 			  if(type == "update"){//编辑
@@ -381,7 +381,7 @@ create(formName){
        * */
       update(formName){
         const set = this.$refs;
-				
+
 				 if(this.form.startTime && (typeof this.form.startTime == "object")){
 				  this.form.startTime = this.form.startTime.getTime();
 				}
@@ -565,7 +565,7 @@ create(formName){
 				console.log(res.data)
         this.form.banner = res.data;
       },
-      
+
       /**
        * 清空旅游弹框数据
        */
@@ -602,7 +602,7 @@ create(formName){
           crtTime:undefined,
           actDesc:undefined,
           willNum:undefined,
-          location:undefined,
+          location:0,
           rank:undefined,
           type:undefined,
           content: '',//营地详情

static/utf8-jsp/themes/default/css/ueditor.css

@@ -3,6 +3,11 @@
 .edui-default{
   z-index: 3000 !important;
 }
+.edui-popup-content{
+  position: absolute;
+  top:0;
+  height: 200px !important;
+}
 /* common layer */
 .edui-default .edui-box {
     border: none;