Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
schedule
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
fengzhaoyu
schedule
Commits
0e09ffc8
Commit
0e09ffc8
authored
Apr 21, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into release/1.0.0
parents
8fd89f52
ad210a73
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
8 deletions
+4
-8
app.js
app.js
+0
-3
index.axml
pages/index/index.axml
+2
-1
index.js
pages/index/index.js
+2
-4
No files found.
app.js
View file @
0e09ffc8
import
{
setGlobalStore
}
from
"dd-store"
;
import
{
setGlobalStore
}
from
"dd-store"
;
import
exampleStore
from
"./stores/exampleStore"
;
import
exampleStore
from
"./stores/exampleStore"
;
import
{
checkFullScren
}
from
"./utils/checkFullScren"
;
setGlobalStore
(
exampleStore
);
setGlobalStore
(
exampleStore
);
import
login
from
"./api/login"
;
import
login
from
"./api/login"
;
...
@@ -9,14 +8,12 @@ App({
...
@@ -9,14 +8,12 @@ App({
// 第一次打开
// 第一次打开
// options.query == {number:1}
// options.query == {number:1}
login
();
login
();
this
.
globalData
.
isFullScren
=
checkFullScren
;
},
},
onShow
(
options
)
{
onShow
(
options
)
{
// 从后台被 scheme 重新打开
// 从后台被 scheme 重新打开
// options.query == {number:1}
// options.query == {number:1}
},
},
globalData
:
{
globalData
:
{
isFullScren
:
false
,
loading
:
false
,
loading
:
false
,
token
:
""
,
token
:
""
,
avatar
:
""
,
avatar
:
""
,
...
...
pages/index/index.axml
View file @
0e09ffc8
...
@@ -148,5 +148,5 @@
...
@@ -148,5 +148,5 @@
<text class="iconfont iconicon_add1"></text>
<text class="iconfont iconicon_add1"></text>
</view>
</view>
</view>
</view>
<template is="fullScreen" data="{{isIPX:is
Fullscreen
}}" />
<template is="fullScreen" data="{{isIPX:is
IPX
}}" />
</view>
</view>
\ No newline at end of file
pages/index/index.js
View file @
0e09ffc8
...
@@ -19,6 +19,7 @@ import {
...
@@ -19,6 +19,7 @@ import {
padZero
,
padZero
,
getCreateShowTime
getCreateShowTime
}
from
"../../utils/utils"
;
}
from
"../../utils/utils"
;
import
{
checkFullScren
}
from
"../../utils/checkFullScren"
;
const
currentDate
=
new
Date
();
const
currentDate
=
new
Date
();
const
minYear
=
2020
;
const
minYear
=
2020
;
const
maxYear
=
currentDate
.
getFullYear
()
+
1
;
const
maxYear
=
currentDate
.
getFullYear
()
+
1
;
...
@@ -44,7 +45,7 @@ create.Page({
...
@@ -44,7 +45,7 @@ create.Page({
current
:
1
,
current
:
1
,
pages
:
1
,
pages
:
1
,
listLoading
:
true
,
listLoading
:
true
,
is
Fullscreen
:
false
is
IPX
:
checkFullScren
()
},
},
scrollTop
:
0
,
scrollTop
:
0
,
pageSize
:
10
,
pageSize
:
10
,
...
@@ -96,9 +97,6 @@ create.Page({
...
@@ -96,9 +97,6 @@ create.Page({
)}
`
)}
`
});
});
}
}
this
.
setData
({
isFullscreen
:
getApp
().
globalData
.
isFullscreen
});
dd
.
setNavigationBar
({
dd
.
setNavigationBar
({
title
:
"动态"
title
:
"动态"
});
});
...
...
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