单位注册支付

@@ -47,14 +47,14 @@
       <view class="payRow ">
       <view class="payRow ">
         <radio-group @change="onPayTypeChange">
         <radio-group @change="onPayTypeChange">
           <label class="radioItem">
           <label class="radioItem">
-            <radio :checked="payType === '0'" class="custom-radio" value="0"/>
+            <radio :checked="payType == '1'" class="custom-radio" value="0"/>
             <view class="payInfo">
             <view class="payInfo">
               <image :src="config.baseUrl_api + '/fs/static/min.png'" class="icon" mode="widthFix"></image>
               <image :src="config.baseUrl_api + '/fs/static/min.png'" class="icon" mode="widthFix"></image>
               <text>民生付</text>
               <text>民生付</text>
             </view>
             </view>
           </label>
           </label>
           <label class="radioItem mt10">
           <label class="radioItem mt10">
-            <radio :checked="payType === '3'" class="custom-radio" value="3"/>
+            <radio :checked="payType == '3'" class="custom-radio" value="3"/>
             <view class="payInfo">
             <view class="payInfo">
               <image :src="config.baseUrl_api + '/fs/static/min.png'" class="icon" mode="widthFix"></image>
               <image :src="config.baseUrl_api + '/fs/static/min.png'" class="icon" mode="widthFix"></image>
               <text>对公转账</text>
               <text>对公转账</text>

-<template>
+<template>
   <view class="perfect-page">
   <view class="perfect-page">
     <!-- 顶部步骤条 -->
     <!-- 顶部步骤条 -->
     <view class="steps-bar">
     <view class="steps-bar">
@@ -204,7 +204,7 @@
           <view class="notice-box">
           <view class="notice-box">
             <checkbox-group @change="onNoticeChange">
             <checkbox-group @change="onNoticeChange">
               <label class="notice-label">
               <label class="notice-label">
-                <checkbox :checked="form.notice" color="#e64329" value="1"/>
+                <checkbox :checked="form.notice" color="#AD181F" value="1"/>
                 <text class="notice-text">我已阅读并同意</text>
                 <text class="notice-text">我已阅读并同意</text>
                 <text class="notice-link" @click.stop="showNotice(1)">《注册须知》</text>
                 <text class="notice-link" @click.stop="showNotice(1)">《注册须知》</text>
                 <text class="notice-link" @click.stop="showNotice(2)">《入会须知》</text>
                 <text class="notice-link" @click.stop="showNotice(2)">《入会须知》</text>
@@ -418,24 +418,30 @@ function onNoticeChange(e) {
 }
 }
 
 
 // 社会信用代码失焦校验
 // 社会信用代码失焦校验
-function onCreditCodeBlur() {
-  return new Promise((resolve, reject) => {
-    const creditCode = form.value.creditCode
-    if (!creditCode) return
-    api.creditCodeExist(creditCode).then(res => {
-      if (res.data) {
-        creditCodeValid.value = false
+async function onCreditCodeBlur(showErrorToast = true) {
+  const currentCreditCode = (form.value.creditCode || '').trim()
+  if (!currentCreditCode) {
+    creditCodeValid.value = true
+    return true
+  }
+  try {
+    const res = await api.creditCodeExist(currentCreditCode)
+    if (res.data) {
+      creditCodeValid.value = false
+      if (showErrorToast) {
         uni.showToast({title: '社会信用代码已存在，请联系中跆协修改', icon: 'none', duration: 3000})
         uni.showToast({title: '社会信用代码已存在，请联系中跆协修改', icon: 'none', duration: 3000})
-        return reject()
-      } else {
-        creditCodeValid.value = true
-        return resolve()
       }
       }
-    }).catch(() => {
-      creditCodeValid.value = true
-      return reject()
-    })
-  })
+      return false
+    }
+    creditCodeValid.value = true
+    return true
+  } catch (e) {
+    creditCodeValid.value = false
+    if (showErrorToast) {
+      uni.showToast({title: '社会信用代码校验失败，请稍后重试', icon: 'none', duration: 3000})
+    }
+    return false
+  }
 }
 }
 
 
 // 查看须知 - 跳转到须知页面
 // 查看须知 - 跳转到须知页面
@@ -759,9 +765,9 @@ function changeAddress(e) {
   console.log("选择的地址：", selectedValue);
   console.log("选择的地址：", selectedValue);
   
   
   // 直接赋值纯ID，不要再取 .value
   // 直接赋值纯ID，不要再取 .value
-  form.value.provinceId = selectedValue[0] || '';
-  form.value.cityId = selectedValue[1] || '';
-  form.value.regionId = selectedValue[2] || '';
+  form.value.provinceId = selectedValue[0].value || '';
+  form.value.cityId = selectedValue[1].value || '';
+  form.value.regionId = selectedValue[2] ? selectedValue[2].value || '' : '';
   
   
   // 同步更新选择器显示
   // 同步更新选择器显示
   coordinates1.value = selectedValue;
   coordinates1.value = selectedValue;
@@ -905,7 +911,11 @@ async function submitStep2() {
     return
     return
   }
   }
   
   
-  await onCreditCodeBlur()
+  const creditCodePass = await onCreditCodeBlur(false)
+  if (!creditCodePass) {
+    uni.showToast({title: '社会信用代码已存在，请联系中跆协修改', icon: 'none', duration: 3000})
+    return
+  }
   uni.showLoading({title: '验证中...'})
   uni.showLoading({title: '验证中...'})
   await api.checkBusinessLicense({
   await api.checkBusinessLicense({
     creditCode: form.value.creditCode,
     creditCode: form.value.creditCode,
@@ -1020,6 +1030,7 @@ function onBusinessLicenseSelect() {
             form.value.creditCode = data.data.creditCode
             form.value.creditCode = data.data.creditCode
             form.value.companyName = data.data.companyName
             form.value.companyName = data.data.companyName
             name = data.data.name || '营业执照'
             name = data.data.name || '营业执照'
+            onCreditCodeBlur()
           }
           }
           // 存储为数组格式的JSON字符串
           // 存储为数组格式的JSON字符串
           form.value.businessLicense = JSON.stringify([{
           form.value.businessLicense = JSON.stringify([{
@@ -1370,7 +1381,7 @@ watch(activeStep, (newVal) => {
 
 
 .tips-title {
 .tips-title {
   display: inline-block;
   display: inline-block;
-  background: #e64329;
+  background: #AD181F;
   color: #fff;
   color: #fff;
   font-size: 22rpx;
   font-size: 22rpx;
   padding: 4rpx 16rpx;
   padding: 4rpx 16rpx;
@@ -1446,12 +1457,12 @@ watch(activeStep, (newVal) => {
 
 
 .logout-icon {
 .logout-icon {
   font-size: 28rpx;
   font-size: 28rpx;
-  color: #e64329;
+  color: #AD181F;
 }
 }
 
 
 .logout-text {
 .logout-text {
   font-size: 24rpx;
   font-size: 24rpx;
-  color: #e64329;
+  color: #AD181F;
 }
 }
 
 
 
 
@@ -1486,12 +1497,12 @@ watch(activeStep, (newVal) => {
   
   
   .logout-icon {
   .logout-icon {
     font-size: 28rpx;
     font-size: 28rpx;
-    color: #e64329;
+    color: #AD181F;
   }
   }
   
   
   .logout-text {
   .logout-text {
     font-size: 22rpx;
     font-size: 22rpx;
-    color: #e64329;
+    color: #AD181F;
   }
   }
 }
 }
 
 
@@ -1509,7 +1520,7 @@ watch(activeStep, (newVal) => {
 }
 }
 
 
 .btn-row button:first-child {
 .btn-row button:first-child {
-  background: #e64329;
+  background: #AD181F;
   color: #fff;
   color: #fff;
 }
 }
 
 
@@ -1590,7 +1601,7 @@ watch(activeStep, (newVal) => {
   position: absolute;
   position: absolute;
   top: 10rpx;
   top: 10rpx;
   right: 10rpx;
   right: 10rpx;
-  background: #e64329;
+  background: #AD181F;
   color: #fff;
   color: #fff;
   width: 40rpx;
   width: 40rpx;
   height: 40rpx;
   height: 40rpx;
@@ -1653,7 +1664,7 @@ watch(activeStep, (newVal) => {
   width: 300rpx;
   width: 300rpx;
   height: 80rpx;
   height: 80rpx;
   line-height: 80rpx;
   line-height: 80rpx;
-  background: #e64329;
+  background: #AD181F;
   color: #fff;
   color: #fff;
   border-radius: 40rpx;
   border-radius: 40rpx;
   font-size: 28rpx;
   font-size: 28rpx;
@@ -1670,7 +1681,7 @@ watch(activeStep, (newVal) => {
 }
 }
 
 
 .text-danger {
 .text-danger {
-  color: #e64329;
+  color: #AD181F;
 }
 }
 
 
 .text-success {
 .text-success {
@@ -1966,7 +1977,7 @@ watch(activeStep, (newVal) => {
 
 
 .status-reject {
 .status-reject {
   background: linear-gradient(135deg, #fef0f0 0%, #fde8e8 100%);
   background: linear-gradient(135deg, #fef0f0 0%, #fde8e8 100%);
-  color: #e64329;
+  color: #AD181F;
 }
 }
 
 
 .status-pending {
 .status-pending {