diff --git a/pages/home/index.wxss b/pages/home/index.wxss
index 3ea44c2..c745b2c 100644
--- a/pages/home/index.wxss
+++ b/pages/home/index.wxss
@@ -30,7 +30,8 @@
}
.notLoginWrapper, .logined {
- padding: 30rpx 32rpx;
+ padding: 24rpx 32rpx;
+ padding-left: 50rpx;
background-color: var(--middle-green);
display: flex;
align-items: center;
@@ -46,11 +47,11 @@
}
.card {
- margin-top: 1vh;
+ margin-top: 0rpx;
margin-left: 46rpx;
margin-right: 46rpx;
border-radius: 30rpx;
- padding: 28rpx 30rpx;
+ padding: 22rpx 30rpx;
/* background-color: rgb(173, 217, 203); */
background: linear-gradient(to bottom right, rgb(212, 240, 231), rgb(145, 206, 185));
}
@@ -78,6 +79,10 @@
font-size: 32rpx;
}
+.cardItem:last-child {
+ margin-bottom: 12rpx;
+}
+
.cardItemValue {
display: flex;
flex: 1;
@@ -91,17 +96,17 @@
.recharge {
background: #fff;
padding: 20rpx 30rpx;
- margin-top: 30rpx;
+ margin-top: 24rpx;
margin-left: 46rpx;
margin-right: 46rpx;
- margin-bottom: 40rpx;
+ margin-bottom: 30rpx;
border-radius: 30rpx;
}
.operate {
margin-left: 46rpx;
margin-right: 46rpx;
- margin-bottom: 40rpx;
+ margin-bottom: 24rpx;
}
.welcome {
@@ -128,13 +133,13 @@
}
.moneyInput {
- margin-top: 30rpx;
- margin-bottom: 30rpx;
+ margin-top: 24rpx;
+ margin-bottom: 24rpx;
}
.others {
margin-left: 46rpx;
margin-right: 46rpx;
- margin-top: 40rpx;
+ margin-top: 10rpx;
margin-bottom: 40rpx;
}
\ No newline at end of file
diff --git a/pages/rechargeDetail/index.js b/pages/rechargeDetail/index.js
index dcfd6de..de33b2c 100644
--- a/pages/rechargeDetail/index.js
+++ b/pages/rechargeDetail/index.js
@@ -32,6 +32,45 @@ Page({
detail: { ...data, way: getRechargeOperateWay(data.way), type: getRechargeOperateType(data.type) }
})
},
+ record() {
+ const { detail } = this.data;
+ wx.showModal({
+ title: '提示',
+ content: '为了您更好的体验,请复制链接,通过电脑浏览器打开下载',
+ showCancel: true,
+ cancelText: '关闭',
+ confirmText: '复制链接',
+
+ complete: (res) => {
+ if (res.confirm) {
+ const result = wx.getAccountInfoSync();
+ const { envVersion } = result.miniProgram;
+ let api = ""
+ switch (envVersion) {
+ // 开发版
+ case 'develop':
+ wx.setClipboardData({
+ data: `https://zgd.hbhcbn.com/print/?id=${detail.serialNumber}`,
+ })
+ break;
+ // 体验版
+ case 'trial':
+ wx.setClipboardData({
+ data: `https://zgd.hbhcbn.com/h5/?report=${id}&tenement=${tenement}`,
+ })
+ break;
+ // 正式版
+ case 'release':
+ wx.setClipboardData({
+ data: `https://zgd.hbhcbn.com/reporth5/?report=${id}&tenement=${tenement}`,
+ })
+ break;
+ }
+
+ }
+ }
+ })
+ },
back() {
// wx.navigateBack({ delta: 1 });
wx.navigateBack();
diff --git a/pages/rechargeDetail/index.wxml b/pages/rechargeDetail/index.wxml
index 599e2f3..f3ba4f1 100644
--- a/pages/rechargeDetail/index.wxml
+++ b/pages/rechargeDetail/index.wxml
@@ -86,5 +86,6 @@
- 返回
+ 收据
+ 返回
\ No newline at end of file
diff --git a/pages/rechargeDetail/index.wxss b/pages/rechargeDetail/index.wxss
index 03cd5c7..331aa30 100644
--- a/pages/rechargeDetail/index.wxss
+++ b/pages/rechargeDetail/index.wxss
@@ -1,8 +1,9 @@
/* pages/rechargeDetail/index.wxss */
.operate {
- margin-top: 60rpx;
+ margin-top: 20rpx;
margin-left: 36rpx;
margin-right: 36rpx;
padding-bottom: 50rpx;
+ display: flex;
}
diff --git a/pages/rechargeRecord/index.wxml b/pages/rechargeRecord/index.wxml
index a21c07b..7ae2d61 100644
--- a/pages/rechargeRecord/index.wxml
+++ b/pages/rechargeRecord/index.wxml
@@ -21,7 +21,9 @@
- 充值
+ 冲正
+ 退费
+ 充值
{{ item.meter.address }}
{{ item.time }}