From 103c10347c1c05943a52f0aebb448b91fc619f0b Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Tue, 21 Jan 2025 14:32:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=95=99=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=E6=96=B0=E5=8A=A0=E8=A7=A3=E9=87=8A=EF=BC=8C=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E6=96=B0=E5=A2=9E=E5=A4=87=E6=B3=A8=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96table=E7=BB=84=E4=BB=B6=E5=8F=AF=E4=BB=A5=E4=BC=A0?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/discountCoupon/index.js   | 19 ++++++++++++++++++-
 components/discountCoupon/index.json |  3 ++-
 components/discountCoupon/index.wxml |  7 ++++---
 components/discountCoupon/index.wxss | 13 +++++++++----
 components/table/table.js            |  3 +++
 components/table/table.wxml          | 15 +++++++++++----
 pages/handleLogin/index.js           |  9 +++++++++
 pages/handleLogin/index.json         |  3 ++-
 pages/handleLogin/index.wxml         | 14 +++++++++++---
 pages/meterList/index.wxml           | 13 +++++++++++--
 pages/meterList/index.wxss           | 11 ++++++++++-
 project.private.config.json          |  7 +++++++
 utils/index.js                       |  4 ++--
 13 files changed, 99 insertions(+), 22 deletions(-)

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 @@
         </view>
     </view>
     <view class="bottom">
-        <view class="left">
-            
+        <view class="left" bind:tap="showRemark">
+            {{data.remark}}
         </view>
         <view class="right">
             <van-button wx:if="{{type === 1}}" type="info" size="small" bind:tap="handleUse">去领取</van-button>
@@ -35,4 +35,5 @@
             <van-button wx:if="{{type === 3}}" type="info" size="small" bind:tap="handleUseIt">去使用</van-button>
         </view>
     </view>
-</view>
\ No newline at end of file
+</view>
+<van-dialog id="van-dialog" />
\ 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 @@
 </wxs>
 <scroll-view hidden="{{!showList.length||!showHeader.length}}" scroll-x class="table1-view" style="--max_line:{{maxLine}};--width:{{getTableWidth(tableWidth)}}">
   <view class="table1 d-table table-class">
-    <view class="d-table-row tr-class">
-      <view class="d-table-cell th-class" wx:for="{{showHeader}}" wx:key="index">{{item.title}}</view>
+    <view class="d-table-row tr-class" style="{{topColor ? 'background-color: rgb(242,248,246)' : ''}}">
+      <view class="d-table-cell th-class" style="{{topStyle}}" wx:for="{{showHeader}}" wx:key="index">{{item.title}}</view>
     </view>
     <view bindtap="onTap" data-index="{{index}}" bindlongpress="onLongPress" class="tr-class d-table-row {{currentIndex===index?'active':''}} {{index%2===0?'tr-class_even':'tr-class_odd'}}" wx:for="{{showList}}" wx:key="index">
-      <view class="d-table-cell td-class " wx:for="{{showHeader}}" wx:for-item="head" wx:for-index="hindex" wx:key="hindex" style="background-color: {{item[head.key].bg}};color:{{item[head.key].color}}">
-        <view class="text">
+      <view 
+        class="d-table-cell td-class" 
+        wx:for="{{showHeader}}" 
+        wx:for-item="head" 
+        wx:for-index="hindex" 
+        wx:key="hindex" 
+        style="background-color: {{item[head.key].bg}};color:{{item[head.key].color}}"
+      >
+        <view class="text" style="{{bodyStyle}}">
           {{item[head.key].text}}
         </view>
       </view>
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 @@
       <van-field
         required
         value="{{ phone }}"
-        label="预留手机号"
         placeholder="请输入预留手机号"
         border="{{ true }}"
         bind:change="onChangePhone"
-      />
+      >
+        <view slot="label"> 
+          手机号 
+          <van-icon 
+            name="question-o" 
+            style="margin-left: 8rpx;font-size: 36rpx;" 
+            bind:tap="showTooltip"  
+          />
+        </view>
+      </van-field>
       <van-field
         required
         value="{{ name }}"
@@ -73,7 +81,7 @@
     </view>
   </van-tab>
 </van-tabs>
-
+<van-dialog id="van-dialog" />
 <search-select 
     show="{{show}}" 
     title="{{title}}" 
diff --git a/pages/meterList/index.wxml b/pages/meterList/index.wxml
index 163119e..f867566 100644
--- a/pages/meterList/index.wxml
+++ b/pages/meterList/index.wxml
@@ -1,4 +1,13 @@
 <!--pages/meterList/index.wxml-->
 <navigator title="电表列表" canBack="{{true}}" />
-<view style="margin: 20rpx"> 当前时间：{{ time }} </view>
-<table header="{{header}}" list="{{list}}" border="{{true}}"  />
\ No newline at end of file
+<view class="time">{{ time }} </view>
+<view style="margin: 0 24rpx;">
+    <table 
+        header="{{header}}" 
+        list="{{list}}" 
+        border="{{true}}"
+        topStyle="text-align: center" 
+        bodyStyle="text-align: center" 
+        topColor="rgb(242,248,246)"  
+    />
+</view>
\ 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"