diff --git a/app.json b/app.json
index c1e68bb..7551a71 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,8 @@
{
"pages": [
- "pages/home/index",
+ "pages/invoiceDetail/index",
"pages/invoicing/index",
+ "pages/home/index",
"pages/invoiceList/index",
"pages/rechargeRecord/index",
"pages/member/index",
@@ -14,7 +15,6 @@
"pages/meterList/index",
"pages/recharge/index",
"pages/questions/index",
- "pages/invoiceDetail/index",
"pages/editInvoice/index",
"pages/rechargeDetail/index",
"pages/agreements/index"
diff --git a/pages/handleLogin/index.wxml b/pages/handleLogin/index.wxml
index de7e4da..5754b6b 100644
--- a/pages/handleLogin/index.wxml
+++ b/pages/handleLogin/index.wxml
@@ -44,8 +44,8 @@
不知道预留的手机号？可联系后台管理员查询！
-
- 13266911877
+
+ 0311-83864830
diff --git a/pages/home/index.js b/pages/home/index.js
index c21b3d0..beb1994 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -63,7 +63,8 @@ Page({
},
async refreshMeter() {
const { meter } = this.data;
- this.handleGetMeterDetail(meter.code);
+ console.log('meter', meter)
+ this.handleGetMeterDetail(meter.id);
},
onOk(e) {
const { type, index, value } = e.detail;
diff --git a/pages/invoiceDetail/index.json b/pages/invoiceDetail/index.json
index da07a9a..e81f5b3 100644
--- a/pages/invoiceDetail/index.json
+++ b/pages/invoiceDetail/index.json
@@ -1,6 +1,8 @@
{
"usingComponents": {
"van-field": "@vant/weapp/field/index",
- "van-button": "@vant/weapp/button/index"
- }
+ "van-button": "@vant/weapp/button/index",
+ "navigator": "/components/navigator/index"
+ },
+ "navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/pages/invoiceDetail/index.wxml b/pages/invoiceDetail/index.wxml
index 2ba3853..d1feb63 100644
--- a/pages/invoiceDetail/index.wxml
+++ b/pages/invoiceDetail/index.wxml
@@ -1,5 +1,5 @@
-
+
+
+
+
+ 尊敬的客户，您好
\ No newline at end of file
diff --git a/pages/invoicing/components/card/index.js b/pages/invoicing/components/card/index.js
new file mode 100644
index 0000000..46d91d1
--- /dev/null
+++ b/pages/invoicing/components/card/index.js
@@ -0,0 +1,24 @@
+// pages/invoicing/components/card/index.js
+Component({
+
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ title: String,
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/invoicing/components/card/index.json b/pages/invoicing/components/card/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/pages/invoicing/components/card/index.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/invoicing/components/card/index.wxml b/pages/invoicing/components/card/index.wxml
new file mode 100644
index 0000000..ba9652d
--- /dev/null
+++ b/pages/invoicing/components/card/index.wxml
@@ -0,0 +1,7 @@
+
+
+ {{ title }}
+
+
+
+
\ No newline at end of file
diff --git a/pages/invoicing/components/card/index.wxss b/pages/invoicing/components/card/index.wxss
new file mode 100644
index 0000000..5d2aea9
--- /dev/null
+++ b/pages/invoicing/components/card/index.wxss
@@ -0,0 +1,17 @@
+/* pages/invoicing/components/card/index.wxss */
+.cardBox {
+ margin-left: 32rpx;
+ margin-right: 32rpx;
+ padding: 2rpx 24rpx 24rpx;
+ background-color: #fff;
+ border-radius: 20rpx;
+}
+
+.title {
+ font-size: 38rpx;
+ font-weight: 600;
+ border-bottom: 1rpx solid #ccc;
+ height: 80rpx;
+ line-height: 80rpx;
+ margin-bottom: 24rpx;
+}
\ No newline at end of file
diff --git a/pages/invoicing/index.js b/pages/invoicing/index.js
index 00bc2e0..49dbe58 100644
--- a/pages/invoicing/index.js
+++ b/pages/invoicing/index.js
@@ -9,6 +9,7 @@ Page({
tenement: "",
ids: [],
count: 0,
+ show: false,
},
/**
@@ -33,7 +34,9 @@ Page({
onShow() {
},
-
+ changeShow() {
+ this.setData({ show: true })
+ },
/**
* 生命周期函数--监听页面隐藏
*/
diff --git a/pages/invoicing/index.json b/pages/invoicing/index.json
index 7feef6d..7b0cb21 100644
--- a/pages/invoicing/index.json
+++ b/pages/invoicing/index.json
@@ -1,7 +1,12 @@
{
"usingComponents": {
"navigator": "/components/navigator/index",
- "van-button": "@vant/weapp/button/index"
+ "van-button": "@vant/weapp/button/index",
+ "card": "./components/card/index",
+ "van-radio": "@vant/weapp/radio/index",
+ "van-radio-group": "@vant/weapp/radio-group/index",
+ "van-field": "@vant/weapp/field/index",
+ "van-dialog": "@vant/weapp/dialog/index"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/pages/invoicing/index.wxml b/pages/invoicing/index.wxml
index d9a5949..00243d0 100644
--- a/pages/invoicing/index.wxml
+++ b/pages/invoicing/index.wxml
@@ -1,14 +1,129 @@
-
+
- 发票金额： {{money}}
+ 发票金额： ￥ {{money}}
发票内容：电费
-
-
+
+
+
+ 普通电子发票
+ 增值税专用电子发票
+
+
+
+
+
+
+
+
+ 企业单位
+ 个人/非企业单位
+
+
+
+
+
+
+
+
+
+
+
+
+
- 提交
-
\ No newline at end of file
+ 立即申请
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/invoicing/index.wxss b/pages/invoicing/index.wxss
index d493360..d0ff763 100644
--- a/pages/invoicing/index.wxss
+++ b/pages/invoicing/index.wxss
@@ -4,6 +4,7 @@
margin-left: 32rpx;
margin-right: 32rpx;
margin-bottom: 40rpx;
+ padding-bottom: 40rpx;
}
.info {
@@ -29,3 +30,15 @@
page {
background-color: var(--transparent-green);
}
+
+.cardWrapper {
+ margin-top: 30rpx;
+}
+
+.van-cell {
+ padding-left: 0rpx !important;
+ padding-right: 0rpx !important;
+}
+.modalContentWrapper{
+ margin: 20rpx 30rpx;
+}
diff --git a/pages/rechargeRecord/index.js b/pages/rechargeRecord/index.js
index 968c24c..73cc495 100644
--- a/pages/rechargeRecord/index.js
+++ b/pages/rechargeRecord/index.js
@@ -87,7 +87,7 @@ Page({
show: false,
title: ""
})
- this.init(year, e)
+ this.init(year, id)
},
/**
* 生命周期函数--监听页面显示
@@ -103,9 +103,10 @@ Page({
alertInfo(message)
return
}
- let tenements = [];
+ let tenements = [{id: "", name: "全部"}];
data.forEach(item => {
if (item.tenements) {
+ console.log('item.te', item.tenements)
tenements = [...tenements, ...item.tenements]
}
})
diff --git a/service/meter.js b/service/meter.js
index 888c69e..534932d 100644
--- a/service/meter.js
+++ b/service/meter.js
@@ -7,8 +7,8 @@ export const getMeterList = async function() {
}
// 获取表计详情
-export const getMeterDetail = async function({ tenement, code }) {
- return await GET(`/wx/getMeterDetail/${tenement}/${code}`);
+export const getMeterDetail = async function({ tenement, id }) {
+ return await GET(`/wx/getMeterDetail/${tenement}/${id}`);
}
// 获取某一商户的电表列表
diff --git a/utils/data.js b/utils/data.js
index 39bb568..a31220a 100644
--- a/utils/data.js
+++ b/utils/data.js
@@ -1,11 +1,9 @@
export const getRechargeOperateType = (num) => {
- console.log('typenum', num)
const types = ["充值", "冲正", "退费"]
return types[num];
}
export const getRechargeOperateWay = (num) => {
- console.log('num', num)
- const types = ["现金", "银行卡", "支付宝", "微信", "云闪付","对公转账", "微信-支付"]
+ const types = ["现金", "银行卡", "支付宝", "微信", "云闪付","对公转账", "小程序-微信支付"]
return types[num];
}
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index 7ec2a96..095c21a 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -19,6 +19,7 @@ const requestWithoutCookie = promisify(wx.request);
// 考虑了Cookie的请求
const request = async function (options, config = {}) {
+ console.log('请求参数', 'options', options, 'config', config)
let token = wx.getStorageSync('token');
const result = wx.getAccountInfoSync();
const { envVersion } = result.miniProgram;