diff --git a/app.js b/app.js index 371edf6..e590e9d 100644 --- a/app.js +++ b/app.js @@ -6,27 +6,27 @@ function share() { const view = pages[pages.length - 1]; if (view) { wx.showShareMenu() + view.onShareAppMessage = () => { + return { + title: "", + path: "/pages/home/index", + imageUrl: "/assets/images/share.png" + } + } } + }) } -// app.js App({ onShow() { checkUpgrade(); }, onLaunch() { - // wx.showShareMenu() - // share() + share() const { api } = getConfigByEnv(); this.globalData = { ...this.globalData, api, } }, - // onShareAppMessage:function(){ - // wx.showShareMenu({ - // withShareTicket:true, - // menu:['shareAppMessage','shareTimeline'] - // }) - // }, globalData: { primaryColor: '#52c41a' } diff --git a/app.json b/app.json index 28d92db..eed1179 100644 --- a/app.json +++ b/app.json @@ -30,7 +30,8 @@ "pages/aid/consult/index", "pages/integral/index", "pages/discountCoupon/index", - "pages/integralRecord/index" + "pages/integralRecord/index", + "pages/meterList/index" ], "subPackages": [ { diff --git a/assets/images/share.png b/assets/images/share.png new file mode 100644 index 0000000..14ac491 Binary files /dev/null and b/assets/images/share.png differ diff --git a/pages/home/index.js b/pages/home/index.js index d80532a..8b39029 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -124,6 +124,20 @@ Page({ onChangeMoney(e) { this.setData({ money: e.detail }) }, + jumpToMeterList() { + const { tenement, user } = this.data; + if (!user) { + alertInfo("请先登录") + return + } + if (!tenement) { + alertInfo("请先选择商户") + return + } + wx.navigateTo({ + url: '/pages/meterList/index?id=' + tenement?.id, + }) + }, async recharge() { const { user, money, meter, tenement, park } = this.data; if (!user || !user.id) { diff --git a/pages/home/index.wxml b/pages/home/index.wxml index a081e7b..8eed4f2 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -62,9 +62,20 @@ {{meter.money}} --- - - - 刷新 + + + + + + 刷新 + diff --git a/pages/invoicing/index.js b/pages/invoicing/index.js index 6430222..49df63d 100644 --- a/pages/invoicing/index.js +++ b/pages/invoicing/index.js @@ -33,7 +33,7 @@ Page({ alertInfo(message) return; } - if (!data?.tenement?.id || !data?.name || !data?.phone || !data?.email) { + if (!data?.id) { const user = wx.getStorageSync('user') if (user.isAdmin) { wx.showModal({ diff --git a/pages/invoicing/index.wxml b/pages/invoicing/index.wxml index 8529c37..86883ff 100644 --- a/pages/invoicing/index.wxml +++ b/pages/invoicing/index.wxml @@ -73,7 +73,7 @@ + + \ No newline at end of file diff --git a/pages/meterList/index.wxss b/pages/meterList/index.wxss new file mode 100644 index 0000000..c7df75e --- /dev/null +++ b/pages/meterList/index.wxss @@ -0,0 +1 @@ +/* pages/meterList/index.wxss */ \ No newline at end of file