fix:"优化个人中心页面"

src/service/purse/index.js

@@ -65,3 +65,13 @@ export function altMchSign(params) {
 export function getPhotos(params) {
   return axios.get(`/SZWL-SERVER/purse/userLicense?${stringToUrl(params)}`);
 }
+
+// 更新商户认证状态
+export function updateMchApproveStatus(params) {
+  return axios.post(`/SZWL-SERVER/tJoinpayMch/updateMchApproveStatus`, params);
+}
+
+// 更新签约状态
+export function updateMchSignStatus(params) {
+  return axios.post(`/SZWL-SERVER/tJoinpayMch/updateMchSignStatus`, params);
+}

src/views/bindBankCard/index.vue

@@ -195,7 +195,7 @@
             <template v-else>
               <van-cell title="企业名称" :value="formData.companyName" />
               <van-cell title="营业执照号" :value="formData.licenseNo" />
-              <van-cell title="注册日期" :value="companyDateValue" />
+              <van-cell title="注册日期" :value="formData.companyDate" />
               <van-cell title="法人姓名" :value="formData.name" />
               <van-cell title="法人身份证" :value="formData.idNumber" />
               <van-cell title="法人手机号" :value="formData.phone" />
@@ -213,11 +213,7 @@
             />
             <van-cell
               :title="merchantType === 0 ? '银行卡号' : '对公账号'"
-              :value="
-                merchantType === 0
-                  ? formData.bankCardNo
-                  : formData.bankAccountNo
-              "
+              :value="formData.bankCardNo"
             />
             <van-cell
               v-if="merchantType === 1"
@@ -276,7 +272,7 @@
               </div>
             </div>
             <van-button
-              v-if="auditStatus == 3"
+              v-if="auditStatus == 2"
               size="small"
               type="primary"
               plain
@@ -297,10 +293,7 @@
           </h3>
 
           <!-- 签约状态栏 -->
-          <div
-            class="audit-status-bar"
-            :class="signStatusClass"
-          >
+          <div class="audit-status-bar" :class="signStatusClass">
             <div class="status-content">
               <van-icon :name="signStatusIcon" class="status-icon" />
               <div class="status-text">
@@ -324,7 +317,15 @@
       </div>
       <div class="action-buttons">
         <van-button
-          v-if="currentStep > 0 && currentStep < 3"
+          v-if="currentStep > 0 && currentStep < 3 && auditStatus != 1"
+          round
+          class="prev-btn"
+          @click="currentStep--"
+        >
+          上一步
+        </van-button>
+        <van-button
+          v-if="currentStep == 2 && auditStatus == 1"
           round
           class="prev-btn"
           @click="currentStep--"
@@ -575,7 +576,7 @@
               required
             />
             <van-field
-              v-model="companyDateValue"
+              v-model="formData.companyDate"
               label="注册日期"
               placeholder="请选择注册日期"
               :rules="[{ required: true, message: '请选择注册日期' }]"
@@ -760,6 +761,8 @@ import {
   getJoinPayMch,
   uploadPhotos,
   updateApproveStatus,
+  updateMchApproveStatus,
+  updateMchSignStatus,
   altMchSign,
   getPhotos,
 } from "../../service/purse/index.js";
@@ -781,6 +784,8 @@ export default {
     const businessLicense = ref([]);
     const bankCard = ref([]);
     const accountLicense = ref([]);
+    // 企业法人确认
+    const legalPersonName = ref('');
     // 确认信息弹窗
     const showConfirmSheet = ref(false);
     // 日期选择
@@ -791,14 +796,6 @@ export default {
     const companyDate = ref(["2022", "06", "01"]);
     // 身份证有效期限
     const validDate = ref(["2022", "06", "01"]);
-    // 企业注册日期
-    const companyDateValue = ref(null);
-    // 切换身份证有效类型
-    const handleValidTypeChange = () => {
-      validDate.value = "";
-      formData.value.startDate = "";
-      formData.value.endDate = "";
-    };
     // 信息认证状态（0: 未认证 1: 已认证 2: 认证失败）
     const infoStatus = ref(0);
     // 信息认证计算属性
@@ -854,13 +851,7 @@ export default {
       }[auditStatus.value];
     });
 
-    const statusSubText = computed(() => {
-      return {
-        0: "预计3分钟内完成审核",
-        1: "可继续完成签约流程",
-        2: "请重新上传符合要求的证件",
-      }[auditStatus.value];
-    });
+    const statusSubText = ref("");
 
     // 签约状态（0: 未签约 1: 已签约 2: 签约失败）
     const signStatus = ref(0);
@@ -991,7 +982,7 @@ export default {
                 data.data.businessLicenseValidDate
               );
               companyDate.value = formData.value.companyDate.split("-");
-              companyDateValue.value = companyDate.value.join(".");
+              legalPersonName.value = data.data.legalPerson;
               break;
             // 银行卡正面
             case "bankCard":
@@ -1016,7 +1007,6 @@ export default {
 
     const companyDateConfirm = () => {
       formData.value.companyDate = companyDate.value.join("-");
-      companyDateValue.value = companyDate.value.join(".");
       showCompanyDatePicker.value = false;
     };
 
@@ -1049,6 +1039,10 @@ export default {
             } else {
               // 企业
               submitParam.value.altMerchantType = 12;
+              if (legalPersonName.value != formData.value.name) {
+                showToast("法人姓名与营业执照主体不一致！");
+                return;
+              }
               submitParam.value.legalPerson = formData.value.name;
               submitParam.value.idCardNo = formData.value.idNumber.replace(
                 /\s/g,
@@ -1088,7 +1082,7 @@ export default {
           try {
             const { data } = await createMch(submitParam.value);
             if (data.code === "00000") {
-                currentStep.value++;
+              currentStep.value++;
             } else {
               showToast(data.message);
             }
@@ -1113,6 +1107,9 @@ export default {
             joinPayMchNo.value = data.data.altMchNo;
           }
           formData.value.merchantType = data.data.altMerchantType;
+          if (formData.value.merchantType === 12) {
+            merchantType.value = 1;
+          }
           formData.value.name = data.data.legalPerson;
           formData.value.idNumber = data.data.idCardNo;
           formData.value.validDate = data.data.idCardExpiry;
@@ -1165,13 +1162,17 @@ export default {
           switch (data.data.approveStatus) {
             case "审核中":
               auditStatus.value = 0;
+              statusSubText.value = "预计3分钟内完成审核";
               changeApproveStatus();
               break;
             case "审核通过":
               auditStatus.value = 1;
+              statusSubText.value = "审核通过";
               break;
             case "审核不通过":
               auditStatus.value = 2;
+              statusSubText.value = data.data.approveNote;
+              changeApproveStatus();
               break;
           }
           // 签约状态
@@ -1248,6 +1249,11 @@ export default {
     onMounted(async () => {
       await getMchInfo();
       await getUserLicense();
+      if (currentStep.value === 3) {
+        changeApproveStatus();
+        changeMchApproveStatus();
+        changeSignStatus();
+      }
     });
 
     const handleNextStep = () => {
@@ -1292,26 +1298,29 @@ export default {
               const { data } = await createMch(submitParam.value);
               if (data.code === "00000") {
                 // 提交成功，看图片是否上传
-                if (uploadStatus.value === 0) {
-                  // 未上传，调用上传接口
-                  const params = {
-                    id: joinPayMchID.value,
-                    adminId: user.id,
-                    altMerchantType: formData.value.merchantType,
-                    status: "0",
-                  };
-                  try {
-                    const { data } = await uploadPhotos(params);
-                    if (data.code === "00000") {
-                      // 上传成功
-                      uploadStatus.value = 1;
-                    } else {
-                      showToast(data.message);
-                    }
-                  } catch (error) {
-                    console.log(error);
+                const params = {
+                  id: joinPayMchID.value,
+                  adminId: user.id,
+                  altMerchantType: formData.value.merchantType,
+                  status: "0",
+                };
+                if (uploadStatus.value === 1 && auditStatus.value === 1) {
+                  // 上传了，调用修改接口
+                  params.status  = "1";
+                }
+                try {
+                  const { data } = await uploadPhotos(params);
+                  if (data.code === "00000") {
+                    // 上传成功
+                    uploadStatus.value = 1;
+                    auditStatus.value = 0;
+                    statusSubText.value = "预计3分钟内完成审核";
+                  } else {
+                    showToast(data.message);
                   }
-                } 
+                } catch (error) {
+                  console.log(error);
+                }
                 infoStatus.value = 0;
                 infoStatusSubText.value = "预计3分钟内完成认证";
                 currentStep.value++;
@@ -1329,9 +1338,11 @@ export default {
       if (currentStep.value === 3) {
         if (infoStatus.value != 1) {
           showToast("请确认认证通过");
+          return;
         }
         if (auditStatus.value != 1) {
           showToast("请确认证件审核通过");
+          return;
         }
         showConfirmDialog({
           message: "确认签约？",
@@ -1364,6 +1375,29 @@ export default {
       if (data.code === "00000") {
         if (data.data === "P1000") {
           auditStatus.value = 1;
+          statusSubText.value = "审核通过";
+        }
+      }
+    };
+
+    // 更新商户认证状态
+    const changeMchApproveStatus = async () => {
+      const { data } = await updateMchApproveStatus({ id: joinPayMchID.value });
+      if (data.code === "00000") {
+        if (data.data === "P1000") {
+          auditStatus.value = 1;
+          statusSubText.value = "审核通过";
+        }
+      }
+    };
+
+    // 更新签约状态
+    const changeSignStatus = async () => {
+      const { data } = await updateMchSignStatus({ id: joinPayMchID.value });
+      if (data.code === "00000") {
+        if (data.data === "P1000") {
+          auditStatus.value = 1;
+          statusSubText.value = "审核通过";
         }
       }
     };
@@ -1434,7 +1468,6 @@ export default {
       maxDate,
       companyDate,
       validDate,
-      companyDateValue,
       activeCollapse,
       auditStatus,
       statusClass,
@@ -1460,7 +1493,6 @@ export default {
       afterRead,
       formatIdCard,
       formatPhone,
-      handleValidTypeChange,
       idDateConfirm,
       confirmInfo,
       companyDateConfirm,
@@ -1805,7 +1837,7 @@ export default {
 .sheet-content {
   padding: 0 16px 20px;
   max-height: 70vh;
-  overflow-y: auto;
+  // overflow-y: auto;
 
   .van-cell {
     background: #f8f9ff;
@@ -1879,8 +1911,7 @@ export default {
 }
 
 .confirm-buttons {
-  padding: 15px 0 0;
-
+  padding: 15px 0;
   .confirm-btn {
     background: #4d6add;
     border: none;

src/views/device/jam/index.vue

@@ -208,7 +208,6 @@ export default {
   }
 
   .jam-image {
-    border: 1px solid #eee;
     flex-shrink: 0;
   }
 

src/views/user.vue

@@ -29,41 +29,40 @@
             class="userInfo l-flex-between"
           >
             <span class="userInfoLeft">{{ $t("user.region") }}</span>
-            <div class="cust_vantBorder">
-              <div class="filedInpPad">
-                <van-field
-                  @click-input="clickShowArea"
-                  readonly
-                  clearable
-                  v-model="fieldValue"
-                  :placeholder="$t('user.regionPlace')"
-                >
-                  <template #right-icon>
-                    <div class="l-flex-RC">
-                      <van-icon
-                        v-if="fieldValue"
-                        @click="
-                          fieldValue = '';
-                          accountDetail.areaId = '';
-                        "
-                        class="o-mr-6"
-                        name="clear"
-                      />
-                      <van-icon @click="clickShowArea" name="arrow-down" />
-                    </div>
-                  </template>
-                </van-field>
-              </div>
-            </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(4)" />
+            <van-field
+              @click-input="clickShowArea"
+              readonly
+              clearable
+              class="relationClass"
+              v-model="fieldValue"
+              :placeholder="$t('user.regionPlace')"
+            >
+              <template #right-icon>
+                <van-icon
+                  v-if="fieldValue"
+                  @click="
+                    fieldValue = '';
+                    accountDetail.areaId = '';
+                  "
+                  class="o-mr-6"
+                  name="clear"
+                />
+              </template>
+              <template #extra>
+                <van-icon name="edit" class="editIcon" @click="editClk(4)" />
+              </template>
+            </van-field>
           </div>
           <div
             v-if="user.type == '2' && areaShow"
             class="userInfo l-flex-between"
           >
             <span class="userInfoLeft">{{ $t("user.region") }}</span>
-            <span>{{ fieldValue }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(4)" />
+            <van-field :model-value="fieldValue" class="textClass" readonly>
+              <template #extra>
+                <van-icon name="edit" class="editIcon" @click="editClk(4)" />
+              </template>
+            </van-field>
           </div>
           <!-- 邮箱 -->
           <div
@@ -71,30 +70,38 @@
             class="userInfo l-flex-between"
           >
             <span class="userInfoLeft">{{ $t("user.mailbox") }}</span>
-            <div>
-              <van-field
-                class="relationClass"
-                v-model="cofficentForm.mailBox"
-                :placeholder="$t('user.mailboxPlace')"
-              >
-                <template #button>
-                  <van-button
-                    type="primary"
-                    @click="mailboxChg(cofficentForm.mailBox, 2)"
-                    >{{ $t("user.confirmLog") }}
-                  </van-button>
-                </template>
-              </van-field>
-            </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(2)" />
+            <van-field
+              class="relationClass"
+              v-model="cofficentForm.mailBox"
+              :placeholder="$t('user.mailboxPlace')"
+              clearable
+            >
+              <template #button>
+                <van-button
+                  type="primary"
+                  @click="mailboxChg(cofficentForm.mailBox, 2)"
+                  >{{ $t("user.confirmLog") }}
+                </van-button>
+              </template>
+              <template #extra>
+                <van-icon name="edit" class="editIcon" @click="editClk(2)" />
+              </template>
+            </van-field>
           </div>
           <div
             v-if="user.type != '0' && mailboxShow"
             class="userInfo l-flex-between"
           >
             <span class="userInfoLeft">{{ $t("user.mailbox") }}</span>
-            <span>{{ accountDetail.email }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(2)" />
+            <van-field
+              :model-value="accountDetail.email"
+              class="textClass"
+              readonly
+            >
+              <template #extra>
+                <van-icon name="edit" class="editIcon" @click="editClk(2)" />
+              </template>
+            </van-field>
           </div>
           <!-- 手机号码 -->
           <div
@@ -102,98 +109,113 @@
             class="userInfo l-flex-between"
           >
             <span class="userInfoLeft">{{ $t("user.phoneNumber") }}</span>
-            <div>
-              <van-field
-                class="relationClass"
-                v-model="cofficentForm.phone"
-                :placeholder="$t('user.phoneNumberPlace')"
-              >
-                <template #button>
-                  <van-button
-                    type="primary"
-                    @click="mailboxChg(cofficentForm.phone, 3)"
-                    >{{ $t("user.confirmLog") }}
-                  </van-button>
-                </template>
-              </van-field>
-            </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(3)" />
+            <van-field
+              class="relationClass"
+              v-model="cofficentForm.phone"
+              :placeholder="$t('user.phoneNumberPlace')"
+              clearable
+            >
+              <template #button>
+                <van-button
+                  type="primary"
+                  @click="mailboxChg(cofficentForm.phone, 3)"
+                  >{{ $t("user.confirmLog") }}
+                </van-button>
+              </template>
+              <template #extra>
+                <van-icon name="edit" class="editIcon" @click="editClk(3)" />
+              </template>
+            </van-field>
           </div>
           <div
             v-if="user.type != '0' && phoneNumberShow"
             class="userInfo l-flex-between"
           >
             <span class="userInfoLeft">{{ $t("user.phoneNumber") }}</span>
-            <span>{{ accountDetail.phone }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(3)" />
+            <van-field
+              :model-value="accountDetail.phone"
+              class="textClass"
+              readonly
+            >
+              <template #extra>
+                <van-icon name="edit" class="editIcon" @click="editClk(3)" />
+              </template>
+            </van-field>
           </div>
 
           <!-- 自定义货币符号 -->
           <div v-if="!symbolShow" class="userInfo l-flex-between">
             <span class="userInfoLeft">{{ $t("user.currencySymbol") }}</span>
-            <div>
-              <van-field
-                class="relationClass"
-                v-model="cofficentForm.currencySymbol"
-                :placeholder="$t('user.currencySymbolPlace')"
-              >
-                <template #button>
-                  <van-button
-                    type="primary"
-                    @click="mailboxChg(cofficentForm.currencySymbol, 5)"
-                    >{{ $t("user.confirmLog") }}
-                  </van-button>
-                </template>
-              </van-field>
-            </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(5)" />
+            <van-field
+              class="relationClass"
+              v-model="cofficentForm.currencySymbol"
+              :placeholder="$t('user.currencySymbolPlace')"
+              clearable
+            >
+              <template #button>
+                <van-button
+                  type="primary"
+                  @click="mailboxChg(cofficentForm.currencySymbol, 5)"
+                  >{{ $t("user.confirmLog") }}
+                </van-button>
+              </template>
+              <template #extra>
+                <van-icon name="edit" class="editIcon" @click="editClk(5)" />
+              </template>
+            </van-field>
           </div>
           <div v-else class="userInfo l-flex-between">
             <span class="userInfoLeft">{{ $t("user.currencySymbol") }}</span>
-            <span>{{ accountDetail.currencySymbol }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(5)" />
+            <van-field
+              :model-value="accountDetail.currencySymbol"
+              class="textClass"
+              readonly
+            >
+              <template #extra>
+                <van-icon name="edit" class="editIcon" @click="editClk(5)" />
+              </template>
+            </van-field>
           </div>
           <!-- 时区 -->
           <div
             v-if="user.type > 1 && !timezoneShow"
             class="userInfo l-flex-between"
           >
-            <span class="userInfoLeft">{{ $t("user.setTheTimezone") }}: </span>
-            <div class="cust_vantBorder">
-              <div class="filedInpPad">
-                <van-field
-                  @click-input="tzFieldValueInpClk"
-                  readonly
-                  clearable
-                  v-model="tzFieldValue"
-                  :placeholder="$t('user.setTheTimezonePlace')"
-                >
-                  <template #right-icon>
-                    <div class="l-flex-RC">
-                      <van-icon
-                        v-if="tzFieldValue"
-                        @click="
-                          tzFieldValue = '';
-                          accountDetail.timeZone = '';
-                        "
-                        class="o-mr-6"
-                        name="clear"
-                      />
-                      <van-icon @click="tzFieldValueInpClk" name="arrow-down" />
-                    </div>
-                  </template>
-                </van-field>
-              </div>
-            </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(7)" />
+            <span class="userInfoLeft">{{ $t("user.setTheTimezone") }}</span>
+            <van-field
+              @click-input="tzFieldValueInpClk"
+              readonly
+              clearable
+              v-model="tzFieldValue"
+              class="relationClass"
+              :placeholder="$t('user.setTheTimezonePlace')"
+            >
+              <template #right-icon>
+                <van-icon
+                  v-if="tzFieldValue"
+                  @click="
+                    tzFieldValue = '';
+                    accountDetail.timeZone = '';
+                  "
+                  class="o-mr-6"
+                  name="clear"
+                />
+              </template>
+              <template #extra>
+                <van-icon name="edit" class="editIcon" @click="editClk(7)" />
+              </template>
+            </van-field>
           </div>
           <div
             v-if="user.type > 1 && timezoneShow"
             class="userInfo l-flex-between"
           >
             <span class="userInfoLeft">{{ $t("user.setTheTimezone") }} </span>
-            <span>{{ tzFieldValue }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(7)" />
+            <van-field :model-value="tzFieldValue" class="textClass" readonly>
+              <template #extra>
+                <van-icon name="edit" class="editIcon" @click="editClk(7)" />
+              </template>
+            </van-field>
           </div>
 
           <!-- DIY使用密码 -->
@@ -202,27 +224,32 @@
             class="userInfo l-flex-between"
           >
             <span class="userInfoLeft">{{ $t("user.diyPassword") }}</span>
-            <div>
-              <van-field
-                class="relationClass"
-                v-model="diyPassword"
-                :placeholder="$t('user.diyPasswordPlace')"
-              >
-                <template #button>
-                  <van-button type="primary" @click="mailboxChg(diyPassword, 6)"
-                    >{{ $t("user.confirmLog") }}
-                  </van-button>
-                </template>
-              </van-field>
-            </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(6)" />
+            <van-field
+              class="relationClass"
+              v-model="diyPassword"
+              :placeholder="$t('user.diyPasswordPlace')"
+              clearable
+            >
+              <template #button>
+                <van-button type="primary" @click="mailboxChg(diyPassword, 6)"
+                  >{{ $t("user.confirmLog") }}
+                </van-button>
+              </template>
+              <template #extra>
+                <van-icon name="edit" class="editIcon" @click="editClk(6)" />
+              </template>
+            </van-field>
           </div>
           <div
             v-if="user.type == '0' && diyPasswordShow"
             class="userInfo l-flex-between"
           >
             <span class="userInfoLeft">{{ $t("user.diyPassword") }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(6)" />
+            <van-field model-value="" class="textClass" readonly>
+              <template #extra>
+                <van-icon name="edit" class="editIcon" @click="editClk(6)" />
+              </template>
+            </van-field>
           </div>
 
           <!-- 切换支付平台 -->
@@ -320,15 +347,6 @@
               <div class="taskTitle">{{ $t("user.taskMessage") }}</div>
             </div>
           </div>
-
-          <!-- 提现帐号 -->
-          <!-- <div v-if="isInland && (user.type == 2 || user.type == 3)" class="taskListRow l-flex-RC"
-            @click="pushPageList('/settlement')">
-            <div class="taskIcon joinPayMchIcon"></div>
-            <div class="taskRight">
-              <div class="taskTitle">{{ $t("user.settlementAccount") }}</div>
-            </div>
-          </div> -->
           <!-- 提现帐号 -->
           <div
             v-if="user.type == 0"
@@ -1333,7 +1351,6 @@ export default {
             font-weight: 600;
             color: @primary-color;
             margin-bottom: 6px;
-            
           }
 
           .infoLabel {
@@ -1384,6 +1401,10 @@ export default {
           padding: 16px 0;
           border-bottom: 1px solid #f0f3f5;
 
+          .textClass {
+            padding: 0;
+          }
+
           &:last-child {
             border-bottom: none;
           }
@@ -1401,6 +1422,8 @@ export default {
             font-size: 18px;
             margin-left: 12px;
             cursor: pointer;
+            display: flex;
+            align-items: center;
             transition: opacity 0.3s;
 
             &:hover {
@@ -1411,7 +1434,7 @@ export default {
           // 输入框区域
           .cust_vantBorder {
             flex: 1;
-            margin: 0 12px;
+            margin-right: 15px;
 
             .van-cell {
               padding: 8px 12px;
@@ -1435,6 +1458,16 @@ export default {
 
           // 带按钮的输入框
           .relationClass {
+            padding: 8px 12px;
+            background: #f8f9fa;
+            border-radius: 6px;
+
+            :deep(.van-field__control) {
+              padding: 4px 8px;
+              background: white;
+              border-radius: 4px;
+            }
+
             .van-button {
               height: 32px;
               padding: 0 16px;
@@ -1486,20 +1519,39 @@ export default {
           .userInfo {
             padding: 12px 0;
             flex-wrap: wrap;
+            display: flex;
+            align-items: center;
+            gap: 1px;
 
             .userInfoLeft {
               flex: 1 1 100%;
               margin-bottom: 8px;
             }
 
-            .cust_vantBorder,
-            .relationClass {
+            .cust_vantBorder {
               flex: 1;
               margin: 0;
             }
 
+            .textClass {
+              padding: 0px;
+            }
+
+            .relationClass {
+              display: flex;
+              padding: 8px 12px;
+              background: #f8f9fa;
+              border-radius: 6px;
+
+              :deep(.van-field__control) {
+                padding: 4px 8px;
+                background: white;
+                border-radius: 4px;
+              }
+            }
+
             .editIcon {
-              margin-left: auto;
+              margin-left: 5px;
             }
           }
         }