Skip to content

E
ElectricitySheep
Commit 95afc04f authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents b52bae8b 3f422221
Show whitespace changes
Inline Side-by-side
Showing with 1211 additions and 458 deletions
src/components/blindDate/recruitStick.vue
View file @ 95afc04f
......@@ -196,7 +196,7 @@
<el-tooltip
class="item"
effect="dark"
content="编辑评价"
content="新增评价"
placement="top"
>
<img
......
src/components/tradePavilion/brandClassification.vue
View file @ 95afc04f
......@@ -3,30 +3,59 @@
<template v-if="!isShowAdd">
<div class="head-title">
品牌分类管理
<el-button style="float:right;margin-top: -5px;" size="small" type="primary" @click="isShowAdd=true,clearMsg()">
新增</el-button>
<el-button
style="float: right; margin-top: -5px"
size="small"
type="primary"
@click="(isShowAdd = true), clearMsg()"
>
新增</el-button
>
</div>
<div class="content">
<div>
<div class="searchInput" style="width:250px">
<el-input @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()"
style="display:inline-block;width:225px;height:30px" placeholder="请输入品牌分类名称" v-model="msg.ClassName" size="small"
clearable>
<div class="searchInput" style="width: 250px">
<el-input
@keyup.enter.native="(msg.pageIndex = 1), getList()"
@clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 225px; height: 30px"
placeholder="请输入品牌分类名称"
v-model="msg.ClassName"
size="small"
clearable
>
</el-input>
<span @click="msg.pageIndex=1,getList()" class="el-icon-search"
style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
<span
@click="(msg.pageIndex = 1), getList()"
class="el-icon-search"
style="
color: #979dad;
font-size: 14px;
position: relative;
top: 1px;
"
></span>
</div>
</div>
<el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0">
<el-table
:data="tableData"
v-loading="loading"
border
style="width: 100%; margin: 20px 0"
>
<el-table-column prop="ID" label="编号" width="100">
</el-table-column>
<el-table-column prop="ClassName" label="品牌分类名称">
</el-table-column>
<el-table-column prop="Logo" width="150" label="封面图">
<template slot-scope="scope">
<div class="app-image"
:style="{backgroundImage:'url(' + scope.row.Logo + ')',backgroundSize:'cover'}">
</div>
<div
class="app-image"
:style="{
backgroundImage: 'url(' + scope.row.Logo + ')',
backgroundSize: 'cover',
}"
></div>
</template>
</el-table-column>
<el-table-column prop="CreateDate" width="200" label="创建时间">
......@@ -34,45 +63,119 @@
<el-table-column prop="address" width="200" label="操作">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="editNews(scope.row)" style="width:32px;height:32px" src="../../assets/img/userman/edit.png"
alt="">
<el-tooltip
class="item"
effect="dark"
content="编辑"
placement="top"
>
<img
@click="editNews(scope.row)"
style="width: 32px; height: 32px"
src="../../assets/img/userman/edit.png"
alt=""
/>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<img @click="delNews(scope.row)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/del.png" alt="">
<el-tooltip
class="item"
effect="dark"
content="删除"
placement="top-start"
>
<img
@click="delNews(scope.row)"
style="width: 32px; height: 32px; margin: 0 10px"
src="../../assets/img/userman/del.png"
alt=""
/>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange"
:page-size="msg.pageSize" :current-page.sync="msg.pageIndex" layout="total,prev, pager, next" :total="total">
<el-pagination
style="text-align: right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
:current-page.sync="msg.pageIndex"
layout="total,prev, pager, next"
:total="total"
>
</el-pagination>
</div>
</template>
<template v-else>
<div class="head-title">
<span @click="isShowAdd=false" style="color:rgb(64, 158, 255);cursor:pointer;">品牌分类管理</span><span
style="margin:0 9px;color:#C0C4CC">/</span><span>品牌分类信息</span>
<span
@click="isShowAdd = false"
style="color: rgb(64, 158, 255); cursor: pointer"
>品牌分类管理</span
><span style="margin: 0 9px; color: #c0c4cc">/</span
><span>品牌分类信息</span>
</div>
<div class="content">
<el-form label-width="120px" :model="addMsg" :rules="rules" ref="addMsg">
<el-form-item label="品牌分类名称" class="is-required" prop="ClassName">
<el-input type="text" class="w400" v-model="addMsg.ClassName" size="small" placeholder="品牌分类名称" maxlength="100">
<el-form
label-width="120px"
:model="addMsg"
:rules="rules"
ref="addMsg"
>
<el-form-item
label="品牌分类名称"
class="is-required"
prop="ClassName"
>
<el-input
type="text"
class="w400"
v-model="addMsg.ClassName"
size="small"
placeholder="品牌分类名称"
maxlength="100"
>
</el-input>
</el-form-item>
<el-form-item label="Logo" size="small" class="is-required" prop="Logo">
<el-button @click="isShowImage=true" size="small">选择文件</el-button>
<div class="app-gallery-item" style="position: relative;width: 100px;margin-top: 10px;border:none;">
<img v-if="!addMsg.Logo || addMsg.Logo==''" src="../../assets/img/default.png"
style="width:80px;height:80px" alt="">
<img v-else style="width:80px;height:80px" :src="addMsg.Logo" alt="">
<el-form-item
label="Logo"
size="small"
class="is-required"
prop="Logo"
>
<el-button @click="isShowImage = true" size="small"
>选择文件</el-button
>
<div
class="app-gallery-item"
style="
position: relative;
width: 100px;
margin-top: 10px;
border: none;
"
>
<img
v-if="!addMsg.Logo || addMsg.Logo == ''"
src="../../assets/img/default.png"
style="width: 80px; height: 80px"
alt=""
/>
<img
v-else
style="width: 80px; height: 80px"
:src="addMsg.Logo"
alt=""
/>
</div>
</el-form-item>
</el-form>
</div>
<el-button size="small" style="margin-top:20px;padding:9px 25px;" type="primary" @click="submitform('addMsg')">保存
<el-button
size="small"
style="margin-top: 20px; padding: 9px 25px"
type="primary"
@click="submitform('addMsg')"
>保存
</el-button>
</template>
<!-- 选择文件 -->
......@@ -82,9 +185,9 @@
</div>
</template>
<script>
import ChooseImg from "@/components/global/ChooseImg.vue";
import UE from "@/components/global/UE.vue";
export default {
import ChooseImg from "@/components/global/ChooseImg.vue";
import UE from "@/components/global/UE.vue";
export default {
components: {
ChooseImg,
UE,
......@@ -94,12 +197,12 @@
defaultMsg: "",
config: {
initialFrameWidth: null,
initialFrameHeight: 350
initialFrameHeight: 350,
},
msg: {
pageIndex: 1,
pageSize: 10,
ClassName: '',
ClassName: "",
},
total: 0,
tableData: [], //数据列表
......@@ -109,20 +212,22 @@
ID: 0, //主键编号
Logo: "", //封面图
ClassName: "", //品牌分类标题
},
rules: {
ClassName: [{
ClassName: [
{
required: true,
message: '请输入品牌分类名称',
trigger: 'blur'
}],
Logo: [{
message: "请输入品牌分类名称",
trigger: "blur",
},
],
Logo: [
{
required: true,
message: '请输入品牌Logo',
trigger: 'blur'
}],
message: "请输入品牌Logo",
trigger: "blur",
},
],
},
};
},
......@@ -131,8 +236,8 @@
},
methods: {
SelectId(msg) {
let url = this.getIconLink(msg.url)
this.addMsg.Logo = url
let url = this.getIconLink(msg.url);
this.addMsg.Logo = url;
this.isShowImage = false;
},
clearMsg() {
......@@ -142,14 +247,14 @@
},
getList() {
this.loading = true;
this.apipost("/api/Trade/GetBrandClassPageList", this.msg, res => {
this.apipost("/api/Trade/GetBrandClassPageList", this.msg, (res) => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
let pageData = res.data.data.pageData;
this.tableData = pageData;
}
})
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
......@@ -160,43 +265,46 @@
let that = this;
that.Confirm("是否删除?", function () {
that.apipost(
"/api/Trade/RemoveBrandClass", {
"/api/Trade/RemoveBrandClass",
{
Id: item.ID,
Status: 1
Status: 1,
},
res => {
(res) => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
} else {
that.Error(res.data.message);
}
},
}
);
});
},
//修改品牌分类
editNews(item) {
this.apipost("/api/Trade/GetBrandClassDetails", {
ID: item.ID
}, res => {
this.apipost(
"/api/Trade/GetBrandClassDetails",
{
ID: item.ID,
},
(res) => {
if (res.data.resultCode == 1) {
this.isShowAdd = true;
var tempData = res.data.data;
this.addMsg.ID = tempData.ID;
this.addMsg.Logo = tempData.Logo;
this.addMsg.ClassName = tempData.ClassName;
} else {
this.Error(res.data.message);
}
})
}
);
}, //新增修改
submitform(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost("/api/Trade/GetSetBrandClass", this.addMsg, res => {
this.apipost("/api/Trade/GetSetBrandClass", this.addMsg, (res) => {
if (res.data.resultCode == 1) {
this.isShowAdd = false;
this.getList();
......@@ -205,52 +313,50 @@
} else {
this.Error(res.data.message);
}
})
});
} else {
return false;
}
});
}
},
mounted() {}
};
},
mounted() {},
};
</script>
<style>
.brandClassification .remark_name {
.brandClassification .remark_name {
color: #888888;
font-size: 12px;
margin-left: 10px;
float: right;
}
}
.brandClassification .app-image {
.brandClassification .app-image {
background-position: center center;
width: 50px;
height: 50px;
border-radius: 0%;
float: left;
margin-right: 8px;
}
}
.brandClassification .blue {
color: #409EFF;
.brandClassification .blue {
color: #409eff;
}
}
.brandClassification .content .searchInput {
border: 1px solid #DCDFE6;
.brandClassification .content .searchInput {
border: 1px solid #dcdfe6;
border-radius: 4px;
}
}
.brandClassification .content .searchInput .el-input__inner {
.brandClassification .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
}
.brandClassification .content .searchInput {
.brandClassification .content .searchInput {
line-height: normal;
display: inline-table;
width: 100%;
......@@ -258,17 +364,16 @@
border-spacing: 0;
width: 250px;
margin-right: 20px;
}
}
.brandClassification .content {
.brandClassification .content {
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
}
.brandClassification .el-form-item__content {
.brandClassification .el-form-item__content {
line-height: 0;
}
}
</style>
src/components/tradePavilion/brandManagement.vue
View file @ 95afc04f
......@@ -2,7 +2,10 @@
<div class="brandManagement">
<div class="el-card__header">
<span>品牌列表</span>
<div style="display: flex; flex-direction: row; align-items: center">
<div
style="display: flex; flex-direction: row; align-items: center"
v-if="!readonly"
>
<el-button type="primary" class="el-button--small" @click="addTopic"
>新增</el-button
>
......@@ -15,7 +18,7 @@
</el-button>
</div>
</div>
<div class="content">
<div class="content" v-if="!readonly">
<div style="display: flex; flex-direction: row; align-items: center">
<div class="block">
<span style="margin-left: 10px">品牌名</span>
......@@ -65,10 +68,21 @@
</el-select>
<span style="margin-left: 10px">认证用户</span>
<el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable @change="(msg.pageIndex = 1), getList()"
placeholder="请选择">
<el-select
size="small"
v-model="msg.UserId"
:filter-method="ChangeListName"
filterable
@change="(msg.pageIndex = 1), getList()"
placeholder="请选择"
>
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
<el-option
v-for="item in userList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
>
</el-option>
</el-select>
</div>
......@@ -230,9 +244,13 @@
</el-table-column>
<el-table-column prop="CustomerType" label="客群定位" width="160">
</el-table-column>
<el-table-column prop="UserName" width="100" label="认证用户"></el-table-column>
<el-table-column
prop="UserName"
width="100"
label="认证用户"
></el-table-column>
<el-table-column fixed="right" label="操作" width="120">
<template slot-scope="scope">
<template slot-scope="scope" v-if="!readonly">
<el-tooltip
class="item"
effect="dark"
......@@ -342,18 +360,18 @@ export default {
XinFeng: -1, //新风（0-否1-有）
BrandClassId: 0, //分类
ExcelEnumIds: [],
UserId:0,//用户认证
UserId: 0, //用户认证
},
usermsg: {
pageIndex: 1,
pageSize: 20,
Name: '',
Name: "",
Source: 0,
MemberGrade: 0,
Id: 0,
Moblie: ''
Moblie: "",
},
userList:[],
userList: [],
addMsg: {},
dialogVisible: false,
dataList: [],
......@@ -366,41 +384,55 @@ export default {
loading: false,
BrandClassList: [], //品牌分类列表
ProjectTypeList: [], //商铺性质列表
readonly: false,
};
},
created() {
if(this.$route.query && this.$route.query.UserId){
this.msg.UserId = Number(this.$route.query.UserId)
this.usermsg.Id = Number(this.$route.query.UserId)
this.getuserList(1)
}else{
this.getuserList()
if (this.$route.query && this.$route.query.UserId) {
this.msg.UserId = Number(this.$route.query.UserId);
this.usermsg.Id = Number(this.$route.query.UserId);
this.getuserList(1);
} else {
this.getuserList();
}
this.getBrandClassList();
this.getProjectType();
this.getDown();
},
mounted() {
if (this.$route.query && this.$route.query.readonly) {
this.readonly = this.$route.query.readonly;
}
if (this.$route.query && this.$route.query.data) {
this.dataList = this.$route.query.data;
this.pageCount = this.dataList.length;
this.dataList.forEach((x) => {
x.LogoList = [];
x.LogoList.push(x.Logo);
});
} else {
this.getList();
}
},
methods: {
ChangeListName(val) {
this.usermsg.Name = val;
this.getuserList();
},
getuserList(type=0) {
this.apipost("/api/user/GetMemberUserDropDownList", this.usermsg, res => {
getuserList(type = 0) {
this.apipost(
"/api/user/GetMemberUserDropDownList",
this.usermsg,
(res) => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData;
this.userList = pageData;
if(type==1){
this.usermsg.Id = 0
if (type == 1) {
this.usermsg.Id = 0;
}
}
}
})
);
},
Export() {
this.msg.ExcelEnumIds = this.checkedCities;
......
src/components/tradePavilion/plugin/dropdown.vue
View file @ 95afc04f
......@@ -13,7 +13,7 @@
<el-form label-width="90px">
<el-form-item :label="searchData.CompData.Name" :required="searchData.CompData.IsRequire"
style="margin-bottom:0">
<el-select v-model="defaultValue" style="width:328px;">
<el-select v-model="defaultValue" style="width:328px;" :popper-append-to-body="false">
<el-option v-for="item in searchData.CompData.OptionList" :key="item.Id" :label="item.Name"
:value="item.Id">
</el-option>
......
src/components/tradePavilion/prizeMange.vue 0 → 100644
View file @ 95afc04f
<template>
<div class="brandClassification">
<template v-if="!isShowAdd">
<div class="head-title">
奖项管理
<el-button
style="float: right; margin-top: -5px"
size="small"
type="primary"
@click="(isShowAdd = true), clearMsg()"
>
新增</el-button
>
</div>
<div class="content">
<div>
<div class="searchInput" style="width: 250px">
<el-input
@keyup.enter.native="(msg.pageIndex = 1), getList()"
@clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 225px; height: 30px"
placeholder="请输入奖项名称"
v-model="msg.Name"
size="small"
clearable
>
</el-input>
<span
@click="(msg.pageIndex = 1), getList()"
class="el-icon-search"
style="
color: #979dad;
font-size: 14px;
position: relative;
top: 1px;
"
></span>
</div>
</div>
<el-table
:data="tableData"
v-loading="loading"
border
style="width: 100%; margin: 20px 0"
>
<el-table-column prop="Id" label="编号" width="100">
</el-table-column>
<el-table-column prop="Name" label="奖项名称"> </el-table-column>
<el-table-column prop="BigIco" width="150" label="大奖章">
<template slot-scope="scope">
<div
class="app-image"
:style="{
backgroundImage: 'url(' + scope.row.BigIco + ')',
backgroundSize: 'cover',
}"
></div>
</template>
</el-table-column>
<el-table-column prop="SmallIco" width="150" label="小奖章">
<template slot-scope="scope">
<div
class="app-image"
:style="{
backgroundImage: 'url(' + scope.row.SmallIco + ')',
backgroundSize: 'cover',
}"
></div>
</template>
</el-table-column>
<el-table-column prop="YearInfo" width="200" label="年份">
</el-table-column>
<el-table-column prop="BrandCount" width="200" label="关联品牌数量">
<template slot-scope="scope">
<div
@click="jumpBrandList(scope.row)"
style="cursor: pointer; color: red"
>
{{ scope.row.TotalCount }}
</div>
</template>
</el-table-column>
<el-table-column prop="address" width="200" label="操作">
<template slot-scope="scope">
<el-tooltip
class="item"
effect="dark"
content="编辑"
placement="top"
>
<img
@click="editNews(scope.row)"
style="width: 32px; height: 32px"
src="../../assets/img/userman/edit.png"
alt=""
/>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="删除"
placement="top-start"
>
<img
@click="delNews(scope.row)"
style="width: 32px; height: 32px; margin: 0 10px"
src="../../assets/img/userman/del.png"
alt=""
/>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<el-pagination
style="text-align: right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
:current-page.sync="msg.pageIndex"
layout="total,prev, pager, next"
:total="total"
>
</el-pagination>
</div>
</template>
<template v-else>
<div class="head-title">
<span
@click="isShowAdd = false"
style="color: rgb(64, 158, 255); cursor: pointer"
>奖项列表</span
><span style="margin: 0 9px; color: #c0c4cc">/</span
><span>编辑奖项</span>
</div>
<div class="content">
<el-form
label-width="120px"
:model="addMsg"
:rules="rules"
ref="addMsg"
>
<el-form-item label="奖项名称" class="is-required" prop="Name">
<el-input
type="text"
class="w400"
v-model="addMsg.Name"
size="small"
placeholder="奖项名称"
maxlength="100"
>
</el-input>
</el-form-item>
<el-form-item
label="大奖章"
size="small"
class="is-required"
prop="BigIco"
>
<el-button @click="openImageChoose(1)" size="small"
>选择大奖章</el-button
>
<div
class="app-gallery-item"
style="
position: relative;
width: 100px;
margin-top: 10px;
border: none;
"
>
<img
v-if="!addMsg.BigIco || addMsg.BigIco == ''"
src="../../assets/img/default.png"
style="width: 80px; height: 80px"
alt=""
/>
<img
v-else
style="width: 80px; height: 80px"
:src="addMsg.BigIco"
alt=""
/>
</div>
</el-form-item>
<el-form-item
label="小奖章"
size="small"
class="is-required"
prop="SmallIco"
>
<el-button @click="openImageChoose(2)" size="small"
>选择小奖章</el-button
>
<div
class="app-gallery-item"
style="
position: relative;
width: 100px;
margin-top: 10px;
border: none;
"
>
<img
v-if="!addMsg.SmallIco || addMsg.SmallIco == ''"
src="../../assets/img/default.png"
style="width: 80px; height: 80px"
alt=""
/>
<img
v-else
style="width: 80px; height: 80px"
:src="addMsg.SmallIco"
alt=""
/>
</div>
</el-form-item>
<el-form-item
label="年份"
size="small"
class="is-required"
prop="YearInfo"
>
<el-select
v-model="addMsg.YearInfo"
filterable
placeholder="请选择"
>
<el-option
v-for="item in yearOptions"
:key="item.name"
:label="item.name"
:value="item.name"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<el-button
size="small"
style="margin-top: 20px; padding: 9px 25px"
type="primary"
@click="submitform('addMsg')"
>保存
</el-button>
</template>
<!-- 选择文件 -->
<el-dialog title="选择文件" :visible.sync="isShowImage" width="1240px">
<ChooseImg @SelectId="SelectId"></ChooseImg>
</el-dialog>
</div>
</template>
<script>
import ChooseImg from "@/components/global/ChooseImg.vue";
import UE from "@/components/global/UE.vue";
export default {
components: {
ChooseImg,
UE,
},
data() {
return {
loading: false,
msg: {
pageIndex: 1,
pageSize: 10,
Name: "",
},
total: 0,
tableData: [], //数据列表
isShowImage: false, //是否显示选择图片弹窗
isShowAdd: false, //是否显示新增
addMsg: {
Id: 0, //主键编号
BigIco: "", //大奖章
SmallIco: "", //小奖章
Name: "", //品牌分类标题
// BrandList: [], //关联的品牌列表
YearInfo: "",
},
rules: {
Name: [
{
required: true,
message: "请输入奖项名称",
trigger: "blur",
},
],
BigIco: [
{
required: true,
message: "请选择大奖章",
trigger: "blur",
},
],
SmallIco: [
{
required: true,
message: "请选择小奖章",
trigger: "blur",
},
],
YearInfo: [
{
required: true,
message: "请选择年份",
trigger: "blur",
},
],
},
brandMsg: {
pageIndex: 1,
pageSize: 9999,
BrandName: "", //品牌名
ProjectType: 0, //商铺性质
Plumbing: -1, //上下水（0-否1-有）
Caliber: -1, //管径（0-否1-有）
Sewage: -1, //排污（0-否1-有）
RanQi: -1, //燃气（0-否1-有）
DianLiang: "", //电量（0-否1-有）
PaiYan: -1, //排烟量（0-否1-有）
KongTiao: -1, //空调（0-否1-有）
XinFeng: -1, //新风（0-否1-有）
BrandClassId: 0, //分类
ExcelEnumIds: [],
UserId: 0, //用户认证
},
openImage: 1, //判断当前（大/小）奖章
yearOptions: [
{
name: 2010,
},
],
};
},
created() {
this.getList();
// this.getBrandList();
this.getYearList(5);
},
methods: {
SelectId(msg) {
let url = this.getIconLink(msg.url);
if (this.openImage === 1) {
this.addMsg.BigIco = url;
} else if (this.openImage === 2) {
this.addMsg.SmallIco = url;
}
this.isShowImage = false;
},
clearMsg() {
this.addMsg.Id = 0;
this.addMsg.BigIco = "";
this.addMsg.SmallIco = "";
this.addMsg.BrandList = [];
this.addMsg.Name = "";
this.addMsg.YearInfo = "";
},
getList() {
this.loading = true;
this.apipost("/api/Trade/GetPrizePageList", this.msg, (res) => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
let pageData = res.data.data.pageData;
this.tableData = pageData;
}
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
//删除品牌分类
delNews(item) {
let that = this;
that.Confirm("是否删除?", function () {
that.apipost(
"/api/Trade/RemovePrize",
{
Id: item.Id,
},
(res) => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
} else {
that.Error(res.data.message);
}
}
);
});
},
//获取详情
editNews(item) {
this.isShowAdd = true;
this.addMsg.Id = item.Id;
this.apipost("/api/Trade/GetPrizeDetails", { Id: item.Id }, (res) => {
if (res.data.resultCode == 1) {
this.addMsg.BigIco = res.data.data.BigIco;
this.addMsg.SmallIco = res.data.data.SmallIco;
this.addMsg.Name = res.data.data.Name;
this.addMsg.YearInfo = res.data.data.YearInfo;
// this.addMsg.BrandList = [];
// res.data.data.BrandList.map((e) => {
// this.addMsg.BrandList.push(e.ID);
// });
} else {
this.Error(res.data.message);
}
});
}, //新增修改
submitform(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
// let msg = JSON.parse(JSON.stringify(this.addMsg));
// msg.BrandList = [];
// this.addMsg.BrandList.forEach((e) => {
// msg.BrandList.push({ ID: e });
// });
this.apipost("/api/Trade/GetSetPrize", this.addMsg, (res) => {
if (res.data.resultCode == 1) {
this.isShowAdd = false;
this.getList();
this.clearMsg();
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
});
} else {
return false;
}
});
},
//获取品牌列表
getBrandList() {
this.apipost("/api/Trade/GetBrandPageList", this.brandMsg, (res) => {
if (res.data.resultCode == 1) {
this.brandOptions = res.data.data.pageData;
} else {
this.Error(res.data.message);
}
});
},
openImageChoose(type) {
this.isShowImage = true;
this.openImage = type;
},
jumpBrandList(item) {
// this.apipost("/api/Trade/GetPrizeDetails", { Id: id }, (res) => {
// if (res.data.resultCode == 1) {
// } else {
// this.Error(res.data.message);
// }
// });
// query: { data: res.data.data.BrandList, readonly: 1 },
if (item.TotalCount > 0) {
this.$router.push({
path: "/firstStoreApply",
});
}
},
getYearList(n) {
let date = new Date();
let year = date.getFullYear();
this.yearOptions = [];
for (let i = year - n; i < year + n; i++) {
this.yearOptions.push({
name: i,
});
}
},
},
mounted() {},
};
</script>
<style>
.brandClassification .remark_name {
color: #888888;
font-size: 12px;
margin-left: 10px;
float: right;
}
.brandClassification .app-image {
background-position: center center;
width: 50px;
height: 50px;
border-radius: 0%;
float: left;
margin-right: 8px;
}
.brandClassification .blue {
color: #409eff;
}
.brandClassification .content .searchInput {
border: 1px solid #dcdfe6;
border-radius: 4px;
}
.brandClassification .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
.brandClassification .content .searchInput {
line-height: normal;
display: inline-table;
width: 100%;
border-collapse: separate;
border-spacing: 0;
width: 250px;
margin-right: 20px;
}
.brandClassification .content {
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
.brandClassification .el-form-item__content {
line-height: 0;
}
</style>
src/components/tradePavilion/tradePavilionIndex.vue
View file @ 95afc04f
<style>
.offlineIndex {
.offlineIndex {
height: 100%;
display: flex;
-webkit-box-orient: horizontal;
......@@ -14,16 +14,16 @@
box-sizing: border-box;
min-width: 0;
font-size: 14px;
}
}
.offlineIndex .mainLeftMenu {
.offlineIndex .mainLeftMenu {
position: relative;
display: flex;
flex-direction: row;
color: #fff;
}
}
.offlineIndex .leftMenu1 {
.offlineIndex .leftMenu1 {
background: #444444;
cursor: pointer;
width: 200px;
......@@ -33,17 +33,17 @@
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
}
.offlineIndex .asideInner {
.offlineIndex .asideInner {
background: rgba(0, 0, 0, 0.15);
padding: 6px 6px;
width: 100%;
border-radius: 3px;
font-weight: bold;
}
}
.offlineIndex .F_Logo {
.offlineIndex .F_Logo {
height: 60px;
background: #464d54;
color: #f2f2f2;
......@@ -53,25 +53,25 @@
padding: 0 15px;
display: flex;
align-items: center;
}
}
.offlineIndex .mainRightContent {
.offlineIndex .mainRightContent {
width: 100%;
height: 100%;
background-color: #f3f3f3;
min-width: 0;
}
}
.offlineIndex .mainRightTop {
.offlineIndex .mainRightTop {
width: 100%;
height: 60px;
background: #fff;
display: flex;
justify-content: space-between;
color: #909399;
}
}
.offlineIndex .mainRightLeft {
.offlineIndex .mainRightLeft {
width: 110px;
height: 60px;
line-height: 62px;
......@@ -80,37 +80,37 @@
cursor: pointer;
position: relative;
top: -2px;
}
}
.offlineIndex .marinRightList {
.offlineIndex .marinRightList {
display: flex;
flex-wrap: wrap;
align-items: center;
width: 300px;
float: right;
}
}
.offlineIndex .marinRightList ul {
.offlineIndex .marinRightList ul {
display: flex;
width: 100%;
justify-content: space-around;
}
}
.offlineIndex .marinRightList ul li {
.offlineIndex .marinRightList ul li {
display: block;
list-style-type: none;
cursor: pointer;
color: #909399;
outline: none;
border: none;
}
}
.offlineIndex .main_routerPage {
.offlineIndex .main_routerPage {
padding: 20px;
overflow-y: scroll;
}
}
.offlineIndex .FsettingUU {
.offlineIndex .FsettingUU {
position: fixed;
width: 200px;
height: 100%;
......@@ -120,15 +120,15 @@
overflow: auto;
z-index: 5;
background-color: rgb(84, 92, 100);
}
}
.offlineIndex .FsettingUU .menu_item {
.offlineIndex .FsettingUU .menu_item {
font-size: 14px;
color: #303133;
padding: 0 20px;
cursor: pointer;
-webkit-transition: border-color .3s, background-color .3s, color .3s;
transition: border-color .3s, background-color .3s, color .3s;
-webkit-transition: border-color 0.3s, background-color 0.3s, color 0.3s;
transition: border-color 0.3s, background-color 0.3s, color 0.3s;
box-sizing: border-box;
height: 56px;
line-height: 56px;
......@@ -137,40 +137,41 @@
color: #fff;
display: flex;
align-items: center;
}
}
.offlineIndex .FsettingUU .menu_item i {
.offlineIndex .FsettingUU .menu_item i {
margin-right: 5px;
width: 24px;
text-align: center;
font-size: 18px;
vertical-align: middle;
color: #909399;
}
}
.offlineIndex .menu_item:hover {
.offlineIndex .menu_item:hover {
background-color: rgba(67, 74, 80, 0);
}
}
.offlineIndex .F_Logo:hover {
.offlineIndex .F_Logo:hover {
background-color: #30353a;
color: #fff;
}
}
.offlineIndex .Fchecked {
.offlineIndex .Fchecked {
color: rgb(255, 208, 75) !important;
}
}
.offlineIndex .Fchecked i {
.offlineIndex .Fchecked i {
color: rgb(255, 208, 75) !important;
}
}
</style>
<template>
<div class="offlineIndex">
<div class="mainLeftMenu">
<div class="leftMenu1">
<div class="F_Logo">
<div class="asideInner" @click="CommonJump('mallIndex')">{{currentUser.MallName}}
<div class="asideInner" @click="CommonJump('mallIndex')">
{{ currentUser.MallName }}
</div>
</div>
<ul class="FsettingUU">
......@@ -178,28 +179,46 @@
@click="isChecked='/companyList',CommonJump('companyList')">
<i class="el-icon-menu"></i><span>公司资料</span>
</li> -->
<li class="menu_item" :class="{'Fchecked':isChecked=='/contactus'}"
@click="isChecked='/contactus',CommonJump('contactus')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/contactus' }"
@click="(isChecked = '/contactus'), CommonJump('contactus')"
>
<i class="el-icon-menu"></i><span>联系我们</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/activityType'}"
@click="isChecked='/activityType',CommonJump('activityType')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/activityType' }"
@click="(isChecked = '/activityType'), CommonJump('activityType')"
>
<i class="el-icon-menu"></i><span>活动类型管理</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/tradeactivityList'}"
@click="isChecked='/tradeactivityList',CommonJump('tradeactivityList')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/tradeactivityList' }"
@click="
(isChecked = '/tradeactivityList'),
CommonJump('tradeactivityList')
"
>
<i class="el-icon-menu"></i><span>活动列表</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/newsList'}"
@click="isChecked='/newsList',CommonJump('newsList')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/newsList' }"
@click="(isChecked = '/newsList'), CommonJump('newsList')"
>
<i class="el-icon-menu"></i><span>新闻列表</span>
</li>
<!-- <li class="menu_item" :class="{'Fchecked':isChecked=='/serviceTypeList'}"
@click="isChecked='/serviceTypeList',CommonJump('serviceTypeList')">
<i class="el-icon-menu"></i><span>服务类型列表</span>
</li> -->
<li class="menu_item" :class="{'Fchecked':isChecked=='/consultList'}"
@click="isChecked='/consultList',CommonJump('consultList')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/consultList' }"
@click="(isChecked = '/consultList'), CommonJump('consultList')"
>
<i class="el-icon-menu"></i><span>咨询管理</span>
</li>
<!-- <li class="menu_item" :class="{'Fchecked':isChecked=='/investmentList'}"
......@@ -210,38 +229,84 @@
@click="isChecked='/procurementList',CommonJump('procurementList')">
<i class="el-icon-menu"></i><span>采购管理</span>
</li> -->
<li class="menu_item" :class="{'Fchecked':isChecked=='/VehicleManagement'}"
@click="isChecked='/VehicleManagement',CommonJump('VehicleManagement')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/VehicleManagement' }"
@click="
(isChecked = '/VehicleManagement'),
CommonJump('VehicleManagement')
"
>
<i class="el-icon-menu"></i><span>载体管理</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/realAuthentication'}"
@click="isChecked='/realAuthentication',CommonJump('realAuthentication')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/realAuthentication' }"
@click="
(isChecked = '/realAuthentication'),
CommonJump('realAuthentication')
"
>
<i class="el-icon-menu"></i><span>企业认证</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/brandClassification'}"
@click="isChecked='/brandClassification',CommonJump('brandClassification')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/brandClassification' }"
@click="
(isChecked = '/brandClassification'),
CommonJump('brandClassification')
"
>
<i class="el-icon-menu"></i><span>品牌分类</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/brandManagement'}"
@click="isChecked='/brandManagement',CommonJump('brandManagement')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/brandManagement' }"
@click="
(isChecked = '/brandManagement'), CommonJump('brandManagement')
"
>
<i class="el-icon-menu"></i><span>品牌管理</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/firstStoreApply'}"
@click="isChecked='/firstStoreApply',CommonJump('firstStoreApply')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/firstStoreApply' }"
@click="
(isChecked = '/firstStoreApply'), CommonJump('firstStoreApply')
"
>
<i class="el-icon-menu"></i><span>首店申请</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/wishList'}"
@click="isChecked='/wishList',CommonJump('wishList')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/wishList' }"
@click="(isChecked = '/wishList'), CommonJump('wishList')"
>
<i class="el-icon-menu"></i><span>心愿列表</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/billboardList'}"
@click="isChecked='/billboardList',CommonJump('billboardList')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/billboardList' }"
@click="(isChecked = '/billboardList'), CommonJump('billboardList')"
>
<i class="el-icon-menu"></i><span>榜单管理</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='registrationLogin'}"
@click="isChecked='registrationLogin',CommonJump('registrationLogin')">
<li
class="menu_item"
:class="{ Fchecked: isChecked == 'registrationLogin' }"
@click="
(isChecked = 'registrationLogin'), CommonJump('registrationLogin')
"
>
<i class="el-icon-menu"></i><span>榜单报名表单</span>
</li>
<li
class="menu_item"
:class="{ Fchecked: isChecked == '/prizeMange' }"
@click="(isChecked = '/prizeMange'), CommonJump('prizeMange')"
>
<i class="el-icon-menu"></i><span>奖项管理</span>
</li>
</ul>
</div>
</div>
......@@ -250,8 +315,9 @@
<div class="mainRightLeft">贸易服务</div>
<div class="marinRightList">
<ul>
<li style="display:none">缓存</li>
<li style="display:none"> title="教程管理">
<li style="display: none">缓存</li>
<li style="display: none">
title="教程管理">
<el-dropdown trigger="click">
<span class="el-dropdown-link">
教程管理<i class="el-icon-arrow-down el-icon--right"></i>
......@@ -264,51 +330,59 @@
<li :title="currentUser.MallName">
<el-dropdown trigger="click">
<span class="el-dropdown-link">
{{currentUser.MallName}}<i class="el-icon-arrow-down el-icon--right"></i>
{{ currentUser.MallName
}}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item disabled>{{currentUser.MallName}}</el-dropdown-item>
<el-dropdown-item disabled>{{currentUser.Account}}({{currentUser.MobilePhone}})</el-dropdown-item>
<el-dropdown-item @click.native="CommonJump('index')">返回系统</el-dropdown-item>
<el-dropdown-item disabled>{{
currentUser.MallName
}}</el-dropdown-item>
<el-dropdown-item disabled
>{{ currentUser.Account }}({{
currentUser.MobilePhone
}})</el-dropdown-item
>
<el-dropdown-item @click.native="CommonJump('index')"
>返回系统</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</li>
</ul>
</div>
</div>
<div class="main_routerPage" :style="{height: Height+'px'}">
<div class="main_routerPage" :style="{ height: Height + 'px' }">
<router-view />
</div>
</div>
</div>
</template>
<script>
export default {
export default {
data() {
return {
currentUser: {},
isChecked: '',
isChecked: "",
Height: 0,
ERPEmpId: 0,
};
},
created() {
this.currentUser = this.getLocalStorage();
this.ERPEmpId = this.currentUser.ERPEmpId
this.ERPEmpId = this.currentUser.ERPEmpId;
this.isChecked = this.$route.path;
if (this.$route.query.FIndex) {
this.CommonJump('companyList');
this.isChecked = '/companyList'
this.CommonJump("companyList");
this.isChecked = "/companyList";
}
},
methods: {},
mounted() {
this.Height = document.documentElement.clientHeight - 60;
//监听浏览器窗口变化　
//监听浏览器窗口变化
window.onresize = () => {
this.Height = document.documentElement.clientHeight - 60
}
}
this.Height = document.documentElement.clientHeight - 60;
};
},
};
</script>
src/router/index.js
View file @ 95afc04f
......@@ -722,17 +722,17 @@ export default new Router({
name: 'newsList',
component: resolve => require(['@/components/tradePavilion/newsList'], resolve),
},
 //贸易管理--榜单报名
      {
        path: '/registrationLogin',
        name: 'registrationLogin',
        component: resolve => require(['@/components/tradePavilion/registrationLogin'], resolve),
      },
//贸易管理--榜单报名
{
path: '/registrationLogin',
name: 'registrationLogin',
component: resolve => require(['@/components/tradePavilion/registrationLogin'], resolve),
},
//贸易管理--新增榜单报名
{
path: '/registrationAdd',
        name: 'registrationAdd',
        component: resolve => require(['@/components/tradePavilion/registrationAdd'], resolve),
name: 'registrationAdd',
component: resolve => require(['@/components/tradePavilion/registrationAdd'], resolve),
},
//贸易管理--服务类型
{
......@@ -812,6 +812,12 @@ export default new Router({
name: 'firstStoreDetail',
component: resolve => require(['@/components/tradePavilion/firstStoreDetail'], resolve),
},
//贸易管理--奖项列表
{
path: '/prizeMange',
name: 'prizeMange',
component: resolve => require(['@/components/tradePavilion/prizeMange'], resolve),
},
//贸易管理--榜单管理
{
path: '/billboardList',
......
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