Commit a74a404f authored by xiaochenghua's avatar xiaochenghua

feat: 支持分享

parent a5da8ef5
import calendarFormatter from '../../utils/calendarFormatter';
import {formatTime} from '../../utils/util';
const DATAH = [];
......
import calendarFormatter from '../../utils/calendarFormatter';
import {formatTime} from '../../utils/util';
import * as echarts from '../../components/ec-canvas/echarts';
const G = ["","","","","","","","","",""]
......@@ -21,6 +20,7 @@ Page({
valueDate: undefined,
valueH: undefined,
flag: false,
pengyouquan: false,
res: {},
dataH: DATAH,
wuxing: {
......@@ -48,8 +48,8 @@ Page({
},
onLoad(e) {
const { valueDate, valueH, flag } = e;
this.setData({valueDate, valueH, flag: flag === '1' });
const { valueDate, valueH, flag, pengyouquan } = e;
this.setData({valueDate, valueH, flag: flag === '1', pengyouquan: pengyouquan === '1' });
},
onShow(){
......@@ -75,7 +75,7 @@ Page({
const { valueDate, valueH } = this.data;
return {
title: '我的八字与五行分布',
query: `valueDate=${valueDate}&valueH=${valueH}`,
query: `valueDate=${valueDate}&valueH=${valueH}&pengyouquan=1`,
}
},
......
......@@ -30,7 +30,7 @@
</view>
<view>
<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>
......
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