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
e90d9907
Commit
e90d9907
authored
Aug 14, 2020
by
chenweisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
营销模块改bug
parent
5865daef
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
gridMarketing.vue
src/views/app/gridMarketing.vue
+13
-5
gridMarketing2.vue
src/views/app/gridMarketing2.vue
+0
-0
No files found.
src/views/app/gridMarketing.vue
View file @
e90d9907
...
...
@@ -8,7 +8,7 @@
<div
class=
"fl selects-date"
@
click=
"changeModel(2)"
>
<selectDate
:value=
"showSelectDateValue"
></selectDate>
</div>
<div
class=
"fr selects-stars"
@
click=
"collectFn"
>
<div
v-if=
"public"
class=
"fr selects-stars"
@
click=
"collectFn"
>
<img
v-if=
"!isStar"
class=
"stars"
src=
"../../assets/app/star.png"
/>
<img
v-if=
"isStar"
class=
"stars"
src=
"../../assets/app/starYellow.png"
/>
</div>
...
...
@@ -21,6 +21,7 @@
</div>
<div
v-if=
"showUpperLevel"
@
click=
"changeUpperLevel"
class=
"upper-level"
>
上一级
</div>
<ModelArea
:public=
"public"
:userInfo=
"userInfo"
:initFlag=
"initFlag"
ref=
"areaRef"
...
...
@@ -178,6 +179,7 @@
},
data
()
{
return
{
public
:
true
,
tabActive
:
REAL_TIME
,
showUpperLevel
:
false
,
isShowTable
:
false
,
...
...
@@ -455,7 +457,7 @@
async
fetch
()
{
let
res
=
null
;
try
{
res
=
await
this
.
post
(
this
.
$urls
.
data
483
,
{});
res
=
await
this
.
post
(
this
.
public
?
this
.
$urls
.
data483
:
this
.
$urls
.
dataPublic
483
,
{});
}
catch
(
error
)
{
console
.
log
(
"error :"
,
error
);
Indicator
.
close
();
...
...
@@ -496,14 +498,14 @@
let
url
=
""
;
let
dateStr
=
""
;
if
(
this
.
tabActive
===
MONTH
)
{
url
=
this
.
$urls
.
data
485
;
url
=
this
.
public
?
this
.
$urls
.
data485
:
this
.
$urls
.
dataPublic
485
;
dateStr
=
formatDateTimeReg
(
new
Date
(
this
.
mouthActiveDate
),
"YYYY-MM-DD mm:ss"
);
}
else
{
// url = this.$urls.data481
url
=
this
.
$urls
.
data
484
;
url
=
this
.
public
?
this
.
$urls
.
data484
:
this
.
$urls
.
dataPublic
484
;
// dateStr = formatDateTimeReg(new Date(), "YYYY-MM-DD mm:ss");
dateStr
=
formatDateTimeReg
(
new
Date
(
this
.
now
),
"YYYY-MM-DD mm:ss"
);
}
...
...
@@ -846,7 +848,13 @@
this
.
selectArea
.
level
=
Number
(
this
.
userInfo
.
level
)
+
1
;
this
.
selectArea
.
areaId
=
this
.
userInfo
.
aid
;
this
.
selectArea
.
selectAreaName
=
this
.
userInfo
.
area
;
this
.
isExistedCollect
();
let
origin
=
this
.
$route
.
query
.
origin
;
if
(
origin
&&
origin
===
"p0"
)
{
this
.
public
=
false
;
}
else
{
this
.
public
=
true
;
this
.
isExistedCollect
();
}
await
this
.
fetch
();
await
this
.
getData
();
}
...
...
src/views/app/gridMarketing2.vue
View file @
e90d9907
This diff is collapsed.
Click to expand it.
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