户号绑定页面、拨打电话按钮问题处理

pages/homepage/homepage.js

@@ -698,7 +698,7 @@ Page({
             const unreadCount = app.globalData.userNoticesList.filter(notice => notice.readstate === '2').length;
             _this.setData({
               unreadCount: unreadCount,
-              enterPriseAddress:apiReturnData.data.enterPriseAddress
+              enterPriseAddress:res.data.enterPriseAddress
             });
           }
         }

pages/huhaobangding/huhaobangding.js

@@ -67,9 +67,42 @@ Page({
   // 拨打电话
   makePhoneCall(e) {
     const phone = e.currentTarget.dataset.phone;
-    wx.makePhoneCall({
-      phoneNumber: phone
-    });
+    // 检查电话号码是否包含分隔符（逗号、顿号等）
+    if (phone.includes('、') || phone.includes(',') || phone.includes('，')) {
+      // 分割电话号码字符串，处理各种可能的分隔符
+      const phoneNumbers = phone.split(/[、,，]/);
+      
+      // 过滤掉空字符串并去除前后空格
+      const validPhoneNumbers = phoneNumbers
+        .map(num => num.trim())
+        .filter(num => num !== '');
+      
+      if (validPhoneNumbers.length > 1) {
+        // 如果有多个电话号码，显示操作菜单让用户选择
+        wx.showActionSheet({
+          itemList: validPhoneNumbers,
+          success: function(res) {
+            // 用户选择了一个号码
+            wx.makePhoneCall({
+              phoneNumber: validPhoneNumbers[res.tapIndex]
+            });
+          },
+          fail: function(res) {
+            console.log('用户取消选择')
+          }
+        });
+      } else if (validPhoneNumbers.length === 1) {
+        // 只有一个有效号码时直接拨打
+        wx.makePhoneCall({
+          phoneNumber: validPhoneNumbers[0]
+        });
+      }
+    } else {
+      // 没有分隔符，直接拨打
+      wx.makePhoneCall({
+        phoneNumber: phone
+      });
+    }
   },
 
   // 修改预览图片方法

pages/huhaobangding/huhaobangding.wxml

@@ -1,90 +1,86 @@
-<view class="container2">
-  <!-- <view class="custom-nav">
-    <view class="nav-back" bindtap="navigateBack">
-      <view class="back-arrow"></view>
-    </view>
-    <view class="nav-title">户号绑定</view> -->
-  <!-- </view>   -->
-  <view class="custom-nav">
-    <view bindtap="goBack">
-      <image src="/static_file/backcion.png" mode="aspectFit" class="back-icon"></image>
-    </view>
-    <view class="nav-title">户号绑定</view>
+<view class="custom-nav">
+  <view bindtap="goBack">
+    <image src="/static_file/backcion.png" mode="aspectFit" class="back-icon"></image>
   </view>
+  <view class="nav-title">户号绑定</view>
+</view>
 
-  <view class="form-group1">
-    <view class="form-item">
-      <text class="label">水站公司<text class="required">*</text></text>
-      <block wx:if="{{isChange}}">
-        <view class="picker-container" bindtap="showWaterCompanyPicker">
-          <text style="color: black;" class="picker-text">{{waterCompany || '请选择水站公司'}}</text>
-          <view class="arrow-right">
+<scroll-view scroll-y="true" class="page-scroll">
+  <view class="container2">
+    <view class="form-group1">
+      <view class="form-item">
+        <text class="label">水站公司<text class="required">*</text></text>
+        <block wx:if="{{isChange}}">
+          <view class="picker-container" bindtap="showWaterCompanyPicker">
+            <text style="color: black;" class="picker-text">{{waterCompany || '请选择水站公司'}}</text>
+            <view class="arrow-right">
+          </view>
         </view>
+        </block>
+        <block wx:else>
+          <view class="picker-container" >
+            <text style="color: black;" class="picker-text">{{waterCompany || '请选择水站公司'}}</text>
+          </view>
+        </block>
+      
       </view>
-      </block>
-      <block wx:else>
-        <view class="picker-container" >
-          <text style="color: black;" class="picker-text">{{waterCompany || '请选择水站公司'}}</text>
-        </view>
-      </block>
-    
     </view>
-  </view>
 
-  <view class="form-group2">
-    <view class="form-item">
-      <text class="label">户号<text class="required">*</text></text>
-      <input type="number" maxlength="9" placeholder="请绑定缴费户号" placeholder-class="placeholder" bindinput="onHuHaoInput" value="{{huHao}}" />
-      <view class="check-auth-btn" bindtap="showDrawer">
-        查看获取方式
+    <view class="form-group2">
+      <view class="form-item">
+        <text class="label">户号<text class="required">*</text></text>
+        <input type="number" maxlength="9" placeholder="请绑定缴费户号" placeholder-class="placeholder" bindinput="onHuHaoInput" value="{{huHao}}" />
+        <view class="check-auth-btn" bindtap="showDrawer">
+          查看获取方式
+        </view>
       </view>
-    </view>
-    <view class="form-item">
-      <text class="label">户名<text class="optional"></text></text>
-      <input type="text" maxlength="30" placeholder="请输入户名" placeholder-class="placeholder" bindinput="onHuMingInput" value="{{huMing}}" />
-      <view class="check-auth-btn" bindtap="getHuMing">
-        获取户名
+      <view class="form-item">
+        <text class="label">户名<text class="optional"></text></text>
+        <input type="text" maxlength="30" placeholder="请输入户名" placeholder-class="placeholder" bindinput="onHuMingInput" value="{{huMing}}" />
+        <view class="check-auth-btn" bindtap="getHuMing">
+          获取户名
+        </view>
+      </view>
+      <view class="form-item">
+        <text class="label">手机号<text class="required">*</text></text>
+        <input type="number" maxlength="11" placeholder="请输入手机号" placeholder-class="placeholder" bindinput="onPhoneInput" value="{{phone}}" />
       </view>
     </view>
-    <view class="form-item">
-      <text class="label">手机号<text class="required">*</text></text>
-      <input type="number" maxlength="11" placeholder="请输入手机号" placeholder-class="placeholder" bindinput="onPhoneInput" value="{{phone}}" />
-    </view>
-  </view>
 
-  <view class="group-select">
-    <text class="section-title">选择分组<text class="optional">(选填)</text></text>
-    <view class="tag-group">
-      <!-- <view class="tag {{selectedTag === '默认户号' ? 'active' : ''}}" bindtap="selectTag" data-tag="默认户号">默认户号</view> -->
-      <view class="tag {{selectedTag === '家' ? 'active' : ''}}" bindtap="selectTag" data-tag="家">家</view>
-      <view class="tag {{selectedTag === '父母' ? 'active' : ''}}" bindtap="selectTag" data-tag="父母">父母</view>
-      <view class="tag {{selectedTag === '公司' ? 'active' : ''}}" bindtap="selectTag" data-tag="公司">公司</view>
-      <view class="tag {{selectedTag === '出租' ? 'active' : ''}}" bindtap="selectTag" data-tag="出租">出租</view>
-      <view class="tag {{selectedTag === '朋友' ? 'active' : ''}}" bindtap="selectTag" data-tag="朋友">朋友</view>
-      <view class="tag {{selectedTag === '自定义' ? 'active' : ''}}" bindtap="selectTag" data-tag="自定义">自定义</view>
-    </view>
+    <view class="group-select">
+      <text class="section-title">选择分组<text class="optional">(选填)</text></text>
+      <view class="tag-group">
+        <!-- <view class="tag {{selectedTag === '默认户号' ? 'active' : ''}}" bindtap="selectTag" data-tag="默认户号">默认户号</view> -->
+        <view class="tag {{selectedTag === '家' ? 'active' : ''}}" bindtap="selectTag" data-tag="家">家</view>
+        <view class="tag {{selectedTag === '父母' ? 'active' : ''}}" bindtap="selectTag" data-tag="父母">父母</view>
+        <view class="tag {{selectedTag === '公司' ? 'active' : ''}}" bindtap="selectTag" data-tag="公司">公司</view>
+        <view class="tag {{selectedTag === '出租' ? 'active' : ''}}" bindtap="selectTag" data-tag="出租">出租</view>
+        <view class="tag {{selectedTag === '朋友' ? 'active' : ''}}" bindtap="selectTag" data-tag="朋友">朋友</view>
+        <view class="tag {{selectedTag === '自定义' ? 'active' : ''}}" bindtap="selectTag" data-tag="自定义">自定义</view>
+      </view>
 
-    <block wx:if="{{showCustomInput}}">
-      <view class="custom-group">
-        <view class="custom-input">
-          <input type="text" placeholder="请输入标签名称" bindinput="onTagInput" value="{{customTag}}" />
-          <view class="char-limit {{tagLength > 4 ? 'error' : ''}}">{{tagLength}}/4字</view>
+      <block wx:if="{{showCustomInput}}">
+        <view class="custom-group">
+          <view class="custom-input">
+            <input type="text" placeholder="请输入标签名称" bindinput="onTagInput" value="{{customTag}}" />
+            <view class="char-limit {{tagLength > 4 ? 'error' : ''}}">{{tagLength}}/4字</view>
+          </view>
         </view>
-      </view>
-    </block>
-  </view>
+      </block>
+    </view>
 
-  <view class="submit-btn">
-    <button class="pay-btn" hover-class="pay-btn-hover" hover-stay-time="100" bindtap="confirmBinding">确认绑定</button>
-  </view>
+    <view class="submit-btn">
+      <button class="pay-btn" hover-class="pay-btn-hover" hover-stay-time="100" bindtap="confirmBinding">确认绑定</button>
+    </view>
 
-  <view class="tips">
-    <text>1、水站公司选择可以根据催缴通知单查询或者电话咨询水利站工作人员。</text>
-    <text>2、绑定户号：户号必须准确，否则无法绑定。</text>
-    <text>3、户号可以从催缴单上查询或者当地营业厅。</text>
-  </view>
+    <view class="tips">
+      <text>1、水站公司选择可以根据催缴通知单查询或者电话咨询水利站工作人员。</text>
+      <text>2、绑定户号：户号必须准确，否则无法绑定。</text>
+      <text>3、户号可以从催缴单上查询或者当地营业厅。</text>
+    </view>
 
-</view>
+  </view>
+</scroll-view>
 
 <view class="picker-mask" wx:if="{{showWaterCompanyPicker}}" bindtap="hideWaterCompanyPicker"></view>
 <view class="picker-container-modal {{showWaterCompanyPicker ? 'show' : ''}}">

pages/huhaobangding/huhaobangding.wxss

@@ -1,20 +1,16 @@
 .container2 {
-  padding: 30rpx;
+  padding: 20rpx 24rpx 40rpx;
   background-color: rgba(242, 246, 250, 1);
-  min-height: 100vh;
+  min-height: auto;
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
-  padding-top: 230rpx;
-  padding-left: 24rpx;
-  padding-right: 24rpx;
 }
 .custom-nav {
   background-color: rgba(46, 130, 255, 1);
   display: flex;
   align-items: center;
   height: 90rpx;
-  margin-bottom: 24rpx;
   position: fixed;
   top: 0;
   left: 0;
@@ -45,7 +41,6 @@
   background-color: #FFFFFF;
   border-radius: 16rpx;
   padding: 0 24rpx;
-  margin-top: -35rpx;
   margin-bottom: 24rpx;
   box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
 }
@@ -60,7 +55,7 @@
 .form-item {
   display: flex;
   align-items: center;
-  padding: 30rpx 0;
+  padding: 24rpx 0;
 }
 
 
@@ -136,21 +131,17 @@ input {
 
 .tag-group {
   display: flex;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  overflow-x: auto;
-  white-space: nowrap;
+  flex-wrap: wrap;
+  justify-content: flex-start;
   width: 100%;
-  padding: 30rpx 0;
-  -webkit-overflow-scrolling: touch;
+  padding: 20rpx 0;
 }
 
 .tag {
   display: inline-block;
-  flex: 1;
-  flex-shrink: 0;
-  min-width: calc((100% - 60rpx) / 6);
+  width: calc((100% - 50rpx) / 3);
   margin-right: 10rpx;
+  margin-bottom: 20rpx;
   padding: 12rpx 10rpx;
   background-color: rgba(242, 245, 250, 1);
   border-radius: 4rpx;
@@ -160,7 +151,7 @@ input {
   box-sizing: border-box;
 }
 
-.tag:last-child {
+.tag:nth-child(3n) {
   margin-right: 0;
 }
 
@@ -197,7 +188,7 @@ input {
 }
 
 .submit-btn {
-  margin: 50rpx 5%;
+  margin: 20rpx 5%;
   width: 90%;
 }
 
@@ -230,9 +221,10 @@ input {
 }
 
 .tips {
-  position: fixed;
-  bottom: 100rpx; 
+  position: relative;
   padding: 0 30rpx;
+  margin-bottom: 30rpx;
+  margin-top: 30rpx;
 }
 
 .tips text {
@@ -652,4 +644,10 @@ input {
 /* 隐藏滚动条但保留功能（可选） */
 .tag-group::-webkit-scrollbar {
   display: none;
+}
+
+.page-scroll {
+  height: 100vh;
+  padding-top: 170rpx;
+  box-sizing: border-box;
 }