Commit a74a404f authored by xiaochenghua's avatar xiaochenghua

feat: 支持分享

parent a5da8ef5
import calendarFormatter from '../../utils/calendarFormatter';
import {formatTime} from '../../utils/util'; import {formatTime} from '../../utils/util';
const DATAH = []; const DATAH = [];
......
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`,
} }
}, },
......
...@@ -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>
......
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