From 725127c29b5105b99d4af18dc6db5b5f33fdafc4 Mon Sep 17 00:00:00 2001
From: YuanHuakk <1751826683@qq.com>
Date: Tue, 30 Jan 2024 16:09:28 +0800
Subject: [PATCH] =?UTF-8?q?mod(custom):=20=E6=A0=B8=E9=94=80=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=8B=A5=E5=B9=B2?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                              | 88 ++++++++++----------
 package.json                                 |  4 +-
 src/pages/admin/verify/verify_list/index.vue |  2 +
 3 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 3a09e8e..133f040 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -1,52 +1,52 @@
 // generated by unplugin-vue-components
 // We suggest you to commit this file into source control
 // Read more: https://github.com/vuejs/core/pull/3399
-import "@vue/runtime-core";
+import '@vue/runtime-core'
 
-export {};
+export {}
 
-declare module "@vue/runtime-core" {
+declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    Auth: typeof import("./src/components/Auth.vue")["default"];
-    Cart: typeof import("./src/components/Cart.vue")["default"];
-    MerList: typeof import("./src/components/MerList.vue")["default"];
-    NutAvatar: typeof import("@nutui/nutui-taro")["Avatar"];
-    NutBacktop: typeof import("@nutui/nutui-taro")["Backtop"];
-    NutButton: typeof import("@nutui/nutui-taro")["Button"];
-    NutCalendar: typeof import("@nutui/nutui-taro")["Calendar"];
-    NutCell: typeof import("@nutui/nutui-taro")["Cell"];
-    NutCellGroup: typeof import("@nutui/nutui-taro")["CellGroup"];
-    NutCheckbox: typeof import("@nutui/nutui-taro")["Checkbox"];
-    NutCheckboxGroup: typeof import("@nutui/nutui-taro")["CheckboxGroup"];
-    NutDialog: typeof import("@nutui/nutui-taro")["Dialog"];
-    NutEllipsis: typeof import("@nutui/nutui-taro")["Ellipsis"];
-    NutEmpty: typeof import("@nutui/nutui-taro")["Empty"];
-    NutForm: typeof import("@nutui/nutui-taro")["Form"];
-    NutFormItem: typeof import("@nutui/nutui-taro")["FormItem"];
-    NutGrid: typeof import("@nutui/nutui-taro")["Grid"];
-    NutGridItem: typeof import("@nutui/nutui-taro")["GridItem"];
-    NutImagePreview: typeof import("@nutui/nutui-taro")["ImagePreview"];
-    NutInput: typeof import("@nutui/nutui-taro")["Input"];
-    NutInputNumber: typeof import("@nutui/nutui-taro")["InputNumber"];
-    NutOverlay: typeof import("@nutui/nutui-taro")["Overlay"];
-    NutPagination: typeof import("@nutui/nutui-taro")["Pagination"];
-    NutPicker: typeof import("@nutui/nutui-taro")["Picker"];
-    NutPopup: typeof import("@nutui/nutui-taro")["Popup"];
-    NutPrice: typeof import("@nutui/nutui-taro")["Price"];
-    NutSearchbar: typeof import("@nutui/nutui-taro")["Searchbar"];
-    NutSwiper: typeof import("@nutui/nutui-taro")["Swiper"];
-    NutSwiperItem: typeof import("@nutui/nutui-taro")["SwiperItem"];
-    NutSwitch: typeof import("@nutui/nutui-taro")["Switch"];
-    NutTable: typeof import("@nutui/nutui-taro")["Table"];
-    NutTabPane: typeof import("@nutui/nutui-taro")["TabPane"];
-    NutTabs: typeof import("@nutui/nutui-taro")["Tabs"];
-    NutTextarea: typeof import("@nutui/nutui-taro")["Textarea"];
-    NutUploader: typeof import("@nutui/nutui-taro")["Uploader"];
-    Pay: typeof import("./src/components/Pay.vue")["default"];
-    Popup: typeof import("./src/components/Popup.vue")["default"];
-    RichEditor: typeof import("./src/components/RichEditor.vue")["default"];
-    Ucharts: typeof import("./src/components/Ucharts.vue")["default"];
-    Upload: typeof import("./src/components/Upload.vue")["default"];
-    UserModal: typeof import("./src/components/UserModal.vue")["default"];
+    Auth: typeof import('./src/components/Auth.vue')['default']
+    Cart: typeof import('./src/components/Cart.vue')['default']
+    MerList: typeof import('./src/components/MerList.vue')['default']
+    NutAvatar: typeof import('@nutui/nutui-taro')['Avatar']
+    NutBacktop: typeof import('@nutui/nutui-taro')['Backtop']
+    NutButton: typeof import('@nutui/nutui-taro')['Button']
+    NutCalendar: typeof import('@nutui/nutui-taro')['Calendar']
+    NutCell: typeof import('@nutui/nutui-taro')['Cell']
+    NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup']
+    NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox']
+    NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup']
+    NutDialog: typeof import('@nutui/nutui-taro')['Dialog']
+    NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis']
+    NutEmpty: typeof import('@nutui/nutui-taro')['Empty']
+    NutForm: typeof import('@nutui/nutui-taro')['Form']
+    NutFormItem: typeof import('@nutui/nutui-taro')['FormItem']
+    NutGrid: typeof import('@nutui/nutui-taro')['Grid']
+    NutGridItem: typeof import('@nutui/nutui-taro')['GridItem']
+    NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview']
+    NutInput: typeof import('@nutui/nutui-taro')['Input']
+    NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber']
+    NutOverlay: typeof import('@nutui/nutui-taro')['Overlay']
+    NutPagination: typeof import('@nutui/nutui-taro')['Pagination']
+    NutPicker: typeof import('@nutui/nutui-taro')['Picker']
+    NutPopup: typeof import('@nutui/nutui-taro')['Popup']
+    NutPrice: typeof import('@nutui/nutui-taro')['Price']
+    NutSearchbar: typeof import('@nutui/nutui-taro')['Searchbar']
+    NutSwiper: typeof import('@nutui/nutui-taro')['Swiper']
+    NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem']
+    NutSwitch: typeof import('@nutui/nutui-taro')['Switch']
+    NutTable: typeof import('@nutui/nutui-taro')['Table']
+    NutTabPane: typeof import('@nutui/nutui-taro')['TabPane']
+    NutTabs: typeof import('@nutui/nutui-taro')['Tabs']
+    NutTextarea: typeof import('@nutui/nutui-taro')['Textarea']
+    NutUploader: typeof import('@nutui/nutui-taro')['Uploader']
+    Pay: typeof import('./src/components/Pay.vue')['default']
+    Popup: typeof import('./src/components/Popup.vue')['default']
+    RichEditor: typeof import('./src/components/RichEditor.vue')['default']
+    Ucharts: typeof import('./src/components/Ucharts.vue')['default']
+    Upload: typeof import('./src/components/Upload.vue')['default']
+    UserModal: typeof import('./src/components/UserModal.vue')['default']
   }
 }
diff --git a/package.json b/package.json
index 5d7f717..c579cd8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jdt-user",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "private": true,
   "description": "",
   "templateInfo": {
@@ -9,7 +9,7 @@
     "css": "sass"
   },
   "taroConfig": {
-    "version": "3.0.10"
+    "version": "3.0.11"
   },
   "scripts": {
     "build:weapp": "taro build --type weapp",
diff --git a/src/pages/admin/verify/verify_list/index.vue b/src/pages/admin/verify/verify_list/index.vue
index 9693cf0..aba6a1a 100644
--- a/src/pages/admin/verify/verify_list/index.vue
+++ b/src/pages/admin/verify/verify_list/index.vue
@@ -51,8 +51,10 @@ Taro.useLoad((options) => {
 const goodInfo = ref<any>({});
 
 const getData = async (options: any) => {
+  const merInfo = Taro.getStorageSync("mer_info");
   const res = await getActiveVerifyList({
     oid: options.oid,
+    bid: merInfo.bid,
   });
   if (!res.data.data.oid) {
     Taro.showToast({