From 2350346d954687349ae2cfef95a88626af4341bd Mon Sep 17 00:00:00 2001
From: yuanteng0011 <1876787513@qq.com>
Date: Thu, 19 Jun 2025 14:13:59 +0800
Subject: [PATCH] commission--yt-commit

---
 pages/personCenter/bindBankCard/bindBankCard.js |  6 +++---
 .../commissionSetting/commissionSetting.wxss    |  2 +-
 .../subCommissionSetting.wxss                   |  2 +-
 .../projectDetail/projectDetail.js              | 17 ++++++++++++++++-
 .../projectDetail/projectDetail.wxml            |  8 ++++----
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/pages/personCenter/bindBankCard/bindBankCard.js b/pages/personCenter/bindBankCard/bindBankCard.js
index a34c552..f5f62f1 100644
--- a/pages/personCenter/bindBankCard/bindBankCard.js
+++ b/pages/personCenter/bindBankCard/bindBankCard.js
@@ -154,11 +154,11 @@ Page({
       return false;
     }
 
-    // 检查银行卡号是否为 16 位且只包含数字
-    const bankCardPattern = /^[0-9]{16}$/;
+    // 检查银行卡号是否为 16 - 19 位且只包含数字
+    const bankCardPattern = /^[0-9]{16,19}$/;
     if (!bankCardPattern.test(bankCardNumber)) {
       wx.showToast({
-        title: '银行卡号必须是 16 位数字',
+        title: '银行卡号必须是 16 - 19 位数字',
         icon: 'none',
       });
       return false;
diff --git a/pages/personCenter/commissionSetting/commissionSetting.wxss b/pages/personCenter/commissionSetting/commissionSetting.wxss
index a58ad31..3600025 100644
--- a/pages/personCenter/commissionSetting/commissionSetting.wxss
+++ b/pages/personCenter/commissionSetting/commissionSetting.wxss
@@ -16,7 +16,7 @@
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  height: 100%;
+  height: calc(100vh - 1rpx);
 }
 .section {
   padding: 28.13rpx 26.25rpx;
diff --git a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxss b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxss
index fd1a935..09f98d7 100644
--- a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxss
+++ b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxss
@@ -19,7 +19,7 @@
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  height: 100%;
+  height: calc(100vh - 1rpx);
 }
 .font {
   font-size: 30rpx;
diff --git a/pages/projectModule/projectDetail/projectDetail.js b/pages/projectModule/projectDetail/projectDetail.js
index b620e4f..312ff02 100644
--- a/pages/projectModule/projectDetail/projectDetail.js
+++ b/pages/projectModule/projectDetail/projectDetail.js
@@ -13,6 +13,10 @@ Page({
     currentQrcode: '',
     currentPromoLink: '',
     globalImgUrl,
+    settlementDesc: '',
+    projectDesc: '',
+    projectFlow: '',
+    projectDescription: '',
   },
 
   onLoad(options) {
@@ -50,7 +54,11 @@ Page({
             projectDetail: detail,
             notificationList: detail.projectNotificationVOList || [],
             settlementDetailList: detail.projectAllDetailVOList || [],
-            promoCodeList: detail.promoCodeApplyVOList || []
+            promoCodeList: detail.promoCodeApplyVOList || [],
+            settlementDesc: this.decode64(detail.settlementDesc),
+            projectDesc: this.decode64(detail.projectDesc),
+            projectFlow: this.decode64(detail.projectFlow),
+            projectDescription: this.decode64(detail.projectDescription)
           });
         } else {
           wx.showToast({
@@ -68,6 +76,13 @@ Page({
     });
   },
 
+  // base64转为字符串
+  decode64(text) {
+    var decoder = new TextDecoder();
+    return new TextDecoder().decode(Uint8Array.from(atob(text), (c) => c.charCodeAt(0)));
+    // return  decodeURIComponent(escape(String.fromCharCode(...[text])));
+  },
+
   switchTab(e) {
     const idx = +e.currentTarget.dataset.index;
     this.setData({ activeTab: idx });
diff --git a/pages/projectModule/projectDetail/projectDetail.wxml b/pages/projectModule/projectDetail/projectDetail.wxml
index ae46c53..f069770 100644
--- a/pages/projectModule/projectDetail/projectDetail.wxml
+++ b/pages/projectModule/projectDetail/projectDetail.wxml
@@ -8,7 +8,7 @@
       <view class="flex-col flex-1 group_1 ml-20">
         <text class="self-start font text">{{projectDetail.projectName}}</text>
         <view class="flex-row items-center self-stretch mt-7">
-          <text class="flex-1 font_2 text_2">{{projectDetail.projectDescription}}</text>
+          <text class="flex-1 font_2 text_2">{{ projectDescription }}</text>
           <view class="flex-row items-center shrink-0 section ml-13" bindtap="gotoSettlement" data-id="{{ projectDetail.id }}" data-url="{{ projectDetail.projectImage }}" data-name="{{ projectDetail.projectName }}">
             <image
               class="shrink-0 image_2"
@@ -97,7 +97,7 @@
               class="image_5 pos_4"
               src="./images/sm.png"
             />
-            <rich-text class="self-stretch section_8 view_2" nodes="{{projectDetail.settlementDesc}}"></rich-text>
+            <rich-text class="self-stretch section_8 view_2" nodes="{{ settlementDesc }}"></rich-text>
           </view>
           <view class="flex-col relative section_1 mt-21">
             <text class="self-start font_5 text_1">项目说明</text>
@@ -105,7 +105,7 @@
               class="image_5 pos_5"
               src="./images/sm.png"
             />
-            <rich-text class="self-stretch section_8" nodes="{{projectDetail.projectDesc}}"></rich-text>
+            <rich-text class="self-stretch section_8" nodes="{{ projectDesc }}"></rich-text>
           </view>
           <view class="flex-col relative section_1 mt-21">
             <text class="self-start font_5 text_1">项目流程</text>
@@ -113,7 +113,7 @@
               class="image_5 pos_6"
               src="./images/sm.png"
             />
-            <rich-text class="self-stretch section_8" nodes="{{projectDetail.projectFlow}}"></rich-text>
+            <rich-text class="self-stretch section_8" nodes="{{ projectFlow }}"></rich-text>
           </view>
         </view>
         <!-- 我的推广码tab -->