Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm

# Conflicts:
#	pnpm-lock.yaml

package.json

@@ -71,7 +71,7 @@
     "vue": "3.5.12",
     "vue": "3.5.12",
     "vue-dompurify-html": "^4.1.4",
     "vue-dompurify-html": "^4.1.4",
     "vue-i18n": "9.10.2",
     "vue-i18n": "9.10.2",
-    "vue-router": "^4.3.0",
+    "vue-router": "4.4.5",
     "vue-types": "^5.1.1",
     "vue-types": "^5.1.1",
     "vuedraggable": "^4.1.0",
     "vuedraggable": "^4.1.0",
     "web-storage-cache": "^1.1.1",
     "web-storage-cache": "^1.1.1",

src/config/axios/service.ts

@@ -44,8 +44,7 @@ service.interceptors.request.use(
     // 是否需要设置 token
     // 是否需要设置 token
     let isToken = (config!.headers || {}).isToken === false
     let isToken = (config!.headers || {}).isToken === false
     whiteList.some((v) => {
     whiteList.some((v) => {
-      if (config.url) {
-        config.url.indexOf(v) > -1
+      if (config.url && config.url.indexOf(v) > -1) {
         return (isToken = false)
         return (isToken = false)
       }
       }
     })
     })

src/plugins/formCreate/index.ts

@@ -51,7 +51,10 @@ import {
   ElMenu,
   ElMenu,
   ElMenuItem,
   ElMenuItem,
   ElFooter,
   ElFooter,
-  ElMessage
+  ElMessage,
+  ElCollapse,
+  ElCollapseItem,
+  ElCard,
   // ElFormItem,
   // ElFormItem,
   // ElOption
   // ElOption
 } from 'element-plus'
 } from 'element-plus'
@@ -113,7 +116,10 @@ const components = [
   UserSelect,
   UserSelect,
   DeptSelect,
   DeptSelect,
   ApiSelect,
   ApiSelect,
-  Editor
+  Editor,
+  ElCollapse,
+  ElCollapseItem,
+  ElCard,
 ]
 ]
 
 
 // 参考 http://www.form-create.com/v3/element-ui/auto-import.html 文档
 // 参考 http://www.form-create.com/v3/element-ui/auto-import.html 文档

src/utils/routerHelper.ts

@@ -120,7 +120,7 @@ export const generateRoute = (routes: AppCustomRouteRecordRaw[]): AppRouteRecord
       data.children = [childrenData]
       data.children = [childrenData]
     } else {
     } else {
       // 目录
       // 目录
-      if (route.children) {
+      if (route.children?.length) {
         data.component = Layout
         data.component = Layout
         data.redirect = getRedirect(route.path, route.children)
         data.redirect = getRedirect(route.path, route.children)
         // 外链
         // 外链

src/views/crm/product/detail/index.vue

@@ -24,7 +24,7 @@ defineOptions({ name: 'CrmProductDetail' })
 
 
 const route = useRoute()
 const route = useRoute()
 const message = useMessage()
 const message = useMessage()
-const id = Number(route.params.id) // 编号
+const id = route.params.id // 编号
 const loading = ref(true) // 加载中
 const loading = ref(true) // 加载中
 const product = ref<ProductApi.ProductVO>({} as ProductApi.ProductVO) // 详情
 const product = ref<ProductApi.ProductVO>({} as ProductApi.ProductVO) // 详情
 
 

src/views/iot/device/detail/index.vue

@@ -27,7 +27,7 @@ defineOptions({ name: 'IoTDeviceDetail' })
 
 
 const route = useRoute()
 const route = useRoute()
 const message = useMessage()
 const message = useMessage()
-const id = Number(route.params.id) // 编号
+const id = route.params.id // 编号
 const loading = ref(true) // 加载中
 const loading = ref(true) // 加载中
 const product = ref<ProductVO>({} as ProductVO) // 产品详情
 const product = ref<ProductVO>({} as ProductVO) // 产品详情
 const device = ref<DeviceVO>({} as DeviceVO) // 设备详情
 const device = ref<DeviceVO>({} as DeviceVO) // 设备详情

src/views/iot/product/detail/index.vue

@@ -33,7 +33,7 @@ const { currentRoute } = useRouter()
 
 
 const route = useRoute()
 const route = useRoute()
 const message = useMessage()
 const message = useMessage()
-const id = Number(route.params.id) // 编号
+const id = route.params.id // 编号
 const loading = ref(true) // 加载中
 const loading = ref(true) // 加载中
 const product = ref<ProductVO>({} as ProductVO) // 详情
 const product = ref<ProductVO>({} as ProductVO) // 详情
 const activeTab = ref('info') // 默认激活的标签页
 const activeTab = ref('info') // 默认激活的标签页

src/views/member/user/detail/index.vue

@@ -113,7 +113,7 @@ const getUserData = async (id: number) => {
 const { currentRoute } = useRouter() // 路由
 const { currentRoute } = useRouter() // 路由
 const { delView } = useTagsViewStore() // 视图操作
 const { delView } = useTagsViewStore() // 视图操作
 const route = useRoute()
 const route = useRoute()
-const id = Number(route.params.id)
+const id = route.params.id
 /* 用户钱包相关信息 */
 /* 用户钱包相关信息 */
 const WALLET_INIT_DATA = {
 const WALLET_INIT_DATA = {
   balance: 0,
   balance: 0,

src/views/pay/order/index.vue

@@ -97,7 +97,7 @@
           plain
           plain
           @click="handleExport"
           @click="handleExport"
           :loading="exportLoading"
           :loading="exportLoading"
-          v-hasPermi="['system:tenant:export']"
+          v-hasPermi="['pay:order:export']"
         >
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
         </el-button>
@@ -192,6 +192,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as OrderApi from '@/api/pay/order'
 import * as OrderApi from '@/api/pay/order'
 import OrderDetail from './OrderDetail.vue'
 import OrderDetail from './OrderDetail.vue'
 import download from '@/utils/download'
 import download from '@/utils/download'
+import { getAppList } from '@/api/pay/app'
 
 
 defineOptions({ name: 'PayOrder' })
 defineOptions({ name: 'PayOrder' })
 
 
@@ -263,6 +264,7 @@ const openDetail = (id: number) => {
 /** 初始化 **/
 /** 初始化 **/
 onMounted(async () => {
 onMounted(async () => {
   await getList()
   await getList()
+  appList.value = await getAppList()
 })
 })
 </script>
 </script>
 <style>
 <style>