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

src/views/campsiteManage/modal/oneCampsiteModal.vue

@@ -168,7 +168,7 @@
         pathway: [],//途径地
         isCreate: false,//是否点击了创建-确定
         fileList2:[],
-        activeName2: 'first',//行程亮点
+        activeName2: '',//行程亮点
         form: {
           id: undefined,
           name: undefined,//营地名称
@@ -535,6 +535,7 @@
             fileList2.push(pp);
           });
           this.fileList2 = fileList2;
+          this.activeName2 = "first";
         })
       },
       /**
@@ -601,7 +602,7 @@
       cleanForm() {
         this.campsiteObj ={name: ""};//营地地址
         this.fileList2=[];
-        this.activeName2= 'first';//营地详情
+        this.activeName2= '';//营地详情
         this.form = {
           id: undefined,
           name: undefined,//营地名称

src/views/order/rentVehicleInfo/illegalModal.vue

@@ -176,6 +176,7 @@
             });
             t.price = parseFloat(response.data.price);
             t.fileList2 = fileList2;
+            t.id = response.data.id?response.data.id: undefined;
           } else {
             this.$notify({
               title: '失败',
@@ -211,7 +212,8 @@
         let params = {
           picture:arr.join(","),
           price:this.price,
-          detailId: this.row.detailId
+          detailId: this.row.detailId,
+          id: this.id
         };
         saveOrderViolation(params).then(response => {
           if (response.status === 200) {