From 2246ccaedea2ff5df5e3eacde7c2fe19803975a9 Mon Sep 17 00:00:00 2001
From: qijq <624811160@qq.com>
Date: Sat, 30 Aug 2025 16:01:24 +0800
Subject: [PATCH] update bug

---
 .../pages/audit/formConfig.js                 |  2 +-
 .../pages/audit/shop2.vue                     | 44 +++++++++++------
 .../pages/audit/shop3.vue                     | 14 +++++-
 .../pages/my/shopQRcode/shopQRcode.vue        | 22 +++++++--
 .../pages/warehouse/manage/classifyList.vue   |  6 +++
 .../pages/warehouse/manage/editClassify.vue   | 48 ++++++++++---------
 6 files changed, 91 insertions(+), 45 deletions(-)

diff --git a/java-mall-app-shop-admin/pages/audit/formConfig.js b/java-mall-app-shop-admin/pages/audit/formConfig.js
index edb6c73..2455799 100644
--- a/java-mall-app-shop-admin/pages/audit/formConfig.js
+++ b/java-mall-app-shop-admin/pages/audit/formConfig.js
@@ -214,7 +214,7 @@ const formConfig = [
     type: "upload",
     key: "individual_id_images2",
     label: "身份证反面图片",
-    class: "upload-5",
+    class: "upload-6",
     placeholder: "请上传身份证身份证反面图片",
     ruleMessage: "请上传身份证身份证反面图片",
     imgUrlArr: [],
diff --git a/java-mall-app-shop-admin/pages/audit/shop2.vue b/java-mall-app-shop-admin/pages/audit/shop2.vue
index fc559cd..d00be55 100644
--- a/java-mall-app-shop-admin/pages/audit/shop2.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop2.vue
@@ -187,7 +187,7 @@
           ></u-upload>
         </view>
         <u-form
-          v-show="fileList3.length && form.legal_person_id_number"
+          v-show="fileList3.length"
           :model="form"
           class="form"
           ref="uForm3"
@@ -214,7 +214,7 @@
             />
           </u-form-item>
           <u-form-item
-            v-show="fileList4.length && form.legal_person_id_period_begin"
+            v-show="fileList4.length"
             label="生效日期"
             prop="legal_person_id_number"
             @click="showStartTime = true"
@@ -234,7 +234,7 @@
             ></u-icon>
           </u-form-item>
           <u-form-item
-            v-show="fileList4.length && form.legal_person_id_period_end"
+            v-show="fileList4.length"
             label="截止日期"
             prop="legal_person_id_period_end"
             required
@@ -308,7 +308,7 @@
           class="form"
           ref="uForm2"
           label-width="100"
-          v-show="fileList5.length && form2.individual_id_number"
+          v-show="fileList5.length"
         >
           <u-form-item label="身份证号码" prop="individual_id_number" required>
             <u-input
@@ -327,7 +327,7 @@
             />
           </u-form-item>
           <u-form-item
-            v-show="fileList6.length && form2.individual_id_period_begin"
+            v-show="fileList6.length"
             label="生效日期"
             prop="individual_id_period_begin"
             @click="showStartTime = true"
@@ -347,7 +347,7 @@
             ></u-icon>
           </u-form-item>
           <u-form-item
-            v-show="fileList6.length && form2.individual_id_period_end"
+            v-show="fileList6.length"
             label="截止日期"
             prop="individual_id_period_end"
             required
@@ -932,6 +932,18 @@ export default {
         }
       }
 
+      const formatDateString = (dateStr) => {
+        if (dateStr.length === 8) {
+          // 假设是 YYYYMMDD 格式
+          const year = dateStr.substring(0, 4);
+          const month = dateStr.substring(4, 6);
+          const day = dateStr.substring(6, 8);
+          return `${year}-${month}-${day}`;
+        }
+        // 如果不是8位，返回原字符串或其他默认处理
+        return dateStr;
+      };
+
       switch (type) {
         case "businessLicense":
           var ocr = await this.getOcrText(
@@ -974,13 +986,12 @@ export default {
             let validity = ocr.validity.split("-");
             this.startTime = validity[0];
             this.endTime = validity[1];
-            this.form.legal_person_id_period_begin = this.startTime.replace(
-              /\./g,
-              "-"
+
+            this.form.legal_person_id_period_begin = formatDateString(
+              this.startTime
             );
-            this.form.legal_person_id_period_end = this.endTime.replace(
-              /\./g,
-              "-"
+            this.form.legal_person_id_period_end = formatDateString(
+              this.endTime
             );
           }
 
@@ -1008,8 +1019,13 @@ export default {
             let validity = ocr.validity.split("-");
             this.startTime = validity[0];
             this.endTime = validity[1];
-            this.form2.individual_id_period_begin = this.startTime;
-            this.form2.individual_id_period_end = this.endTime;
+
+            this.form2.individual_id_period_begin = formatDateString(
+              this.startTime
+            );
+            this.form2.individual_id_period_end = formatDateString(
+              this.endTime
+            );
           }
           console.log("personIdFront", ocr);
           break;
diff --git a/java-mall-app-shop-admin/pages/audit/shop3.vue b/java-mall-app-shop-admin/pages/audit/shop3.vue
index c6211d5..6e3d8f9 100644
--- a/java-mall-app-shop-admin/pages/audit/shop3.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop3.vue
@@ -124,8 +124,8 @@
         <template v-if="bankList.length">
           <view
             class="branch_list_item"
-            v-for="(item, index) in bankList"
-            :key="item.id + index"
+            v-for="(item, index) of bankList"
+            :key="index"
             @click="onBankSelect(item, $event)"
           >
             {{ item.branch_bank_name }}
@@ -445,6 +445,16 @@ export default {
       this.$refs.uForm.validate().then(async (valid) => {
         if (valid) {
           let auditItem = uni.getStorageSync("auditItem");
+
+          if (auditItem.login_mobile) {
+            auditItem.login_mobile = auditItem.login_mobile.replace(
+              /^\+86/,
+              ""
+            );
+
+            console.log(auditItem);
+          }
+
           let params = {
             ...this.form,
             ...auditItem,
diff --git a/java-mall-app-shop-admin/pages/my/shopQRcode/shopQRcode.vue b/java-mall-app-shop-admin/pages/my/shopQRcode/shopQRcode.vue
index 7628cb2..052e9c8 100644
--- a/java-mall-app-shop-admin/pages/my/shopQRcode/shopQRcode.vue
+++ b/java-mall-app-shop-admin/pages/my/shopQRcode/shopQRcode.vue
@@ -15,16 +15,28 @@
 
 <script>
 import { mapState } from "vuex";
-
+import { GetAccountDashboard } from "@/api/user";
 export default {
   data() {
-    return {};
+    return {
+      dashboardInfo: {
+        store_info: {
+          wx_qrcode: "",
+        },
+      },
+    };
   },
-  onShow() {},
-  computed: {
-    ...mapState("user", ["dashboardInfo"]),
+  onShow() {
+    this.getAccountDashboard();
   },
+
   methods: {
+    async getAccountDashboard() {
+      let res = await GetAccountDashboard();
+      if (res && res.status == 200) {
+        this.dashboardInfo = res.data;
+      }
+    },
     save() {
       uni.showLoading({
         title: "保存中",
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue b/java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue
index 5861eaa..30e1e9d 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue
@@ -691,6 +691,12 @@ export default {
             duration: 1000,
           });
           await this.getCommodityClassify(true);
+          this.form = {
+            type_category_id: 0,
+            category_name: "",
+            category_virtual_enable: 0,
+            type_name: "",
+          };
         }
         this.showAddStairClassifyPopup = false;
         this.radioValue = "";
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/editClassify.vue b/java-mall-app-shop-admin/pages/warehouse/manage/editClassify.vue
index 9591591..f1ecf87 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/editClassify.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/editClassify.vue
@@ -21,10 +21,11 @@
       </block>
     </navBar>
     <u-alert
-    :closable="true"
-    fontSize="12"
+      :closable="true"
+      fontSize="12"
       title="注意，确认商品类型后不可修改名称，商品类型，虚拟商品!"
-      type="warning" :show-icon="true"
+      type="warning"
+      :show-icon="true"
     ></u-alert>
     <view class="edit-item">
       <view class="item-name">一级分类</view>
@@ -194,12 +195,13 @@
           }}
         </view>
         <u-alert
-        class="my_alert"
-    :closable="true"
-    fontSize="12"
-      title="注意，确认商品类型后不可修改名称，商品类型，虚拟商品!"
-      type="warning" :show-icon="true"
-    ></u-alert>
+          class="my_alert"
+          :closable="true"
+          fontSize="12"
+          title="注意，确认商品类型后不可修改名称，商品类型，虚拟商品!"
+          type="warning"
+          :show-icon="true"
+        ></u-alert>
         <u--form
           labelPosition="left"
           :model="form2"
@@ -255,13 +257,13 @@
             class="form-item form-item-switch"
           >
             <u-switch
-            v-model="form2.category_virtual_enable"
-            :disabled="form2.type_id != 0"
-            :activeValue="1"
-            :inactiveValue="0"
-            activeColor="#fe411b"
-            inactiveColor="#ccc"
-          ></u-switch>
+              v-model="form2.category_virtual_enable"
+              :disabled="form2.type_id != 0"
+              :activeValue="1"
+              :inactiveValue="0"
+              activeColor="#fe411b"
+              inactiveColor="#ccc"
+            ></u-switch>
           </u-form-item>
         </u--form>
         <view class="popup-btn-list">
@@ -328,7 +330,7 @@
             @change="handerRadioChange"
           >
             <u-radio
-            activeColor="#FE411B"
+              activeColor="#FE411B"
               class="commodity-type-radio"
               v-for="(item, index) in typeManageList"
               :key="index"
@@ -595,7 +597,7 @@ export default {
       this.$refs.uForm.validate().then(async (valid) => {
         let params = {
           category_parent_id: this.form.category_parent_id,
-          type_id: this.form.type_id,
+          type_id: this.radioValue,
           type_id_disable: false,
           category_name: this.form.category_name,
           category_image: this.form.category_image,
@@ -828,7 +830,7 @@ export default {
   }
 
   .second-level-item-input {
-    ::v-deep .u-input{
+    ::v-deep .u-input {
       padding: 30rpx 0 !important;
     }
     .statistics {
@@ -871,8 +873,8 @@ export default {
 
       .btn-item {
         width: 46%;
-          height: 64rpx;
-          border-color: #909193;
+        height: 64rpx;
+        border-color: #909193;
 
         &::after {
           border: none;
@@ -899,7 +901,7 @@ export default {
     .add-popup-content {
       width: 700rpx;
 
-      .my_alert{
+      .my_alert {
         margin: 0 24rpx;
       }
 
@@ -928,7 +930,7 @@ export default {
 
         .btn-item {
           width: 46%;
-           height: 64rpx;
+          height: 64rpx;
           border-color: #909193;
 
           &::after {