diff --git a/components/discountCoupon/index.js b/components/discountCoupon/index.js
index 2b2cddd..eeff869 100644
--- a/components/discountCoupon/index.js
+++ b/components/discountCoupon/index.js
@@ -38,10 +38,27 @@ Component({
that.triggerEvent("change", { id, type: 2 })
})
},
+ showRemark() {
+ wx.showModal({
+ title: '备注',
+ content: this.data?.data?.remark,
+ showCancel: false,
+ complete: (res) => {
+ if (res.cancel) {
+
+ }
+
+ if (res.confirm) {
+
+ }
+ }
+ })
+
+ },
handleUseIt() {
alertInfo("敬请期待")
},
- async handleUse(e) {
+ async handleUse() {
const { data } = this.data;
const that = this;
loadingFunc(async () => {
diff --git a/components/discountCoupon/index.json b/components/discountCoupon/index.json
index 3b51cdc..6a35321 100644
--- a/components/discountCoupon/index.json
+++ b/components/discountCoupon/index.json
@@ -1,6 +1,7 @@
{
"component": true,
"usingComponents": {
- "van-button": "@vant/weapp/button/index"
+ "van-button": "@vant/weapp/button/index",
+ "van-dialog": "@vant/weapp/dialog/index"
}
}
\ No newline at end of file
diff --git a/components/discountCoupon/index.wxml b/components/discountCoupon/index.wxml
index 8db85d7..4e012c2 100644
--- a/components/discountCoupon/index.wxml
+++ b/components/discountCoupon/index.wxml
@@ -26,8 +26,8 @@
-
-
+
+ {{data.remark}}
去领取
@@ -35,4 +35,5 @@
去使用
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/components/discountCoupon/index.wxss b/components/discountCoupon/index.wxss
index 4dac214..214f566 100644
--- a/components/discountCoupon/index.wxss
+++ b/components/discountCoupon/index.wxss
@@ -10,7 +10,7 @@
display: flex;
justify-content: space-between;
border-bottom: 1rpx dashed #ccc;
- padding-bottom: 20rpx;
+ padding-bottom: 30rpx;
}
.top .right {
@@ -25,7 +25,7 @@
.typeText {
font-weight: 700;
- font-size: 42rpx;
+ font-size: 36rpx;
margin-bottom: 20rpx;
}
@@ -51,5 +51,10 @@
.bottom .left {
flex: 1;
- font-size: 32rpx;
-}
\ No newline at end of file
+ max-width: calc(100vw - 60rpx - 250rpx);
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ font-size: 30rpx;
+ color: rgba(0, 0, 0, 0.7)
+}
diff --git a/components/table/table.js b/components/table/table.js
index e4dd2c2..c104dcd 100644
--- a/components/table/table.js
+++ b/components/table/table.js
@@ -27,6 +27,9 @@ Component({
type: String,
value: '#d6e8ff'
},
+ topColor: String,
+ topStyle: String,
+ bodyStyle: String,
maxLine: {
type: Number,
value: 2
diff --git a/components/table/table.wxml b/components/table/table.wxml
index 54a5a3b..e46080e 100644
--- a/components/table/table.wxml
+++ b/components/table/table.wxml
@@ -8,12 +8,19 @@
-
- {{item.title}}
+
+ {{item.title}}
-
-
+
+
{{item[head.key].text}}
diff --git a/pages/handleLogin/index.js b/pages/handleLogin/index.js
index 0005692..9eb4e12 100644
--- a/pages/handleLogin/index.js
+++ b/pages/handleLogin/index.js
@@ -2,6 +2,7 @@
import { userValidate } from "../../service/user";
import { alertInfo, alertSuccess, loadingFunc, wxLogin } from "../../utils/index";
import request from "../../utils/request"
+import Dialog from '@vant/weapp/dialog/dialog';
const { OK } = request;
Page({
@@ -112,6 +113,14 @@ Page({
type: 'tenement'
})
},
+ showTooltip() {
+ Dialog.alert({
+ title: '提示',
+ message: '该手机号为开户时预留的手机号,一般为接收电费欠费短信的管理员手机号。',
+ }).then(() => {
+ // on close
+ });
+ },
scan() {
wx.scanCode({
scanType: "qrCode",
diff --git a/pages/handleLogin/index.json b/pages/handleLogin/index.json
index c29853f..febad6d 100644
--- a/pages/handleLogin/index.json
+++ b/pages/handleLogin/index.json
@@ -8,7 +8,8 @@
"van-icon": "@vant/weapp/icon/index",
"van-tab": "@vant/weapp/tab/index",
"van-tabs": "@vant/weapp/tabs/index",
- "navigator": "/components/navigator/index"
+ "navigator": "/components/navigator/index",
+ "van-dialog": "@vant/weapp/dialog/index"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/pages/handleLogin/index.wxml b/pages/handleLogin/index.wxml
index 0990a90..d79253d 100644
--- a/pages/handleLogin/index.wxml
+++ b/pages/handleLogin/index.wxml
@@ -46,11 +46,19 @@
+ >
+
+ 手机号
+
+
+
-
+
- 当前时间:{{ time }}
-
\ No newline at end of file
+{{ time }}
+
+
+
\ No newline at end of file
diff --git a/pages/meterList/index.wxss b/pages/meterList/index.wxss
index c7df75e..564316e 100644
--- a/pages/meterList/index.wxss
+++ b/pages/meterList/index.wxss
@@ -1 +1,10 @@
-/* pages/meterList/index.wxss */
\ No newline at end of file
+/* pages/meterList/index.wxss */
+.time {
+ margin: 20rpx 24rpx;
+ font-size: 28rpx;
+ color: rgb(97, 93, 93);
+}
+
+page {
+ background-color: var(--transparent-green);
+ }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index a784ce0..aa91fce 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -10,6 +10,13 @@
"condition": {
"miniprogram": {
"list": [
+ {
+ "name": "pages/discountCoupon/index",
+ "pathName": "pages/discountCoupon/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
{
"name": "childPackage/pages/electricQuery/index",
"pathName": "childPackage/pages/electricQuery/index",
diff --git a/utils/index.js b/utils/index.js
index 1389446..b49eed0 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 = "https://zgd.hbhcbn.com/api3"
+ // api = "http://localhost:8000"
+ api = "https://zgd.hbhcbn.com/api3"
// api = "https://zgd.hbhcbn.com/api3"
// api = "https://zgd.hbhcbn.com/wxApi"
// api = "http://127.0.0.1:4523/m1/4143821-0-default"