Selaa lähdekoodia

feature 优化使用体验

xiahan 2 kuukautta sitten
vanhempi
commit
37f6df8aa0

+ 4 - 4
pages/huhaobangding/huhaobangding.wxml

@@ -12,7 +12,7 @@
         <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>
+            <text class="picker-text">{{waterCompany || '请选择水站公司'}}</text>
             <view class="arrow-right">
           </view>
         </view>
@@ -29,21 +29,21 @@
     <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}}" />
+        <input class="labelInput" type="number" maxlength="9" placeholder="请绑定缴费户号" placeholder-class="placeholder" bindinput="onHuHaoInput" value="{{huHao}}" />
         <view class="check-auth-btn" bindtap="showDrawer">
           查看获取方式
         </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}}" />
+        <input class="labelInput" 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}}" />
+        <input class="labelInput" type="number" maxlength="11" placeholder="请输入手机号" placeholder-class="placeholder" bindinput="onPhoneInput" value="{{phone}}" />
       </view>
     </view>
 

+ 13 - 2
pages/huhaobangding/huhaobangding.wxss

@@ -56,6 +56,7 @@
   display: flex;
   align-items: center;
   padding: 24rpx 0;
+  height: 4vh;
 }
 
 
@@ -68,8 +69,15 @@
   display: flex;
   align-items: center;
   white-space: nowrap;
+  height: 100%;
+}
+.labelInput{
+  font-weight: 550;
+  font-size: 24px;
+  color: gray;
+  height: 100%;
+  align-items: center;
 }
-
 input {
   flex: 1;
   font-size: 32rpx;
@@ -432,8 +440,11 @@ input {
 }
 
 .picker-text {
-  color: #999;
   text-align: right;
+  height: 100%;
+  font-weight: 550;
+  font-size: 20px;
+  color: gray;
 }
 
 .arrow-right {

+ 6 - 5
pages/lijijiaofei/lijijiaofei.js

@@ -1,4 +1,5 @@
 const app = getApp();
+const utils = require('../../utils/util.js')
 Page({
   data: {
     images: {
@@ -132,7 +133,7 @@ Page({
   // 计算默认实缴金额
   calculateDefaultAmount: function() {
     const { actualAmount, balance } = this.data;
-    const difference = (actualAmount - balance).toFixed(2);
+    const difference =  utils.floatSub(actualAmount,balance);
     
     if (difference <= 0) {
       this.setData({
@@ -178,10 +179,10 @@ Page({
       });
       return;
     }
-
-    if (actualAmount > 0 && amount * 1000 + balance * 1000 < actualAmount * 1000) {
+    debugger;
+    if (actualAmount > 0 && utils.floatAdd(amount,balance) < actualAmount) {
       // 先转整数计算,再转回浮点数
-      const minPayment = (actualAmount * 1000 - balance * 1000) / 1000;
+      const minPayment =  utils.floatSub(actualAmount - balance);
       const formattedMinPayment = minPayment.toFixed(2);
       wx.showToast({
         title: '最低缴费金额:' + formattedMinPayment + '元',
@@ -204,7 +205,7 @@ Page({
       },
       data: {
         openId: app.globalData.userWxInfo.openid,
-        totalAmount: this.data.amount*1000/10,
+        totalAmount: utils.floatMul(this.data.amount,100),
         dskey: app.globalData.currentAccountInfo.dsKey,
         zdId: this.data.zdId,
         userNumber: app.globalData.currentAccountInfo.usernumber

+ 49 - 1
utils/util.js

@@ -53,11 +53,59 @@ function formatDateToYMD(dateString) {
     return dateString; // 返回原字符串或自定义错误提示
   }
 }
-
+function floatAdd(a, b) {
+  var c, d, e;
+  if(undefined==a||null==a||""==a||isNaN(a)){a=0;}
+  if(undefined==b||null==b||""==b||isNaN(b)){b=0;}
+  try {
+      c = a.toString().split(".")[1].length;
+  } catch (f) {
+      c = 0;
+  }
+  try {
+      d = b.toString().split(".")[1].length;
+  } catch (f) {
+      d = 0;
+  }
+  e = Math.pow(10, Math.max(c, d));
+  return  (floatMul(a, e) + floatMul(b, e)) / e;
+}
+function floatSub(a, b) {
+  var c, d, e;
+  if(undefined==a||null==a||""==a||isNaN(a)){a=0;}
+  if(undefined==b||null==b||""==b||isNaN(b)){b=0;}
+  try {
+      c = a.toString().split(".")[1].length;
+  } catch (f) {
+      c = 0;
+  }
+  try {
+      d = b.toString().split(".")[1].length;
+  } catch (f) {
+      d = 0;
+  }
+  e = Math.pow(10, Math.max(c, d));
+  return (floatMul(a, e) - floatMul(b, e)) / e;
+}
+function floatMul(a, b) {
+  var c = 0,
+      d = a.toString(),
+      e = b.toString();
+  try {
+      c += d.split(".")[1].length;
+  } catch (f) {}
+  try {
+      c += e.split(".")[1].length;
+  } catch (f) {}
+  return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+}
 module.exports = {
   simleInfo: simleInfo,
   simleInfoWithBack: simleInfoWithBack,
   formatNumber: formatNumber,
   formatTime: formatTime,
   formatDate: formatDate,
+  floatMul:floatMul,
+  floatAdd:floatAdd,
+  floatSub:floatSub
 }