From 587858fc74f1db1fb4a8beceb38da11975bb85fe Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 17 Apr 2025 14:34:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=9F=9C=E5=BC=80=E9=97=A8?=
 =?UTF-8?q?=E6=8B=92=E7=BB=9D=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |   7 +
 src/pages/cabinet/buy.vue                     |  13 +-
 .../tm-collapse-item/tm-collapse-item.vue     |   2 +-
 .../components/tm-collapse/tm-collapse.vue    | 151 +++++++++---------
 4 files changed, 92 insertions(+), 81 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index be1859c..a2b99c1 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -328,6 +328,13 @@
 						"navigationBarTitleText": "选择支付方式",
 						"disableScroll": true
 					}
+				},
+				{
+					"path": "cabinetList",
+					"style": {
+						"navigationBarTitleText": "智能柜列表",
+						"disableScroll": true
+					}
 				}
 			]
 		},
diff --git a/src/pages/cabinet/buy.vue b/src/pages/cabinet/buy.vue
index ca08653..0f7d6b4 100644
--- a/src/pages/cabinet/buy.vue
+++ b/src/pages/cabinet/buy.vue
@@ -82,7 +82,8 @@
 			height="800rpx"
 			cancelText="拒绝"
 			confirmText="同意"
-			@confirm="appAuthHardDoorConfirm"
+			@confirm="appAuthHardDoor(1)"
+			@cancel="appAuthHardDoor(0)"
 		>
 			<tm-text color="#999999">{{ state.authDesc }}</tm-text>
 		</tm-modal>
@@ -166,16 +167,16 @@ const openDoor = async () => {
 // 支付方式tab改变
 const payMethodTabChange = (e: number) => {}
 
-// 确认协议
-const appAuthHardDoorConfirm = async () => {
+// 确认或拒绝协议
+const appAuthHardDoor = async (type: 1 | 0) => {
 	try {
-		uni.showLoading({ title: "授权中", mask: true })
+		uni.showLoading({ title: type ? "授权中" : "加载中", mask: true })
 		const res = await hardApi.appAuthHardDoor({
 			authId: state.authId,
-			authStatus: 1,
+			authStatus: type ? 1 : 0,
 		})
 		if (res.code == 0) {
-			uni.showToast({ title: "授权成功", icon: "none" })
+			if (type) uni.showToast({ title: "授权成功", icon: "none" })
 			state.show = false
 		}
 	} catch (error: any) {
diff --git a/src/uni_modules/tm-ui/components/tm-collapse-item/tm-collapse-item.vue b/src/uni_modules/tm-ui/components/tm-collapse-item/tm-collapse-item.vue
index 783ac51..c740aca 100644
--- a/src/uni_modules/tm-ui/components/tm-collapse-item/tm-collapse-item.vue
+++ b/src/uni_modules/tm-ui/components/tm-collapse-item/tm-collapse-item.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch, provide, getCurrentInstance, PropType, computed, inject, onMounted } from 'vue'
+import { ref, watch, provide, getCurrentInstance, computed, inject, onMounted } from 'vue'
 import { arrayNumberValid, arrayNumberValidByStyleMP, covetUniNumber, linearValid, getUnit, getUid } from "../../libs/tool";
 import { useTmConfig } from "../../libs/config";
 import { getDefaultColor, setTextColorLightByDark, getOutlineColorObj, getTextColorObj, getThinColorObj } from "../../libs/colors";
diff --git a/src/uni_modules/tm-ui/components/tm-collapse/tm-collapse.vue b/src/uni_modules/tm-ui/components/tm-collapse/tm-collapse.vue
index 594a67e..59777c3 100644
--- a/src/uni_modules/tm-ui/components/tm-collapse/tm-collapse.vue
+++ b/src/uni_modules/tm-ui/components/tm-collapse/tm-collapse.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { ref, watch, provide, onBeforeMount, PropType, computed } from 'vue'
-import { arrayNumberValid, arrayNumberValidByStyleMP, covetUniNumber, linearValid, getUnit, getUid } from "../../libs/tool";
-import { useTmConfig } from "../../libs/config";
-import { getDefaultColor, setTextColorLightByDark, getOutlineColorObj, getTextColorObj, getThinColorObj } from "../../libs/colors";
+import { ref, watch, provide, onBeforeMount, computed } from "vue"
+import { arrayNumberValid, arrayNumberValidByStyleMP, covetUniNumber, linearValid, getUnit, getUid } from "../../libs/tool"
+import { useTmConfig } from "../../libs/config"
+import { getDefaultColor, setTextColorLightByDark, getOutlineColorObj, getTextColorObj, getThinColorObj } from "../../libs/colors"
 
 /**
  * @displayName 折叠面板
@@ -14,100 +14,103 @@ import { getDefaultColor, setTextColorLightByDark, getOutlineColorObj, getTextCo
     | --- | --- | --- | --- |
     | ☑️| ☑️ | ☑️ | ☑️ | ☑️ | 1.0.0 |
  */
-defineOptions({ name: 'TmCollapse' });
+defineOptions({ name: "TmCollapse" })
 
 const { config } = useTmConfig()
 
-
 const props = defineProps({
-    /**
-     * 当前子项值。可v-model,类型兼容性高,因此不管你提供的是不是数组,最终同步时会被设置成数组
-     */
-    modelValue: {
-        type: [Array<string | number>, String, Number],
-        default: (): string[] => [] as string[]
-    },
-    /**
-     * 是否允许打开多个。
-     */
-    multiple: {
-        type: Boolean,
-        default: true
-    }
+	/**
+	 * 当前子项值。可v-model,类型兼容性高,因此不管你提供的是不是数组,最终同步时会被设置成数组
+	 */
+	modelValue: {
+		type: [Array<string | number>, String, Number],
+		default: (): string[] => [] as string[],
+	},
+	/**
+	 * 是否允许打开多个。
+	 */
+	multiple: {
+		type: Boolean,
+		default: true,
+	},
 })
 
 const emit = defineEmits([
-    /**
-     * 变换时触发
-     * @param {String[]} value - 当前打开的值
-     */
-    'change',
-    'update:modelValue'
+	/**
+	 * 变换时触发
+	 * @param {String[]} value - 当前打开的值
+	 */
+	"change",
+	"update:modelValue",
 ])
 
-
 const activeName = ref<Array<string | number>>([])
 
 onBeforeMount(() => {
-    toggleActivate(props.modelValue)
+	toggleActivate(props.modelValue)
 })
 
-provide('tmCollapseDefaultName', computed((): Array<string | number> => activeName.value))
+provide(
+	"tmCollapseDefaultName",
+	computed((): Array<string | number> => activeName.value),
+)
 
-watch(() => props.modelValue, (newValue: Array<string | number> | string | number) => {
-    if(newValue == activeName.value.join('')) return;
-    if(Array.isArray(newValue)){
-        if(newValue.join('') == activeName.value.join('')) return;
-    }
-    toggleActivate(newValue)
-})
+watch(
+	() => props.modelValue,
+	(newValue: Array<string | number> | string | number) => {
+		if (newValue == activeName.value.join("")) return
+		if (Array.isArray(newValue)) {
+			if (newValue.join("") == activeName.value.join("")) return
+		}
+		toggleActivate(newValue)
+	},
+)
 /**
  * 切换选中
  */
 const toggleActivate = (name: Array<string | number> | string | number, isEmits = false) => {
-    let ar = [] as Array<string | number>
-    if (Array.isArray(name)) {
-        ar = name
-    } else if(name !==''&&name!=undefined&&name!=null) {
-        ar = [name]
-    }
-    
-    if (ar.length == 0) {
-        activeName.value = []
-    } else {
-        if (props.multiple) {
-            let diff = activeName.value.filter((item: string | number) => {
-                return ar.indexOf(item) == -1
-            })
-            let diffname = ar.filter((item: string | number) => {
-                return activeName.value.indexOf(item) == -1
-            })
-            activeName.value = [...diff, ...diffname].slice(0)
-        } else {
-            if (activeName.value.indexOf(ar[0]) != -1) {
-                activeName.value = []
-            } else {
-                activeName.value = [ar[0]]
-            }
-        }
-    }
-    
-    if (isEmits) {
-        let covervalue:string|number|Array<string|number> = activeName.value.slice(0)
-        emit('update:modelValue', covervalue)
-        emit('change', covervalue)
-    }
+	let ar = [] as Array<string | number>
+	if (Array.isArray(name)) {
+		ar = name
+	} else if (name !== "" && name != undefined && name != null) {
+		ar = [name]
+	}
+
+	if (ar.length == 0) {
+		activeName.value = []
+	} else {
+		if (props.multiple) {
+			let diff = activeName.value.filter((item: string | number) => {
+				return ar.indexOf(item) == -1
+			})
+			let diffname = ar.filter((item: string | number) => {
+				return activeName.value.indexOf(item) == -1
+			})
+			activeName.value = [...diff, ...diffname].slice(0)
+		} else {
+			if (activeName.value.indexOf(ar[0]) != -1) {
+				activeName.value = []
+			} else {
+				activeName.value = [ar[0]]
+			}
+		}
+	}
+
+	if (isEmits) {
+		let covervalue: string | number | Array<string | number> = activeName.value.slice(0)
+		emit("update:modelValue", covervalue)
+		emit("change", covervalue)
+	}
 }
 
 defineExpose({ toggleActivate })
-
 </script>
 <template>
-    <view>
-        <!-- 
+	<view>
+		<!-- 
 		@slot 默认插槽，可放置tm-collapse-item子节点 
 		 -->
-        <slot></slot>
-    </view>
+		<slot></slot>
+	</view>
 </template>
-<style scoped></style>
\ No newline at end of file
+<style scoped></style>