From f5ddb92449864f311230288f062660f1bd064c95 Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Wed, 3 Apr 2024 14:46:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=9B=AD=E5=8C=BA=EF=BC=8C=EF=BC=8C=E5=95=86=E6=88=B7?= =?UTF-8?q?=EF=BC=8C=EF=BC=8C=E7=94=B5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 4 +-- components/dot/index.js | 24 +++++++++++++ components/dot/index.json | 4 +++ components/dot/index.wxml | 3 ++ components/dot/index.wxss | 10 ++++++ pages/home/index.js | 62 ++++++++++++++++----------------- pages/home/index.wxml | 18 ++++++---- pages/my/index.js | 19 +++++----- pages/my/index.json | 3 +- pages/my/index.wxml | 9 ++++- pages/my/index.wxss | 5 +++ pages/rechargeDetail/index.js | 2 -- pages/rechargeRecord/index.js | 54 ++++++++++++++++++++++------ pages/rechargeRecord/index.wxml | 8 ++--- service/user.js | 5 +++ utils/index.js | 5 ++- utils/system.js | 21 +++++++++++ 17 files changed, 188 insertions(+), 68 deletions(-) create mode 100644 components/dot/index.js create mode 100644 components/dot/index.json create mode 100644 components/dot/index.wxml create mode 100644 components/dot/index.wxss create mode 100644 utils/system.js diff --git a/app.json b/app.json index a30484f..f470c25 100644 --- a/app.json +++ b/app.json @@ -1,10 +1,10 @@ { "pages": [ - "pages/rechargeRecord/index", "pages/home/index", + "pages/my/index", + "pages/rechargeRecord/index", "pages/invoiceList/index", "pages/waitApprove/index", - "pages/my/index", "pages/apply/index", "pages/member/index", "pages/handleLogin/index", diff --git a/components/dot/index.js b/components/dot/index.js new file mode 100644 index 0000000..0859d85 --- /dev/null +++ b/components/dot/index.js @@ -0,0 +1,24 @@ +// components/dot/index.js +Component({ + + /** + * 组件的属性列表 + */ + properties: { + number: Number, + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) \ No newline at end of file diff --git a/components/dot/index.json b/components/dot/index.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/dot/index.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/dot/index.wxml b/components/dot/index.wxml new file mode 100644 index 0000000..93b0870 --- /dev/null +++ b/components/dot/index.wxml @@ -0,0 +1,3 @@ + + {{ number }} + 99+ diff --git a/components/dot/index.wxss b/components/dot/index.wxss new file mode 100644 index 0000000..fd4927c --- /dev/null +++ b/components/dot/index.wxss @@ -0,0 +1,10 @@ +/* components/dot/index.wxss */ +.dot { + background-color: #ee0a24; + width: 56rpx; + height: 56rpx; + border-radius: 50%; + text-align: center; + color: #fff; + font-size: 28rpx; +} \ No newline at end of file diff --git a/pages/home/index.js b/pages/home/index.js index c7eebb8..ab15993 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -3,6 +3,7 @@ import { getOwnTenementList } from "../../service/tenement"; import { getUserInfo } from "../../service/user"; import { alertError, alertInfo } from "../../utils/index"; import request from '../../utils/request'; +import { getDot } from "../../utils/system"; const { OK } = request; // pages/home/index.js Page({ @@ -52,30 +53,15 @@ Page({ }, async changeMeter() { const { meterList = [], meterIndex, tenement = {} } = this.data; - let newIndex = meterIndex + 1; - if (newIndex === meterList.length) { - newIndex = 0; - } - const { code, message, data } = getMeterDetail({ code: meterList[newIndex]?.code, tenement: tenement.id }) - if (code !== OK) { - alertInfo(message) - return - } - meterList[newIndex] = { ...data.meter, money: data.money }; this.setData({ - meterIndex: newIndex, - meterList + columns: meterList.map(item => { item.id = item.code; item.name = `${item.code} - ${item.address}`; return item; }), + show: true, + pickerType: "meter" }) }, async refreshMeter() { - const { meterIndex } = this.data; - const { code, message, data } = getMeterDetail({ code: meterList[newIndex].id, tenement: tenement.id }) - if (code !== OK) { - alertInfo(message) - return - } - meterList[meterIndex] = { ...data.meter, money: data.money }; - this.setData({ meterList }) + const { meter } = this.data; + this.handleGetMeterDetail(meter.code); }, onOk(e) { const { type, index, value } = e.detail; @@ -102,6 +88,18 @@ Page({ tenement: value }) } + if (type === "meter") { + const { code, id } = e.detail.value; + this.handleGetMeterDetail(code) + } + }, + async handleGetMeterDetail(meterCode) { + const { tenement } = this.data; + const { code, message, data } = await getMeterDetail({ tenement, code: meterCode }); + this.setData({ + tenement: data, + show: false, + }) }, onCancel() { this.setData({ @@ -115,7 +113,7 @@ Page({ }) }, onChangeMoney(e) { - this.setData({ money: Number(e.detail) }) + this.setData({ money: e.detail ? Number(e.detail) : e.detail }) }, recharge() { const { user, money } = this.data; @@ -136,6 +134,7 @@ Page({ this.setUser(); this.getAllList(); this.watchTenement(); + getDot(); }, watchTenement() { const that = this; @@ -151,18 +150,19 @@ Page({ set: function (newVal) { const oldValue = value; value = newVal; - // that.getMeters(newVal); + that.getMeters(newVal); } }); }, async getMeters({ id }) { const { code, message, data } = await getTenementMeterList(id); - if (code !== OK) { - alertError(message) - return; - } + // if (code !== OK) { + // alertError(message) + // return; + // } this.setData({ - meterList: data || [] + meterList: data || [], + meter: data?.[0] || {} }) }, async setUser() { @@ -178,10 +178,10 @@ Page({ }, async getAllList() { const { code, message, data } = await getOwnTenementList() - if (code !== OK) { - alertInfo(message) - return - } + // if (code !== OK) { + // alertInfo(message) + // return + // } const [firstPark = {}] = data; const { park, tenement } = this.data; const updateDatas = {} diff --git a/pages/home/index.wxml b/pages/home/index.wxml index 1a37d3e..4bffd7b 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -32,9 +32,10 @@ - 华昌宝能 - 软c307 + 华昌宝能 - 软c307 + -- - + 切换电表 @@ -42,17 +43,20 @@ 电表编号： - 15151515 + {{meter.code}} + -- 电表地址： - 软C307 + {{meter.address}} + -- 电表余额： - 200 - + {{meter.money}} + --- + 刷新 @@ -80,7 +84,7 @@ - 去缴费 + 去缴费 diff --git a/pages/my/index.js b/pages/my/index.js index 9c83602..4cd9ebb 100644 --- a/pages/my/index.js +++ b/pages/my/index.js @@ -46,15 +46,16 @@ 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() { const result = await getUserInfo(); diff --git a/pages/my/index.json b/pages/my/index.json index 8b2f35a..d53986f 100644 --- a/pages/my/index.json +++ b/pages/my/index.json @@ -3,7 +3,8 @@ "van-cell": "@vant/weapp/cell/index", "van-cell-group": "@vant/weapp/cell-group/index", "cell": "/components/cell/index", - "van-dialog": "@vant/weapp/dialog/index" + "van-dialog": "@vant/weapp/dialog/index", + "dot": "/components/dot/index" }, "navigationBarTitleText": "我的" } \ No newline at end of file diff --git a/pages/my/index.wxml b/pages/my/index.wxml index be369e6..eda91f7 100644 --- a/pages/my/index.wxml +++ b/pages/my/index.wxml @@ -7,7 +7,14 @@ - + + + + 成员管理 + + + + - - + + {{ tenementName }} 全部 - + - 合计： 3000元 + 合计： {{amount}}元 diff --git a/service/user.js b/service/user.js index 8edabb7..a96c7f7 100644 --- a/service/user.js +++ b/service/user.js @@ -49,4 +49,9 @@ export const userApply = async function(data) { // 获取所有的园区和商户 export const getUserParksAndTenementsList = async function() { return await GET('/wx/getUserParksAndTenementsList'); +} + +// 获取所有未阅读的用户数 +export const getUnReadApproveNumber = async function() { + return await GET('/wx/getApproveNumber'); } \ No newline at end of file diff --git a/utils/index.js b/utils/index.js index fa494ac..e492a39 100644 --- a/utils/index.js +++ b/utils/index.js @@ -1,3 +1,5 @@ + + /** 每次系统加载的时候判断是否有发版 */ export function checkUpgrade() { if (wx.canIUse('getUpdateManager')) { @@ -216,4 +218,5 @@ export const wxModal = (data) => { } }) }) -} \ No newline at end of file +} + diff --git a/utils/system.js b/utils/system.js new file mode 100644 index 0000000..9bf6022 --- /dev/null +++ b/utils/system.js @@ -0,0 +1,21 @@ +import { getUnReadApproveNumber } from "../service/user"; +import request from '../utils/request' +const { OK } = request + + +export const getDot = async () => { + const user = wx.getStorageSync('user') + if (!user || !user.id) { + return; + } + const { code, message, data } = await getUnReadApproveNumber(); + if (data > 0) { + wx.showTabBarRedDot({ + index: 1, + }) + } else { + wx.hideTabBarRedDot({ + index: 1, + }) + } +} \ No newline at end of file