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

src/views/admin/appUser/index.vue

@@ -76,7 +76,7 @@
       </el-form-item>
       <el-form-item label="数据权限" prop="dataState">
         <el-checkbox-group v-model="form.dataLimit" >
-          <el-checkbox  v-for="item in dataOptions"  :label="item.id" >{{item.val}}</el-checkbox>
+          <el-checkbox  v-for="item in dataOptions"  :label="item.id" :key="item">{{item.val}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <el-form-item label="描述">

src/views/appManagement/appVersion/index.vue

@@ -238,7 +238,6 @@
         },
         listLoading: true,
         tableKey: 0,
-        BASE_API: process.env.BASE_API,
         query: {
           limit: 10,
           page: 1,

src/views/appManagement/modalManagement/index.vue

@@ -95,7 +95,7 @@
         <el-form-item label="弹窗图片" prop="background" :style="{display:'block'}">
           <el-upload
             class="avatar-uploader"
-            :action="'https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload'"
+            :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
             :show-file-list="false"
             :headers="getHeaderWithToken"
             :on-success="handleAvatarSuccess">
@@ -106,7 +106,7 @@
         <el-form-item label="按钮图片" prop="buttonImages" :style="{display:'block'}">
           <el-upload
             class="avatar-uploader"
-            :action="'https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload'"
+            :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
             :show-file-list="false"
             :headers="getHeaderWithToken"
             :on-success="handleBtnSuccess">

src/views/appManagement/selectedActivities/index.vue

@@ -87,7 +87,7 @@
         <el-form-item label="图片" prop="picture" :style="{display:'block'}">
           <el-upload
             class="avatar-uploader"
-            :action="'https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload'"
+            :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
             :show-file-list="false"
             :headers="getHeaderWithToken"
             :on-success="handleAvatarSuccess">
@@ -521,7 +521,7 @@
             }
           });
         })
-        
+
       },
     }
   }

src/views/baseInfo/bannerSetting.vue

@@ -77,7 +77,7 @@
         <el-form-item label="banner图" prop="cover" :style="{display:'block'}">
           <el-upload
             class="avatar-uploader"
-            :action="'https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload'"
+            :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
             :show-file-list="false"
             :headers="getHeaderWithToken"
             :on-success="handleAvatarSuccess">

src/views/campsiteManage/campsiteLabel.vue

@@ -55,7 +55,7 @@
         <el-form-item label="标签底图" :style="{display:'block'}">
           <el-upload
             class="avatar-uploader"
-            :action="'https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload'"
+            :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
             :show-file-list="false"
             :headers="getHeaderWithToken"
             :on-success="handleAvatarSuccess">

src/views/campsiteManage/modal/oneCampsiteModal.vue

@@ -55,7 +55,7 @@
         <el-upload
           class="upload-demo"
           :headers="getHeaderWithToken"
-          action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+          :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
           list-type="picture">
@@ -67,7 +67,7 @@
         <el-upload
           class="upload-demo"
           :headers="getHeaderWithToken"
-          action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+          :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
           :on-remove="handleRemove"
           :file-list="fileList2"
           :on-success="handleBannerSuccess"
@@ -155,6 +155,7 @@
     },
     data() {
       return {
+        BASE_API: process.env.BASE_API,
         defaultMsg: '这里是UE测试',
         config: {
           initialFrameWidth: null,

src/views/cunponManagements/cunponManagement.vue

@@ -153,7 +153,7 @@
               <el-upload
                 class="upload-demo"
                 :headers="getHeaderWithToken"
-                action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+                :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess"
                 list-type="picture">

src/views/member/info/index.vue

@@ -121,7 +121,7 @@
       </el-table-column>
       <el-table-column width="150" align="center" label="家庭成员">
         <template scope="scope">
-          <el-row v-for="item in scope.row.family">
+          <el-row v-for="item in scope.row.family" :key="item">
             {{item.name}} - {{item.relationship}}
           </el-row>
         </template>
@@ -232,7 +232,7 @@
         </el-form-item>
 
         <el-form-item label="家庭成员" prop="family">
-          <el-row v-for="(item, index) in form.family">
+          <el-row v-for="(item, index) in form.family" :key="item">
             <el-col :span="9">
               <el-input v-model="item.name" placeholder="成员名称"></el-input>
             </el-col>

src/views/modal/editorTool.vue

@@ -3,7 +3,7 @@
     <!-- 图片上传组件辅助-->
     <el-upload
       class="avatar-uploader"
-      :action="'https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload'"
+      :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
       :show-file-list="false"
       :headers="getHeaderWithToken"
       :before-upload="beforeUpload"
@@ -79,6 +79,7 @@
 
     data() {
       return {
+        BASE_API: process.env.BASE_API,
         content: this.value,
         quillUpdateImg: false, // 根据图片上传状态来确定是否显示loading动画，刚开始是false,不显示
         quill: undefined,

src/views/order/rentVehicleInfo/illegalModal.vue

@@ -57,7 +57,7 @@
         <el-col>
           <el-form-item label="违章截图" :style="{display:'block'}">
             <!--<el-upload-->
-              <!--action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"-->
+              <!--:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"-->
               <!--list-type="picture-card"-->
               <!--:headers="getHeaderWithToken"-->
               <!--:on-success="handleSuccess"-->
@@ -70,7 +70,7 @@
             <el-upload
               class="upload-demo"
               :headers="getHeaderWithToken"
-              action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+              :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
               :on-remove="handleRemove"
               :file-list="fileList2"
               :on-success="handleSuccess"
@@ -126,6 +126,7 @@
     },
     data() {
       return {
+        BASE_API: process.env.BASE_API,
         price: undefined,//违章罚款金额
         isVisible: false,
         fileList2:[],//违章截图

src/views/tourManage/modal/oneTourModal.vue

@@ -138,7 +138,7 @@
         <el-upload
           class="upload-demo"
           :headers="getHeaderWithToken"
-          action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+          :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
           :on-progress="uploadProcess"
@@ -152,7 +152,7 @@
         <el-upload
           class="upload-demo"
           :headers="getHeaderWithToken"
-          action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+          :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
           :on-remove="handleRemove"
           :file-list="fileList2"
           :on-success="handleBannerSuccess"
@@ -256,6 +256,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
     },
     data() {
       return {
+        BASE_API: process.env.BASE_API,
         config: {
           initialFrameWidth: null,
           initialFrameHeight: 350

src/views/tourManage/tourLabel.vue

@@ -72,7 +72,7 @@
         <el-form-item label="封面图" :style="{display:'block'}">
           <el-upload
             class="avatar-uploader"
-            :action="'https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload'"
+            :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
             :show-file-list="false"
             :headers="getHeaderWithToken"
             :on-success="handleAvatarSuccess">
@@ -84,7 +84,7 @@
           <el-upload
             class="upload-demo"
             :headers="getHeaderWithToken"
-            action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+            :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
             :on-remove="handleRemove"
             :file-list="fileList2"
             :on-success="handleBannerSuccess"
@@ -156,11 +156,11 @@
     },
     data() {
       return {
+        BASE_API: process.env.BASE_API,
         isCreate: false,//是否点击了确定按钮
         isExist: false,//标签是否已存在
         tableKey:0,
         modalTitle: "创建",
-        BASE_API: process.env.BASE_API,
         bannerDialogVisible: false,//添加、编辑弹框
         showLoadingBody: false,
         fileList2: [],//轮播图

src/views/userManagement/memberManagement/index.vue

@@ -106,7 +106,7 @@
               <el-upload
                 class="upload-demo"
                 :headers="getHeaderWithToken"
-                action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+                :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess"
                 list-type="picture">

src/views/vehicle/accompanyingItem/accItemSelector.vue

@@ -5,9 +5,9 @@
                element-loading-spinner="el-icon-loading" :visible.sync="dialogVisible">
       <el-form :model="selected" :inline="true" ref="form4Selected" label-width="100px">
         <el-collapse v-model="activeTypes">
-          <el-collapse-item v-for=" (val, key, index) in allAccItem " :title="getTypeName(key)" :name="key">
+          <el-collapse-item v-for=" (val, key, index) in allAccItem " :title="getTypeName(key)" :name="key" :key="item">
             <el-row :gutter="10">
-              <el-col v-for=" item in val " :span="8" :style="{padding: '2px'}">
+              <el-col v-for=" item in val " :span="8" :style="{padding: '2px'}" :key="item">
                 <el-col :span="16" :style="{textAlign: 'center'}">
                   <span :style="{padding: '3px 10px', fontSize: '14px' ,display: 'inline-block'}">{{item.name}}</span>
                 </el-col>

src/views/vehicle/bookRecord/index.vue

@@ -441,7 +441,7 @@
               <el-upload
                 class="upload-demo"
                 :headers="getHeaderWithToken"
-                action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+                :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
                 :on-remove="handleDepartureRemove"
                 :file-list="departurePicList"
                 :on-success="handleDepartureSuccess"
@@ -495,7 +495,7 @@
               <el-upload
                 class="upload-demo"
                 :headers="getHeaderWithToken"
-                action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+                :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
                 :on-remove="handleArrivalRemove"
                 :file-list="arrivalPicList"
                 :on-success="handleArrivalSuccess"
@@ -520,7 +520,7 @@
               <el-upload
                 class="upload-demo"
                 :headers="getHeaderWithToken"
-                action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+                :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
                 :on-remove="handleRemove"
                 :file-list="fileList2"
                 :on-success="handleSuccess"
@@ -606,6 +606,7 @@
     },
     data() {
       return {
+        BASE_API: process.env.BASE_API,
         departureFormrules:{
           checkMan:{
             required: true,

src/views/vehicleType/modal/oneType.vue

@@ -86,7 +86,7 @@
 
       <el-form-item label="房车配置"></el-form-item>
       <el-row>
-        <el-col :span="8"  v-for="(item, index) in labelList">
+        <el-col :span="8"  v-for="(item, index) in labelList" :key="item">
           <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>
@@ -126,7 +126,7 @@
       </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">
+        <el-col v-for="(item, index) in form.modelParam" :key="item.id">
           <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>
@@ -138,7 +138,7 @@
         <el-upload
           class="upload-demo"
           :headers="getHeaderWithToken"
-          action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+          :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
           :on-remove="handleRemove"
           :file-list="fileList2"
           :on-success="handleBannerSuccess"
@@ -241,6 +241,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
     },
     data() {
       return {
+        BASE_API: process.env.BASE_API,
         config: {
           initialFrameWidth: null,
           initialFrameHeight: 350
@@ -421,9 +422,11 @@ import UE from '../../modal/Ueditor';//百度ue富文本
           vioDeposit: this.form.vioDeposit,
           hotSign: this.form.hotSign,//热门车型
           rentDiscountStatus: this.form.rentDiscountStatus,//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值
-          rentDiscountPrice:this.form.pPrice+","+this.form.hPrice+","+this.form.zPrice,//租车优惠价格  固定优化价格
           buyPrice: this.form.buyPrice,//购买价格
         };
+        if(this.form.rentDiscountStatus == 2){
+          params.rentDiscountPrice = this.form.pPrice+","+this.form.hPrice+","+this.form.zPrice//租车优惠价格  固定优化价格
+        }
         console.log(params);
         console.log(this.form);
         addVehicleModel(params).then(response => {
@@ -464,9 +467,12 @@ import UE from '../../modal/Ueditor';//百度ue富文本
           vioDeposit: this.form.vioDeposit,
           hotSign: this.form.hotSign,//热门车型
           rentDiscountStatus: this.form.rentDiscountStatus,//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值
-          rentDiscountPrice:this.form.pPrice+","+this.form.hPrice+","+this.form.zPrice,//租车优惠价格  固定优化价格
+//          rentDiscountPrice:this.form.pPrice+","+this.form.hPrice+","+this.form.zPrice,//租车优惠价格  固定优化价格
           buyPrice: this.form.buyPrice,//购买价格
         };
+        if(this.form.rentDiscountStatus == 2){
+          params.rentDiscountPrice = this.form.pPrice+","+this.form.hPrice+","+this.form.zPrice//租车优惠价格  固定优化价格
+        }
         console.log(params);
         console.log(this.form);
         updateVehicleModel(params).then(response => {

static/utf8-jsp/ueditor.config.js

@@ -19,21 +19,22 @@
      * 因此，UEditor提供了针对不同页面的编辑器可单独配置的根路径，具体来说，在需要实例化编辑器的页面最顶部写上如下代码即可。当然，需要令此处的URL等于对应的配置。
      * window.UEDITOR_HOME_URL = "/xxxx/xxxx/";
      */
-    // window.UEDITOR_HOME_URL = "/static/utf8-jsp/";
-
-    var getHost = function(url) {
-      var host = "null";
-      if(typeof url == "undefined"
-        || null == url)
-        url = window.location.href;
-      var regex = /.*\:\/\/([^\/]*).*/;
-      var match = url.match(regex);
-      if(typeof match != "undefined"
-        && null != match)
-        host = match[1]+"/";
-      return host;
-    }
-  var URL = getHost();
+    window.UEDITOR_HOME_URL = "/static/utf8-jsp/";
+
+  var getHost = function(url) {
+    var host = "null";
+    if(typeof url == "undefined"
+      || null == url)
+      url = window.location.href;
+    var regex = /.*\:\/\/([^\/]*).*/;
+    var match = url.match(regex);
+    if(typeof match != "undefined"
+      && null != match)
+      host = match[1];
+    return host+"/";
+  }
+  var URL = window.UEDITOR_HOME_URL || getUEBasePath();
+
     /**
      * 配置项主体。注意，此处所有涉及到路径的配置别遗漏URL变量。
      */
@@ -43,7 +44,7 @@
         UEDITOR_HOME_URL: URL
 
         // 服务器统一请求接口路径
-        , serverUrl:"/api/universal/file/app/unauth/ueditor"
+        , serverUrl:"api/universal/file/app/unauth/ueditor"
 
         //工具栏上的所有的功能按钮和下拉框，可以在new编辑器的实例时选择自己需要的重新定义
         , toolbars: [[
@@ -446,9 +447,8 @@
 
 
     function getUEBasePath(docUrl, confUrl) {
-      return URL;
 
-        // return getBasePath(docUrl || self.document.URL || self.location.href, confUrl || getConfigFilePath());
+        return getBasePath(docUrl || self.document.URL || self.location.href, confUrl || getConfigFilePath());
 
     }