Commit a20a2160 authored by guoyou's avatar guoyou

Merge branch 'base-modify'

parents 8dd834c4 ae70a2d4
...@@ -24,11 +24,21 @@ ...@@ -24,11 +24,21 @@
<span>{{scope.row.name}}</span> <span>{{scope.row.name}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="300" align="center" label="跳转链接"> <el-table-column width="300" align="center" label="安卓跳转链接">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.url}}</span> <span>{{scope.row.url}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="300" align="center" label="苹果跳转链接">
<template scope="scope">
<span>{{scope.row.iosUrl}}</span>
</template>
</el-table-column>
<el-table-column width="300" align="center" label="小程序跳转链接">
<template scope="scope">
<span>{{scope.row.purl}}</span>
</template>
</el-table-column>
<el-table-column width="300" align="center" label="banner图片"> <el-table-column width="300" align="center" label="banner图片">
<template scope="scope"> <template scope="scope">
<img :src="scope.row.picture" style="width:100%;max-height:100px;"> <img :src="scope.row.picture" style="width:100%;max-height:100px;">
...@@ -52,10 +62,18 @@ ...@@ -52,10 +62,18 @@
</el-table-column> </el-table-column>
<el-table-column align="center" width="150" label="操作" fixed="right"> <el-table-column align="center" width="150" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleDown(scope.row)" v-show="scope.row.status==1">下架</el-button> 编辑
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUp(scope.row)" v-show="scope.row.status==2">上架</el-button> </el-button>
<el-button class="el-button el-button--text el-button--small" size="small" @click="deleteHandler(scope.row)" style="color:red;" v-show="scope.row.status==2">删除</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleDown(scope.row)"
v-show="scope.row.status==1">下架
</el-button>
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUp(scope.row)"
v-show="scope.row.status==2">上架
</el-button>
<el-button class="el-button el-button--text el-button--small" size="small" @click="deleteHandler(scope.row)"
style="color:red;" v-show="scope.row.status==2">删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -70,15 +88,19 @@ ...@@ -70,15 +88,19 @@
<el-form-item label="描述" prop="name"> <el-form-item label="描述" prop="name">
<el-input v-model="form.name" placeholder="请输入描述"></el-input> <el-input v-model="form.name" placeholder="请输入描述"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上架时间" > <el-form-item label="上架时间">
<el-radio-group v-model="form.up_name" size="medium"> <el-radio-group v-model="form.up_name" size="medium">
<el-radio-button label="不限"></el-radio-button> <el-radio-button label="不限"></el-radio-button>
<el-radio-button label="自定义"></el-radio-button> <el-radio-button label="自定义"></el-radio-button>
</el-radio-group> </el-radio-group>
<div style="display:inline-block" v-show="form.up_name=='自定义'"> <div style="display:inline-block" v-show="form.up_name=='自定义'">
<el-date-picker v-model="form.starTimeStr" type = "datetime" placeholder = "开始时间" value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" :picker-options="pickerOptionsStart"></el-date-picker> <el-date-picker v-model="form.starTimeStr" type="datetime" placeholder="开始时间"
value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm"
:picker-options="pickerOptionsStart"></el-date-picker>
<span> - </span> <span> - </span>
<el-date-picker v-model="form.endTimeStr" type = "datetime" placeholder = "结束时间" value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" :picker-options="pickerOptionsEnd"></el-date-picker> <el-date-picker v-model="form.endTimeStr" type="datetime" placeholder="结束时间"
value-format=" yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm"
:picker-options="pickerOptionsEnd"></el-date-picker>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">
...@@ -91,13 +113,21 @@ ...@@ -91,13 +113,21 @@
:show-file-list="false" :show-file-list="false"
:headers="getHeaderWithToken" :headers="getHeaderWithToken"
:on-success="handleAvatarSuccess"> :on-success="handleAvatarSuccess">
<img v-if="$utils.isString(form.picture) && !$utils.isEmpty(form.picture)" :src="form.picture" style="width:200px;max-height:200px;"> <img v-if="$utils.isString(form.picture) && !$utils.isEmpty(form.picture)" :src="form.picture"
<i v-else class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:100px;height: 100px;vertical-align: middle;"></i> style="width:200px;max-height:200px;">
<i v-else class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:100px;height: 100px;vertical-align: middle;"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="跳转链接" prop="url"> <el-form-item label="安卓跳转链接" prop="url">
<el-input v-model="form.url" placeholder="请输入跳转链接"></el-input> <el-input v-model="form.url" placeholder="请输入跳转链接"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="苹果跳转链接" prop="url">
<el-input v-model="form.iosUrl" placeholder="请输入跳转链接"></el-input>
</el-form-item>
<el-form-item label="小程序跳转链接" prop="url">
<el-input v-model="form.purl" placeholder="请输入跳转链接"></el-input>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancelHandel">取 消</el-button> <el-button @click="cancelHandel">取 消</el-button>
...@@ -152,19 +182,21 @@ ...@@ -152,19 +182,21 @@
}, },
data() { data() {
return { return {
tableKey:0, tableKey: 0,
modalTitle: "创建", modalTitle: "创建",
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
bannerDialogVisible: false,//添加、编辑弹框 bannerDialogVisible: false,//添加、编辑弹框
showLoadingBody: false, showLoadingBody: false,
form: { form: {
name: "", name: "",
up_name:'自定义', up_name: '自定义',
starTimeStr:'', starTimeStr: '',
endTimeStr:'', endTimeStr: '',
sort:'', sort: '',
picture:'', picture: '',
url:'', url: '',
iosUrl: '',
purl:'',
}, },
listQuery: { listQuery: {
page: 1, page: 1,
...@@ -190,7 +222,7 @@ ...@@ -190,7 +222,7 @@
message: '请输入链接', message: '请输入链接',
trigger: 'blur' trigger: 'blur'
}, },
sort:{ sort: {
required: true, required: true,
message: '请输入排序' message: '请输入排序'
} }
...@@ -261,15 +293,15 @@ ...@@ -261,15 +293,15 @@
this.cleanForm(); this.cleanForm();
getObj(row.id).then(response => { getObj(row.id).then(response => {
var item = response.data; var item = response.data;
item.up_name = item.timeType==0?'不限':item.timeType==1?'自定义':''; item.up_name = item.timeType == 0 ? '不限' : item.timeType == 1 ? '自定义' : '';
if(item.startTime>0&&item.timeType==1){ if (item.startTime > 0 && item.timeType == 1) {
item.starTimeStr = getYMD_hm(item.startTime); item.starTimeStr = getYMD_hm(item.startTime);
}else{ } else {
item.starTimeStr = ''; item.starTimeStr = '';
} }
if(item.endTime>0&&item.timeType==1){ if (item.endTime > 0 && item.timeType == 1) {
item.endTimeStr = getYMD_hm(item.endTime); item.endTimeStr = getYMD_hm(item.endTime);
}else{ } else {
item.endTimeStr = ''; item.endTimeStr = '';
} }
this.form = item; this.form = item;
...@@ -280,7 +312,7 @@ ...@@ -280,7 +312,7 @@
/** /**
* 弹框-取消 * 弹框-取消
* */ * */
cancelHandel(){ cancelHandel() {
this.cleanForm(); this.cleanForm();
this.bannerDialogVisible = false; this.bannerDialogVisible = false;
}, },
...@@ -290,13 +322,13 @@ ...@@ -290,13 +322,13 @@
cleanForm() { cleanForm() {
this.form = { this.form = {
name: "", name: "",
up_name:'自定义', up_name: '自定义',
starTimeStr:'', starTimeStr: '',
endTimeStr:'', endTimeStr: '',
sort:'', sort: '',
picture:'', picture: '',
url:'', url: '',
sort:0, sort: 0,
} }
}, },
/** /**
...@@ -309,7 +341,7 @@ ...@@ -309,7 +341,7 @@
let listRs = undefined; let listRs = undefined;
if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) { if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
listRs = response.data.list; listRs = response.data.list;
response.data.list.map(function(item){ response.data.list.map(function (item) {
item.crtTimeStr = timestamp2Date(item.crtTime); item.crtTimeStr = timestamp2Date(item.crtTime);
item.visible2 = false; item.visible2 = false;
}); });
...@@ -328,11 +360,11 @@ ...@@ -328,11 +360,11 @@
const set = this.$refs; const set = this.$refs;
set[formName].validate(valid => { set[formName].validate(valid => {
if (valid) { if (valid) {
if(that.form.up_name=='自定义'){ if (that.form.up_name == '自定义') {
that.form.timeType=1; that.form.timeType = 1;
that.form.startTime = new Date(this.form.starTimeStr).getTime(); that.form.startTime = new Date(this.form.starTimeStr).getTime();
that.form.endTime = new Date(this.form.endTimeStr).getTime(); that.form.endTime = new Date(this.form.endTimeStr).getTime();
if(new Date(this.form.endTimeStr).getTime()<new Date(this.form.starTimeStr).getTime()){ if (new Date(this.form.endTimeStr).getTime() < new Date(this.form.starTimeStr).getTime()) {
this.$notify({ this.$notify({
title: '警告', title: '警告',
message: '结束时间不能小于起始时间', message: '结束时间不能小于起始时间',
...@@ -341,8 +373,8 @@ ...@@ -341,8 +373,8 @@
}); });
return false; return false;
} }
}else{ } else {
that.form.timeType=0; that.form.timeType = 0;
} }
that.form.status = 2; that.form.status = 2;
addObj(this.form).then(response => { addObj(this.form).then(response => {
...@@ -376,12 +408,13 @@ ...@@ -376,12 +408,13 @@
let that = this; let that = this;
const set = this.$refs; const set = this.$refs;
set[formName].validate(valid => { set[formName].validate(valid => {
debugger
if (valid) { if (valid) {
if(that.form.up_name=='自定义'){ if (that.form.up_name == '自定义') {
that.form.timeType=1; that.form.timeType = 1;
that.form.startTime = new Date(this.form.starTimeStr).getTime(); that.form.startTime = new Date(this.form.starTimeStr).getTime();
that.form.endTime = new Date(this.form.endTimeStr).getTime(); that.form.endTime = new Date(this.form.endTimeStr).getTime();
if(new Date(this.form.endTimeStr).getTime()<new Date(this.form.starTimeStr).getTime()){ if (new Date(this.form.endTimeStr).getTime() < new Date(this.form.starTimeStr).getTime()) {
this.$notify({ this.$notify({
title: '警告', title: '警告',
message: '结束时间不能小于起始时间', message: '结束时间不能小于起始时间',
...@@ -390,9 +423,10 @@ ...@@ -390,9 +423,10 @@
}); });
return false; return false;
} }
}else{ } else {
that.form.timeType=0; that.form.timeType = 0;
} }
debugger
editObj(this.form).then(response => { editObj(this.form).then(response => {
if (response.status === 200) { if (response.status === 200) {
this.bannerDialogVisible = false; this.bannerDialogVisible = false;
...@@ -420,7 +454,7 @@ ...@@ -420,7 +454,7 @@
/** /**
* 上架 * 上架
* */ * */
handleUp(row){ handleUp(row) {
this.form = {}; this.form = {};
this.form.id = row.id; this.form.id = row.id;
this.form.status = 1; this.form.status = 1;
...@@ -447,7 +481,7 @@ ...@@ -447,7 +481,7 @@
/** /**
* 下架 * 下架
* */ * */
handleDown(row){ handleDown(row) {
this.form = {}; this.form = {};
this.form.id = row.id; this.form.id = row.id;
this.form.status = 2; this.form.status = 2;
......
<template> <template>
<div class="app-container calendar-list-container" v-loading.body="showLoadingBody"> <div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" <el-button
type="primary" icon="edit">添加 class="filter-item"
</el-button> style="margin-left: 10px;"
@click="handleCreate"
type="primary"
icon="edit"
>添加</el-button>
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%"> <el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%">
<el-table-column <el-table-column type="index" align="center" label="序号" width="98"></el-table-column>
type="index"
align="center" label="序号" width="98">
</el-table-column>
<el-table-column width="160" align="center" label="标题"> <el-table-column width="160" align="center" label="标题">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.title}}</span> <span>{{scope.row.title}}</span>
...@@ -29,10 +30,10 @@ ...@@ -29,10 +30,10 @@
</el-table-column> </el-table-column>
<el-table-column width="250" align="center" label="banner图"> <el-table-column width="250" align="center" label="banner图">
<template scope="scope"> <template scope="scope">
<img :src="scope.row.cover" style="width:100%;max-height:100px;"> <img :src="scope.row.cover" style="width:100%;max-height:100px;" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="跳转"> <el-table-column align="center" label="安卓跳转">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.url}}</span> <span>{{scope.row.url}}</span>
</template> </template>
...@@ -42,21 +43,40 @@ ...@@ -42,21 +43,40 @@
<span>{{scope.row.iosUrl}}</span> <span>{{scope.row.iosUrl}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="小程序跳转">
<template scope="scope">
<span>{{scope.row.appletUrl}}</span>
</template>
</el-table-column>
<el-table-column align="center" width="150" label="操作"> <el-table-column align="center" width="150" label="操作">
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑 <el-button
</el-button> size="small"
<el-button class="el-button el-button--text el-button--small" style="color:red;" size="small" @click="deleteHandler(scope.row)">删除</el-button> class="el-button el-button--text el-button--small"
@click="handleUpdate(scope.row)"
>编辑</el-button>
<el-button
class="el-button el-button--text el-button--small"
style="color:red;"
size="small"
@click="deleteHandler(scope.row)"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" <el-pagination
:current-page.sync="listQuery.pageNo" :page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" @size-change="handleSizeChange"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination> @current-change="handleCurrentChange"
:current-page.sync="listQuery.pageNo"
:page-sizes="[10,20,30, 50]"
:page-size="listQuery.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
></el-pagination>
</div> </div>
<!-- banner modal弹窗 --> <!-- banner modal弹窗 -->
<el-dialog :title="modalTitle" :visible.sync="bannerDialogVisible"> <el-dialog :title="modalTitle" :visible.sync="bannerDialogVisible" @close="closePop">
<el-form :model="form" :rules="rules" ref="form" label-width="90px"> <el-form :model="form" :rules="rules" ref="form" label-width="90px">
<el-form-item label="标题" prop="title"> <el-form-item label="标题" prop="title">
<el-input v-model="form.title" placeholder="请输入标题"></el-input> <el-input v-model="form.title" placeholder="请输入标题"></el-input>
...@@ -85,20 +105,30 @@ ...@@ -85,20 +105,30 @@
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'" :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:show-file-list="false" :show-file-list="false"
:headers="getHeaderWithToken" :headers="getHeaderWithToken"
:on-success="handleAvatarSuccess"> :on-success="handleAvatarSuccess"
<img v-if="$utils.isString(form.cover) && !$utils.isEmpty(form.cover)" :src="form.cover" style="width:500px;max-height:300px;"> >
<i v-else class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:500px;height: 100px;"></i> <img
v-if="$utils.isString(form.cover) && !$utils.isEmpty(form.cover)"
:src="form.cover"
style="width:500px;max-height:300px;"
/>
<i
v-else
class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:500px;height: 100px;"
></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>建议尺寸:1080*630</el-form-item>
建议尺寸:1080*630 <el-form-item label="安卓跳转链接" prop="url">
</el-form-item>
<el-form-item label="跳转链接">
<el-input v-model="form.url" placeholder="请输入跳转链接"></el-input> <el-input v-model="form.url" placeholder="请输入跳转链接"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="ios跳转链接"> <el-form-item label="ios跳转链接" prop="iosUrl">
<el-input v-model="form.iosUrl" placeholder="请输入ios跳转链接"></el-input> <el-input v-model="form.iosUrl" placeholder="请输入ios跳转链接"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="小程序跳转链接" prop="appletUrl">
<el-input v-model="form.appletUrl" placeholder="请输入ios跳转链接"></el-input>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancelHandel">取 消</el-button> <el-button @click="cancelHandel">取 消</el-button>
...@@ -110,38 +140,30 @@ ...@@ -110,38 +140,30 @@
</template> </template>
<script> <script>
import 'static/css/uploadImg.css';// 引入图片上传组件对话框 import 'static/css/uploadImg.css' // 引入图片上传组件对话框
import { import { formatDate } from 'utils/dateFormattor'
formatDate
} from 'utils/dateFormattor';
import { import {
toEast8Date, toEast8Date,
deepCopyDate, deepCopyDate,
newEast8Date, newEast8Date,
convertDate2Str convertDate2Str
} from 'utils/dateUtils'; } from 'utils/dateUtils'
import { import { getBannerList, editBanner, addBanner, delBanner } from 'api/tourManage'
getBannerList,
editBanner,
addBanner,
delBanner
} from 'api/tourManage';
import rsCode from '../../utils/rsCode'; import rsCode from '../../utils/rsCode'
import {mapGetters} from 'vuex'; import { mapGetters } from 'vuex'
import { import { getToken } from '../../utils/auth'
getToken
} from '../../utils/auth';
import Element1 from "../admin/menu/components/element"; import Element1 from '../admin/menu/components/element'
import ElRow from "element-ui/packages/row/src/row"; import ElRow from 'element-ui/packages/row/src/row'
import ElCol from "element-ui/packages/col/src/col"; import ElCol from 'element-ui/packages/col/src/col'
import {objDeepCopy} from "../../utils"
export default { export default {
name: 'tourManage', name: 'tourManage',
components: { components: {
ElCol, ElCol,
...@@ -150,18 +172,19 @@ ...@@ -150,18 +172,19 @@
}, },
data() { data() {
return { return {
tableKey:0, tableKey: 0,
modalTitle: "创建", modalTitle: '创建',
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
bannerDialogVisible: false,//添加、编辑弹框 bannerDialogVisible: false, //添加、编辑弹框
showLoadingBody: false, showLoadingBody: false,
form: { form: {
title: "", title: '',
url: "", url: '',
cover:"", cover: '',
type: "0", type: '0',
location: "0", location: '0',
iosUrl:'' iosUrl: '',
appletUrl: null
}, },
listQuery: { listQuery: {
pageNo: 1, pageNo: 1,
...@@ -174,14 +197,14 @@ ...@@ -174,14 +197,14 @@
message: '请输入标题', message: '请输入标题',
trigger: 'blur' trigger: 'blur'
}, },
type:{ type: {
type: 'string', type: 'string',
required: true, required: true,
message: '请选择banner类型', message: '请选择banner类型',
trigger: 'blur' trigger: 'blur'
}, },
location:{ location: {
type: "string", type: 'string',
required: true, required: true,
message: '请选择位置类型', message: '请选择位置类型',
trigger: 'blur' trigger: 'blur'
...@@ -189,166 +212,176 @@ ...@@ -189,166 +212,176 @@
cover: { cover: {
type: 'string', type: 'string',
required: true, required: true,
message: '请上传图片', message: '请上传图片'
}, }
}, },
isRead: false,
list: null, list: null,
total: null, total: null,
listLoading: true, listLoading: true,
inline: true, inline: true,
banner_btn_edit: false,//编辑 banner_btn_edit: false, //编辑
banner_btn_add: false,//添加 tableInfo:{},
banner_btn_add: false //添加
} }
}, },
created() { created() {
this.getList(); this.getList()
this.banner_btn_edit = true;//this.elements['tourManage:btn_edit']; this.banner_btn_edit = true //this.elements['tourManage:btn_edit'];
this.banner_btn_add = true;//this.elements['tourManage:btn_add']; this.banner_btn_add = true //this.elements['tourManage:btn_add'];
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(['elements', 'belong2Type']),
'elements',
'belong2Type'
]),
getHeaderWithToken() { getHeaderWithToken() {
return {Authorization: getToken()}; return { Authorization: getToken() }
}, }
}, },
methods: { methods: {
handleSizeChange(val) { handleSizeChange(val) {
this.listQuery.pageSize = val; this.listQuery.pageSize = val
this.getList(); this.getList()
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.listQuery.pageNo = val; this.listQuery.pageNo = val
this.getList(); this.getList()
}, },
/** /**
* 添加 * 添加
* */ * */
handleCreate() { handleCreate() {
this.cleanForm(); this.cleanForm()
this.modalTitle = '创建'; this.modalTitle = '创建'
this.bannerDialogVisible = true; this.bannerDialogVisible = true
},
closePop() {
this.cleanForm()
}, },
/** /**
* 操作-编辑 * 操作-编辑
* */ * */
handleUpdate(row) { handleUpdate(row) {
this.modalTitle = '编辑'; console.log(objDeepCopy);
this.cleanForm();
this.form = row; this.modalTitle = '编辑'
this.bannerDialogVisible = true; this.form = objDeepCopy(row)
this.bannerDialogVisible = true
}, },
/** /**
* 弹框-取消 * 弹框-取消
* */ * */
cancelHandel(){ cancelHandel() {
this.cleanForm(); this.cleanForm()
this.bannerDialogVisible = false; this.bannerDialogVisible = false
}, },
/** /**
* 清空表单 * 清空表单
* */ * */
cleanForm() { cleanForm() {
this.form = { this.form = {
title: "", title: '',
cover: "", cover: '',
url:"", url: '',
type: "0", type: '0',
location: "0", location: '0',
iosUrl:'' iosUrl: '',
appletUrl: null
} }
}, },
showImgDialog(drivingLicensePath) { showImgDialog(drivingLicensePath) {
this.licenceSrcUrl = this.getDrivingLicenseUrl(drivingLicensePath); this.licenceSrcUrl = this.getDrivingLicenseUrl(drivingLicensePath)
this.dialogForm4LicenceVisible = true; this.dialogForm4LicenceVisible = true
}, },
/** /**
* 获取banner列表数据 * 获取banner列表数据
* */ * */
getList() { getList() {
this.listLoading = true; this.listLoading = true
getBannerList(this.listQuery).then(response => { getBannerList(this.listQuery).then(response => {
let totalCountRs = undefined; let totalCountRs = undefined
let listRs = undefined; let listRs = undefined
if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) { if (
listRs = response.data.data; !this.$utils.isEmpty(response.data.data) &&
response.data.data.map(function(item){ this.$utils.isInteger(response.data.totalCount)
item.type = item.type+""; ) {
item.location = item.location?item.location+"": "0"; listRs = response.data.data
item.visible2 = false; response.data.data.map(function(item) {
}); item.type = item.type + ''
totalCountRs = response.data.totalCount; item.location = item.location ? item.location + '' : '0'
item.visible2 = false
})
totalCountRs = response.data.totalCount
} }
this.listLoading = false; this.listLoading = false
this.list = listRs; this.list = listRs
this.total = totalCountRs; this.total = totalCountRs
}); })
}, },
/** /**
* 创建 * 创建
* */ * */
create(formName) { create(formName) {
const set = this.$refs; const set = this.$refs
set[formName].validate(valid => { set[formName].validate(valid => {
if (valid) { if (valid) {
addBanner(this.form) addBanner(this.form).then(response => {
.then(response => {
if (response.status === 200) { if (response.status === 200) {
this.bannerDialogVisible = false; this.bannerDialogVisible = false
this.getList(); this.getList()
this.$notify({ this.$notify({
title: '成功', title: '成功',
message: '创建成功', message: '创建成功',
type: 'success', type: 'success',
duration: 2000 duration: 2000
}); })
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败!', message: rsCode.msg[response.code]
? rsCode.msg[response.code]
: '操作失败!',
type: 'error', type: 'error',
duration: 2000 duration: 2000
}); })
} }
}); })
} else { } else {
return false; return false
} }
}); })
}, },
/** /**
* 编辑-更新 * 编辑-更新
* */ * */
update(formName) { update(formName) {
const set = this.$refs; const set = this.$refs
set[formName].validate(valid => { set[formName].validate(valid => {
if (valid) { if (valid) {
editBanner(this.form).then(response => { editBanner(this.form).then(response => {
if (response.status === 200) { if (response.status === 200) {
this.bannerDialogVisible = false; this.bannerDialogVisible = false
this.getList(); this.getList()
this.$notify({ this.$notify({
title: '成功', title: '成功',
message: '编辑成功', message: '编辑成功',
type: 'success', type: 'success',
duration: 2000 duration: 2000
}); })
this.getList(); this.getList()
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败!', message: rsCode.msg[response.code]
? rsCode.msg[response.code]
: '操作失败!',
type: 'error', type: 'error',
duration: 2000 duration: 2000
}); })
} }
}); })
} else { } else {
return false; return false
} }
}); })
}, },
/** /**
* 上传图片 * 上传图片
...@@ -356,21 +389,22 @@ ...@@ -356,21 +389,22 @@
* @returns {boolean} * @returns {boolean}
*/ */
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
const isJPG = file.type === 'image/jpeg' || file.type === 'image/gif'; const isJPG =
const isLt2M = file.size / 1024 / 1024 < 10; file.type === 'image/jpeg' || file.type === 'image/gif'
const isLt2M = file.size / 1024 / 1024 < 10
if (!isJPG) { if (!isJPG) {
this.$message.error('上传图片只能是 JPG/GIF 格式!'); this.$message.error('上传图片只能是 JPG/GIF 格式!')
} }
if (!isLt2M) { if (!isLt2M) {
this.$message.error('上传图片大小不能超过 10MB!'); this.$message.error('上传图片大小不能超过 10MB!')
} }
this.showLoadingBody = true; this.showLoadingBody = true
return isJPG && isLt2M; return isJPG && isLt2M
}, },
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
this.form.cover = res.data; this.form.cover = res.data
this.showLoadingBody = false; this.showLoadingBody = false
}, },
/** /**
* 操作-删除 * 操作-删除
...@@ -388,23 +422,28 @@ ...@@ -388,23 +422,28 @@
message: '删除成功', message: '删除成功',
type: 'success', type: 'success',
duration: 2000 duration: 2000
}); })
this.getList(); this.getList()
} else { } else {
this.$notify({ this.$notify({
title: '删除失败', title: '删除失败',
message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败!', message: rsCode.msg[response.code]
? rsCode.msg[response.code]
: '操作失败!',
type: 'error', type: 'error',
duration: 2000 duration: 2000
}); })
} }
}); })
}) })
}, },
getUrl(drivingLicensePath) { getUrl(drivingLicensePath) {
return process.env.BASE_API + return (
'/vehicle/vehicleInfo/download/drivingLicense?realFileRelPath=' + encodeURI(drivingLicensePath); process.env.BASE_API +
}, '/vehicle/vehicleInfo/download/drivingLicense?realFileRelPath=' +
encodeURI(drivingLicensePath)
)
} }
} }
}
</script> </script>
...@@ -358,9 +358,9 @@ export default { ...@@ -358,9 +358,9 @@ export default {
} else { } else {
if (data.data.localePrize != ''){ if (data.data.localePrize != ''){
data.data.localePrize.forEach(element => { data.data.localePrize.forEach(element => {
// if (!element.goodsId) { if (!element.goodsId) {
// element.goodsId = '' element.goodsId = ''
// } }
// if (!element.totalStock) { // if (!element.totalStock) {
// element.totalStock = '' // element.totalStock = ''
// } // }
......
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