diff --git a/app.json b/app.json index d8d6094..a9cdc5d 100644 --- a/app.json +++ b/app.json @@ -1,14 +1,14 @@ { "pages": [ - "pages/login/index", "pages/home/index", + "pages/invoiceList/index", + "pages/member/index", + "pages/login/index", + "pages/handleLogin/index", "pages/my/index", "pages/rechargeRecord/index", - "pages/invoiceList/index", "pages/waitApprove/index", "pages/apply/index", - "pages/member/index", - "pages/handleLogin/index", "pages/qrCode/index", "pages/meterList/index", "pages/recharge/index", diff --git a/pages/handleLogin/index.js b/pages/handleLogin/index.js index a3f2c6a..a078e0b 100644 --- a/pages/handleLogin/index.js +++ b/pages/handleLogin/index.js @@ -71,7 +71,6 @@ Page({ alertInfo("请输入你的昵称") return } - let err = "" loadingFunc(async () => { const wxLoginCode = await wxLogin() const { code, message, data } = await userValidate({ park, tenement, phone, name, code: wxLoginCode }) diff --git a/pages/invoiceList/components/info/index.js b/pages/invoiceList/components/info/index.js index 0b71c49..18dfc10 100644 --- a/pages/invoiceList/components/info/index.js +++ b/pages/invoiceList/components/info/index.js @@ -1,3 +1,5 @@ +import { getInvoiceInfoList } from "../../../../service/invoice" + // pages/invoiceList/components/info/index.js Component({ @@ -7,7 +9,11 @@ Component({ properties: { }, - + lifetimes: { + attached() { + getInvoiceInfoList() + } + }, /** * 组件的初始数据 */ diff --git a/pages/invoiceList/components/notyet/index.js b/pages/invoiceList/components/notyet/index.js index 5050bb7..f84d1c2 100644 --- a/pages/invoiceList/components/notyet/index.js +++ b/pages/invoiceList/components/notyet/index.js @@ -12,13 +12,24 @@ Component({ * 组件的初始数据 */ data: { - + chooseList: [] }, /** * 组件的方法列表 */ methods: { - + onChange(e) { + const { id } = e.currentTarget.dataset; + let newList = this.data.chooseList; + if (e.detail) { + newList = [...new Set([...newList, id])] + } else { + newList = newList.filter(item => item !== id); + } + this.setData({ + chooseList: newList, + }) + } } }) \ No newline at end of file diff --git a/pages/invoiceList/components/notyet/index.json b/pages/invoiceList/components/notyet/index.json index e8cfaaf..cee4dba 100644 --- a/pages/invoiceList/components/notyet/index.json +++ b/pages/invoiceList/components/notyet/index.json @@ -1,4 +1,6 @@ { "component": true, - "usingComponents": {} + "usingComponents": { + "van-checkbox": "@vant/weapp/checkbox/index" + } } \ No newline at end of file diff --git a/pages/invoiceList/components/notyet/index.wxml b/pages/invoiceList/components/notyet/index.wxml index 48f8ab5..c77f163 100644 --- a/pages/invoiceList/components/notyet/index.wxml +++ b/pages/invoiceList/components/notyet/index.wxml @@ -1,2 +1,25 @@ - -pages/invoiceList/components/notyet/index.wxml \ No newline at end of file + + + + + + + + 1月份 + 软C306 + + + 河北创新风华科技有限公司 + + + 2024年1月1日-2024年1月31日 + + + + 待开票 + + + + + + diff --git a/pages/invoiceList/components/notyet/index.wxss b/pages/invoiceList/components/notyet/index.wxss index 9e2d912..2d45ea7 100644 --- a/pages/invoiceList/components/notyet/index.wxss +++ b/pages/invoiceList/components/notyet/index.wxss @@ -1 +1,37 @@ -/* pages/invoiceList/components/notyet/index.wxss */ \ No newline at end of file +/* pages/invoiceList/components/notyet/index.wxss */ +.cardWrapper { + margin: 30rpx 32rpx 30rpx; + position: relative; + padding: 30rpx 40rpx; + background-color: #fff; + border-radius: 20rpx; +} + +.top { + display: flex; +} + +.top .address { + margin-left: 36rpx; +} + +.middle { + margin-top: 26rpx; + font-size: 32rpx; +} + +.bottom { + margin-top: 24rpx; + font-size: 32rpx; +} + +.right { + position: absolute; + top: 0; + right: 0; + font-size: 30rpx; + background-color: rgb(239,227,227); + padding: 14rpx 24rpx; + border-radius: 18rpx; + color: rgb(224, 106, 106) +} \ No newline at end of file diff --git a/pages/invoiceList/index.js b/pages/invoiceList/index.js index bfceda5..dffc733 100644 --- a/pages/invoiceList/index.js +++ b/pages/invoiceList/index.js @@ -40,8 +40,8 @@ Page({ this.init(); }, async init() { - const { data, code, message } = await getInvoiceInfoList() - this.setData({ list: data }) + // const { data, code, message } = await getInvoiceInfoList() + // this.setData({ list: data }) }, operate(e) { const { data } = e.currentTarget.dataset; diff --git a/pages/invoiceList/index.wxss b/pages/invoiceList/index.wxss index 53789f7..e496bac 100644 --- a/pages/invoiceList/index.wxss +++ b/pages/invoiceList/index.wxss @@ -1,15 +1,3 @@ -/* pages/invoiceList/index.wxss */ -.wrapper { - margin-left: 24rpx; - margin-right: 24rpx; -} - -.item { - display: flex; - align-items: center; - margin: 10rpx 0; -} - -.operate { - display: flex; +page { + background-color: rgb(228,240,236); } \ No newline at end of file diff --git a/pages/member/components/memberManage/index.js b/pages/member/components/memberManage/index.js index bf4eb37..7db56f0 100644 --- a/pages/member/components/memberManage/index.js +++ b/pages/member/components/memberManage/index.js @@ -34,10 +34,10 @@ Component({ async init() { const result = await getApproveList(1) const { code, message, data } = result; - // if (code !== OK) { - // alertInfo(message) - // return; - // } + if (code !== OK) { + alertInfo(message) + return; + } this.setData({ list: data }) diff --git a/pages/my/index.js b/pages/my/index.js index 4cd9ebb..fb544eb 100644 --- a/pages/my/index.js +++ b/pages/my/index.js @@ -1,6 +1,7 @@ import { alertInfo } from "../../utils/index"; import Dialog from '@vant/weapp/dialog/dialog'; import { getUserInfo } from "../../service/user"; +import { getDot } from "../../utils/system"; import request from "../../utils/request" const { OK } = request; @@ -46,15 +47,15 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - // const user = wx.getStorageSync('user'); - // if (!user || !user.id) { - // wx.switchTab({ - // url: '/pages/home/index', - // }) - // alertInfo("请先登录"); - // return false; - // } - // this.init() + const user = wx.getStorageSync('user'); + if (!user || !user.id) { + wx.switchTab({ + url: '/pages/home/index', + }) + alertInfo("请先登录"); + return false; + } + this.init() getDot(); }, async init() { diff --git a/utils/system.js b/utils/system.js index 9bf6022..f45f851 100644 --- a/utils/system.js +++ b/utils/system.js @@ -4,11 +4,13 @@ const { OK } = request export const getDot = async () => { + console.log("获取dot数") const user = wx.getStorageSync('user') if (!user || !user.id) { return; } const { code, message, data } = await getUnReadApproveNumber(); + console.log('data', data) if (data > 0) { wx.showTabBarRedDot({ index: 1,