Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hu-shoujijingfen-h5
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenweisong
hu-shoujijingfen-h5
Commits
18ef6b4b
Commit
18ef6b4b
authored
Aug 29, 2020
by
chenweisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
营销模块改bug
parent
3a705431
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
6 deletions
+38
-6
gridMarketing.vue
src/views/app/gridMarketing.vue
+19
-3
gridMarketing2.vue
src/views/app/gridMarketing2.vue
+19
-3
No files found.
src/views/app/gridMarketing.vue
View file @
18ef6b4b
...
...
@@ -103,7 +103,7 @@
id=
"table"
class=
"rolling-table tableDetails"
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"
>
<thead
ref=
"theadDetails"
>
...
...
@@ -952,7 +952,6 @@
}
,
async
created
()
{
await
this
.
isInRiseList
();
this
.
areaId
=
this
.
userInfo
.
aid
;
this
.
selectArea
.
level
=
Number
(
this
.
userInfo
.
level
)
+
1
;
this
.
selectArea
.
areaId
=
this
.
userInfo
.
aid
;
...
...
@@ -960,8 +959,24 @@
let
origin
=
this
.
$route
.
query
.
origin
;
if
(
origin
&&
origin
===
"p0"
)
{
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
{
this
.
public
=
true
;
await
this
.
isInRiseList
();
this
.
isExistedCollect
();
}
await
this
.
fetchCategory
();
...
...
@@ -1144,10 +1159,11 @@
.list
{
background-color
:
#fff
;
z-index
:
1
;
z-index
:
998
;
width
:
1.8rem
;
border
:
1px
solid
#cccccc
;
overflow
:
hidden
;
position
:
relative
;
ul
{
li
{
...
...
src/views/app/gridMarketing2.vue
View file @
18ef6b4b
...
...
@@ -103,7 +103,7 @@
id=
"table"
class=
"rolling-table tableDetails"
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"
>
<thead
ref=
"theadDetails"
>
...
...
@@ -952,7 +952,6 @@
}
,
async
created
()
{
await
this
.
isInRiseList
();
this
.
areaId
=
this
.
userInfo
.
aid
;
this
.
selectArea
.
level
=
Number
(
this
.
userInfo
.
level
)
+
1
;
this
.
selectArea
.
areaId
=
this
.
userInfo
.
aid
;
...
...
@@ -960,8 +959,24 @@
let
origin
=
this
.
$route
.
query
.
origin
;
if
(
origin
&&
origin
===
"p0"
)
{
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
{
this
.
public
=
true
;
await
this
.
isInRiseList
();
this
.
isExistedCollect
();
}
await
this
.
fetchCategory
();
...
...
@@ -1144,10 +1159,11 @@
.list
{
background-color
:
#fff
;
z-index
:
1
;
z-index
:
998
;
width
:
1.8rem
;
border
:
1px
solid
#cccccc
;
overflow
:
hidden
;
position
:
relative
;
ul
{
li
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment