hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-07-26 16:55:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yudao/dev' into dev-to-dev

Browse Source 
# Conflicts:
#	package.json
#	src/views/member/user/detail/UserOrderList.vue
This commit is contained in:
puhui999
2023-10-20 16:40:19 +08:00
parent 1e8945de63 2457665b55
commit d62bbcdd92
59 changed files with 2766 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/mall/trade/order/index.vue
View File

@ -128,6 +128,7 @@
class="!w-280px"
clearable
placeholder="请输入"
:type="queryType.queryParam === 'userId' ? 'number' : 'text'"
>
<template #prepend>
<el-select