From 417ba1454cd60b23150308f16e2c0a7aeceb1e26 Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Sun, 7 Apr 2024 14:47:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=85=E5=80=BC=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 6 +- components/navigator/index.js | 3 +- pages/agreements/index.js | 67 ++++++++++++++ pages/agreements/index.json | 3 + pages/agreements/index.wxml | 2 + pages/agreements/index.wxss | 1 + pages/home/index.js | 87 +++++++++++-------- pages/home/index.wxml | 2 +- pages/invoiceList/components/already/index.js | 24 +++++ .../invoiceList/components/already/index.json | 4 + .../invoiceList/components/already/index.wxml | 2 + .../invoiceList/components/already/index.wxss | 1 + pages/invoiceList/components/info/index.js | 24 +++++ pages/invoiceList/components/info/index.json | 4 + pages/invoiceList/components/info/index.wxml | 2 + pages/invoiceList/components/info/index.wxss | 1 + pages/invoiceList/components/notyet/index.js | 24 +++++ .../invoiceList/components/notyet/index.json | 4 + .../invoiceList/components/notyet/index.wxml | 2 + .../invoiceList/components/notyet/index.wxss | 1 + .../components/notyetCard/index.js | 24 +++++ .../components/notyetCard/index.json | 4 + .../components/notyetCard/index.wxml | 2 + .../components/notyetCard/index.wxss | 1 + pages/invoiceList/index.json | 11 ++- pages/invoiceList/index.wxml | 38 +++----- pages/login/index.js | 25 ++++-- pages/login/index.wxml | 2 +- .../member/components/memberManage/index.wxml | 10 --- pages/rechargeRecord/index.js | 10 +-- utils/index.js | 4 +- utils/request.js | 4 + 32 files changed, 302 insertions(+), 97 deletions(-) create mode 100644 pages/agreements/index.js create mode 100644 pages/agreements/index.json create mode 100644 pages/agreements/index.wxml create mode 100644 pages/agreements/index.wxss create mode 100644 pages/invoiceList/components/already/index.js create mode 100644 pages/invoiceList/components/already/index.json create mode 100644 pages/invoiceList/components/already/index.wxml create mode 100644 pages/invoiceList/components/already/index.wxss create mode 100644 pages/invoiceList/components/info/index.js create mode 100644 pages/invoiceList/components/info/index.json create mode 100644 pages/invoiceList/components/info/index.wxml create mode 100644 pages/invoiceList/components/info/index.wxss create mode 100644 pages/invoiceList/components/notyet/index.js create mode 100644 pages/invoiceList/components/notyet/index.json create mode 100644 pages/invoiceList/components/notyet/index.wxml create mode 100644 pages/invoiceList/components/notyet/index.wxss create mode 100644 pages/invoiceList/components/notyetCard/index.js create mode 100644 pages/invoiceList/components/notyetCard/index.json create mode 100644 pages/invoiceList/components/notyetCard/index.wxml create mode 100644 pages/invoiceList/components/notyetCard/index.wxss diff --git a/app.json b/app.json index f470c25..d8d6094 100644 --- a/app.json +++ b/app.json @@ -1,5 +1,6 @@ { "pages": [ + "pages/login/index", "pages/home/index", "pages/my/index", "pages/rechargeRecord/index", @@ -8,15 +9,14 @@ "pages/apply/index", "pages/member/index", "pages/handleLogin/index", - "pages/login/index", "pages/qrCode/index", "pages/meterList/index", "pages/recharge/index", "pages/questions/index", - "pages/index/index", "pages/invoiceDetail/index", "pages/editInvoice/index", - "pages/rechargeDetail/index" + "pages/rechargeDetail/index", + "pages/agreements/index" ], "tabBar": { "list": [ diff --git a/components/navigator/index.js b/components/navigator/index.js index 61e24b9..522c980 100644 --- a/components/navigator/index.js +++ b/components/navigator/index.js @@ -35,7 +35,8 @@ Component({ */ methods: { back() { - this.triggerEvent("back") + // this.triggerEvent("back") + wx.navigateBack(); } } }) \ No newline at end of file diff --git a/pages/agreements/index.js b/pages/agreements/index.js new file mode 100644 index 0000000..3722385 --- /dev/null +++ b/pages/agreements/index.js @@ -0,0 +1,67 @@ +// pages/agreements/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + url: "" + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const { url } = options; + this.setData({ url }); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/agreements/index.json b/pages/agreements/index.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/agreements/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/agreements/index.wxml b/pages/agreements/index.wxml new file mode 100644 index 0000000..fd9cd53 --- /dev/null +++ b/pages/agreements/index.wxml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/pages/agreements/index.wxss b/pages/agreements/index.wxss new file mode 100644 index 0000000..678c29c --- /dev/null +++ b/pages/agreements/index.wxss @@ -0,0 +1 @@ +/* pages/agreements/index.wxss */ \ No newline at end of file diff --git a/pages/home/index.js b/pages/home/index.js index ab15993..6d55951 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -1,7 +1,6 @@ import { getMeterDetail, getMeterList, getTenementMeterList } from "../../service/meter"; import { getOwnTenementList } from "../../service/tenement"; -import { getUserInfo } from "../../service/user"; -import { alertError, alertInfo } from "../../utils/index"; +import { alertInfo } from "../../utils/index"; import request from '../../utils/request'; import { getDot } from "../../utils/system"; const { OK } = request; @@ -52,9 +51,10 @@ Page({ }, async changeMeter() { - const { meterList = [], meterIndex, tenement = {} } = this.data; + const { meterList = [] } = this.data; + const newColumns = meterList.map(item => { item.id = item.code; item.name = `${item.code} - ${item.address}`; return item; }) this.setData({ - columns: meterList.map(item => { item.id = item.code; item.name = `${item.code} - ${item.address}`; return item; }), + columns: newColumns, show: true, pickerType: "meter" }) @@ -66,36 +66,42 @@ Page({ onOk(e) { const { type, index, value } = e.detail; const currentPark = this.data.park; - if (type === "park") { - if (value.id === currentPark?.id) { - this.setData({ show: false }) - return - } - this.setData({ - show: false, - park: value, - tenement: value.tenements?.[0] - }) - } - if (type === "tenement") { - const currentTenement = this.data.tenement; - if (value.id === currentTenement?.id) { - this.setData({ show: false }) - return - } - this.setData({ - show: false, - tenement: value - }) - } - if (type === "meter") { - const { code, id } = e.detail.value; - this.handleGetMeterDetail(code) + switch(type) { + case "park": + // if (value.id === currentPark?.id) { + // this.setData({ show: false }) + // return + // } + this.setData({ + show: false, + park: value, + tenement: value.tenements?.[0] + }) + break; + case "tenement": + const currentTenement = this.data.tenement; + // if (value.id === currentTenement?.id) { + // this.setData({ show: false }) + // return + // } + this.setData({ + show: false, + tenement: value + }) + break; + case "meter": + const { code, id } = e.detail.value; + this.handleGetMeterDetail(code) + break; } }, async handleGetMeterDetail(meterCode) { const { tenement } = this.data; const { code, message, data } = await getMeterDetail({ tenement, code: meterCode }); + if (code !== OK) { + alertInfo(message); + return; + } this.setData({ tenement: data, show: false, @@ -122,6 +128,11 @@ Page({ return } }, + jumpToInvoice() { + wx.navigateTo({ + url: '/pages/invoiceList/index', + }) + }, jumpToLogin() { wx.navigateTo({ url: '/pages/login/index', @@ -148,7 +159,7 @@ Page({ return value; // 返回属性的当前值 }, set: function (newVal) { - const oldValue = value; + // const oldValue = value; value = newVal; that.getMeters(newVal); } @@ -156,10 +167,10 @@ Page({ }, 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 || [], meter: data?.[0] || {} @@ -178,10 +189,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 4bffd7b..38c21f1 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -94,7 +94,7 @@ - + diff --git a/pages/invoiceList/components/already/index.js b/pages/invoiceList/components/already/index.js new file mode 100644 index 0000000..1a97511 --- /dev/null +++ b/pages/invoiceList/components/already/index.js @@ -0,0 +1,24 @@ +// pages/invoiceList/components/already/index.js +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) \ No newline at end of file diff --git a/pages/invoiceList/components/already/index.json b/pages/invoiceList/components/already/index.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/pages/invoiceList/components/already/index.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/invoiceList/components/already/index.wxml b/pages/invoiceList/components/already/index.wxml new file mode 100644 index 0000000..aaac974 --- /dev/null +++ b/pages/invoiceList/components/already/index.wxml @@ -0,0 +1,2 @@ + +pages/invoiceList/components/already/index.wxml \ No newline at end of file diff --git a/pages/invoiceList/components/already/index.wxss b/pages/invoiceList/components/already/index.wxss new file mode 100644 index 0000000..a3c3551 --- /dev/null +++ b/pages/invoiceList/components/already/index.wxss @@ -0,0 +1 @@ +/* pages/invoiceList/components/already/index.wxss */ \ No newline at end of file diff --git a/pages/invoiceList/components/info/index.js b/pages/invoiceList/components/info/index.js new file mode 100644 index 0000000..0b71c49 --- /dev/null +++ b/pages/invoiceList/components/info/index.js @@ -0,0 +1,24 @@ +// pages/invoiceList/components/info/index.js +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) \ No newline at end of file diff --git a/pages/invoiceList/components/info/index.json b/pages/invoiceList/components/info/index.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/pages/invoiceList/components/info/index.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/invoiceList/components/info/index.wxml b/pages/invoiceList/components/info/index.wxml new file mode 100644 index 0000000..f1399e6 --- /dev/null +++ b/pages/invoiceList/components/info/index.wxml @@ -0,0 +1,2 @@ + +pages/invoiceList/components/info/index.wxml \ No newline at end of file diff --git a/pages/invoiceList/components/info/index.wxss b/pages/invoiceList/components/info/index.wxss new file mode 100644 index 0000000..20acb8b --- /dev/null +++ b/pages/invoiceList/components/info/index.wxss @@ -0,0 +1 @@ +/* pages/invoiceList/components/info/index.wxss */ \ No newline at end of file diff --git a/pages/invoiceList/components/notyet/index.js b/pages/invoiceList/components/notyet/index.js new file mode 100644 index 0000000..5050bb7 --- /dev/null +++ b/pages/invoiceList/components/notyet/index.js @@ -0,0 +1,24 @@ +// pages/invoiceList/components/notyet/index.js +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) \ No newline at end of file diff --git a/pages/invoiceList/components/notyet/index.json b/pages/invoiceList/components/notyet/index.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/pages/invoiceList/components/notyet/index.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/invoiceList/components/notyet/index.wxml b/pages/invoiceList/components/notyet/index.wxml new file mode 100644 index 0000000..48f8ab5 --- /dev/null +++ b/pages/invoiceList/components/notyet/index.wxml @@ -0,0 +1,2 @@ + +pages/invoiceList/components/notyet/index.wxml \ No newline at end of file diff --git a/pages/invoiceList/components/notyet/index.wxss b/pages/invoiceList/components/notyet/index.wxss new file mode 100644 index 0000000..9e2d912 --- /dev/null +++ b/pages/invoiceList/components/notyet/index.wxss @@ -0,0 +1 @@ +/* pages/invoiceList/components/notyet/index.wxss */ \ No newline at end of file diff --git a/pages/invoiceList/components/notyetCard/index.js b/pages/invoiceList/components/notyetCard/index.js new file mode 100644 index 0000000..629ba33 --- /dev/null +++ b/pages/invoiceList/components/notyetCard/index.js @@ -0,0 +1,24 @@ +// pages/invoiceList/components/notyetCard/index.js +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) \ No newline at end of file diff --git a/pages/invoiceList/components/notyetCard/index.json b/pages/invoiceList/components/notyetCard/index.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/pages/invoiceList/components/notyetCard/index.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/invoiceList/components/notyetCard/index.wxml b/pages/invoiceList/components/notyetCard/index.wxml new file mode 100644 index 0000000..5da3fa4 --- /dev/null +++ b/pages/invoiceList/components/notyetCard/index.wxml @@ -0,0 +1,2 @@ + +pages/invoiceList/components/notyetCard/index.wxml \ No newline at end of file diff --git a/pages/invoiceList/components/notyetCard/index.wxss b/pages/invoiceList/components/notyetCard/index.wxss new file mode 100644 index 0000000..dea19b4 --- /dev/null +++ b/pages/invoiceList/components/notyetCard/index.wxss @@ -0,0 +1 @@ +/* pages/invoiceList/components/notyetCard/index.wxss */ \ No newline at end of file diff --git a/pages/invoiceList/index.json b/pages/invoiceList/index.json index 375f0cb..030f04c 100644 --- a/pages/invoiceList/index.json +++ b/pages/invoiceList/index.json @@ -1,7 +1,12 @@ { "usingComponents": { - "van-action-sheet": "@vant/weapp/action-sheet/index", - "van-button": "@vant/weapp/button/index" + "van-tab": "@vant/weapp/tab/index", + "van-tabs": "@vant/weapp/tabs/index", + "navigator": "/components/navigator/index", + "notyet": "./components/notyet/index", + "already": "./components/already/index", + "info": "./components/info/index", + "notyetCard": "./components/notyetCard/index" }, - "navigationBarTitleText": "开票信息" + "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/invoiceList/index.wxml b/pages/invoiceList/index.wxml index 9930cc5..39200ad 100644 --- a/pages/invoiceList/index.wxml +++ b/pages/invoiceList/index.wxml @@ -1,27 +1,13 @@ - - - - {{ item.tenement.name }} - - 操作 - - - + - - 创建一个 - - - - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/pages/login/index.js b/pages/login/index.js index 375c0ce..1d58183 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -20,19 +20,19 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad() { - // const user = wx.getStorageSync('user') - // if (!user || !user.id) { - // return; - // } + const user = wx.getStorageSync('user') + if (!user || !user.id) { + return; + } // if (user.status === 0 || user.status === 2) { // wx.redirectTo({ // url: '/pages/waitApprove/index', // }) // return // } - // wx.switchTab({ - // url: '/pages/home/index', - // }) + wx.switchTab({ + url: '/pages/home/index', + }) }, /** @@ -108,6 +108,17 @@ Page({ .catch(() => { // on cancel }); + }, + jumpToUserAgreement() { + wx.navigateTo({ + url: '/pages/agreements/index', + }) + }, + jumpToLoginAgreement() { + + }, + jumpToSecret() { + }, /** * 生命周期函数--监听页面显示 diff --git a/pages/login/index.wxml b/pages/login/index.wxml index b37232a..931ccb0 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -11,7 +11,7 @@ - 使用本系统，代表您已阅读并同意 《用电管理服务条款》、《用电管理登录政策》《隐私政策》。 + 使用本系统，代表您已阅读并同意 《用电管理服务条款》、《用电管理登录政策》《隐私政策》。 diff --git a/pages/member/components/memberManage/index.wxml b/pages/member/components/memberManage/index.wxml index 4ba0a25..a4ed1c2 100644 --- a/pages/member/components/memberManage/index.wxml +++ b/pages/member/components/memberManage/index.wxml @@ -1,12 +1,3 @@ - - - @@ -15,7 +6,6 @@ {{ ele.name }} {{ ele.phone }} - 设为管理员 移除 diff --git a/pages/rechargeRecord/index.js b/pages/rechargeRecord/index.js index 70fe639..5a4d5e1 100644 --- a/pages/rechargeRecord/index.js +++ b/pages/rechargeRecord/index.js @@ -1,6 +1,6 @@ import { getRechargeList } from "../../service/recharge"; import { getOwnTenementList } from "../../service/tenement"; -import { getYears } from "../../utils/index"; +import { getYears, alertInfo } from "../../utils/index"; import request from "../../utils/request"; const { OK } = request; // pages/rechargeRecord/index.js @@ -97,10 +97,10 @@ Page({ }, async getTenementsList() { const { code, message, data } = await getOwnTenementList() - // if (code !== OK) { - // alertInfo(message) - // return - // } + if (code !== OK) { + alertInfo(message) + return + } let tenements = []; data.forEach(item => { if (item.tenements) { diff --git a/utils/index.js b/utils/index.js index e492a39..1d32357 100644 --- a/utils/index.js +++ b/utils/index.js @@ -45,8 +45,8 @@ export function getConfigByEnv() { switch (envVersion) { // 开发版 case 'develop': - // api = "http://localhost:8000" - api = "http://127.0.0.1:4523/m1/4143821-0-default" + api = "http://localhost:8000" + // api = "http://127.0.0.1:4523/m1/4143821-0-default" break; // 体验版 case 'trial': diff --git a/utils/request.js b/utils/request.js index 59e4e15..5b28000 100644 --- a/utils/request.js +++ b/utils/request.js @@ -83,12 +83,16 @@ const parseResponse = function (response) { return } const { statusCode } = response; + console.log('response', response) if (statusCode === 401) { wx.redirectTo({ url: '/pages/login/index', }) return { code: 401, message: '未登录状态' } } + if (statusCode === 403) { + return { code: 403, message: "非法访问" } + } if (statusCode === 404) { return { code: 404, message: "服务故障" } }