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

src/api/vehicleType.js

@@ -70,6 +70,17 @@ export function getAllVehicleList() {
     method: 'get'
   });
 }
+
+/**
+ * 根据sort排序,获取全部车型
+ * */
+export function getAllVehicleModelList() {
+  return fetch({
+    url: '/vehicle/vehicleModel/list',
+    method: 'get'
+  });
+}
+
 /**
  * 车型标签是否多选
  */

src/main.js

@@ -96,6 +96,22 @@ Vue.directive('enterNumber', {
     });
   }
 });
+Vue.directive('isNumber', {
+  inserted: function (el) {
+    el.addEventListener("keypress",function(e){
+      e = e || window.event;
+      let charcode = typeof e.charCode == 'number' ? e.charCode : e.keyCode;
+      let re = /\d/;
+      if(!re.test(String.fromCharCode(charcode)) && charcode > 9 && !e.ctrlKey){
+        if(e.preventDefault){
+          e.preventDefault();
+        }else{
+          e.returnValue = false;
+        }
+      }
+    });
+  }
+});
 
 // register global utility filters.
 Object.keys(filters).forEach(key => {

src/router/index.js

@@ -561,4 +561,32 @@ export const asyncRouterMap = [{
     }
   ]
 }
+,
+  {
+    path: '/xxOfficialWebsite',
+    component: Layout,
+    name: '新欣房车官网管理',
+    icon: 'setting',
+    authority: 'xxOfficialWebsite',
+    children: [
+      {
+        path: 'activityList',
+        component: _import('xxOfficialWebsite/activityList'),
+        name: '活动管理',
+        authority: 'activityList'
+      },
+      {
+        path: 'newsList',
+        component: _import('xxOfficialWebsite/newsList'),
+        name: '新闻管理',
+        authority: 'newsList'
+      },
+      {
+        path: 'bannerList',
+        component: _import('xxOfficialWebsite/bannerList'),
+        name: 'banner管理',
+        authority: 'bannerList'
+      }
+    ]
+  }
 ];

src/utils/validate.js

@@ -50,3 +50,298 @@ export function objDeepCopy(source) {
 }
 
 
+
+
+/*是否合法IP地址*/
+export function validateIP(rule, value,callback) {
+  if(value==''||value==undefined||value==null){
+    callback();
+  }else {
+    const reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
+    if ((!reg.test(value)) && value != '') {
+      callback(new Error('请输入正确的IP地址'));
+    } else {
+      callback();
+    }
+  }
+}
+
+/* 是否手机号码或者固话*/
+export function validatePhoneTwo(rule, value, callback) {
+  const reg = /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/;;
+  if (value == '' || value == undefined || value == null) {
+    callback();
+  } else {
+    if ((!reg.test(value)) && value != '') {
+      callback(new Error('请输入正确的电话号码或者固话号码'));
+    } else {
+      callback();
+    }
+  }
+}
+/* 是否固话*/
+export function validateTelphone(rule, value,callback) {
+  const reg =/0\d{2}-\d{7,8}/;
+  if(value==''||value==undefined||value==null){
+    callback();
+  }else {
+    if ((!reg.test(value)) && value != '') {
+      callback(new Error('请输入正确的固话（格式：区号+号码,如010-1234567）'));
+    } else {
+      callback();
+    }
+  }
+}
+/* 是否手机号码*/
+export function validatePhone(rule, value,callback) {
+  const reg =/^[1][3,4,5,7,8][0-9]{9}$/;
+  if(value==''||value==undefined||value==null){
+    callback();
+  }else {
+    if ((!reg.test(value)) && value != '') {
+      callback(new Error('请输入正确的电话号码'));
+    } else {
+      callback();
+    }
+  }
+}
+/* 是否身份证号码*/
+export function validateIdNo(rule, value,callback) {
+  const reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+  if(value==''||value==undefined||value==null){
+    callback();
+  }else {
+    if ((!reg.test(value)) && value != '') {
+      callback(new Error('请输入正确的身份证号码'));
+    } else {
+      callback();
+    }
+  }
+}
+/* 是否邮箱*/
+export function validateEMail(rule, value,callback) {
+  const reg =/^([a-zA-Z0-9]+[-_\.]?)+@[a-zA-Z0-9]+\.[a-z]+$/;
+  if(value==''||value==undefined||value==null){
+    callback();
+  }else{
+    if (!reg.test(value)){
+      callback(new Error('请输入正确的邮箱地址'));
+    } else {
+      callback();
+    }
+  }
+}
+
+
+/*验证内容是否英文数字以及下划线*/
+export function isPassword(rule, value, callback) {
+  const reg =/^[_a-zA-Z0-9]+$/;
+  if(value==''||value==undefined||value==null){
+    callback();
+  } else {
+    if (!reg.test(value)){
+      callback(new Error('密码仅由英文字母，数字以及下划线组成'));
+    } else {
+      callback();
+    }
+  }
+}
+
+/*自动检验数值的范围*/
+export function checkMax20000(rule, value, callback) {
+  if (value == '' || value == undefined || value == null) {
+    callback();
+  } else if (!Number(value)) {
+    callback(new Error('请输入[1,20000]之间的数字'));
+  } else if (value < 1 || value > 20000) {
+    callback(new Error('请输入[1,20000]之间的数字'));
+  } else {
+    callback();
+  }
+}
+
+//验证数字输入框最大数值,32767
+export function checkMaxVal(rule, value,callback) {
+  if (value < 0 || value > 32767) {
+    callback(new Error('请输入[0,32767]之间的数字'));
+  } else {
+    callback();
+  }
+}
+//验证是否1-99之间
+export function isOneToNinetyNine(rule, value, callback) {
+  if (!value) {
+    return callback(new Error('输入不可以为空'));
+  }
+  setTimeout(() => {
+    if (!Number(value)) {
+      callback(new Error('请输入正整数'));
+    } else {
+      const re = /^[1-9][0-9]{0,1}$/;
+      const rsCheck = re.test(value);
+      if (!rsCheck) {
+        callback(new Error('请输入正整数，值为【1,99】'));
+      } else {
+        callback();
+      }
+    }
+  }, 0);
+}
+
+// 验证是否整数
+export function isInteger(rule, value, callback) {
+  if (!value) {
+    return callback(new Error('输入不可以为空'));
+  }
+  setTimeout(() => {
+    if (!Number(value)) {
+      callback(new Error('请输入正整数'));
+    } else {
+      const re = /^[0-9]*[1-9][0-9]*$/;
+      const rsCheck = re.test(value);
+      if (!rsCheck) {
+        callback(new Error('请输入正整数'));
+      } else {
+        callback();
+      }
+    }
+  }, 0);
+}
+// 验证是否整数,非必填
+export function isIntegerNotMust(rule, value, callback) {
+  if (!value) {
+    callback();
+  }
+  setTimeout(() => {
+    if (!Number(value)) {
+      callback(new Error('请输入正整数'));
+    } else {
+      const re = /^[0-9]*[1-9][0-9]*$/;
+      const rsCheck = re.test(value);
+      if (!rsCheck) {
+        callback(new Error('请输入正整数'));
+      } else {
+        callback();
+      }
+    }
+  }, 1000);
+}
+
+// 验证是否是[0-1]的小数
+export function isDecimal(rule, value, callback) {
+  if (!value) {
+    return callback(new Error('输入不可以为空'));
+  }
+  setTimeout(() => {
+    if (!Number(value)) {
+      callback(new Error('请输入[0,1]之间的数字'));
+    } else {
+      if (value < 0 || value > 1) {
+        callback(new Error('请输入[0,1]之间的数字'));
+      } else {
+        callback();
+      }
+    }
+  }, 100);
+}
+
+// 验证是否是[1-10]的小数,即不可以等于0
+export function isBtnOneToTen(rule, value, callback) {
+  if (typeof value == 'undefined') {
+    return callback(new Error('输入不可以为空'));
+  }
+  setTimeout(() => {
+    if (!Number(value)) {
+      callback(new Error('请输入正整数，值为[1,10]'));
+    } else {
+      if (!(value == '1' || value == '2' || value == '3' || value == '4' || value == '5' || value == '6' || value == '7' || value == '8' || value == '9' || value == '10')) {
+        callback(new Error('请输入正整数，值为[1,10]'));
+      } else {
+        callback();
+      }
+    }
+  }, 100);
+}
+// 验证是否是[1-100]的小数,即不可以等于0
+export function isBtnOneToHundred(rule, value, callback) {
+  if (!value) {
+    return callback(new Error('输入不可以为空'));
+  }
+  setTimeout(() => {
+    if (!Number(value)) {
+      callback(new Error('请输入整数，值为[1,100]'));
+    } else {
+      if (value < 1 || value > 100) {
+        callback(new Error('请输入整数，值为[1,100]'));
+      } else {
+        callback();
+      }
+    }
+  }, 100);
+}
+// 验证是否是[0-100]的小数
+export function isBtnZeroToHundred(rule, value, callback) {
+  if (!value) {
+    return callback(new Error('输入不可以为空'));
+  }
+  setTimeout(() => {
+    if (!Number(value)) {
+      callback(new Error('请输入[1,100]之间的数字'));
+    } else {
+      if (value < 0 || value > 100) {
+        callback(new Error('请输入[1,100]之间的数字'));
+      } else {
+        callback();
+      }
+    }
+  }, 100);
+}
+
+// 验证端口是否在[0,65535]之间
+export function isPort(rule, value, callback) {
+  if (!value) {
+    return callback(new Error('输入不可以为空'));
+  }
+  setTimeout(() => {
+    if (value == '' || typeof(value) == undefined) {
+      callback(new Error('请输入端口值'));
+    } else {
+      const re = /^([0-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/;
+      const rsCheck = re.test(value);
+      if (!rsCheck) {
+        callback(new Error('请输入在[0-65535]之间的端口值'));
+      } else {
+        callback();
+      }
+    }
+  }, 100);
+}
+// 验证端口是否在[0,65535]之间，非必填,isMust表示是否必填
+export function isCheckPort(rule, value, callback) {
+  if (!value) {
+    callback();
+  }
+  setTimeout(() => {
+    if (value == '' || typeof(value) == undefined) {
+      //callback(new Error('请输入端口值'));
+    } else {
+      const re = /^([0-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/;
+      const rsCheck = re.test(value);
+      if (!rsCheck) {
+        callback(new Error('请输入在[0-65535]之间的端口值'));
+      } else {
+        callback();
+      }
+    }
+  }, 100);
+}
+
+
+/*保留2为小数*/
+export function validatetoFixedNew(str) {
+  return str ;
+}
+
+
+
+

src/views/userManagement/memberEnter.vue

@@ -102,7 +102,7 @@
             <el-form-item label="会员等级">
               <el-select class="filter-item" v-model="newMemberObject.memberLevel" placeholder="选择会员等级">
 <!--                <el-option :key="undefined" label="无" :value="undefined"></el-option>-->
-                <el-option v-for="(val, key, index) in memberLevelist " :key="val.id" :label="val.name"
+                <el-option v-for="(val, key, index) in memberLevelList " :key="val.id" :label="val.name"
                            :value="val.id"></el-option>
               </el-select>
             </el-form-item>
@@ -125,14 +125,14 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="免费天数" placeholder="免费天数" prop="totalNumber">
-              <el-input size="small " type="text" v-model="newMemberObject.totalNumber" v-enterNumber></el-input>
+              <el-input size="small " type="number" v-model="newMemberObject.totalNumber" min="0" v-enterNumber></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="剩余天数" placeholder="剩余天数" prop="rentFreeDays">
-              <el-input size="small " type="text" v-model="newMemberObject.rentFreeDays" v-enterNumber></el-input>
+              <el-input size="small " type="number" v-model="newMemberObject.rentFreeDays" min="0" v-enterNumber></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -196,6 +196,7 @@
   import {formatDate} from "../../utils/dateFormattor";
   import ElRow from "element-ui/packages/row/src/row";
   import ElCol from "element-ui/packages/col/src/col";
+  import {getMembers} from "src/api/admin/member/index"
 
   export default {
     components: {
@@ -214,7 +215,7 @@
           id: undefined,
           userId: undefined
         },
-        memberLevelist: [{id: 1, name: '普通会员'}, {id: 2, name: '黄金会员'}, {id: 3, name: '钻石会员'}],
+        memberLevelList: [],
         saveUserId: undefined,
         validityType: '无',
         userOrderMessage: {},
@@ -302,6 +303,7 @@
       this.memberEnter_btn_del=this.elements['memberEnter:btn_del'];//删除
       this.memberEnter_btn_addIn=this.elements['memberEnter:btn_addIn'];//批量上传
       this.getList();
+     this. getMembersLevel()
     } ,
     computed: {
       ...
@@ -316,6 +318,20 @@
       },
     },
     methods: {
+      getMembersLevel() {
+        var _this = this;
+        getMembers().then(res => {
+            let members = res.data
+            // console.log('getMembersLevel:{}'+JSON.stringify(members))
+            // debugger
+            members.map(function (ele) {
+
+              _this.memberLevelList.push({id: ele.level, name: ele.name})
+            })
+            // console.log('this.queryMemberLevelList'+JSON.stringify(this.queryMemberLevelList))
+          }
+        )
+      },
       /**
        *  上传
        */

src/views/userManagement/memberManagement/index.vue

@@ -65,7 +65,7 @@
           <el-row>
             <el-col :span="16">
               <el-form-item label="等级" prop="level">
-                <el-input type="text" v-model="add.level" placeholder="请填会员等级"></el-input>
+                <el-input type="number" min="0" v-model="add.level" placeholder="请填会员等级" v-enterNumber></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -82,7 +82,7 @@
           <el-row>
             <el-col :span="16">
               <el-form-item label="折扣" prop="discount">
-                <el-input type="text" v-model="add.discount"
+                <el-input type="number" min="0" v-model="add.discount"
                           placeholder="请填写折扣"></el-input>
               </el-form-item>
             </el-col>
@@ -90,14 +90,14 @@
           <el-row>
             <el-col :span="16">
               <el-form-item label="免费天数" prop="number">
-                <el-input type="text" v-model="add.number" placeholder="请填免费天数"></el-input>
+                <el-input type="number" min="0" v-model="add.number" placeholder="请填免费天数" v-enterNumber></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="16">
               <el-form-item label="价格" prop="price">
-                <el-input type="text" v-model="add.price" placeholder="请填价格"></el-input>
+                <el-input type="number" min="0" v-model="add.price" placeholder="请填价格"></el-input>
               </el-form-item>
             </el-col>
           </el-row>

src/views/vehicle/vehicleInfo/index.vue

@@ -745,6 +745,7 @@
   } from 'api/vehicle/vehicleInfo/';
 
   import {
+    getAllVehicleModelList,
     getAllVehicleList
   } from 'api/vehicleType';
 
@@ -1368,7 +1369,7 @@
        * 获取全部车型
        * */
       getAllVehicleType() {
-        getAllVehicleList().then(response => {
+        getAllVehicleModelList().then(response => {
           let listRs = undefined;
           if (!this.$utils.isEmpty(response.data)) {
             listRs = response.data;

src/views/vehicleType/index.vue

@@ -69,7 +69,7 @@
             <span>{{scope.row.sum}}</span>
           </template>
         </el-table-column>
-        <el-table-column width="200" align="center" label="可租借数量">
+        <el-table-column width="150" align="center" label="可租借数量">
           <template scope="scope">
             <span>{{scope.row.leasableQuantity}}</span>
           </template>