Merge branch 'feture-yt' into dev

# Conflicts:
#	request.js

pages/personCenter/bindBankCard/bindBankCard.js

@@ -122,6 +122,17 @@ Page({
       return false;
     }
 
+    // 正则表达式，匹配非汉字字符
+    const reg = /[^\u4e00-\u9fa5]/;
+    // 判断输入的值是否含有非汉字字符
+    if (reg.test(cardHolder)) {
+      wx.showToast({
+        title: '姓名必须为汉字',
+        icon: 'none',
+      });
+      return false;
+    } 
+    
     // 检查手机号是否为 11 位且只包含数字
     const phonePattern = /^[0-9]{11}$/;
     if (!phonePattern.test(phoneNumber)) {

pages/personCenter/bindBankCard/bindBankCard.wxml

@@ -73,6 +73,7 @@
         placeholder="请输入开户银行" 
         data-field="bankName"
         bindinput="handleInputChange"
+        type="number"
         value="{{ bankName }}"
       />
     </view>

pages/personCenter/withdrawalAccount/withdrawalAccount.js

@@ -25,6 +25,22 @@ Page({
       success: (res) => {
         console.log('当前账户是---->',res.data);
         if (res.data.code === 1) {
+          if (res.data.data === null ) {
+            wx.showModal({
+              title: '提示',
+              content: '当前无账户，请添加',
+              complete: (res) => {
+                if (res.cancel) {
+                  wx.navigateBack()
+                } else if (res.confirm) {
+                  wx.navigateTo({
+                    url: '/pages/personCenter/bindBankCard/bindBankCard',
+                  })
+                }
+              }
+            })
+            return;
+          }
           this.setData({
             cardHolder: res.data.data.cardHolder,
             idCardNumber: res.data.data.idCardNumber,
@@ -72,7 +88,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    this.getAccountInfo()
   },
 
   /**

pages/personCenter/withdrawalAccount/withdrawalAccount.wxss

@@ -1,5 +1,5 @@
 .mt-27 {
-  margin-top: 50.63rpx;
+  margin-top: 32.63rpx;
 }
 .page {
   padding: 65.63rpx 37.5rpx 701.25rpx 58.13rpx;
@@ -17,7 +17,7 @@
   margin-top: 82.5rpx;
 }
 .group_2 {
-  padding-bottom: 41.25rpx;
+  padding-bottom: 29.25rpx;
   border-bottom: solid 1.88rpx #d1d1d1;
 }
 .font {
@@ -48,11 +48,11 @@
   line-height: 22.76rpx;
 }
 .group_3 {
-  padding-bottom: 41.25rpx;
+  padding-bottom: 29.25rpx;
 }
 .group_4 {
   margin-right: 11.25rpx;
-  padding: 30rpx 0;
+  padding: 25rpx 0;
   border-top: solid 1.88rpx #d1d1d1;
   border-bottom: solid 1.88rpx #d1d1d1;
 }