Compare commits

...

74 Commits

Author SHA1 Message Date
5e32c846c7 feat(custom): 订单列表支付方式筛选增加新条件
All checks were successful
continuous-integration/drone/push Build is passing
2025-05-29 16:03:28 +08:00
7609765042 mod(custom): \! 2025-05-29 16:03:28 +08:00
96c802be5f Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-19 15:35:43 +08:00
d520e95b3b Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-19 15:16:09 +08:00
667bb80456 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-14 23:07:27 +08:00
7b5bb9b565 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-13 16:40:37 +08:00
e9d5ca54a3 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-12 01:43:11 +08:00
e7b1992932 Merge branch 'test' of https://gitea.jdt168.com/XinLingKeJi/jdt-admin into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-12 01:42:56 +08:00
aee9a2d9c0 Merge branch 'dev' into test 2024-09-12 01:42:52 +08:00
f031d84745 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-09 16:04:14 +08:00
5128b519b9 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-06 21:39:40 +08:00
94cb709702 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-06 21:05:30 +08:00
b2ff663fa8 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-05 20:30:25 +08:00
5c129c35af Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-05 16:42:12 +08:00
2d067aae44 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-03 22:24:16 +08:00
df831595c9 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-05 18:11:27 +08:00
0f1fa9c932 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-05 18:03:33 +08:00
7dda1e1734 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-05 05:33:50 +08:00
a8a3bc4ee9 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-05 05:33:39 +08:00
28021165e2 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-04 00:20:51 +08:00
7fc8762bd9 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-04 00:20:40 +08:00
bd1b127306 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-03 23:33:32 +08:00
d21b06875a Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-01 22:56:51 +08:00
503b077c6b Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-31 21:04:16 +08:00
65ade0ef3a Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-29 18:48:12 +08:00
e051d75d21 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-29 18:35:23 +08:00
8daa1d4925 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-29 18:06:12 +08:00
d4ab8720cb Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-28 10:45:31 +08:00
3e920e2873 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-28 10:45:22 +08:00
4488180cc9 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-20 18:47:22 +08:00
f75d9eef81 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-19 17:03:31 +08:00
0ea8754321 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-19 11:01:23 +08:00
b47bc1b35b Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-18 19:05:04 +08:00
cab4da5b28 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-17 20:10:00 +08:00
7c7d395518 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-17 18:29:45 +08:00
324426ef4a Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-06-21 19:51:24 +08:00
d40146c07e Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-29 16:10:01 +08:00
d3a8a0425c Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-29 16:09:52 +08:00
06b43dd14d Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-20 16:07:08 +08:00
5c9b248624 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-20 16:06:56 +08:00
9657f989cd Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-09 19:22:19 +08:00
a7cb1758e2 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-09 19:20:19 +08:00
2c881a2084 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-28 16:39:46 +08:00
25e4185183 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-28 16:39:38 +08:00
233824e959 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-21 18:36:08 +08:00
1f7669f033 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-20 16:38:37 +08:00
45e6c145e5 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-15 16:04:06 +08:00
18b2e7361f Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-15 16:03:15 +08:00
2d109b22a0 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 20:53:46 +08:00
6256f59fe9 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 18:51:10 +08:00
49bbe2a086 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 18:48:50 +08:00
929a9e5826 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 18:30:34 +08:00
a01f94bfb3 Merge branch 'dev' into test
Some checks failed
continuous-integration/drone/push Build is failing
2024-03-08 18:23:19 +08:00
5c7a54cfb4 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 18:16:49 +08:00
77c7b1e8b9 Merge branch 'test' 2024-03-08 17:59:07 +08:00
b027215afa Merge branch 'dev' into test 2024-03-08 17:52:24 +08:00
165149e0c2 Merge branch 'dev' into test 2024-03-07 18:57:32 +08:00
f5d75820d7 Merge branch 'test' 2024-01-31 23:00:16 +08:00
373e25cf82 Merge branch 'dev' into test 2024-01-31 22:59:50 +08:00
6279e8c692 Merge branch 'test' 2024-01-27 14:13:25 +08:00
ce68556827 Merge branch 'dev' into test 2024-01-25 23:02:04 +08:00
cb2e68cede Merge pull request 'feat(custom): 新增记录' (#1) from dev into test
Reviewed-on: #1
2024-01-25 22:54:27 +08:00
9f89ccab42 Merge branch 'test' 2023-12-24 00:04:28 +08:00
673a17a817 Merge branch 'test' 2023-12-22 22:09:09 +08:00
3fa884fbad Merge branch 'test' 2023-12-20 23:10:53 +08:00
c733fc1124 Merge branch 'test' 2023-12-19 23:02:13 +08:00
d15a377710 Merge branch 'test' 2023-12-17 00:46:54 +08:00
2c13d9d25d Merge branch 'test' 2023-12-15 20:50:42 +08:00
1338ad99ad Merge branch 'test' 2023-12-13 20:47:00 +08:00
9416fced28 Merge branch 'test' 2023-12-08 20:48:41 +08:00
92b6c6bea2 Merge branch 'test' 2023-12-04 18:44:43 +08:00
23dca69b2f Merge branch 'test' 2023-11-29 18:54:26 +08:00
d8c9c15442 Merge branch 'test' 2023-11-29 15:33:51 +08:00
bcf6fa4df2 build(custom): 增加idea配置 2023-10-28 20:19:47 +08:00
9 changed files with 110 additions and 1 deletions

5
.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,5 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/

57
.idea/codeStyles/Project.xml generated Normal file
View File

@@ -0,0 +1,57 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<HTMLCodeStyleSettings>
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
</HTMLCodeStyleSettings>
<JSCodeStyleSettings version="0">
<option name="FORCE_SEMICOLON_STYLE" value="true" />
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
<option name="FORCE_QUOTE_STYlE" value="true" />
<option name="ENFORCE_TRAILING_COMMA" value="Remove" />
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
<option name="SPACES_WITHIN_IMPORTS" value="true" />
</JSCodeStyleSettings>
<TypeScriptCodeStyleSettings version="0">
<option name="FORCE_SEMICOLON_STYLE" value="true" />
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
<option name="FORCE_QUOTE_STYlE" value="true" />
<option name="ENFORCE_TRAILING_COMMA" value="Remove" />
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
<option name="SPACES_WITHIN_IMPORTS" value="true" />
</TypeScriptCodeStyleSettings>
<VueCodeStyleSettings>
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
</VueCodeStyleSettings>
<codeStyleSettings language="HTML">
<option name="SOFT_MARGINS" value="80" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JavaScript">
<option name="SOFT_MARGINS" value="80" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="TypeScript">
<option name="SOFT_MARGINS" value="80" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="Vue">
<option name="SOFT_MARGINS" value="80" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</component>

5
.idea/codeStyles/codeStyleConfig.xml generated Normal file
View File

@@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

6
.idea/git_toolbox_blame.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GitToolBoxBlameSettings">
<option name="version" value="2" />
</component>
</project>

View File

@@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
</profile>
</component>

12
.idea/jdt-admin.iml generated Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/jdt-admin.iml" filepath="$PROJECT_DIR$/.idea/jdt-admin.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@@ -58,9 +58,13 @@
value: 2, value: 2,
}, },
{ {
label: '小猪积分', label: '智多鑫积分',
value: 3, value: 3,
}, },
{
label: '渔乐潮玩积分',
value: 5,
},
]" ]"
:key="song.value" :key="song.value"
:value="song.value" :value="song.value"