Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期

# Conflicts:
#	src/views/permissions/permission.vue

src/views/permissions/permission.vue

@@ -738,18 +738,24 @@ const resetPassword = function (row) {
 
 // 确认重置密码
 const confirmResetPassword = async function () {
+  console.log('重置密码markets1', adminData.value.markets)
   // 处理markets数据
   if (typeof adminData.value.markets === 'string' && adminData.value.markets) {
     adminData.value.markets = adminData.value.markets.split(',');
-  } else {
+  }else if(Array.isArray(adminData.value.markets)){
+    // 不处理
+  }
+  else {
     adminData.value.markets = [];
   }
-  console.log("地区",adminData.value.markets[0])
+
+  console.log('重置密码markets2', adminData.value.markets)
+ 
+
   // 权限检查
-  await getAdminData()
-  if (adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets === '总部') {
+  if (adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部') {
 
-    console.log('符合条件，可以操作',adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets === '总部');
+    console.log('符合条件，可以操作',adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部');
     const params = {
       account: currentRow.value.account,
     }