Skip to content

E
ElectricitySheep
Commit 10a10f36 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents e3cc6715 a8fbc07a
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 102 deletions
src/components/StoreDesign/minipage.vue
View file @ 10a10f36
<style>
.mimipage .el-tabs__header{
padding: 0 20px;
height: 56px;
line-height: 56px;
background-color: #fff;
margin-bottom:15px;
}
.mimipage .panelDiv{
display: flex;
flex-wrap: wrap;
}
.mimipage .panel_item{
background-color: #fff;
width: 33%;
min-height: 185px;
margin-bottom: 10px;
position: relative;
padding: 20px;
margin-right: 0.33%;
}
.mimipage .panel_name{
background-color: #F4F4F5;
color: #909399;
width: auto;
display: inline-block;
padding: 0 10px;
height: 32px;
line-height: 32px;
text-align: center;
font-size: 12px;
border-radius: 3px;
border: 1px solid #E0E0E3;
margin-bottom: 5px;
}
.mimipage .el-form-item{
margin-bottom:0;
}
.mimipage .el-tabs__header {
padding: 0 20px;
height: 56px;
line-height: 56px;
background-color: #fff;
margin-bottom: 15px;
}
.mimipage .panelDiv {
display: flex;
flex-wrap: wrap;
}
.mimipage .panel_item {
background-color: #fff;
width: 33%;
min-height: 185px;
margin-bottom: 10px;
position: relative;
padding: 20px;
margin-right: 0.33%;
}
.mimipage .panel_name {
background-color: #F4F4F5;
color: #909399;
width: auto;
display: inline-block;
padding: 0 10px;
height: 32px;
line-height: 32px;
text-align: center;
font-size: 12px;
border-radius: 3px;
border: 1px solid #E0E0E3;
margin-bottom: 5px;
}
.mimipage .el-form-item {
margin-bottom: 0;
}
</style>
<template>
<div class="mimipage">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane v-for="(item,index) in dataList" :label="item.PageTypeName" :name="item.PageTypeId+''" :key="index">
<div class="panelDiv">
<div class="panel_item" v-for="(subItem,subIndex) in item.SubMenuList" :key="subIndex">
<div class="panel_name">
<span v-if="subItem.SelfPageName">{{subItem.SelfPageName}}</span>
<span v-else>{{subItem.PageName}} </span>
</div>
<el-form label-width="50px">
<el-form-item label="路径">
<span>{{subItem.PageUrl}}</span>
</el-form-item>
<el-form-item label="参数1" v-if="subItem.IsParameter==1">
<el-input size="small" v-model="subItem.ParameterValue" :placeholder="subItem.TipText"></el-input>
</el-form-item>
</el-form>
<div class="panel_item" v-for="(subItem,subIndex) in item.SubMenuList" :key="subIndex">
<div class="panel_name">
<span v-if="subItem.SelfPageName">{{subItem.SelfPageName}}</span>
<span v-else>{{subItem.PageName}} </span>
</div>
<el-form label-width="50px">
<el-form-item label="路径">
<span>{{subItem.PageUrl}}</span>
</el-form-item>
<el-form-item label="参数1" v-if="subItem.IsParameter==1">
<el-input size="small" v-model="subItem.ParameterValue" :placeholder="subItem.TipText"></el-input>
</el-form-item>
</el-form>
</div>
</div>
</el-tab-pane>
</el-tabs>
......@@ -75,10 +80,12 @@
},
methods: {
handleClick(tab, event) {
},
getList() {
this.apipost("/api/Tenant/GetMiniprogramPageListExt", {}, res => {
this.apipost("/api/Tenant/GetMiniprogramPageListExt", {
IsHiddenGoods: 1
}, res => {
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
} else {
......@@ -91,4 +98,5 @@
this.getList();
}
};
</script>
src/components/StoreDesign/minititle.vue
View file @ 10a10f36
<style>
.mimititle .mimitBody{
padding:20px;
.mimititle .mimitBody {
padding: 20px;
background-color: #fff;
margin:10px 0 20px 0;
display:table;
width:100%;
margin: 10px 0 20px 0;
display: table;
width: 100%;
}
.mimititle .mimitList{
margin-bottom:15px;
.mimititle .mimitList {
margin-bottom: 15px;
display: flex;
flex-direction: row;
}
.mimititle .mimitBody .el-tag{
.mimititle .mimitBody .el-tag {
min-width: 120px;
padding-right: 50px;
}
.mimititle .el-button--small{
padding:9px 25px;
.mimititle .el-button--small {
padding: 9px 25px;
}
</style>
<template>
<div class="mimititle">
<div class="CommonHeader">页面标题设置</div>
<div class="mimitBody">
<template v-for="(item,index) in dataList">
<div class="el-col el-col-12 mimitList" :key="index">
<el-tag>{{item.firstItem.PageName}}</el-tag>
<el-input type="text" style="margin:0 20px;" v-model="item.firstItem.SelfPageName" size="small"></el-input>
</div>
<div class="el-col el-col-12 mimitList" :key="index+1000">
<el-tag v-if="item.secondItem">{{item.secondItem.PageName}}</el-tag>
<el-input v-if="item.secondItem" v-model="item.secondItem.SelfPageName" type="text" style="margin:0 20px;" size="small"></el-input>
</div>
</template>
<template v-for="(item,index) in dataList">
<div class="el-col el-col-12 mimitList" :key="index">
<el-tag>{{item.firstItem.PageName}}</el-tag>
<el-input type="text" style="margin:0 20px;" v-model="item.firstItem.SelfPageName" size="small"></el-input>
</div>
<div class="el-col el-col-12 mimitList" :key="index+1000">
<el-tag v-if="item.secondItem">{{item.secondItem.PageName}}</el-tag>
<el-input v-if="item.secondItem" v-model="item.secondItem.SelfPageName" type="text" style="margin:0 20px;"
size="small"></el-input>
</div>
</template>
</div>
<el-button size="small" type="primary" @click="submitForm()">保存</el-button>
<el-button size="small" @click="resetInfo()">恢复默认</el-button>
......@@ -52,7 +57,9 @@
methods: {
getList() {
this.dataList = [];
this.apipost("/api/Tenant/GetMiniprogramPageListExt", {}, res => {
this.apipost("/api/Tenant/GetMiniprogramPageListExt", {
IsHiddenGoods: 1
}, res => {
if (res.data.resultCode == 1) {
var data = res.data.data;
var myArray = [];
......@@ -126,14 +133,14 @@
},
//恢复默认
resetInfo(){
resetInfo() {
if (this.dataList && this.dataList.length > 0) {
this.dataList.forEach(item => {
if (item.firstItem) {
item.firstItem.SelfPageName=''
item.firstItem.SelfPageName = ''
}
if (item.secondItem) {
item.secondItem.SelfPageName=''
item.secondItem.SelfPageName = ''
}
})
}
......@@ -143,4 +150,5 @@
this.getList();
}
};
</script>
\ No newline at end of file
</script>
src/components/common/chooseMenu.vue
View file @ 10a10f36
......@@ -2,16 +2,24 @@
<div class="chooseMenu">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane v-for="(item,index) in dataList" :label="item.PageTypeName" :name="item.PageTypeId+''" :key="index">
<div style="height:450px;overflow:scroll">
<div style="height:450px;overflow:scroll;line-height:normal;" v-if="item.PageTypeId!=6">
<template v-for="(subItem,subIndex) in item.SubMenuList">
<div :key="subIndex" style="margin-bottom:10px;">
<el-checkbox v-model="subItem.IsChecked" :key="subIndex" @change="checkMenuChange(subItem)">
<span v-if="subItem.SelfPageName">{{subItem.SelfPageName}}</span>
<span v-else>{{subItem.PageName}} </span>
</el-checkbox>
</div>
<div :key="subIndex" style="margin-bottom:10px;">
<el-checkbox v-model="subItem.IsChecked" :key="subIndex" @change="checkMenuChange(subItem)">
<span v-if="subItem.SelfPageName">{{subItem.SelfPageName}}</span>
<span v-else>{{subItem.PageName}} </span>
</el-checkbox>
</div>
</template>
</div>
<div style="height:450px;overflow:scroll" v-else>
<el-input placeholder="输入关键字进行过滤" style="width:99%;margin-bottom:10px;" v-model="filterText">
</el-input>
<el-tree :data="item.SubMenuList" node-key="PageId" ref="tree" :props="defaultProps" filter
:filter-node-method="filterNode" @check="handleCheck"
:check-strictly="true" show-checkbox>
</el-tree>
</div>
</el-tab-pane>
</el-tabs>
</div>
......@@ -21,10 +29,21 @@
data() {
return {
dataList: [],
activeName: "1"
activeName: "1",
filterText: '',
defaultProps: {
children: 'SubMenuList',
label: 'PageName'
},
checkedObj:{}
};
},
created() {},
watch: {
filterText(val) {
this.$refs.tree[0].filter(val.trim());
}
},
methods: {
//复选框选择
checkMenuChange(subItem) {
......@@ -35,6 +54,8 @@
subItem.IsChecked = false;
})
}
//清空商品选择
// this.$refs.tree[0].setCheckedKeys([]);
});
}
subItem.IsChecked = !subItem.IsChecked;
......@@ -47,19 +68,26 @@
ParameterValue: "",
PageName: ""
};
if (this.dataList && this.dataList.length > 0) {
this.dataList.forEach(item => {
if (item.SubMenuList && item.SubMenuList.length > 0) {
item.SubMenuList.forEach(subItem => {
if (subItem.IsChecked) {
obj.PageUrl = subItem.PageUrl;
obj.IsParameter = subItem.IsParameter;
obj.ParameterValue = subItem.ParameterValue;
obj.PageName = subItem.PageName;
}
})
}
});
if(this.activeName!=6){
if (this.dataList && this.dataList.length > 0) {
this.dataList.forEach(item => {
if (item.SubMenuList && item.SubMenuList.length > 0) {
item.SubMenuList.forEach(subItem => {
if (subItem.IsChecked) {
obj.PageUrl = subItem.PageUrl;
obj.IsParameter = subItem.IsParameter;
obj.ParameterValue = subItem.ParameterValue;
obj.PageName = subItem.PageName;
}
})
}
});
}
}else{
obj.PageUrl=this.checkedObj.PageUrl
obj.IsParameter=this.checkedObj.IsParameter
obj.ParameterValue=this.checkedObj.ParameterValue
obj.PageName=this.checkedObj.PageName;
}
return obj;
},
......@@ -84,6 +112,18 @@
}
})
},
filterNode(value, data) {
if (!value) return true;
return data.PageName.indexOf(value) !== -1;
},
//check单选
handleCheck (a, b) {
//a为传递给 data 属性的数组中该节点所对应的对象；b为树目前的选中状态对象
if (b.checkedKeys.length > 0) {
this.$refs.tree[0].setCheckedKeys([a.PageId]);
this.checkedObj=a;
}
},
},
mounted() {
this.getList();
......
src/components/sallCenter/addAutoreleaseCoupon.vue
View file @ 10a10f36
......@@ -49,7 +49,7 @@
<div style="flex-wrap: wrap;" flex="dir:left">
<div flex="dir:top cross:center" class="user-item" v-for="(item,index) in UserList" :label="item.Id" :key="index">
<img :src="item.Photo" alt="" class="avatar">
<div class="username">{{item.AliasName}}</div>
<div class="username">{{item.Name}}</div>
<button type="button" class="el-button close el-button--danger is-circle" @click="delUserList(index)"><i class="el-icon-close"></i></button>
</div>
</div>
......@@ -62,7 +62,7 @@
<!--选择用户-->
<el-dialog title="选择用户" :visible.sync="category" width="612px">
<div class="el-input el-input--small el-input-group el-input-group--append">
<input type="text" autocomplete="off" placeholder="输入用户ID、昵称搜索" class="el-input__inner" v-model="msg_t.AliasName">
<input type="text" autocomplete="off" placeholder="输入用户ID、昵称搜索" class="el-input__inner" v-model="msg_t.Name">
<div class="el-input-group__append"><button type="button" class="el-button el-button--default" @click="search"><!----><!----><span>搜索</span></button></div>
</div>
<el-table
......@@ -91,7 +91,7 @@
</template>
</el-table-column>
<el-table-column
prop="AliasName"
prop="Name"
label="昵称"
show-overflow-tooltip>
</el-table-column>
......@@ -140,7 +140,7 @@
msg_t:{
pageIndex:1,
pageSize:10,
AliasName:''
Name:''
},
count:0,
loading:false,
......
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