XinLingKeJi/jdt-admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: XinLingKeJi:test
Branches Tags
XinLingKeJi:main XinLingKeJi:test XinLingKeJi:dev
..
compare: XinLingKeJi:5146fe7932e60cb6ca54403931a617823c4b2c41
Branches Tags
XinLingKeJi:main XinLingKeJi:test XinLingKeJi:dev

42 Commits
test ... 5146fe7932

Author SHA1 Message Date
YuanHuakk
5146fe7932 ci: update ci
All checks were successful
CI Build & Deploy / build-and-deploy-dev (push) Has been skipped
Details
CI Build & Deploy / build-and-deploy-prod (push) Successful in 2m44s
Details
2025-10-31 18:03:40 +08:00
YuanHuakk
b7980221e7 ci: ci test 2025-10-31 18:03:40 +08:00
YuanHuakk
101ff278d0 ci: test ci 2025-10-31 18:03:40 +08:00
YuanHuakk
6e51a2e90c ci: test ci 2025-10-31 18:03:40 +08:00
YuanHuakk
d6bd167cc5 ci: test ci 2025-10-31 18:03:31 +08:00
YuanHuakk
9952e47f58 ci: test ci 2025-10-31 18:03:31 +08:00
YuanHuakk
2f6ad79660 build(deps): 依赖升级 2025-10-31 18:03:31 +08:00
YuanHuakk
07e3e15be8 refactor: 活动订单id显示变更嘉联
Some checks failed
continuous-integration/drone/push Build is failing
Details
2025-10-31 14:40:14 +08:00
YuanHuakk
d5751d305c feat(custom): 多API版本
All checks were successful
continuous-integration/drone/push Build is passing
Details
2025-09-23 18:27:30 +08:00
YuanHuakk
5e32c846c7 feat(custom): 订单列表支付方式筛选增加新条件
All checks were successful
continuous-integration/drone/push Build is passing
Details
2025-05-29 16:03:28 +08:00
YuanHuakk
7609765042 mod(custom): \! 2025-05-29 16:03:28 +08:00
YuanHuakk
96c802be5f Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-09-19 15:35:43 +08:00
YuanHuakk
667bb80456 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-09-14 23:07:27 +08:00
YuanHuakk
e9d5ca54a3 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-09-12 01:43:11 +08:00
Huakk
5128b519b9 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-09-06 21:39:40 +08:00
Huakk
df831595c9 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-08-05 18:11:27 +08:00
Huakk
7dda1e1734 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-08-05 05:33:50 +08:00
Huakk
28021165e2 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-08-04 00:20:51 +08:00
Huakk
bd1b127306 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-08-03 23:33:32 +08:00
Huakk
503b077c6b Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-07-31 21:04:16 +08:00
Huakk
d4ab8720cb Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-07-28 10:45:31 +08:00
Huakk
4488180cc9 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-07-20 18:47:22 +08:00
Huakk
d40146c07e Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-05-29 16:10:01 +08:00
Huakk
06b43dd14d Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-05-20 16:07:08 +08:00
YuanHuakk
9657f989cd Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-04-09 19:22:19 +08:00
YuanHuakk
2c881a2084 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-03-28 16:39:46 +08:00
YuanHuakk
45e6c145e5 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details
2024-03-15 16:04:06 +08:00
YuanHuakk
77c7b1e8b9 Merge branch 'test' 2024-03-08 17:59:07 +08:00
YuanHuakk
f5d75820d7 Merge branch 'test' 2024-01-31 23:00:16 +08:00
YuanHuakk
6279e8c692 Merge branch 'test' 2024-01-27 14:13:25 +08:00
YuanHuakk
9f89ccab42 Merge branch 'test' 2023-12-24 00:04:28 +08:00
YuanHuakk
673a17a817 Merge branch 'test' 2023-12-22 22:09:09 +08:00
YuanHuakk
3fa884fbad Merge branch 'test' 2023-12-20 23:10:53 +08:00
YuanHuakk
c733fc1124 Merge branch 'test' 2023-12-19 23:02:13 +08:00
YuanHuakk
d15a377710 Merge branch 'test' 2023-12-17 00:46:54 +08:00
YuanHuakk
2c13d9d25d Merge branch 'test' 2023-12-15 20:50:42 +08:00
YuanHuakk
1338ad99ad Merge branch 'test' 2023-12-13 20:47:00 +08:00
YuanHuakk
9416fced28 Merge branch 'test' 2023-12-08 20:48:41 +08:00
YuanHuakk
92b6c6bea2 Merge branch 'test' 2023-12-04 18:44:43 +08:00
YuanHuakk
23dca69b2f Merge branch 'test' 2023-11-29 18:54:26 +08:00
YuanHuakk
d8c9c15442 Merge branch 'test' 2023-11-29 15:33:51 +08:00
YuanHuakk
bcf6fa4df2 build(custom): 增加idea配置 2023-10-28 20:19:47 +08:00
2 changed files with 1 additions and 2 deletions
Expand all files Collapse all files

2
.gitea/workflows/ci.yaml
View File

@@ -78,7 +78,6 @@ jobs:
COMMIT: ${{ gitea.sha }} COMMIT: ${{ gitea.sha }}
ACTOR: ${{ gitea.actor }} ACTOR: ${{ gitea.actor }}
run: | run: |
sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories || true
apk add --no-cache curl jq apk add --no-cache curl jq
EMOJI=$( [ "$STATUS" = "success" ] && echo "✅" || echo "❌" ) EMOJI=$( [ "$STATUS" = "success" ] && echo "✅" || echo "❌" )
MSG="$(printf "%s**%s** (Run #%s)\n>**构建结果**: %s\n>**构建详情**: [点击查看](%s)\n>**代码分支**: %s\n>**提交标识**: %s\n>**提交发起**: %s\n" "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$STATUS" "$RUN_URL" "$BRANCH" "$COMMIT" "$ACTOR")" MSG="$(printf "%s**%s** (Run #%s)\n>**构建结果**: %s\n>**构建详情**: [点击查看](%s)\n>**代码分支**: %s\n>**提交标识**: %s\n>**提交发起**: %s\n" "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$STATUS" "$RUN_URL" "$BRANCH" "$COMMIT" "$ACTOR")"
@@ -155,7 +154,6 @@ jobs:
COMMIT: ${{ gitea.sha }} COMMIT: ${{ gitea.sha }}
ACTOR: ${{ gitea.actor }} ACTOR: ${{ gitea.actor }}
run: | run: |
sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories || true
apk add --no-cache curl jq apk add --no-cache curl jq
EMOJI=$( [ "$STATUS" = "success" ] && echo "✅" || echo "❌" ) EMOJI=$( [ "$STATUS" = "success" ] && echo "✅" || echo "❌" )
MSG="$(printf "%s**%s** (Run #%s)\n>**构建结果**: %s\n>**构建详情**: [点击查看](%s)\n>**代码分支**: %s\n>**提交标识**: %s\n>**提交发起**: %s\n" "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$STATUS" "$RUN_URL" "$BRANCH" "$COMMIT" "$ACTOR")" MSG="$(printf "%s**%s** (Run #%s)\n>**构建结果**: %s\n>**构建详情**: [点击查看](%s)\n>**代码分支**: %s\n>**提交标识**: %s\n>**提交发起**: %s\n" "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$STATUS" "$RUN_URL" "$BRANCH" "$COMMIT" "$ACTOR")"

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

@@ -186,6 +186,7 @@ const selectOptions = ref([
label: '商家名称', label: '商家名称',
}, },
]) ])
const columns = ref([ const columns = ref([
{ {
title: '订单号', title: '订单号',