Commit 18ef6b4b by chenweisong

营销模块改bug

parent 3a705431
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
id="table" id="table"
class="rolling-table tableDetails" class="rolling-table tableDetails"
ref="tableBoxDetails" ref="tableBoxDetails"
:style="{height: maxHeight + 'px',overflow: overflowStyle, zIndex: -1}" :style="{height: maxHeight + 'px',overflow: overflowStyle, zIndex: 600}"
> >
<table v-if="isShowTable" class="table" cellpadding="0" cellspacing="0" ref="table"> <table v-if="isShowTable" class="table" cellpadding="0" cellspacing="0" ref="table">
<thead ref="theadDetails"> <thead ref="theadDetails">
...@@ -952,7 +952,6 @@ ...@@ -952,7 +952,6 @@
} }
, ,
async created() { async created() {
await this.isInRiseList();
this.areaId = this.userInfo.aid; this.areaId = this.userInfo.aid;
this.selectArea.level = Number(this.userInfo.level) + 1; this.selectArea.level = Number(this.userInfo.level) + 1;
this.selectArea.areaId = this.userInfo.aid; this.selectArea.areaId = this.userInfo.aid;
...@@ -960,8 +959,24 @@ ...@@ -960,8 +959,24 @@
let origin = this.$route.query.origin; let origin = this.$route.query.origin;
if (origin && origin === "p0") { if (origin && origin === "p0") {
this.public = false; this.public = false;
this.userInfo = {
account: this.$route.query.account, // "XUSHENG1",
aid: this.$route.query.aid, // 18411, //地区id
areaId: this.$route.query.areaId, // 731, //地区id
area: this.$route.query.area, // "A_长沙", 地区名
id: this.$route.query.id, // "OCxusheng1", 用户id
level: parseInt(this.$route.query.level), // 等级 ,0 是省,1 是市,2 是区或者分公司
phone: this.$route.query.phone, // "13873110056",
pid: this.$route.query.pid, // 0, 上级id
username: this.$route.query.username
}// "徐胜", 用户名 account: "", // "XUSHENG1",
this.selectArea.level = Number(this.userInfo.level) + 1;
this.selectArea.areaId = this.userInfo.aid;
this.selectArea.selectAreaName = this.userInfo.area;
this.areaId = this.userInfo.aid;
} else { } else {
this.public = true; this.public = true;
await this.isInRiseList();
this.isExistedCollect(); this.isExistedCollect();
} }
await this.fetchCategory(); await this.fetchCategory();
...@@ -1144,10 +1159,11 @@ ...@@ -1144,10 +1159,11 @@
.list { .list {
background-color: #fff; background-color: #fff;
z-index: 1; z-index: 998;
width: 1.8rem; width: 1.8rem;
border: 1px solid #cccccc; border: 1px solid #cccccc;
overflow: hidden; overflow: hidden;
position: relative;
ul { ul {
li { li {
......
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
id="table" id="table"
class="rolling-table tableDetails" class="rolling-table tableDetails"
ref="tableBoxDetails" ref="tableBoxDetails"
:style="{height: maxHeight + 'px',overflow: overflowStyle, zIndex: -1}" :style="{height: maxHeight + 'px',overflow: overflowStyle, zIndex: 600}"
> >
<table v-if="isShowTable" class="table" cellpadding="0" cellspacing="0" ref="table"> <table v-if="isShowTable" class="table" cellpadding="0" cellspacing="0" ref="table">
<thead ref="theadDetails"> <thead ref="theadDetails">
...@@ -952,7 +952,6 @@ ...@@ -952,7 +952,6 @@
} }
, ,
async created() { async created() {
await this.isInRiseList();
this.areaId = this.userInfo.aid; this.areaId = this.userInfo.aid;
this.selectArea.level = Number(this.userInfo.level) + 1; this.selectArea.level = Number(this.userInfo.level) + 1;
this.selectArea.areaId = this.userInfo.aid; this.selectArea.areaId = this.userInfo.aid;
...@@ -960,8 +959,24 @@ ...@@ -960,8 +959,24 @@
let origin = this.$route.query.origin; let origin = this.$route.query.origin;
if (origin && origin === "p0") { if (origin && origin === "p0") {
this.public = false; this.public = false;
this.userInfo = {
account: this.$route.query.account, // "XUSHENG1",
aid: this.$route.query.aid, // 18411, //地区id
areaId: this.$route.query.areaId, // 731, //地区id
area: this.$route.query.area, // "A_长沙", 地区名
id: this.$route.query.id, // "OCxusheng1", 用户id
level: parseInt(this.$route.query.level), // 等级 ,0 是省,1 是市,2 是区或者分公司
phone: this.$route.query.phone, // "13873110056",
pid: this.$route.query.pid, // 0, 上级id
username: this.$route.query.username
}// "徐胜", 用户名 account: "", // "XUSHENG1",
this.selectArea.level = Number(this.userInfo.level) + 1;
this.selectArea.areaId = this.userInfo.aid;
this.selectArea.selectAreaName = this.userInfo.area;
this.areaId = this.userInfo.aid;
} else { } else {
this.public = true; this.public = true;
await this.isInRiseList();
this.isExistedCollect(); this.isExistedCollect();
} }
await this.fetchCategory(); await this.fetchCategory();
...@@ -1144,10 +1159,11 @@ ...@@ -1144,10 +1159,11 @@
.list { .list {
background-color: #fff; background-color: #fff;
z-index: 1; z-index: 998;
width: 1.8rem; width: 1.8rem;
border: 1px solid #cccccc; border: 1px solid #cccccc;
overflow: hidden; overflow: hidden;
position: relative;
ul { ul {
li { li {
......
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