Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
X
xundao
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiaoyao
xundao
Commits
a74a404f
Commit
a74a404f
authored
Oct 15, 2022
by
xiaochenghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 支持分享
parent
a5da8ef5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
pages/index/index.js
pages/index/index.js
+0
-1
pages/wuxingres/index.js
pages/wuxingres/index.js
+4
-4
pages/wuxingres/index.wxml
pages/wuxingres/index.wxml
+1
-1
No files found.
pages/index/index.js
View file @
a74a404f
import
calendarFormatter
from
'
../../utils/calendarFormatter
'
;
import
{
formatTime
}
from
'
../../utils/util
'
;
import
{
formatTime
}
from
'
../../utils/util
'
;
const
DATAH
=
[];
const
DATAH
=
[];
...
...
pages/wuxingres/index.js
View file @
a74a404f
import
calendarFormatter
from
'
../../utils/calendarFormatter
'
;
import
calendarFormatter
from
'
../../utils/calendarFormatter
'
;
import
{
formatTime
}
from
'
../../utils/util
'
;
import
*
as
echarts
from
'
../../components/ec-canvas/echarts
'
;
import
*
as
echarts
from
'
../../components/ec-canvas/echarts
'
;
const
G
=
[
"
甲
"
,
"
乙
"
,
"
丙
"
,
"
丁
"
,
"
戊
"
,
"
己
"
,
"
庚
"
,
"
辛
"
,
"
壬
"
,
"
癸
"
]
const
G
=
[
"
甲
"
,
"
乙
"
,
"
丙
"
,
"
丁
"
,
"
戊
"
,
"
己
"
,
"
庚
"
,
"
辛
"
,
"
壬
"
,
"
癸
"
]
...
@@ -21,6 +20,7 @@ Page({
...
@@ -21,6 +20,7 @@ Page({
valueDate
:
undefined
,
valueDate
:
undefined
,
valueH
:
undefined
,
valueH
:
undefined
,
flag
:
false
,
flag
:
false
,
pengyouquan
:
false
,
res
:
{},
res
:
{},
dataH
:
DATAH
,
dataH
:
DATAH
,
wuxing
:
{
wuxing
:
{
...
@@ -48,8 +48,8 @@ Page({
...
@@ -48,8 +48,8 @@ Page({
},
},
onLoad
(
e
)
{
onLoad
(
e
)
{
const
{
valueDate
,
valueH
,
flag
}
=
e
;
const
{
valueDate
,
valueH
,
flag
,
pengyouquan
}
=
e
;
this
.
setData
({
valueDate
,
valueH
,
flag
:
flag
===
'
1
'
});
this
.
setData
({
valueDate
,
valueH
,
flag
:
flag
===
'
1
'
,
pengyouquan
:
pengyouquan
===
'
1
'
});
},
},
onShow
(){
onShow
(){
...
@@ -75,7 +75,7 @@ Page({
...
@@ -75,7 +75,7 @@ Page({
const
{
valueDate
,
valueH
}
=
this
.
data
;
const
{
valueDate
,
valueH
}
=
this
.
data
;
return
{
return
{
title
:
'
我的八字与五行分布
'
,
title
:
'
我的八字与五行分布
'
,
query
:
`valueDate=
${
valueDate
}
&valueH=
${
valueH
}
`
,
query
:
`valueDate=
${
valueDate
}
&valueH=
${
valueH
}
&pengyouquan=1
`
,
}
}
},
},
...
...
pages/wuxingres/index.wxml
View file @
a74a404f
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
</view>
</view>
<view>
<view>
<button wx:if="{{res.gzYear && flag}}" type="primary" open-type="share" class="button">分享给好友</button>
<button wx:if="{{res.gzYear && flag}}" type="primary" open-type="share" class="button">分享给好友</button>
<button wx:if="{{res.gzYear}}" type="default" class="button" bind:tap="goback">{{ flag ? '重新计算' : '我也算算'}}</button>
<button wx:if="{{res.gzYear
&& !pengyouquan
}}" type="default" class="button" bind:tap="goback">{{ flag ? '重新计算' : '我也算算'}}</button>
</view>
</view>
</view>
</view>
...
...
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