diff --git a/app.json b/app.json index 4e4188f..4cec556 100644 --- a/app.json +++ b/app.json @@ -1,17 +1,19 @@ { "pages": [ + "pages/login/index", "pages/invoiceList/index", "pages/rechargeRecord/index", "pages/meterList/index", "pages/recharge/index", - "pages/login/index", "pages/handleLogin/index", "pages/member/index", "pages/my/index", "pages/questions/index", "pages/home/index", "pages/index/index", - "pages/qrCode/index" + "pages/qrCode/index", + "pages/invoiceDetail/index", + "pages/editInvoice/index" ], "tabBar": { "list": [ diff --git a/components/select/index.js b/components/select/index.js index ccb6b40..cb4e7ef 100644 --- a/components/select/index.js +++ b/components/select/index.js @@ -30,7 +30,6 @@ Component({ */ methods: { async onInput(e) { - console.log('this.type', this.data.type) // this.setData({ // visible: true, // list: [e.detail, e.detail, e.detail] diff --git a/pages/editInvoice/index.js b/pages/editInvoice/index.js new file mode 100644 index 0000000..c86c4d0 --- /dev/null +++ b/pages/editInvoice/index.js @@ -0,0 +1,75 @@ +import { getInvoiceInfoDetail } from "../../service/invoice"; + +// pages/invoiceInfo/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + detail: {} + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const { id } = options; + console.log('options', options) + if (id !== "-1") { + this.init(id); + } + }, + async init(id) { + const { code, message, data } = await getInvoiceInfoDetail(id) + this.setData({ detail: data }); + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/editInvoice/index.json b/pages/editInvoice/index.json new file mode 100644 index 0000000..da07a9a --- /dev/null +++ b/pages/editInvoice/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "van-field": "@vant/weapp/field/index", + "van-button": "@vant/weapp/button/index" + } +} \ No newline at end of file diff --git a/pages/editInvoice/index.wxml b/pages/editInvoice/index.wxml new file mode 100644 index 0000000..723d20b --- /dev/null +++ b/pages/editInvoice/index.wxml @@ -0,0 +1,50 @@ + + + + + + + + + + + + 保存 + \ No newline at end of file diff --git a/pages/editInvoice/index.wxss b/pages/editInvoice/index.wxss new file mode 100644 index 0000000..a707d47 --- /dev/null +++ b/pages/editInvoice/index.wxss @@ -0,0 +1,6 @@ +/* pages/editInvoice/index.wxss */ +.operate { + display: flex; + align-items: center; + margin-top: 50rpx; +} \ No newline at end of file diff --git a/pages/invoiceDetail/index.js b/pages/invoiceDetail/index.js new file mode 100644 index 0000000..509c4be --- /dev/null +++ b/pages/invoiceDetail/index.js @@ -0,0 +1,74 @@ +import { getInvoiceInfoDetail } from "../../service/invoice"; + +// pages/invoiceInfo/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + detail: {} + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const { id } = options; + this.init(id); + }, + async init(id) { + const { code, message, data } = await getInvoiceInfoDetail(id) + this.setData({ detail: data }); + }, + handleBack() { + wx.navigateBack() + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/invoiceDetail/index.json b/pages/invoiceDetail/index.json new file mode 100644 index 0000000..da07a9a --- /dev/null +++ b/pages/invoiceDetail/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "van-field": "@vant/weapp/field/index", + "van-button": "@vant/weapp/button/index" + } +} \ No newline at end of file diff --git a/pages/invoiceDetail/index.wxml b/pages/invoiceDetail/index.wxml new file mode 100644 index 0000000..2ba3853 --- /dev/null +++ b/pages/invoiceDetail/index.wxml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + 返回 + 编辑 + \ No newline at end of file diff --git a/pages/invoiceDetail/index.wxss b/pages/invoiceDetail/index.wxss new file mode 100644 index 0000000..19410eb --- /dev/null +++ b/pages/invoiceDetail/index.wxss @@ -0,0 +1,7 @@ +/* pages/invoiceInfo/index.wxss */ + +.operate { + display: flex; + align-items: center; + margin-top: 50rpx; +} \ No newline at end of file diff --git a/pages/invoiceList/index.js b/pages/invoiceList/index.js index ad249cd..bfceda5 100644 --- a/pages/invoiceList/index.js +++ b/pages/invoiceList/index.js @@ -1,3 +1,7 @@ +import { deleteInvoiceInfo, getInvoiceInfoList } from "../../service/invoice"; +import { alertInfo, alertSuccess, wxModal } from "../../utils/index"; +import request from '../../utils/request' +const { OK } = request // pages/invoiceList/index.js Page({ @@ -5,7 +9,14 @@ Page({ * 页面的初始数据 */ data: { - + list: [], + show: false, + actions: [ + { name: '查看', }, + { name: '编辑', }, + { name: '删除', }, + ], + selectData: {} }, /** @@ -26,9 +37,53 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + this.init(); + }, + async init() { + const { data, code, message } = await getInvoiceInfoList() + this.setData({ list: data }) + }, + operate(e) { + const { data } = e.currentTarget.dataset; + this.setData({ + show: true, + selectData: data + }) + }, + onClose() { + this.setData({ show: false, selectData: {} }); + }, + onSelect(e) { + const type = e.detail.name; + switch(type) { + case "编辑": + break; + case "查看": + wx.navigateTo({ + url: '/pages/invoiceDetail/index?id=' + this.data.selectData.id, + }) + break; + case "删除": + this.handleDelete(); + break; + } + }, + async handleDelete() { + const { id } = this.data.selectData; + await wxModal({ content: "确定要删除当前记录吗？" }) + const { code, message } = await deleteInvoiceInfo(id) + if (code !== OK) { + alertInfo(message) + return; + } + alertSuccess("删除成功") + this.init(); + }, + handleCreate() { + wx.navigateTo({ + url: '/pages/editInvoice/index?id=-1', + }) }, - /** * 生命周期函数--监听页面隐藏 */ diff --git a/pages/invoiceList/index.json b/pages/invoiceList/index.json index e6368d1..375f0cb 100644 --- a/pages/invoiceList/index.json +++ b/pages/invoiceList/index.json @@ -1,4 +1,7 @@ { - "usingComponents": {}, + "usingComponents": { + "van-action-sheet": "@vant/weapp/action-sheet/index", + "van-button": "@vant/weapp/button/index" + }, "navigationBarTitleText": "开票信息" } \ No newline at end of file diff --git a/pages/invoiceList/index.wxml b/pages/invoiceList/index.wxml index 41d0dcf..9930cc5 100644 --- a/pages/invoiceList/index.wxml +++ b/pages/invoiceList/index.wxml @@ -1,2 +1,27 @@ -pages/invoiceList/index.wxml \ No newline at end of file + + + {{ item.tenement.name }} + + 操作 + + + + + + 创建一个 + + + + \ No newline at end of file diff --git a/pages/invoiceList/index.wxss b/pages/invoiceList/index.wxss index c164c96..53789f7 100644 --- a/pages/invoiceList/index.wxss +++ b/pages/invoiceList/index.wxss @@ -1 +1,15 @@ -/* pages/invoiceList/index.wxss */ \ No newline at end of file +/* pages/invoiceList/index.wxss */ +.wrapper { + margin-left: 24rpx; + margin-right: 24rpx; +} + +.item { + display: flex; + align-items: center; + margin: 10rpx 0; +} + +.operate { + display: flex; +} \ No newline at end of file diff --git a/pages/member/components/approveMember/index.js b/pages/member/components/approveMember/index.js index 36594a3..f1c6baf 100644 --- a/pages/member/components/approveMember/index.js +++ b/pages/member/components/approveMember/index.js @@ -39,7 +39,6 @@ Component({ }, async agree(e) { const { user } = e.currentTarget.dataset; - console.log('user', user) await wxModal({ content: `同意${user.nickName}的申请？` }) const { code, message } = await approveUser({ userId: user.id, type: 1 }) if (code !== OK) { diff --git a/pages/member/components/memberManage/index.js b/pages/member/components/memberManage/index.js index a81e3f0..758a2bb 100644 --- a/pages/member/components/memberManage/index.js +++ b/pages/member/components/memberManage/index.js @@ -39,7 +39,6 @@ Component({ }, async setAdmin(e) { const { user } = e.currentTarget.dataset; - console.log('user', user) await wxModal({ content: `你的管理员身份将转交给${user.nickName}` }) const { code, message } = await approveUser({ userId: user.id, type: 2 }) if (code !== OK) { diff --git a/pages/recharge/index.js b/pages/recharge/index.js index 4f21762..780ab6d 100644 --- a/pages/recharge/index.js +++ b/pages/recharge/index.js @@ -21,12 +21,10 @@ Page({ */ onLoad(options) { const { tenement, code } = options - console.log('options', options) this.init({ tenement, code }) }, async init(options) { const { code, message, data = {}} = await getMeterDetail(options) - console.log('data', data) this.setData({ detail: data }) diff --git a/pages/rechargeRecord/index.js b/pages/rechargeRecord/index.js index f869b2d..f723f91 100644 --- a/pages/rechargeRecord/index.js +++ b/pages/rechargeRecord/index.js @@ -46,7 +46,6 @@ Page({ }, async init(year) { const { code, message, data } = await getRechargeList(year); - console.log('data', data) this.setData({ list: data }) diff --git a/service/invoice.js b/service/invoice.js index b9a28dc..9a12c31 100644 --- a/service/invoice.js +++ b/service/invoice.js @@ -17,11 +17,16 @@ export const updateInvoiceInfo = async function(data) { } // 删除发票信息 -export const deleteInvoiceInfo = async function(data) { - return await DELETE(`/wx/deleteInvoiceInfo/${id}`, data); +export const deleteInvoiceInfo = async function(id) { + return await DELETE(`/wx/deleteInvoiceInfo/${id}`); } // 获取可开发票列表 export const getInvoiceList = async function() { return await GET(`/wx/getInvoiceList`); +} + +// 获取创建的发开票信息详情 +export const getInvoiceInfoDetail = async function(id) { + return await GET(`/wx/getInvoiceInfoDetail/${id}`); } \ No newline at end of file