diff --git a/childPackage/pages/billDetail/index.js b/childPackage/pages/billDetail/index.js
index 445d702..7472ed6 100644
--- a/childPackage/pages/billDetail/index.js
+++ b/childPackage/pages/billDetail/index.js
@@ -35,7 +35,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- const { id = "R00053677580943361", time = "2023-10" } = options;
+ const { id, time } = options;
this.init(id, time);
},
async init(id, time) {
diff --git a/childPackage/pages/electricQuery/index.js b/childPackage/pages/electricQuery/index.js
index d29a000..d7b7937 100644
--- a/childPackage/pages/electricQuery/index.js
+++ b/childPackage/pages/electricQuery/index.js
@@ -99,7 +99,12 @@ Page({
alertInfo(message)
return;
}
- this.setData({ list: data, electricNumber: Number(electricNumber)?.toFixed(2), meterNumber: Number(meterNumber), totalPage: Math.ceil(total / 20) })
+ this.setData({
+ list: data,
+ electricNumber: Number(electricNumber)?.toFixed(2),
+ meterNumber: Number(meterNumber),
+ totalPage: Math.ceil(total / 20)
+ })
if (!data?.length) {
return;
}
@@ -279,7 +284,13 @@ Page({
});
break;
case "day":
- this.setData({ yearMonthDay: time, yearMonthDayStamp: new Date(time).getTime(), visible: false }, () => {
+ console.log('day')
+ this.setData({
+ yearMonthDay: time,
+ yearMonthDayStamp: new Date(time).getTime(),
+ visible: false,
+ page: 1,
+ }, () => {
this.init();
})
break;
diff --git a/childPackage/pages/electricQuery/index.wxml b/childPackage/pages/electricQuery/index.wxml
index 3491c96..ecee176 100644
--- a/childPackage/pages/electricQuery/index.wxml
+++ b/childPackage/pages/electricQuery/index.wxml
@@ -105,7 +105,6 @@
-
diff --git a/components/navigator/index.js b/components/navigator/index.js
index 522c980..a86a1d7 100644
--- a/components/navigator/index.js
+++ b/components/navigator/index.js
@@ -35,7 +35,6 @@ Component({
*/
methods: {
back() {
- // this.triggerEvent("back")
wx.navigateBack();
}
}
diff --git a/components/pagination/index.js b/components/pagination/index.js
index 540e3a3..b17976b 100644
--- a/components/pagination/index.js
+++ b/components/pagination/index.js
@@ -5,10 +5,26 @@ Component({
properties: {
currentIndex: { //当前页码
type: Number,
- value: 1
+ value: 1,
+ observer(newVal,oldVal) {// 数据监听
+ const that = this;
+ this.setData({
+ index: newVal
+ }, () => {
+ that.updateBtnDis();
+ })
+ },
},
totalPage: {
- type: Number
+ type: Number,
+ observer(newVal,oldVal) {// 数据监听
+ const that = this;
+ this.setData({
+ total: newVal
+ }, () => {
+ that.updateBtnDis();
+ })
+ },
}
},
@@ -124,17 +140,17 @@ Component({
})
}else if (index == total) { // 最后一页
this.setData({
- nextBtnDis: true
+ nextBtnDis: true,
+ prevBtnDis: false,
})
} else if (index == 1){ // 第一页
this.setData({
- prevBtnDis: true
+ prevBtnDis: true,
+ nextBtnDis: false,
})
}else{
this.setData({
- prevBtnDis: false
- })
- this.setData({
+ prevBtnDis: false,
nextBtnDis: false
})
}
diff --git a/components/pagination/index.wxml b/components/pagination/index.wxml
index 4d599db..4005047 100644
--- a/components/pagination/index.wxml
+++ b/components/pagination/index.wxml
@@ -14,3 +14,4 @@
+{{totalPage}}
diff --git a/components/picker/index.js b/components/picker/index.js
index 4babf45..b72f05f 100644
--- a/components/picker/index.js
+++ b/components/picker/index.js
@@ -15,13 +15,6 @@ Component({
title: String,
},
- /**
- * 组件的初始数据
- */
- data: {
- // columns:['杭州', '宁波', '温州', '嘉兴', '湖州']
- },
-
/**
* 组件的方法列表
*/
diff --git a/components/select/index.js b/components/select/index.js
index cb4e7ef..951936f 100644
--- a/components/select/index.js
+++ b/components/select/index.js
@@ -3,7 +3,7 @@ import { getTenementList } from "../../service/tenement";
import request from '../../utils/request'
const { OK } = request
-// components/select/index.js
+
Component({
/**
@@ -30,10 +30,6 @@ Component({
*/
methods: {
async onInput(e) {
- // this.setData({
- // visible: true,
- // list: [e.detail, e.detail, e.detail]
- // })
switch(this.data.type) {
case 0:
const { data = [], code, message } = await getParkList({ keyword: e.detail });
diff --git a/pages/apply/index.js b/pages/apply/index.js
index fb31e07..81e0ed0 100644
--- a/pages/apply/index.js
+++ b/pages/apply/index.js
@@ -102,52 +102,4 @@ Page({
})
}, 500)
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/billList/index.js b/pages/billList/index.js
index 1b8c272..9230ed4 100644
--- a/pages/billList/index.js
+++ b/pages/billList/index.js
@@ -2,7 +2,7 @@ import { getBillList } from "../../service/accounting"
import { alertInfo } from "../../utils/index";
import request from '../../utils/request'
const { OK } = request;
-// pages/billList/index.js
+
Page({
/**
@@ -37,52 +37,4 @@ Page({
url: '/childPackage/pages/billDetail/index?id=' + report,
})
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/handleLogin/index.js b/pages/handleLogin/index.js
index a39081c..87ab42f 100644
--- a/pages/handleLogin/index.js
+++ b/pages/handleLogin/index.js
@@ -1,8 +1,8 @@
+// pages/handleLogin/index.js
import { userValidate } from "../../service/user";
import { alertInfo, alertSuccess, loadingFunc, wxLogin } from "../../utils/index";
import request from "../../utils/request"
const { OK } = request;
-// pages/handleLogin/index.js
Page({
/**
@@ -111,52 +111,4 @@ Page({
}
})
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/home/index.js b/pages/home/index.js
index f67c92f..2ce113b 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -1,3 +1,4 @@
+// pages/home/index.js
import { getMeterDetail, getMeterList, getTenementMeterList } from "../../service/meter";
import { getOwnTenementList } from "../../service/tenement";
import { alertInfo, alertSuccess } from "../../utils/index";
@@ -6,7 +7,6 @@ import { getDot } from "../../utils/system";
import { getUserInfo } from "../../service/user"
import { requestRecharge } from "../../service/recharge";
const { OK } = request;
-// pages/home/index.js
Page({
/**
@@ -75,10 +75,6 @@ Page({
const currentPark = this.data.park;
switch(type) {
case "park":
- // if (value.id === currentPark?.id) {
- // this.setData({ show: false })
- // return
- // }
this.setData({
show: false,
park: value,
@@ -88,13 +84,7 @@ Page({
wx.setStorageSync('tenement', value.tenements?.[0])
break;
case "tenement":
- // const currentTenement = this.data.tenement;
- // if (value.id === currentTenement?.id) {
- // this.setData({ show: false })
- // return
- // }
wx.setStorageSync('tenement', value)
- // wx.setStorageSync('meter', null)
this.setData({
show: false,
tenement: value
@@ -153,9 +143,6 @@ Page({
alertInfo("最少为1分")
return
}
- // wx.navigateTo({
- // url: `/pages/rechargeWay/index?money=${money}&address=${meter.address}&id=${meter?.id}&tenement=${tenement?.id}&park=${park.id}`,
- // })
this.setData({ rechargeVisible: true })
},
jumpToInvoice() {
@@ -267,15 +254,12 @@ Page({
async setUser() {
const result = await getUserInfo();
if (result.code !== OK) {
- // alertInfo(result.message)
const user = wx.getStorageSync('user')
this.setData({ user: user })
return;
}
this.setData({ user: result.data })
wx.setStorageSync('user', result.data)
- // const user = wx.getStorageSync('user')
- // this.setData({ user: user })
},
async getAllList() {
const { code, message, data } = await getOwnTenementList()
@@ -332,7 +316,6 @@ Page({
alertInfo("请先登录")
return
}
- // alertInfo("尚未完成")
wx.navigateTo({
url: '/pages/billList/index',
})
@@ -380,38 +363,4 @@ Page({
}
})
},
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/home/index.wxml b/pages/home/index.wxml
index 93a727e..d5f57f9 100644
--- a/pages/home/index.wxml
+++ b/pages/home/index.wxml
@@ -94,8 +94,6 @@
-
-
diff --git a/pages/invoiceDetail/index.js b/pages/invoiceDetail/index.js
index 4c82899..c28234f 100644
--- a/pages/invoiceDetail/index.js
+++ b/pages/invoiceDetail/index.js
@@ -1,8 +1,8 @@
+// pages/invoiceInfo/index.js
import { getInvoiceInfoDetail, downloadInvoice } from "../../service/invoice";
import { alertError, alertInfo, loadingFunc } from "../../utils/index";
import request from '../../utils/request'
const { OK } = request;
-// pages/invoiceInfo/index.js
Page({
/**
@@ -74,69 +74,7 @@ Page({
}
})
})
-
-
- // console.log('data', data)
- // const filePath = `${wx.env.USER_DATA_PATH}/发票/${that.data.id}.${res.tapIndex === 0 ? 'xml' : "pdf"}`;
- // FileSystemManager.writeFile({
- // filePath: filePath,
- // data: res.data,
- // encoding: 'base64', // 2. base64解密写入, 后台返回的byte[]数组是经过base64编码的,其他方式写入文件打开格式不对
- // success: function(res) {
-
- // },
- // fail: function (e) {
- // console.log(e.errMsg);
- // }
- // });
}
})
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/invoiceDetailContent/index.js b/pages/invoiceDetailContent/index.js
index c5367c3..640592a 100644
--- a/pages/invoiceDetailContent/index.js
+++ b/pages/invoiceDetailContent/index.js
@@ -1,6 +1,6 @@
+// pages/invoiceDetailContent/index.js
import { getInvoiceInfoDetail } from "../../service/invoice";
-// pages/invoiceDetailContent/index.js
Page({
/**
@@ -35,52 +35,4 @@ Page({
url: '/pages/invoiceDetail/index?id=' + this.data.id,
})
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/invoiceList/components/already/index.js b/pages/invoiceList/components/already/index.js
index 4c61922..ca71d3d 100644
--- a/pages/invoiceList/components/already/index.js
+++ b/pages/invoiceList/components/already/index.js
@@ -1,8 +1,8 @@
+// pages/invoiceList/components/already/index.js
import { getAlreadyInvoiceList } from "../../../../service/invoice"
import { alertInfo, loadingFunc } from "../../../../utils/index";
import request from '../../../../utils/request'
const { OK } = request;
-// pages/invoiceList/components/already/index.js
Component({
/**
diff --git a/pages/invoiceList/components/info/index.js b/pages/invoiceList/components/info/index.js
index 0cedb1a..c63eb58 100644
--- a/pages/invoiceList/components/info/index.js
+++ b/pages/invoiceList/components/info/index.js
@@ -1,10 +1,10 @@
+// pages/invoiceList/components/info/index.js
import { getInvoiceInfo, updateInvoiceInfo } from "../../../../service/invoice"
import { getUserInfo } from "../../../../service/user";
import { alertInfo, alertSuccess, isValidPhoneNumber } from "../../../../utils/index";
import request from '../../../../utils/request'
const { OK } = request
-// pages/invoiceList/components/info/index.js
Component({
/**
@@ -89,10 +89,6 @@ Component({
alertInfo("请输入发票税号")
return;
}
- // if (!address) {
- // alertInfo("请输入地址")
- // return;
- // }
if (phone && !isValidPhoneNumber(phone)) {
alertInfo("手机号格式不正确")
return
diff --git a/pages/invoiceList/components/info/index.wxml b/pages/invoiceList/components/info/index.wxml
index b4b76c5..20301b9 100644
--- a/pages/invoiceList/components/info/index.wxml
+++ b/pages/invoiceList/components/info/index.wxml
@@ -17,7 +17,6 @@
label="发票类型"
readonly="{{true}}"
autosize="{{true}}"
-
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ false }}"
@@ -28,7 +27,6 @@
label="发票类型"
readonly="{{true}}"
autosize="{{true}}"
-
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ false }}"
@@ -39,7 +37,6 @@
label="发票类型"
readonly="{{true}}"
autosize="{{true}}"
-
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ false }}"
@@ -50,7 +47,6 @@
label="抬头类型"
readonly="{{true}}"
autosize="{{true}}"
-
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ false }}"
@@ -70,7 +66,6 @@
label="抬头类型"
readonly="{{true}}"
autosize="{{true}}"
-
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ false }}"
@@ -81,7 +76,6 @@
label="抬头类型"
readonly="{{true}}"
autosize="{{true}}"
-
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ false }}"
@@ -95,7 +89,6 @@
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{true}}"
autosize="{{true}}"
-
title-width="132rpx"
border="{{ false }}"
>
@@ -107,7 +100,6 @@
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
-
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
>
@@ -119,7 +111,6 @@
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
-
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
>
@@ -132,7 +123,6 @@
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
-
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
@@ -146,7 +136,6 @@
custom-style="padding-left: 0; padding-right: 0; height: auto;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
-
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
@@ -161,16 +150,12 @@
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
-
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
data-name="remark"
value="{{detail.remark || '-'}}"
>
-
@@ -303,7 +288,6 @@
data-name="phone"
value="{{detail.phone || '-'}}"
>
-
diff --git a/pages/invoiceList/components/notyet/index.js b/pages/invoiceList/components/notyet/index.js
index 36cff76..f73ecad 100644
--- a/pages/invoiceList/components/notyet/index.js
+++ b/pages/invoiceList/components/notyet/index.js
@@ -46,15 +46,12 @@ Component({
},
onChange(e) {
const { id, index } = e.currentTarget.dataset;
- // let newList = this.data.chooseList;
const { list } = this.data;
const newSelectList = this.data.selectList;
if (e.detail) {
newSelectList[index] = true;
- // newList = [...new Set([...newList, id])]
} else {
newSelectList[index] = false;
- // newList = newList.filter(item => item !== id);
}
let selectCount = 0;
let selectMoney = 0;
@@ -66,7 +63,6 @@ Component({
}
}
this.setData({
- // chooseList: newList,
selectList: newSelectList,
allChecked: selectCount === list.length,
selectCount,
diff --git a/pages/invoiceList/index.js b/pages/invoiceList/index.js
index 0aa18e1..015cfc7 100644
--- a/pages/invoiceList/index.js
+++ b/pages/invoiceList/index.js
@@ -1,8 +1,8 @@
-import { deleteInvoiceInfo, getInvoiceInfoList } from "../../service/invoice";
+// pages/invoiceList/index.js
+import { deleteInvoiceInfo } from "../../service/invoice";
import { alertInfo, alertSuccess, wxModal } from "../../utils/index";
import request from '../../utils/request'
const { OK } = request
-// pages/invoiceList/index.js
Page({
/**
@@ -32,24 +32,6 @@ Page({
active: Number(tab)
})
},
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
- this.init();
- },
- async init() {
- // const { data, code, message } = await getInvoiceInfoList()
- // this.setData({ list: data })
- },
operate(e) {
const { data } = e.currentTarget.dataset;
this.setData({
@@ -94,38 +76,4 @@ Page({
url: '/pages/editInvoice/index?id=-1',
})
},
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/invoicing/index.js b/pages/invoicing/index.js
index d12089b..6430222 100644
--- a/pages/invoicing/index.js
+++ b/pages/invoicing/index.js
@@ -1,9 +1,9 @@
+// pages/invoicing/index.js
import { getInvoiceInfo, makeInvoice } from "../../service/invoice"
import { alertInfo, alertSuccess, loadingFunc } from "../../utils/index";
import request from '../../utils/request'
const { OK } = request
-// pages/invoicing/index.js
Page({
/**
@@ -77,18 +77,6 @@ Page({
},
changeRemark(e) {
this.setData({ remark: e.detail })
- },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
},
async onSubmit() {
loadingFunc(async() => {
@@ -111,38 +99,4 @@ Page({
changeShow() {
this.setData({ show: true })
},
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/login/index.js b/pages/login/index.js
index 3a5a32e..cef9e84 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -1,3 +1,4 @@
+// pages/login/index.js
import { getPrivaciList, login } from "../../service/user";
import { alertError, alertInfo, alertSuccess, loadingFunc, wxLogin } from "../../utils/index";
import request from "../../utils/request";
@@ -5,7 +6,6 @@ import { getUserInfo } from "../../service/user"
import Dialog from '@vant/weapp/dialog/dialog';
const { OK } = request;
-// pages/login/index.js
Page({
/**
@@ -29,21 +29,9 @@ Page({
this.setData({ user: result.data })
wx.setStorageSync('user', result.data)
- // const user = wx.getStorageSync('user')
- // this.setData({ user: user })
},
onLoad() {
this.getPrivacy();
- // this.setUser();
- // if (user.status === 0 || user.status === 2) {
- // wx.redirectTo({
- // url: '/pages/waitApprove/index',
- // })
- // return
- // }
- // wx.switchTab({
- // url: '/pages/home/index',
- // })
},
async getPrivacy() {
const { code, message, data } = await getPrivaciList()
@@ -53,18 +41,6 @@ Page({
}
this.setData({ privacyList: data })
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
- onClose() {
- // wx.exitMiniProgram()
- },
- onConfirm() {
- // this.handleLogin()
- },
async handleLogin(phoneCode) {
loadingFunc(async () => {
const wxLoginCode = await wxLogin()
@@ -134,51 +110,4 @@ Page({
url: '/childPackage/pages/agreements/index?url=' + url,
})
},
- jumpToLoginAgreement() {
-
- },
- jumpToSecret() {
-
- },
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/member/components/memberManage/index.js b/pages/member/components/memberManage/index.js
index f612f9a..aad0fb4 100644
--- a/pages/member/components/memberManage/index.js
+++ b/pages/member/components/memberManage/index.js
@@ -5,14 +5,6 @@ import request from "../../../../utils/request"
const { OK } = request;
Component({
-
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
/**
* 组件的初始数据
*/
@@ -21,9 +13,6 @@ Component({
},
lifetimes: {
attached: function() {
- // this.setData({
- // list: []
- // })
this.init();
}
},
diff --git a/pages/member/components/memberManage/index.wxss b/pages/member/components/memberManage/index.wxss
index 2949e41..3c23b9e 100644
--- a/pages/member/components/memberManage/index.wxss
+++ b/pages/member/components/memberManage/index.wxss
@@ -3,8 +3,6 @@
.item {
display: flex;
align-items: center;
- /* padding-top: 24rpx; */
- /* padding-bottom: 24rpx; */
padding: 24rpx;
margin-left: 32rpx;
margin-right: 32rpx;
@@ -19,7 +17,6 @@
}
.operate {
- /* display: flex; */
height: 100%;
display: flex;
flex-direction: column;
diff --git a/pages/member/index.js b/pages/member/index.js
index 473d55e..5c6a0bb 100644
--- a/pages/member/index.js
+++ b/pages/member/index.js
@@ -7,64 +7,9 @@ Page({
data: {
active: 0
},
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
-
- },
onChangeTab(e) {
this.setData({
active: e.detail.index
})
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/my/index.js b/pages/my/index.js
index 21285ab..eb42c0c 100644
--- a/pages/my/index.js
+++ b/pages/my/index.js
@@ -1,3 +1,4 @@
+// pages/my/index.js
import { alertInfo, alertSuccess } from "../../utils/index";
import Dialog from '@vant/weapp/dialog/dialog';
import { getUserInfo, logout } from "../../service/user";
@@ -5,7 +6,6 @@ import { getDot } from "../../utils/system";
import request from "../../utils/request"
const { OK } = request;
-// pages/my/index.js
Page({
/**
@@ -116,38 +116,4 @@ Page({
});
},
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/my/index.wxml b/pages/my/index.wxml
index aae8228..86cbd8b 100644
--- a/pages/my/index.wxml
+++ b/pages/my/index.wxml
@@ -1,9 +1,5 @@
-
-
-
@@ -19,9 +15,5 @@
-
-
\ No newline at end of file
diff --git a/pages/qrCode/index.js b/pages/qrCode/index.js
index 376c274..022c893 100644
--- a/pages/qrCode/index.js
+++ b/pages/qrCode/index.js
@@ -11,9 +11,6 @@ Page({
* 页面的初始数据
*/
data: {
- // list: [],
- // urls: [],
- // indexs: [],
url: "",
tenement: ""
},
@@ -22,7 +19,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- // this.getList()
loadingFunc(async () => {
await this.getCode()
})
@@ -43,7 +39,6 @@ Page({
})
},
async getCode() {
- // const { index, id } = e.currentTarget.dataset;
const tenement = wx.getStorageSync('tenement');
const { code, message, data } = await getWxCode(tenement.id)
if (code !== OK) {
@@ -54,14 +49,6 @@ Page({
url: data,
tenement: tenement
})
- // const newUrls = that.data.urls;
- // newUrls[index] = data;
- // const newIndexs = that.data.indexs;
- // newIndexs[index] = true;
- // that.setData({
- // urls: newUrls,
- // indexs: newIndexs,
- // })
},
look(e) {
const that = this;
@@ -69,52 +56,4 @@ Page({
await this.getCode(e, that)
})
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/questions/index.js b/pages/questions/index.js
index 112ad11..516da03 100644
--- a/pages/questions/index.js
+++ b/pages/questions/index.js
@@ -1,8 +1,8 @@
+// pages/questions/index.js
import { getQuestionList } from "../../service/user";
import { alertInfo } from "../../utils/index";
import request from '../../utils/request'
const { OK } = request
-// pages/questions/index.js
Page({
/**
@@ -36,52 +36,8 @@ Page({
page: next ? page + 1 : page
})
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
+
onReachBottom() {
this.getList();
},
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/recharge/index.wxml b/pages/recharge/index.wxml
index dc7674e..c765007 100644
--- a/pages/recharge/index.wxml
+++ b/pages/recharge/index.wxml
@@ -1,32 +1,7 @@
-
+
充值表号:
diff --git a/pages/rechargeDetail/index.js b/pages/rechargeDetail/index.js
index f167f3c..cd5ec8a 100644
--- a/pages/rechargeDetail/index.js
+++ b/pages/rechargeDetail/index.js
@@ -1,9 +1,9 @@
+// pages/rechargeDetail/index.js
import { getRechargeDetail } from "../../service/recharge";
import { alertError, alertInfo, loadingFunc } from "../../utils/index";
import { getRechargeOperateType, getRechargeOperateWay } from "../../utils/data";
import request from "../../utils/request"
const { OK } = request
-// pages/rechargeDetail/index.js
Page({
/**
@@ -72,54 +72,6 @@ Page({
})
},
back() {
- // wx.navigateBack({ delta: 1 });
wx.navigateBack();
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/rechargeRecord/index.js b/pages/rechargeRecord/index.js
index a1f7621..00392a6 100644
--- a/pages/rechargeRecord/index.js
+++ b/pages/rechargeRecord/index.js
@@ -1,9 +1,9 @@
+// pages/rechargeRecord/index.js
import { getRechargeList } from "../../service/recharge";
import { getTenementMeterList } from "../../service/meter";
import { getYears, alertInfo, loadingFunc } from "../../utils/index";
import request from "../../utils/request";
const { OK } = request;
-// pages/rechargeRecord/index.js
Page({
/**
@@ -50,19 +50,6 @@ Page({
this.onChangeMeter(value)
return;
}
- },
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
},
onChangeYear(e) {
const { codeId } = this.data;
@@ -78,9 +65,7 @@ Page({
onChangeMeter(e) {
const { id, code } = e;
const { year } = this.data;
- // const currentYear = years[Number(e)]
this.setData({
- // year: currentYear,
codeId: id,
meterCode: code,
type: "",
@@ -144,38 +129,4 @@ Page({
back() {
wx.navigateBack({delta: 1 })
},
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
diff --git a/pages/rechargeRecord/index.wxss b/pages/rechargeRecord/index.wxss
index 409aceb..6cf1605 100644
--- a/pages/rechargeRecord/index.wxss
+++ b/pages/rechargeRecord/index.wxss
@@ -23,7 +23,6 @@
}
.recordsItem {
display: flex;
- /* justify-content: space-between; */
padding: 16rpx 20rpx;
border-left: 0;
border-right: 0;
@@ -73,8 +72,6 @@
text-align: right;
color: #fff;
font-size: 32rpx;
- /* display: flex; */
- /* justify-content: end; */
}
.type {
@@ -92,8 +89,4 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-}
-
-page {
- /* background-color: var(--light-green); */
}
\ No newline at end of file