From d553101182080a33bf67ff34ea8a56b823622b24 Mon Sep 17 00:00:00 2001
From: mixtan <424491071@qq.com>
Date: Wed, 14 May 2025 17:36:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20main=E5=BC=95=E5=85=A5reset=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=A0=B7=E5=BC=8F=E5=90=8E=E7=BB=AD=E5=8F=AF=E6=85=A2?=
 =?UTF-8?q?=E6=85=A2=E6=B7=BB=E5=8A=A0=EF=BC=8C=E5=BC=95=E5=85=A5lodash?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=BA=93=E6=96=B9=E4=BE=BF=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=EF=BC=88=E6=94=AF=E8=A1=8C=EF=BC=89=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E9=93=B6?=
 =?UTF-8?q?=E8=A1=8C=E5=8D=A1=E8=B5=84=E6=96=99=E5=A1=AB=E5=86=99=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=BC=80=E6=88=B7=E6=94=AF=E8=A1=8C=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=88=96=E6=89=8B=E5=8A=A8=E5=A1=AB=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 java-mall-app-shop-admin/api/audit.js         |  17 ++
 java-mall-app-shop-admin/main.js              |   1 +
 java-mall-app-shop-admin/package-lock.json    |  14 +-
 java-mall-app-shop-admin/package.json         |   3 +-
 .../pages/audit/shop3.vue                     | 264 ++++++++++++++----
 java-mall-app-shop-admin/static/reset.css     |   8 +
 6 files changed, 251 insertions(+), 56 deletions(-)
 create mode 100644 java-mall-app-shop-admin/static/reset.css

diff --git a/java-mall-app-shop-admin/api/audit.js b/java-mall-app-shop-admin/api/audit.js
index a7ac223..0138b85 100644
--- a/java-mall-app-shop-admin/api/audit.js
+++ b/java-mall-app-shop-admin/api/audit.js
@@ -239,3 +239,20 @@ export function GetBizCategoryList(params) {
     data: params,
   });
 }
+
+
+/**
+ * 搜索银行（支行）分页列表
+ * @author Seven
+ * @data 2025-5-13
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/mobile/shop/lakala/tk/bank/search
+ */
+
+export function branchBankSearchApi(params) {
+  return http({
+    url: '/shop/lakala/tk/bank/search',
+    method: 'post',
+    data: params,
+  });
+}
diff --git a/java-mall-app-shop-admin/main.js b/java-mall-app-shop-admin/main.js
index 139d5ee..d35b642 100644
--- a/java-mall-app-shop-admin/main.js
+++ b/java-mall-app-shop-admin/main.js
@@ -5,6 +5,7 @@ import uView from '@/uni_modules/uview-ui'
 import './uni.promisify.adaptor'
 import tui from './utils/httpRequest'
 import Socket  from './utils/socket.js'
+import "@/static/reset.css"
 // import Utils from './utils/http'
 // import "@/static/font/iconfont.css"
 
diff --git a/java-mall-app-shop-admin/package-lock.json b/java-mall-app-shop-admin/package-lock.json
index 7524a70..9149d91 100644
--- a/java-mall-app-shop-admin/package-lock.json
+++ b/java-mall-app-shop-admin/package-lock.json
@@ -6,7 +6,8 @@
     "": {
       "dependencies": {
         "axios": "^0.27.2",
-        "axios-adapter-uniapp": "^0.1.4"
+        "axios-adapter-uniapp": "^0.1.4",
+        "lodash": "^4.17.21"
       },
       "devDependencies": {
         "sass": "^1.80.6",
@@ -475,6 +476,12 @@
         "node": ">=0.12.0"
       }
     },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "http://npm.ifengqun.com:4873/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
     "node_modules/micromatch": {
       "version": "4.0.8",
       "resolved": "https://mirrors.tencent.com/npm/micromatch/-/micromatch-4.0.8.tgz",
@@ -864,6 +871,11 @@
       "dev": true,
       "optional": true
     },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "http://npm.ifengqun.com:4873/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
     "micromatch": {
       "version": "4.0.8",
       "resolved": "https://mirrors.tencent.com/npm/micromatch/-/micromatch-4.0.8.tgz",
diff --git a/java-mall-app-shop-admin/package.json b/java-mall-app-shop-admin/package.json
index de05cbb..754f56c 100644
--- a/java-mall-app-shop-admin/package.json
+++ b/java-mall-app-shop-admin/package.json
@@ -5,6 +5,7 @@
   },
   "dependencies": {
     "axios": "^0.27.2",
-    "axios-adapter-uniapp": "^0.1.4"
+    "axios-adapter-uniapp": "^0.1.4",
+    "lodash": "^4.17.21"
   }
 }
diff --git a/java-mall-app-shop-admin/pages/audit/shop3.vue b/java-mall-app-shop-admin/pages/audit/shop3.vue
index c076adb..2e6af26 100644
--- a/java-mall-app-shop-admin/pages/audit/shop3.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop3.vue
@@ -1,26 +1,29 @@
 <template>
   <view class="shop-3-container">
-    <u-navbar
-      :autoBack="true"
-      :safeAreaInsetTop="true"
-      title="填写店铺信息第3步 / 共3步"
-    >
+    <u-navbar :autoBack="true" :safeAreaInsetTop="true" title="填写店铺信息第3步 / 共3步">
       <template slot="right">
         <view class="btn-login-out" @click="loginOut">退出登录</view>
       </template>
     </u-navbar>
     <u-form :model="form" ref="uForm" label-width="90">
-      <u-form-item
-        label="开户行"
-        prop="bank_name"
-        required
-        @click="showActionSheet"
-      >
+      <u-form-item label="开户名称" required prop="account_holder_name">
+        <u-input v-model="form.account_holder_name" placeholder="请输入开户名称" />
+      </u-form-item>
+
+      <u-form-item label="银行卡号" required prop="account_number">
+        <u-input
+          type="number"
+          v-model="form.account_number"
+          placeholder="请输入银行卡号"
+        />
+      </u-form-item>
+
+      <u-form-item label="开户行" prop="bank_name" required @click="showActionSheet">
         <u-input
           style="pointer-events: none"
           class="form-input"
           v-model="form.bank_name"
-          placeholder="请选择您的开户行"
+          placeholder="请选择开户行"
           readonly
         />
         <u-icon
@@ -30,62 +33,103 @@
           color="aaaaaa"
         ></u-icon>
       </u-form-item>
-      <u-form-item label="开户银行的支行名称" required prop="bank_branch_name">
+
+      <u-form-item
+        label="开户支行"
+        prop="bank_branch_name"
+        @click="branchBankActionSheet"
+      >
         <u-input
+          :readonly="!form.bank_name"
+          :style="{ pointerEvents: form.bank_name ? '' : 'none' }"
+          class="form-input"
           v-model="form.bank_branch_name"
-          placeholder="请输入开户银行的支行名称"
-        />
-      </u-form-item>
-      <u-form-item label="收款账户" required prop="account_number">
-        <u-input
-          v-model="form.account_number"
-          placeholder="请输入收款账户号码"
-        />
-      </u-form-item>
-      <u-form-item label="账户姓名" required prop="account_holder_name">
-        <u-input
-          v-model="form.account_holder_name"
-          placeholder="请输入账户姓名"
+          placeholder="请选择开户支行名称"
+          @change="onBranchBankChange"
         />
+        <u-icon
+          style="display: inline-block; margin-left: 8rpx"
+          name="arrow-down"
+          size="12"
+          color="aaaaaa"
+        ></u-icon>
       </u-form-item>
     </u-form>
-    <!-- <u-picker
-      v-if="showActionSheet"
-      mode="selector"
-      :show="showActionSheet"
-      :safe-area-inset-bottom="true"
-      :default-selector="[0]"
-      :columns="bankList"
-      keyName="bank_name"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-    >
-    </u-picker> -->
+
     <lzcPicker
       :pickerList="bankList"
       :showKey="'bank_name'"
       @change="handleCancel"
-      :searchPlaceholder="'请输入银行名称进行搜索'"
+      :searchPlaceholder="'输入开户支行名称'"
       ref="lzcPicker"
-      pickerTittle="选择银行"
+      pickerTittle="选择开户支行"
     ></lzcPicker>
+
+    <tui-dropdown-list
+      :show="BranchBankDropdownShow"
+      :height="500"
+      class="dropdown_branch"
+    >
+      <template v-slot:dropdownbox>
+        <div class="branch_list">
+          <template v-if="branchBankList.length">
+            <view
+              class="branch_list_item"
+              v-for="(item, index) in branchBankList"
+              :key="item.id"
+              @click="onBranchBankSelect(item, $event)"
+            >
+              {{ item.branch_bank_name }}
+            </view>
+          </template>
+          <view v-else class="nodata">
+            <template v-if="firstBranchBankLoad">
+              <view class="tit">暂无法搜索到该开户支行</view>
+              <view class="tips" @click="onUseBankBranchClick">点击填写</view>
+            </template>
+            <template v-else>
+              <view class="tit">数据加载中...</view>
+            </template>
+          </view>
+        </div>
+        <u-icon
+          v-if="firstBranchBankLoad"
+          name="close-circle"
+          color="#999"
+          size="28"
+          class="icon_close"
+          @click="onBranchBankDropdownClose"
+        ></u-icon>
+      </template>
+    </tui-dropdown-list>
+
     <view class="btn-content">
       <u-button class="btn-submit" @click="handleSubmit">提交审核</u-button>
     </view>
+
+    <u-toast ref="uToast" />
   </view>
 </template>
 
 <script>
-import { GetBankList, GetMerchApply, GetRestartMerchApply } from "@/api/audit";
+import {
+  GetBankList,
+  GetMerchApply,
+  GetRestartMerchApply,
+  branchBankSearchApi,
+} from "@/api/audit";
 import lzcPicker from "@/components/lzc-picker/lzc-picker.vue";
+import tuiDropdownList from "@/components/tui-dropdown-list/tui-dropdown-list.vue";
 import { mapState } from "vuex";
+import { throttle, debounce } from "lodash";
+
 export default {
   components: {
     lzcPicker,
+    tuiDropdownList,
   },
   data() {
     return {
-      // showActionSheet: false,
       form: {
         bank_name: "",
         bank_branch_name: "",
@@ -93,19 +137,16 @@ export default {
         account_holder_name: "",
       },
       bankList: [],
+      firstBranchBankLoad: false,
+      BranchBankDropdownShow: false,
+      branchBankDebounceFn: null,
+      currentBranchBank: null,
+      branchBankList: [],
       rules: {
         bank_name: [
           {
             required: true,
-            message: "请选择您的开户行",
-            // 可以单个或者同时写两个触发验证方式
-            trigger: ["change", "blur"],
-          },
-        ],
-        bank_branch_name: [
-          {
-            required: true,
-            message: "请输入开户银行的支行名称",
+            message: "请选择开户行",
             // 可以单个或者同时写两个触发验证方式
             trigger: ["change", "blur"],
           },
@@ -113,7 +154,7 @@ export default {
         account_number: [
           {
             required: true,
-            message: "请输入收款账户号码",
+            message: "请输入银行卡号",
             // 可以单个或者同时写两个触发验证方式
             trigger: ["change", "blur"],
           },
@@ -121,7 +162,7 @@ export default {
         account_holder_name: [
           {
             required: true,
-            message: "请输入账户姓名",
+            message: "请输入开户名称",
             // 可以单个或者同时写两个触发验证方式
             trigger: ["change", "blur"],
           },
@@ -138,14 +179,35 @@ export default {
   onShow() {
     this.getBankList();
   },
+  beforeUnmount() {
+    this.branchBankDebounceFn?.cancel();
+  },
+  mounted() {
+    let auditItem = uni.getStorageSync("auditItem");
+
+    this.form.account_holder_name = auditItem.biz_license_company;
+    this.branchBankDebounceFn = debounce(this.getBranchBankList, 500);
+  },
   methods: {
     async getBankList() {
       let res = await GetBankList();
+
       if (res && res.status == 200) {
         this.bankList = res.data;
       }
     },
-    actionSheetCallback() {},
+
+    async getBranchBankList(keyword) {
+      let res = await branchBankSearchApi({
+        keyword,
+        pageNum: 1,
+        pageSize: 10,
+      });
+
+      this.branchBankList = res.data.items;
+      this.firstBranchBankLoad = true;
+    },
+
     async handleSubmit() {
       let valid = this.$refs.uForm.validate().then((valid) => {
         return valid;
@@ -159,8 +221,11 @@ export default {
         let params = {
           ...this.form,
           ...auditItem,
+          ...this.currentBranchBank
         };
 
+        console.log("params", params);
+
         if (this.approvalStatus == 2) {
           params.id = uni.getStorageSync("auditId");
           let res = await GetRestartMerchApply(params);
@@ -183,15 +248,59 @@ export default {
         }
       }
     },
+
     showActionSheet() {
       this.$refs["lzcPicker"].handleShow();
       if (this.bankList.length <= 0) {
         this.getBankList();
       }
     },
+
+    branchBankActionSheet() {
+      if (!this.form.bank_name) {
+        this.$refs.uToast.show({
+          message: "请选择开户行",
+          type: "error",
+          duration: 1000,
+        });
+        return;
+      }
+
+      if (!this.form.bank_branch_name) {
+        this.branchBankDebounceFn(this.form.bank_name || "中国银行");
+      }
+
+      this.BranchBankDropdownShow = true;
+    },
+
+    onUseBankBranchClick() {
+      this.BranchBankDropdownShow = false;
+    },
+
+    onBranchBankSelect(data) {
+      const { area_code, branch_bank_name, branch_bank_no, clear_no } = data;
+      this.currentBranchBank = {
+        area_code,
+        branch_bank_name,
+        openning_bank_code: branch_bank_no,
+        clearing_bank_code: clear_no,
+      };
+      this.BranchBankDropdownShow = false;
+      this.form.bank_branch_name = data.branch_bank_name;
+    },
+
+    onBranchBankDropdownClose() {
+      this.BranchBankDropdownShow = false;
+    },
+
+    async onBranchBankChange() {
+      this.branchBankDebounceFn(this.form.bank_branch_name);
+    },
+
     handleCancel(item) {
       this.form.bank_name = item.bank_name;
     },
+
     loginOut() {
       this.$store.dispatch("user/LoginOut");
     },
@@ -203,6 +312,53 @@ export default {
 .shop-3-container {
   padding: 24rpx;
 
+  ::v-deep .tui-dropdownlist-show {
+    box-shadow: 1rpx 1rpx 20rpx rgba(100, 100, 100, 0.1);
+    border: 1rpx solid rgba(100, 100, 100, 0.1);
+    overflow: visible;
+
+    .icon_close {
+      position: absolute;
+      bottom: -80rpx;
+      left: 50%;
+      transform: translateX(-50%);
+    }
+  }
+
+  .branch_list {
+    height: 500rpx;
+    overflow: auto;
+    background: #fff;
+
+    .branch_list_item {
+      font-size: 28rpx;
+      line-height: 28rpx;
+      padding: 20rpx;
+      border-bottom: 1rpx solid #eee;
+    }
+
+    .nodata {
+      height: 500rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      font-size: 28rpx;
+
+      .tit {
+        color: #666;
+        padding-bottom: 80rpx;
+      }
+
+      .tips {
+        padding: 10rpx 20rpx;
+        color: #fff;
+        border-radius: 100rpx;
+        background: #4b71ff;
+      }
+    }
+  }
+
   .u-navbar {
     height: 88rpx;
   }
diff --git a/java-mall-app-shop-admin/static/reset.css b/java-mall-app-shop-admin/static/reset.css
new file mode 100644
index 0000000..b7aa74f
--- /dev/null
+++ b/java-mall-app-shop-admin/static/reset.css
@@ -0,0 +1,8 @@
+*{
+    margin: 0;
+    padding: 0;
+}
+
+ul{
+    list-style: none;
+}
\ No newline at end of file