qichexitong/car-admin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7.3(优化

Browse Source
This commit is contained in:
Hong
2024-07-03 17:05:43 +08:00
parent 3e732054d1
commit 249c5fc5eb
6 changed files with 124 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/Tinymce/index.vue
View File

@@ -107,6 +107,19 @@ export default {
link_title: false,
convert_urls: false, //防止路径被转化为相对路径
nonbreaking_force_tab: true, // inserting nonbreaking space   need Nonbreaking Space Plugin
style_formats: [
{title: "行高", items: [
{title: '1', block: 'p', styles: {'line-height': '1.0'}},
{title: '1.5', block: 'p', styles: {'line-height':'1.5'}},
{title: '1.75', block: 'p', styles: {'line-height': '1.75'}},
{title: '2', block: 'p', styles: {'line-height': '2'}},
{title: '3', block: 'p', styles: {'line-height': '3'} },
{title: '4', block: 'p', styles: {'line-height': '4'}},
{title: '5', block: 'p', styles: {'line-height': '5'}},
]},
],
style_formats_merge: true,
style_formats_autohide: false,
init_instance_callback: (editor) => {
if (_this.value) {
editor.setContent(_this.value);

2
src/components/Tinymce/toolbar.js
View File

@@ -2,7 +2,7 @@
// Detail list see https://www.tinymce.com/docs/advanced/editor-control-identifiers/#toolbarcontrols
const toolbar = [
'searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent blockquote undo redo removeformat subscript superscript code codesample fontsizeselect fontselect',
'searchreplace styleselect bold italic underline strikethrough alignleft aligncenter alignright outdent indent blockquote undo redo removeformat subscript superscript code codesample fontsizeselect fontselect',
'hr bullist numlist link image charmap preview anchor pagebreak insertdatetime media table emoticons forecolor backcolor fullscreen',
];

2
src/views/carousel/carouselList/creatLevel.vue
View File

@@ -20,7 +20,7 @@
<el-option label="维修店app轮播图" :value="1" />
<el-option label="小程序首页" :value="2" />
<el-option label="小程序预约页首页" :value="3" />
<el-option label="用户端福利页轮播图" :value="4" />
<el-option label="用户端维修页轮播图" :value="4" />
<el-option label="用户端邀请页广告位" :value="5" />
<el-option label="用户端发现广场轮播图" :value="6" />
<el-option label="展厅" :value="7" />

4
src/views/carousel/carouselList/index.vue
View File

@@ -12,7 +12,7 @@
<el-option label="维修店app轮播图" :value="1" />
<el-option label="小程序首页" :value="2" />
<el-option label="小程序预约页首页" :value="3" />
<el-option label="用户端福利页轮播图" :value="4" />
<el-option label="用户端维修页轮播图" :value="4" />
<el-option label="用户端邀请页广告位" :value="5" />
<el-option label="用户端发现广场轮播图" :value="6" />
<el-option label="展厅" :value="7" />
@@ -152,7 +152,7 @@ export default {
if (type == 1) return '维修店app轮播图';
if (type == 2) return '小程序首页';
if (type == 3) return '小程序预约页首页';
if (type == 4) return '用户端福利页轮播图';
if (type == 4) return '用户端维修页轮播图';
if (type == 5) return '用户端邀请页广告位';
if (type == 6) return '用户端发现广场轮播图';
if (type == 7) return '展厅';

117
src/views/divide/divide_list/creatMerchant.vue
View File

@@ -1,6 +1,6 @@
<template>
<div>
<el-dialog :title="title" :visible.sync="dialogVisible" destroy-on-close>
<el-dialog :title="title" :visible.sync="dialogVisible" destroy-on-close width="1000px">
<el-form v-loading="loadingFrom" ref="dataForm" :inline="true" :model="dataForm" label-width="100px"
:rules="rules">
<!-- <el-form-item label="" class="el-alert">
@@ -35,34 +35,27 @@
<el-radio v-model="dataForm.way" :label="'0'">按比例分佣(0~1)</el-radio>
<el-radio v-model="dataForm.way" :label="'1'">按量分佣(/单)</el-radio>
</el-form-item>
<el-form-item v-if="dataForm.way == 0" label="按比例分佣" prop="ratio" class="lang">
<!-- <el-input v-model.trim="dataForm.ratio" placeholder="请输入比例分佣" /> -->
<el-input-number type="text" :precision="2" v-model="dataForm.ratio" :min="0" :max="999999999"
></el-input-number>
</el-form-item>
<el-form-item v-if="dataForm.way == 1" label="按量分佣" prop="each" class="lang">
<!-- <el-input v-model.trim="dataForm.each" type="number" placeholder="请输入" /> -->
<el-input-number type="text" :precision="2" v-model="dataForm.each" :min="0" :max="999999999"
></el-input-number>
<el-form-item label="按比例分佣" prop="ratio" class="lang">
<div style="display: flex;align-items: center;color: #1890ff;text-align: left;">
<span style="width: 200px;">起始单量</span>
<span style="width: 200px;">结束单量</span>
<span style="width: 200px;">分佣比例/每单</span>
<i class="el-icon-circle-plus" style="font-size: 22px;margin-left: 6px;" @click="addRatioListFn"></i>
</div>
<div v-for="(item, index) in gearList" :key="index"
style="display: flex;align-items: center;margin-bottom: 4px">
<el-input type="number" v-model.trim="item.minStandard" style="width: 200px;" placeholder="请输入起始单量" />
<el-input type="number" v-model.trim="item.maxStandard" style="width: 200px;" placeholder="请输入结束单量" />
<el-input-number type="text" :precision="2" style="width: 200px;" v-model="item.rebate" :min="0"
:max="999999999"></el-input-number>
<i class="el-icon-remove" style="font-size: 22px;color: red;margin-left: 6px;" @click="subRatioListFn(index)"></i>
<!-- <el-button type="primary" icon="el-icon-remove" circle ></el-button> -->
</div>
</el-form-item>
<el-form-item label="省市区" prop="selectedOptions" class="lang">
<el-cascader style="width: 100%" :options="pcTextArr" v-model="dataForm.selectedOptions"
@change="addressChoose"></el-cascader>
</el-form-item>
<!-- <el-form-item label="地址：" prop="addressDetail">
<el-input class="width100" v-model="dataForm.addressDetail" enter-button="查找位置" placeholder="请查找位置"
readonly />
<iframe id="mapPage" width="100%" height="500px" frameborder="0" :src="keyUrl" />
</el-form-item>
<el-form-item label="详细地址" prop="addressDetail" class="lang">
<el-input v-model="dataForm.addressDetail" placeholder="请输入详细地址" style="width: 200px;" />
</el-form-item>
<el-form-item label="经度" prop="longitude">
<el-input v-model="dataForm.longitude" placeholder="请输入酒店经度" />
</el-form-item>
<el-form-item label="纬度" prop="latitude">
<el-input v-model="dataForm.latitude" placeholder="请输入酒店纬度" />
</el-form-item> -->
<el-form-item label="上传合同" prop="contract" class="lang">
<div class="upLoadPicBox" @click="modalPicTapOnly('1', 'contract')">
<div v-if="dataForm.contract" class="pictrue"><img :src="dataForm.contract" /></div>
@@ -95,19 +88,21 @@ import { pcTextArr } from 'element-china-area-data';
import * as merchant from '@/api/vehicleShop/vehicleShop';
import { mapGetters } from 'vuex';
import Keyword from '../../../components/base/keyword';
import { Icon } from "element-ui";
import elementIcons from "@/components/js/element-icons";
export default {
name: 'creatClassify',
components: {
Keyword,
},
props: {
formData:{
type:Object,
default:{}
formData: {
type: Object,
default: {}
},
title:{
type:String,
default:''
title: {
type: String,
default: ''
},
},
computed: {
@@ -115,7 +110,7 @@ export default {
},
data() {
return {
dialogVisible:false,
dialogVisible: false,
formValidate: Object.assign({}, {}),
formValidate2: Object.assign({}, {}),
// 省市区级联
@@ -136,6 +131,12 @@ export default {
marginMark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
marginStatus: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
},
//阶梯列表
gearList: [{
minStandard: '',
maxStandard: '',
rebate: ''
}],
dataForm: {
name: '',
image: '',
@@ -164,23 +165,26 @@ export default {
}
},
formData: function (val) {
console.log(8888888,val);
if(val.id){
console.log(8888888, val);
if (val.id) {
console.log(val.selectedOptions);
this.dataForm=val
}else{
this.dataForm={
this.dataForm = val
if(val.gearList){
this.gearList=val.gearList
}
} else {
this.dataForm = {
name: '',
image: '',
contract: '',
addressDetail: '',
latitude: '',
longitude: '',
time1:[],
selectedOptions:[]
image: '',
contract: '',
addressDetail: '',
latitude: '',
longitude: '',
time1: [],
selectedOptions: []
}
}
}
},
mounted() {
@@ -202,6 +206,19 @@ export default {
this.keyUrl = `https://apis.map.qq.com/tools/locpicker?type=1&key=SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7&referer=myapp`;
},
methods: {
//添加分佣列表
addRatioListFn() {
this.gearList.push({
minStandard: '',
maxStandard: '',
rebate: ''
})
},
subRatioListFn(index) {
if (this.gearList.length > 1) {
this.gearList.splice(index, 1)
}
},
//时间
timeChange(e) {
console.log(e);
@@ -247,7 +264,7 @@ export default {
onChange(id) {
this.dataForm.handlingFee = this.merchantClassify.find((item) => item.id === id).handlingFee;
},
onSubmitPfoor(formName) {
if (this.isShow == 3) {
this.$refs[formName].validate((valid) => {
@@ -276,16 +293,17 @@ export default {
}
},
closeModel() {
this.$parent.formData={}
this.dialogVisible=false;
this.$parent.formData = {}
this.dialogVisible = false;
},
handleRemove(i) {
this.dataForm.sliderImages.splice(i, 1);
},
onClose() {
this.dialogVisible=false;
this.dialogVisible = false;
// this.$refs['dataForm'].resetFields();
this.loading = false;
this.gearList=[]
this.$parent.carListFn()
// this.$emit('getList');
},
@@ -294,6 +312,7 @@ export default {
if (valid) {
this.loading = true;
// if (this.dataForm.addressDetail) this.$delete(this.dataForm, 'addressDetail');
this.dataForm.gearList=this.gearList
this.dataForm.qualificationPicture = JSON.stringify(this.dataForm.sliderImages);
this.dataForm.keywords = this.labelarr.join(',');
this.dataForm.startTime = this.dataForm.time1[0]
@@ -301,6 +320,7 @@ export default {
platformUpdate(this.dataForm).then((res) => {
this.$message.success('操作成功');
this.onClose();
})
.catch(() => {
this.loading = false;
@@ -309,6 +329,7 @@ export default {
platformAdd(this.dataForm).then((res) => {
this.$message.success(`添加成功`);
this.onClose();
})
.catch(() => {
this.loading = false;

50
src/views/divide/divide_list/index.vue
View File

@@ -6,18 +6,18 @@
<div class="container" v-hasPermi="['platform:merchant:page:list']">
<el-form size="small" label-width="100px" :inline="true">
<el-form-item label="平台名称：" label-width="100px" style="display: inline-block">
<el-input v-model.trim="tableFrom.name" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入平台名称："
class="selWidth" clearable>
<el-input v-model.trim="tableFrom.name" style="width: 200px;" @keyup.enter.native="carListFn(1)"
placeholder="请输入平台名称：" class="selWidth" clearable>
</el-input>
</el-form-item>
<el-form-item label="平台编码：" label-width="100px" style="display: inline-block">
<el-input v-model.trim="tableFrom.platformSn" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入平台编码："
class="selWidth" clearable>
<el-input v-model.trim="tableFrom.platformSn" style="width: 200px;" @keyup.enter.native="carListFn(1)"
placeholder="请输入平台编码：" class="selWidth" clearable>
</el-input>
</el-form-item>
<el-form-item label="分佣方案:" label-width="100px" style="display: inline-block">
<el-select v-model="tableFrom.way" style="width: 200px;" filterable remote reserve-keyword placeholder="选择分佣方案"
:loading="loading" clearable>
<el-select v-model="tableFrom.way" style="width: 200px;" filterable remote reserve-keyword
placeholder="选择分佣方案" :loading="loading" clearable>
<el-option :key="1" label="按单量" :value="1">
</el-option>
<el-option :key="0" label="按比例" :value="0">
@@ -61,12 +61,12 @@
{{ scope.row.way == 0 ? '按比例' : '按单量' }}
</template>
</el-table-column>
<el-table-column prop="way" label="分佣方式" show-overflow-tooltip>
<!-- <el-table-column prop="way" label="分佣方式" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.way == 0">{{ scope.row.ratio }}</span>
<span v-else>{{ scope.row.eachMoney }}/单</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="contract" label="合同链接" show-overflow-tooltip></el-table-column>
<el-table-column prop="link" label="注册" show-overflow-tooltip></el-table-column>
<el-table-column prop="status" label="返佣城市" show-overflow-tooltip>
@@ -83,6 +83,7 @@
</el-table-column>
<el-table-column label="操作" min-width="110" fixed="right" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" @click="actWayFn(scope.row)" class="mr10">查看分佣方式</el-button>
<el-button type="text" size="small" @click="onEdit(scope.row)" class="mr10">修改</el-button>
<el-button type="text" size="small" @click="onDel(scope.row)" class="mr10">删除</el-button>
</template>
@@ -94,21 +95,33 @@
@size-change="handleSizeChange" @current-change="pageChange" />
</div>
</el-card>
<el-dialog title="分佣方式" :visible.sync="gearShow">
<h1 style="margin-bottom: 20px;">{{ wayType == 0 ? '按比例' : '按单量' }}</h1>
<el-table :data="gearList">
<el-table-column property="minStandard" label="起始单量" width="150"></el-table-column>
<el-table-column property="maxStandard" label="结束单量" width="200"></el-table-column>
<el-table-column property="rebate" :label="wayType == 0 ? '分佣比例' : '每单'"></el-table-column>
</el-table>
</el-dialog>
<CreatMerchant ref="creatMerchants" :formData="formData" :title="title"></CreatMerchant>
</div>
</template>
<script>
import { pcTextArr } from 'element-china-area-data';
import { platformPageListApi, platformAdd, platformUpdate, platformDelete, platformDetail, platformSwitch,exportCommission } from "@/api/divide.js"
import { platformPageListApi, platformAdd, platformUpdate, platformDelete, platformDetail, platformSwitch, exportCommission } from "@/api/divide.js"
import CreatMerchant from './creatMerchant';
export default {
name: 'carBrand',
components: { CreatMerchant },
data() {
return {
//分佣方式列表
gearShow: false,
gearList: [],
wayType: 0,
// 省市区级联
pcTextArr,
selectedOptions:[],
selectedOptions: [],
//时间
time1: [],
title: '添加',
@@ -189,10 +202,23 @@ export default {
this.carListFn();
},
methods: {
//查看分佣方式
actWayFn(row) {
this.gearShow = true
platformDetail(row.id).then((res) => {
this.wayType = res.way
if (res.gearList) {
this.gearList = res.gearList
} else {
this.gearList = []
}
})
},
//监听省市
addressChoose(e) {
console.log(e[0]);
this.tableFrom.city=e[1]
this.tableFrom.city = e[1]
},
/** 开启关闭 */
carSeriesSwitchFn(row) {
@@ -275,7 +301,7 @@ export default {
this.resettingFn();
},
//导出数据
exportListFn(){
exportListFn() {
exportCommission(this.tableFrom).then((res) => {
// console.log(res);
let URL = window.URL || window.webkitURL;