diff --git a/pages/billList/index.js b/pages/billList/index.js index 2c67d1d..2412005 100644 --- a/pages/billList/index.js +++ b/pages/billList/index.js @@ -33,13 +33,33 @@ Page({ }, jumpToDetail(e) { const { id: report } = e.currentTarget.dataset - wx.navigateTo({ - url: '/pages/billDetail/index?id=' + report, - }) + const { id: tenement } = wx.getStorageSync('tenement') + // wx.navigateTo({ + // url: '/pages/billDetail/index?id=' + report, + // }) // const { id: tenement } = wx.getStorageSync('tenement') // wx.navigateTo({ // url: `https://zgd.hbhcbn.com/h5/?report=${report}&tenement=${tenement}`, // }) + wx.showModal({ + title: '提示', + content: '为了您更好的体验,请复制链接,通过浏览器打开下载', + showCancel: true, + cancelText: '关闭', + confirmText: '复制链接', + + complete: (res) => { + if (res.cancel) { + + } + + if (res.confirm) { + wx.setClipboardData({ + data: `https://zgd.hbhcbn.com/h5/?report=${report}&tenement=${tenement}`, + }) + } + } + }) }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/pages/invoiceList/components/notyet/index.js b/pages/invoiceList/components/notyet/index.js index 55a8dfd..8abbe57 100644 --- a/pages/invoiceList/components/notyet/index.js +++ b/pages/invoiceList/components/notyet/index.js @@ -68,12 +68,13 @@ Component({ // chooseList: newList, selectList: newSelectList, selectCount, - selectMoney + selectMoney: Number(selectMoney.toFixed(2)) }) }, next() { const { selectList, list, selectMoney, selectCount } = this.data; let tenementID = ""; + let tenementName = ""; let ids = []; for(let i = 0; i < selectList.length; i ++) { if (selectList[i]) { @@ -81,6 +82,7 @@ Component({ ids.push(list[i]?.id); if (!tenementID) { tenementID = currentTenementID; + tenementName = list[i]?.tenement?.name; } else if(tenementID !== currentTenementID) { alertInfo("只能对一个公司开票") return; @@ -88,7 +90,7 @@ Component({ } } wx.navigateTo({ - url: `/pages/invoicing/index?money=${selectMoney}&count=${selectCount}&tenement=${tenementID}&ids=${ids}`, + url: `/pages/invoicing/index?money=${selectMoney}&count=${selectCount}&tenement=${tenementID}&ids=${ids}&tenementName=${tenementName}`, }) } } diff --git a/pages/invoicing/index.js b/pages/invoicing/index.js index 8b781e9..a8f13fd 100644 --- a/pages/invoicing/index.js +++ b/pages/invoicing/index.js @@ -12,6 +12,7 @@ Page({ data: { money: 0, tenement: "", + tenementName: "", ids: [], count: 0, show: false, @@ -22,8 +23,9 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - const { money = 10, tenement, ids = 'q', count = 10 } = options; - this.setData({ money, tenement, ids: ids.split(","), count }) + console.log('options', options) + const { money = 0, tenement, ids = '', count = 0, tenementName } = options; + this.setData({ money, tenement, ids: ids.split(","), count, tenementName }) this.getDetail(); }, async getDetail() { @@ -42,9 +44,6 @@ Page({ */ onReady() { - }, - onSubmit() { - console.log('----------') }, /** * 生命周期函数--监听页面显示 diff --git a/pages/invoicing/index.wxml b/pages/invoicing/index.wxml index 8cc9c6b..d510195 100644 --- a/pages/invoicing/index.wxml +++ b/pages/invoicing/index.wxml @@ -104,7 +104,7 @@ >