Skip to content

C
cloud-platform-ui
Commit 1ff8db13 authored by hanfeng's avatar hanfeng
Browse files
Options

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

# Conflicts:
#	src/views/vehicleType/modal/oneType.vue
parents 3be1bf08 cd4bf5cf
Show whitespace changes
Inline Side-by-side
Showing with 891 additions and 839 deletions
src/router/index.js
View file @ 1ff8db13
...@@ -337,12 +337,12 @@ export const asyncRouterMap = [{ ...@@ -337,12 +337,12 @@ export const asyncRouterMap = [{
name: '车辆排班管理', name: '车辆排班管理',
authority: 'bookRecord' authority: 'bookRecord'
}, },
{ // {
path: 'bookingManagement', // path: 'bookingManagement',
component: _import('vehicle/smallProgram/bookingManagement'), // component: _import('vehicle/smallProgram/bookingManagement'),
name: '小程序车辆申请管理', // name: '小程序车辆申请管理',
authority: 'bookingManagement' // authority: 'bookingManagement'
}, // },
{ {
path: 'vehicleWarningMsg', path: 'vehicleWarningMsg',
component: _import('vehicle/vehicleWarningMsg/index'), component: _import('vehicle/vehicleWarningMsg/index'),
......
src/views/baseInfo/companyInfo/companyMap.vue
View file @ 1ff8db13
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
} else { } else {
allPage(this.listQuery) allPage(this.listQuery)
.then(response => { .then(response => {
let listTemp = response.data.data; let listTemp = response.data;
let arr = []; let arr = [];
listTemp.map(function(item){ listTemp.map(function(item){
arr.push(item); arr.push(item);
......
src/views/baseInfo/companyInfo/index.vue
View file @ 1ff8db13
...@@ -490,7 +490,7 @@ ...@@ -490,7 +490,7 @@
.then(res => { .then(res => {
this.loading = false; this.loading = false;
let allList = []; let allList = [];
let listTemp = res.data.data; let listTemp = res.data;
//一次读入所有涉及地区，防止多次读取 //一次读入所有涉及地区，防止多次读取
// if (!this.$utils.isEmpty(listTemp)) { // if (!this.$utils.isEmpty(listTemp)) {
// let allRegions = new Set(); // let allRegions = new Set();
...@@ -503,11 +503,11 @@ ...@@ -503,11 +503,11 @@
// } // }
// getRegionByCodes([...allRegions]); // getRegionByCodes([...allRegions]);
// } // }
if(res.data.data){ if(res.data){
res.data.data.forEach(function (item) { res.data.forEach(function (item) {
allList.push(item); allList.push(item);
}); });
if(res.data.data.length< this.listQuery.limit && this.list.length>0){ if(res.data.length< this.listQuery.limit && this.list.length>0){
//已加载全部 //已加载全部
this.nomore = true; this.nomore = true;
} }
......
src/views/purseManage/discountRecord.vue
View file @ 1ff8db13
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="状态" prop="type"> <el-form-item label="状态" prop="type">
<el-select class="filter-item" v-model="listQuery.state" placeholder="请输入状态"> <el-select class="filter-item" v-model="listQuery.state" placeholder="请输入状态">
<el-option v-for="(item,index) in typeOptions" :key="index" :label="item.name" :value="item.val"> </el-option> <el-option v-for="(item,index) in typeOptions" :key="index" :label="item.name"
:value="item.val"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -49,7 +50,7 @@ ...@@ -49,7 +50,7 @@
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.stauts==0">未到帐</span> <span v-if="scope.row.stauts==0">未到帐</span>
<span v-if="scope.row.stauts==1">已到账</span> <span v-if="scope.row.stauts==1">已到账</span>
<span v-if="scope.row.stauts==2">审核失败</span> <span v-if="scope.row.stauts==2">驳回</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="申请时间"> <el-table-column align="center" label="申请时间">
...@@ -64,7 +65,9 @@ ...@@ -64,7 +65,9 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="65" fixed="right"> <el-table-column align="center" label="操作" width="65" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" v-if="scope.row.stauts==0" @click="handleUpdate(scope.row)">审核</el-button> <el-button size="small" class="el-button el-button--text el-button--small" v-if="scope.row.stauts==0"
@click="handleUpdate(scope.row)">审核
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -133,19 +136,19 @@ ...@@ -133,19 +136,19 @@
return { return {
typeOptions: [ typeOptions: [
{ {
"name":'全部', "name": '全部',
"val":'' "val": ''
}, },
{ {
"name":'未到账', "name": '未到账',
"val":'0' "val": '0'
}, },
{ {
"name":'已到账', "name": '已到账',
"val":'1' "val": '1'
}, },
], ],
dialogVisible:false, dialogVisible: false,
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
showLoadingBody: false, showLoadingBody: false,
list: null, list: null,
...@@ -156,14 +159,14 @@ ...@@ -156,14 +159,14 @@
limit: 20, limit: 20,
phone: '',//手机号 phone: '',//手机号
username: '',//姓名 username: '',//姓名
state:'',//状态 state: '',//状态
}, },
inline: true, inline: true,
tableKey: 0, tableKey: 0,
dialogFrom:{ dialogFrom: {
status:'1', status: '1',
cono:'', cono: '',
reason:'' reason: ''
}, },
} }
}, },
...@@ -187,9 +190,11 @@ ...@@ -187,9 +190,11 @@
if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) { if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) {
listRs = response.data.data; listRs = response.data.data;
totalCountRs = response.data.totalCount; totalCountRs = response.data.totalCount;
listRs.map(function(item){ listRs.map(function (item) {
item.crtTimeStr = timestamp2Date(item.crtTime); item.crtTimeStr = timestamp2Date(item.crtTime);
if (item.finishTime != 0 && item.finishTime != null) {
item.finishTimeStr = timestamp2Date(item.finishTime); item.finishTimeStr = timestamp2Date(item.finishTime);
}
}); });
} }
this.listLoading = false; this.listLoading = false;
...@@ -216,10 +221,10 @@ ...@@ -216,10 +221,10 @@
this.listQuery.page = val; this.listQuery.page = val;
this.getList(); this.getList();
}, },
cancelHandel(){ cancelHandel() {
this.dialogVisible = false; this.dialogVisible = false;
}, },
handleUpdate(row){ handleUpdate(row) {
this.dialogFrom.cathId = row.id; this.dialogFrom.cathId = row.id;
this.dialogVisible = true; this.dialogVisible = true;
}, },
...@@ -227,8 +232,8 @@ ...@@ -227,8 +232,8 @@
var that = this; var that = this;
const set = this.$refs; const set = this.$refs;
set[formName].validate(valid => { set[formName].validate(valid => {
if(this.dialogFrom.status==1){ if (this.dialogFrom.status == 1) {
if(this.dialogFrom.cono==''){ if (this.dialogFrom.cono == '') {
this.$notify({ this.$notify({
title: '警告', title: '警告',
message: '请输入订单号', message: '请输入订单号',
...@@ -238,8 +243,8 @@ ...@@ -238,8 +243,8 @@
return false; return false;
} }
} }
if(this.dialogFrom.status==2){ if (this.dialogFrom.status == 2) {
if(this.dialogFrom.reason==''){ if (this.dialogFrom.reason == '') {
this.$notify({ this.$notify({
title: '警告', title: '警告',
message: '请输入拒绝原因', message: '请输入拒绝原因',
......
src/views/vehicle/bookRecord/index.vue
View file @ 1ff8db13
...@@ -802,6 +802,7 @@ ...@@ -802,6 +802,7 @@
listQuery: { listQuery: {
page: 1, page: 1,
limit: 20, limit: 20,
flag: false,
zoneId:undefined, zoneId:undefined,
liftCompany: undefined, liftCompany: undefined,
numberPlate: undefined, numberPlate: undefined,
...@@ -1239,7 +1240,7 @@ ...@@ -1239,7 +1240,7 @@
getList() { getList() {
this.listLoading = true; this.listLoading = true;
for(var key in this.listQuery){ for(var key in this.listQuery){
if(this.listQuery[key]==''){ if(this.listQuery[key]===''){
this.listQuery[key]=undefined this.listQuery[key]=undefined
} }
} }
......
src/views/vehicle/vehicleSchedulManage/index.vue
View file @ 1ff8db13
...@@ -535,6 +535,9 @@ ...@@ -535,6 +535,9 @@
* */ * */
toShowDialog(item, iitem, ii){ toShowDialog(item, iitem, ii){
// <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他--> // <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
if (!item.mileageLastUpdate) {
item.mileageLastUpdate = 0
}
if(!ii.bg){ if(!ii.bg){
//空白-可安排用车 //空白-可安排用车
if(item.vehicleModel==undefined){ if(item.vehicleModel==undefined){
......
src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue
View file @ 1ff8db13
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="公里数"> <el-form-item label="公里数">
<span>{{currentItem.item.maintenanceMileage}}km</span> <span>{{currentItem.item.mileageLastUpdate}}km</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
src/views/vehicleType/modal/oneType.vue
View file @ 1ff8db13
...@@ -156,16 +156,40 @@ ...@@ -156,16 +156,40 @@
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
:on-progress="uploadProcess" :on-progress="uploadProcess"
list-type="picture"> list-type="picture">
<div slot="tip" class="el-upload__tip"> <span style="color: red;">建议尺寸：320*228px</span></div> <div slot="tip" class="el-upload__tip"><span style="color: red;">建议尺寸：320*228px</span></div>
<el-progress v-show="imgFlag == true" type="circle" :percentage="percent" style="margin-top: 20px"></el-progress> <el-progress v-show="imgFlag == true" type="circle" :percentage="percent"
<img v-if="$utils.isString(form.coverPic) && !$utils.isEmpty(form.coverPic) && !imgFlag" :src="form.coverPic" style="width:300px;max-height:300px;"> style="margin-top: 20px"></el-progress>
<i v-else-if="!imgFlag" class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i> <img v-if="$utils.isString(form.coverPic) && !$utils.isEmpty(form.coverPic) && !imgFlag" :src="form.coverPic"
style="width:300px;max-height:300px;">
<i v-else-if="!imgFlag" class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="alt"> <el-form-item label="alt">
<el-input v-model="form.alt" type="text" placeholder="请输入描述"></el-input> <el-input v-model="form.alt" type="text" placeholder="请输入替代文本"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="img-title">
<el-input v-model="form.imgTitle" type="text" placeholder="请输入图片title"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="img-keyword">
<el-input v-model="form.imgKeyword" type="text" placeholder="请输入图片关键字"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="img-desc">
<el-input v-model="form.imgDesc" type="text" placeholder="请输入图片描述"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -178,10 +202,13 @@ ...@@ -178,10 +202,13 @@
:on-success="handlePosterSuccess" :on-success="handlePosterSuccess"
:on-progress="uploadPosterProcess" :on-progress="uploadPosterProcess"
list-type="picture"> list-type="picture">
<div slot="tip" class="el-upload__tip"> <span style="color: red;">建议尺寸：320*228px</span></div> <div slot="tip" class="el-upload__tip"><span style="color: red;">建议尺寸：320*228px</span></div>
<el-progress v-show="imgPosterFlag == true" type="circle" :percentage="percent_poster" style="margin-top: 20px"></el-progress> <el-progress v-show="imgPosterFlag == true" type="circle" :percentage="percent_poster"
<img v-if="$utils.isString(form.posterBackground) && !$utils.isEmpty(form.posterBackground)&& !imgPosterFlag" :src="form.posterBackground" style="width:300px;max-height:300px;"> style="margin-top: 20px"></el-progress>
<i v-else-if="!imgPosterFlag" class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i> <img v-if="$utils.isString(form.posterBackground) && !$utils.isEmpty(form.posterBackground)&& !imgPosterFlag"
:src="form.posterBackground" style="width:300px;max-height:300px;">
<i v-else-if="!imgPosterFlag" class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="轮播图" :style="{display:'block'}"> <el-form-item label="轮播图" :style="{display:'block'}">
...@@ -202,7 +229,8 @@ ...@@ -202,7 +229,8 @@
<el-tab-pane label="车型详情" name="first"> <el-tab-pane label="车型详情" name="first">
<!--<Editor @input="handelIncrease" :value="form.modelsDetails" :myQuillEditor="'myQuillEditor'"></Editor>--> <!--<Editor @input="handelIncrease" :value="form.modelsDetails" :myQuillEditor="'myQuillEditor'"></Editor>-->
<div class="editor-container" v-if="activeName2=='first'"> <div class="editor-container" v-if="activeName2=='first'">
<UE :editorId="activeName2" :defaultMsg="form.modelsDetails" :config=config ref="ue" @ready="editorReadyEvent"></UE> <UE :editorId="activeName2" :defaultMsg="form.modelsDetails" :config=config ref="ue"
@ready="editorReadyEvent"></UE>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -248,20 +276,22 @@ ...@@ -248,20 +276,22 @@
</div> </div>
</template> </template>
<style> <style>
textarea{ textarea {
display: none; display: none;
} }
.el-upload-list{
.el-upload-list {
display: flex; display: flex;
width: 100px; width: 100px;
} }
.el-upload-list li{
.el-upload-list li {
margin-left: 10px; margin-left: 10px;
} }
</style> </style>
<script> <script>
// import Editor from "../../modal/editorTool";//富文本 // import Editor from "../../modal/editorTool";//富文本
import UE from '../../modal/Ueditor';//百度ue富文本 import UE from '../../modal/Ueditor';//百度ue富文本
import { import {
getOneTypeById, getOneTypeById,
getAllParentLabel, getAllParentLabel,
...@@ -280,7 +310,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -280,7 +310,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
import ElRadio from "../../../../node_modules/element-ui/packages/radio/src/radio.vue"; import ElRadio from "../../../../node_modules/element-ui/packages/radio/src/radio.vue";
export default { export default {
props: ["oneRow", "title", "brandlist", "numberList","vehicleTypeList_btn_edit"], props: ["oneRow", "title", "brandlist", "numberList", "vehicleTypeList_btn_edit"],
name: 'upkeepDialog', name: 'upkeepDialog',
components: { components: {
ElRadio, ElRadio,
...@@ -291,8 +321,8 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -291,8 +321,8 @@ import UE from '../../modal/Ueditor';//百度ue富文本
}, },
data() { data() {
return { return {
imgPosterFlag:false, imgPosterFlag: false,
percent_poster:0, percent_poster: 0,
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
percent: 0,//上传进度 percent: 0,//上传进度
imgFlag: false, imgFlag: false,
...@@ -300,14 +330,17 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -300,14 +330,17 @@ import UE from '../../modal/Ueditor';//百度ue富文本
initialFrameWidth: null, initialFrameWidth: null,
initialFrameHeight: 350 initialFrameHeight: 350
}, },
labelList:[],//全部车型标签 labelList: [],//全部车型标签
fileList2:[], fileList2: [],
activeName2: '',//房车详情 activeName2: '',//房车详情
form: { form: {
alt:'', alt: '',
pPrice:0,//普通会员 imgTitle: undefined,
hPrice:0,//黄金会员 imgKeyword: undefined,
zPrice:0,//钻石会员 imgDesc: undefined,
pPrice: 0,//普通会员
hPrice: 0,//黄金会员
zPrice: 0,//钻石会员
name: undefined,//房车名称 name: undefined,//房车名称
config: "",//房车配置 config: "",//房车配置
keyword: "",//房车关键标签 keyword: "",//房车关键标签
...@@ -318,10 +351,10 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -318,10 +351,10 @@ import UE from '../../modal/Ueditor';//百度ue富文本
deposit: 20000,//总押金 deposit: 20000,//总押金
vioDeposit: 0,//违章押金 vioDeposit: 0,//违章押金
hotSign: "2",//热门车型 1、热门 2、非热门 hotSign: "2",//热门车型 1、热门 2、非热门
rentDiscountStatus:"0",//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值 rentDiscountStatus: "0",//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值
rentDiscountPrice: 0,//租车优惠价格 固定优化价格 rentDiscountPrice: 0,//租车优惠价格 固定优化价格
buyPrice: 0,//购买价格 buyPrice: 0,//购买价格
intro:'' intro: ''
}, },
showDestinationVisible: false,//编辑目的地 showDestinationVisible: false,//编辑目的地
showPathWayVisible: false,//编辑途径地 showPathWayVisible: false,//编辑途径地
...@@ -333,7 +366,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -333,7 +366,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
trigger: 'blur' trigger: 'blur'
} }
}, },
checkList:[],//已选中的标签 checkList: [],//已选中的标签
allCompanies: {}, allCompanies: {},
allCompaniesArr: [], allCompaniesArr: [],
oneTypeDialogVisible: false, oneTypeDialogVisible: false,
...@@ -343,10 +376,10 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -343,10 +376,10 @@ import UE from '../../modal/Ueditor';//百度ue富文本
showName: "", showName: "",
configDialogVisible: false,//配置弹框 configDialogVisible: false,//配置弹框
modalTitle: "修改房车配置", modalTitle: "修改房车配置",
configItem: {parent:{isMore: 0}},//待编辑配置数据 configItem: {parent: {isMore: 0}},//待编辑配置数据
configItemChildren:[],//待配置的二级标签 configItemChildren: [],//待配置的二级标签
childNameLists: [], childNameLists: [],
childName:"", childName: "",
totalLabel: [],//关键标签id totalLabel: [],//关键标签id
canSelectLabel: [],//可选择的二级标签 canSelectLabel: [],//可选择的二级标签
selectedLabel: [],//已选中的标签 selectedLabel: [],//已选中的标签
...@@ -356,8 +389,8 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -356,8 +389,8 @@ import UE from '../../modal/Ueditor';//百度ue富文本
created() { created() {
}, },
watch: { watch: {
oneTypeDialogVisible(newValue, oldValue){ oneTypeDialogVisible(newValue, oldValue) {
if(!newValue){ if (!newValue) {
this.cleanForm(); this.cleanForm();
} }
}, },
...@@ -377,45 +410,45 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -377,45 +410,45 @@ import UE from '../../modal/Ueditor';//百度ue富文本
} }
}, },
methods: { methods: {
changeConfig(){ changeConfig() {
console.log(this.configItemChildren); console.log(this.configItemChildren);
}, },
/** /**
* 获取全部一级、二级分类数据 * 获取全部一级、二级分类数据
* */ * */
getAllTag() { getAllTag() {
let listQuery = {sort: 1, page:1,limit:10}; let listQuery = {sort: 1, page: 1, limit: 10};
let that = this; let that = this;
getLabelList(listQuery).then(response => { getLabelList(listQuery).then(response => {
let listRs = undefined; let listRs = undefined;
if (!this.$utils.isEmpty(response.data)) { if (!this.$utils.isEmpty(response.data)) {
listRs = response.data; listRs = response.data;
response.data.map(function(item){ response.data.map(function (item) {
item.childName = []; item.childName = [];
}) })
} }
this.labelList = listRs; this.labelList = listRs;
if(this.title == "编辑"){ if (this.title == "编辑") {
let row = this.oneRow; let row = this.oneRow;
this.getOne(row.id); this.getOne(row.id);
} else { } else {
this.activeName2 = "first"; this.activeName2 = "first";
let tagArr = []; let tagArr = [];
this.labelList.map(function(iitem){ this.labelList.map(function (iitem) {
if(iitem.children.length >0){ if (iitem.children.length > 0) {
tagArr.push(iitem.children[0].id); tagArr.push(iitem.children[0].id);
} }
}); });
this.form.brand = this.brandlist[0].id; this.form.brand = this.brandlist[0].id;
this.form.number = this.numberList[0].id; this.form.number = this.numberList[0].id;
this.labelList.map(function(iitem){ this.labelList.map(function (iitem) {
let p = []; let p = [];
let pp = []; let pp = [];
let aa = []; let aa = [];
iitem.childNameLists =[]; iitem.childNameLists = [];
iitem.children.map(function (c) { iitem.children.map(function (c) {
tagArr.map(function (ii) { tagArr.map(function (ii) {
if(c.id == ii){ if (c.id == ii) {
p.push(c); p.push(c);
aa.push(c.name); aa.push(c.name);
pp.push(c.id); pp.push(c.id);
...@@ -440,7 +473,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -440,7 +473,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
that.labelList.map(function (i) { that.labelList.map(function (i) {
i.children.map(function (ic) { i.children.map(function (ic) {
that.totalLabel.map(function (c) { that.totalLabel.map(function (c) {
if(ic.id == c){ if (ic.id == c) {
canSelectLabel.push(ic); canSelectLabel.push(ic);
} }
}) })
...@@ -471,7 +504,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -471,7 +504,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
/** /**
* 封面图上传 * 封面图上传
* **/ * **/
handleAvatarSuccess(res, file){ handleAvatarSuccess(res, file) {
this.percent = 0; this.percent = 0;
this.imgFlag = false; this.imgFlag = false;
this.form.coverPic = res.data; this.form.coverPic = res.data;
...@@ -479,7 +512,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -479,7 +512,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
/** /**
* 海报背景上传 * 海报背景上传
* **/ * **/
handlePosterSuccess(res, file){ handlePosterSuccess(res, file) {
this.percent_poster = 0; this.percent_poster = 0;
this.imgPosterFlag = false; this.imgPosterFlag = false;
this.form.posterBackground = res.data; this.form.posterBackground = res.data;
...@@ -487,7 +520,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -487,7 +520,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
/** /**
* 创建 * 创建
* */ * */
create(formName){ create(formName) {
const set = this.$refs; const set = this.$refs;
set[formName].validate(valid => { set[formName].validate(valid => {
if (valid) { if (valid) {
...@@ -508,11 +541,14 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -508,11 +541,14 @@ import UE from '../../modal/Ueditor';//百度ue富文本
hotSign: this.form.hotSign,//热门车型 hotSign: this.form.hotSign,//热门车型
rentDiscountStatus: this.form.rentDiscountStatus,//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值 rentDiscountStatus: this.form.rentDiscountStatus,//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值
buyPrice: this.form.buyPrice,//购买价格 buyPrice: this.form.buyPrice,//购买价格
alt:this.form.alt,//seo 标签优化 alt: this.form.alt,//seo 标签优化
intro:this.form.intro intro: this.form.intro,
imgTitle: this.form.imgTitle,
imgKeyword: this.form.imgKeyword,
imgDesc: this.form.imgDesc,
}; };
if(this.form.rentDiscountStatus == 2){ if (this.form.rentDiscountStatus == 2) {
params.rentDiscountPrice = this.form.pPrice+","+this.form.hPrice+","+this.form.zPrice//租车优惠价格 固定优化价格 params.rentDiscountPrice = this.form.pPrice + "," + this.form.hPrice + "," + this.form.zPrice//租车优惠价格 固定优化价格
} }
console.log(params); console.log(params);
console.log(this.form); console.log(this.form);
...@@ -542,7 +578,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -542,7 +578,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
/** /**
* 编辑 * 编辑
* */ * */
update(formName){ update(formName) {
const set = this.$refs; const set = this.$refs;
set[formName].validate(valid => { set[formName].validate(valid => {
if (valid) { if (valid) {
...@@ -565,11 +601,14 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -565,11 +601,14 @@ import UE from '../../modal/Ueditor';//百度ue富文本
rentDiscountStatus: this.form.rentDiscountStatus,//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值 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,//购买价格 buyPrice: this.form.buyPrice,//购买价格
alt:this.form.alt,//seo 标签优化 alt: this.form.alt,//seo 标签优化
intro:this.form.intro intro: this.form.intro,
imgTitle: this.form.imgTitle,
imgKeyword: this.form.imgKeyword,
imgDesc: this.form.imgDesc,
}; };
if(this.form.rentDiscountStatus == 2){ if (this.form.rentDiscountStatus == 2) {
params.rentDiscountPrice = this.form.pPrice+","+this.form.hPrice+","+this.form.zPrice//租车优惠价格 固定优化价格 params.rentDiscountPrice = this.form.pPrice + "," + this.form.hPrice + "," + this.form.zPrice//租车优惠价格 固定优化价格
} }
console.log(params); console.log(params);
console.log(this.form); console.log(this.form);
...@@ -599,43 +638,43 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -599,43 +638,43 @@ import UE from '../../modal/Ueditor';//百度ue富文本
/** /**
* 关闭编辑车型 * 关闭编辑车型
*/ */
cancel(){ cancel() {
this.cleanForm(); this.cleanForm();
this.$emit("oneDialogEvent", false); this.$emit("oneDialogEvent", false);
}, },
/** /**
* 编辑关键标签 * 编辑关键标签
* */ * */
editLabe(){ editLabe() {
this.keywordDialogVisible = true; this.keywordDialogVisible = true;
}, },
/** /**
* 删除房车参数 * 删除房车参数
* */ * */
delModelParam(index){ delModelParam(index) {
this.form.modelParam.splice(index, 1); this.form.modelParam.splice(index, 1);
}, },
/** /**
* 添加房车参数 * 添加房车参数
* */ * */
addModelParam(){ addModelParam() {
console.log(this.form.modelParam); console.log(this.form.modelParam);
let c = { let c = {
key: "", key: "",
val:"" val: ""
}; };
this.form.modelParam.push(c); this.form.modelParam.push(c);
}, },
/** /**
* 关闭关键标签配置 * 关闭关键标签配置
* */ * */
cancelHandelLabel(){ cancelHandelLabel() {
this.keywordDialogVisible = false; this.keywordDialogVisible = false;
}, },
/** /**
* 更新关键标签 * 更新关键标签
* */ * */
updateLabel(){ updateLabel() {
let that = this; let that = this;
this.keywordDialogVisible = false; this.keywordDialogVisible = false;
console.log(this.selectedLabel); console.log(this.selectedLabel);
...@@ -654,22 +693,22 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -654,22 +693,22 @@ import UE from '../../modal/Ueditor';//百度ue富文本
/** /**
* 关闭房车配置弹框 * 关闭房车配置弹框
* */ * */
cancelHandel(){ cancelHandel() {
this.configDialogVisible = false; this.configDialogVisible = false;
}, },
/** /**
* 更新房车配置弹框 * 更新房车配置弹框
* **/ * **/
updateConfig(){ updateConfig() {
let that = this; let that = this;
this.configDialogVisible = false; this.configDialogVisible = false;
if(this.configItem.parent.isMore == 0){ if (this.configItem.parent.isMore == 0) {
//单选 //单选
console.log(this.childName); console.log(this.childName);
that.labelList.map(function (i) { that.labelList.map(function (i) {
if(i.parent.id == that.configItem.parent.id){ if (i.parent.id == that.configItem.parent.id) {
i.children.map(function (ic) { i.children.map(function (ic) {
if(ic.id == that.childName){ if (ic.id == that.childName) {
i.selectChild = ic.name; i.selectChild = ic.name;
let a = []; let a = [];
i.childNameLists[0] = that.childName; i.childNameLists[0] = that.childName;
...@@ -678,18 +717,18 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -678,18 +717,18 @@ import UE from '../../modal/Ueditor';//百度ue富文本
} }
}); });
console.log(that.labelList); console.log(that.labelList);
} else{ } else {
if(this.childNameLists.length<=0){ if (this.childNameLists.length <= 0) {
return; return;
} }
//多选 //多选
console.log(this.childNameLists); console.log(this.childNameLists);
that.labelList.map(function (i) { that.labelList.map(function (i) {
let a = []; let a = [];
if(i.parent.id == that.configItem.parent.id){ if (i.parent.id == that.configItem.parent.id) {
i.children.map(function (ic) { i.children.map(function (ic) {
that.childNameLists.map(function (cc) { that.childNameLists.map(function (cc) {
if(cc == ic.id){ if (cc == ic.id) {
a.push(ic.name); a.push(ic.name);
} }
}); });
...@@ -720,7 +759,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -720,7 +759,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
that.labelList.map(function (i) { that.labelList.map(function (i) {
i.children.map(function (ic) { i.children.map(function (ic) {
that.totalLabel.map(function (c) { that.totalLabel.map(function (c) {
if(ic.id == c){ if (ic.id == c) {
canSelectLabel.push(ic); canSelectLabel.push(ic);
} }
}) })
...@@ -734,12 +773,12 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -734,12 +773,12 @@ import UE from '../../modal/Ueditor';//百度ue富文本
/** /**
* editConfig * editConfig
* */ * */
editConfig(item){ editConfig(item) {
this.configDialogVisible = true; this.configDialogVisible = true;
this.childNameLists = []; this.childNameLists = [];
this.childName = undefined; this.childName = undefined;
this.modalTitle = item.parent.name; this.modalTitle = item.parent.name;
item.childNameList.map(function(ii){ item.childNameList.map(function (ii) {
ii.showName = ii.id; ii.showName = ii.id;
}); });
this.configItem = item;//待编辑配置信息 this.configItem = item;//待编辑配置信息
...@@ -751,40 +790,40 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -751,40 +790,40 @@ import UE from '../../modal/Ueditor';//百度ue富文本
/** /**
* 获取一条车型数据 * 获取一条车型数据
* */ * */
getOne(id){ getOne(id) {
let that = this; let that = this;
getOneTypeById(id).then(response => { getOneTypeById(id).then(response => {
let item = response.data; let item = response.data;
let pic = item.picture.split(","); let pic = item.picture.split(",");
//轮播 //轮播
let fileList2 = []; let fileList2 = [];
pic.map(function(pp){ pic.map(function (pp) {
let p = { let p = {
url: pp url: pp
}; };
fileList2.push(p); fileList2.push(p);
}); });
this.fileList2 = fileList2; this.fileList2 = fileList2;
let yhPrice = item.rentDiscountPrice?item.rentDiscountPrice.split(","):[]; let yhPrice = item.rentDiscountPrice ? item.rentDiscountPrice.split(",") : [];
if(item.rentDiscountPrice) { if (item.rentDiscountPrice) {
item.pPrice = yhPrice.length>=1?parseInt(yhPrice[0]):0; item.pPrice = yhPrice.length >= 1 ? parseInt(yhPrice[0]) : 0;
item.hPrice = yhPrice.length>=2?parseInt(yhPrice[1]):0; item.hPrice = yhPrice.length >= 2 ? parseInt(yhPrice[1]) : 0;
item.zPrice = yhPrice.length>=3?parseInt(yhPrice[2]):0; item.zPrice = yhPrice.length >= 3 ? parseInt(yhPrice[2]) : 0;
} }
item.rentDiscountStatus = item.rentDiscountStatus+""; item.rentDiscountStatus = item.rentDiscountStatus + "";
item.hotSign = item.hotSign+""; item.hotSign = item.hotSign + "";
item.brand = item.brand*1; item.brand = item.brand * 1;
item.number = item.number*1; item.number = item.number * 1;
item.modelParam = JSON.parse(item.modelParam); item.modelParam = JSON.parse(item.modelParam);
let tagArr = response.data.config.split(","); let tagArr = response.data.config.split(",");
this.labelList.map(function(iitem){ this.labelList.map(function (iitem) {
let p = []; let p = [];
let pp = []; let pp = [];
let aa = []; let aa = [];
iitem.childNameLists =[]; iitem.childNameLists = [];
iitem.children.map(function (c) { iitem.children.map(function (c) {
tagArr.map(function (ii) { tagArr.map(function (ii) {
if(c.id == ii){ if (c.id == ii) {
p.push(c); p.push(c);
aa.push(c.name); aa.push(c.name);
pp.push(c.id); pp.push(c.id);
...@@ -809,14 +848,14 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -809,14 +848,14 @@ import UE from '../../modal/Ueditor';//百度ue富文本
that.labelList.map(function (i) { that.labelList.map(function (i) {
i.children.map(function (ic) { i.children.map(function (ic) {
that.totalLabel.map(function (c) { that.totalLabel.map(function (c) {
if(ic.id == c){ if (ic.id == c) {
canSelectLabel.push(ic); canSelectLabel.push(ic);
} }
}) })
}) })
}); });
this.canSelectLabel = canSelectLabel; this.canSelectLabel = canSelectLabel;
response.data.hotSign = response.data.hotSign? response.data.hotSign: "2"; response.data.hotSign = response.data.hotSign ? response.data.hotSign : "2";
this.form = response.data; this.form = response.data;
this.activeName2 = "first"; this.activeName2 = "first";
}) })
...@@ -824,7 +863,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -824,7 +863,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
/** /**
* 深拷贝 * 深拷贝
*/ */
objDeepCopy (source) { objDeepCopy(source) {
var sourceCopy = source instanceof Array ? [] : {}; var sourceCopy = source instanceof Array ? [] : {};
for (var item in source) { for (var item in source) {
sourceCopy[item] = typeof source[item] === 'object' ? objDeepCopy(source[item]) : source[item]; sourceCopy[item] = typeof source[item] === 'object' ? objDeepCopy(source[item]) : source[item];
...@@ -833,7 +872,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -833,7 +872,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
}, },
querySearch(queryString, cb) { querySearch(queryString, cb) {
let selectArry = []; let selectArry = [];
this.allCompaniesArr.map(function(item){ this.allCompaniesArr.map(function (item) {
item.value = item.name; item.value = item.name;
selectArry.push(item); selectArry.push(item);
}); });
...@@ -846,7 +885,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -846,7 +885,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
* 富文本内容 * 富文本内容
* @param step * @param step
*/ */
editorReadyEvent(instance){ editorReadyEvent(instance) {
let t = this; let t = this;
instance.addListener('contentChange', () => { instance.addListener('contentChange', () => {
t.form.modelsDetails = instance.getContent(); t.form.modelsDetails = instance.getContent();
...@@ -855,18 +894,18 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -855,18 +894,18 @@ import UE from '../../modal/Ueditor';//百度ue富文本
/** /**
* 删除banner * 删除banner
* */ * */
handleRemove(file, fileList){ handleRemove(file, fileList) {
let list = []; let list = [];
fileList.map(function(item){ fileList.map(function (item) {
if(item.url != file.url){ if (item.url != file.url) {
list.push(item); list.push(item);
} }
}); });
this.fileList2 = list; this.fileList2 = list;
let arr = []; let arr = [];
let picture = this.form.picture.split(","); let picture = this.form.picture.split(",");
picture.map(function(item){ picture.map(function (item) {
if(item != file.url){ if (item != file.url) {
arr.push(item); arr.push(item);
} }
}); });
...@@ -875,7 +914,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -875,7 +914,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
/** /**
* banner上传 * banner上传
* */ * */
handleBannerSuccess(res, file){ handleBannerSuccess(res, file) {
this.fileList2.push({url: res.data}); this.fileList2.push({url: res.data});
let c = []; let c = [];
this.fileList2.map(function (i) { this.fileList2.map(function (i) {
...@@ -899,31 +938,35 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -899,31 +938,35 @@ import UE from '../../modal/Ueditor';//百度ue富文本
deposit: 20000,//总押金 deposit: 20000,//总押金
vioDeposit: 0,//违章押金 vioDeposit: 0,//违章押金
hotSign: "2",//热门车型 1、热门 2、非热门 hotSign: "2",//热门车型 1、热门 2、非热门
rentDiscountStatus:"0",//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值 rentDiscountStatus: "0",//租车优惠状态 0--没有优惠;1--会员折扣;2--固定值
rentDiscountPrice: "",//租车优惠价格 固定优化价格 rentDiscountPrice: "",//租车优惠价格 固定优化价格
buyPrice: 0,//购买价格 buyPrice: 0,//购买价格
posterBackground:'',//海报背景 posterBackground: '',//海报背景
alt:'', alt: '',
imgTitle: undefined,
imgKeyword: undefined,
imgDesc: undefined,
} }
} }
} }
} }
</script> </script>
<style> <style>
.flex-aic{ .flex-aic {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.left-item{ .left-item {
width: 300px; width: 300px;
border-left: 1px solid #999; border-left: 1px solid #999;
border-right: 1px solid #999; border-right: 1px solid #999;
border-bottom: 1px solid #999; border-bottom: 1px solid #999;
padding: 3px; padding: 3px;
} }
.right-item{
width:400px; .right-item {
width: 400px;
border-right: 1px solid #999; border-right: 1px solid #999;
border-bottom: 1px solid #999; border-bottom: 1px solid #999;
padding: 3px; padding: 3px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment