Commits · 2d4afb860bd63a1d82d28fd65f41066aadaba883 · jijin / dance-pc

11 May, 2024 2 commits
- 订单倒计时 · 2d4afb86
  zhangmeng committed 2024-05-11 11:04:51 +0800
  
  2d4afb86 Browse Files
- 细节修改 · 5967e434
  zhangmeng committed 2024-05-11 10:04:48 +0800
  
  5967e434 Browse Files
10 May, 2024 9 commits
- Merge branch 'dev' into devdev · 71d17dcf
  zhangmeng committed 2024-05-10 20:01:53 +0800
  
  71d17dcf Browse Files
- 字段修改 · f4ddf436
  zhangmeng committed 2024-05-10 19:57:35 +0800
  
  f4ddf436 Browse Files
- 订单灵界值处理 · a5eb27ff
  zhangmeng committed 2024-05-10 17:01:51 +0800
  
  a5eb27ff Browse Files
- 个人报名选多人 bug 修改 · 9cbbd2b9
  杨炀 committed 2024-05-10 15:36:40 +0800
  
  9cbbd2b9
- 订单翻译 · c37e07b7
  zhangmeng committed 2024-05-10 14:40:02 +0800
  
  c37e07b7 Browse Files
- 订单支付，时间限制 · 0103405a
  zhangmeng committed 2024-05-10 11:50:48 +0800
  
  0103405a Browse Files
- no message · 6bbdee8b
  杨炀 committed 2024-05-10 10:30:15 +0800
  
  6bbdee8b Browse Files
- 化妆拍照 · 21335b63
  zhangmeng committed 2024-05-10 10:16:30 +0800
  
  21335b63 Browse Files
- 化妆拍照 · d9a84b21
  zhangmeng committed 2024-05-10 10:14:13 +0800
  
  d9a84b21
09 May, 2024 2 commits
- 化妆 · 0ac2721e
  zhangmeng committed 2024-05-09 15:39:42 +0800
  
  0ac2721e Browse Files
- stage · f0f90c51
  杨炀 committed 2024-05-09 14:52:42 +0800
  
  f0f90c51
08 May, 2024 7 commits
- 国内赛 · fb5fd137
  杨炀 committed 2024-05-08 17:16:02 +0800
  
  fb5fd137
- Merge branch 'dev-a' into devdev · 0beb5d2d
  zhangmeng committed 2024-05-08 14:27:03 +0800
  
  0beb5d2d Browse Files
- Merge branch 'order' of https://code.itechtop.cn/yangyang/dance-pc into order · 12d621d3
  zhangmeng committed 2024-05-08 14:25:48 +0800
  
  12d621d3 Browse Files
- 化妆 · 931e0767
  zhangmeng committed 2024-05-08 14:24:56 +0800
  
  931e0767 Browse Files
- 化妆 · 6aa3b469
  zhangmeng committed 2024-05-08 14:24:21 +0800
  
  6aa3b469 Browse Files
- 化妆 · 73dc0e6e
  zhangmeng committed 2024-05-08 14:23:30 +0800
  
  73dc0e6e Browse Files
- no message · 182c235a
  杨炀 committed 2024-05-08 14:03:02 +0800
  
  182c235a Browse Files
07 May, 2024 7 commits
- Merge branch 'prod' into dev · bffd51b5 ...
```
# Conflicts:
#	src/viewsPc/match/detail_en.vue
```
  杨炀 committed 2024-05-07 18:01:58 +0800
  bffd51b5 Browse Files
- fsl · db8f8433
  杨炀 committed 2024-05-07 17:53:26 +0800
  
  db8f8433
- no message · ca5ba54b
  杨炀 committed 2024-05-07 17:20:14 +0800
  
  ca5ba54b
- 国内赛修改 · 42450b62
  杨炀 committed 2024-05-07 14:59:45 +0800
  
  42450b62
- 新数据 · 85059f20
  zhangmeng committed 2024-05-07 14:57:41 +0800
  
  85059f20 Browse Files
- Merge branch 'dev' into devdev · 16aad7ee ...
```
# Conflicts:
#	src/assets/booking/hz_bg.png
#	src/routerPc/en.js
#	src/viewsPc/booking/makeUp.vue
```
  zhangmeng committed 2024-05-07 14:44:23 +0800
  16aad7ee Browse Files
- 新数据 · 13a27606
  zhangmeng committed 2024-05-07 14:43:27 +0800
  
  13a27606
06 May, 2024 1 commit
- no message · 0cb2e2e0
  杨炀 committed 2024-05-06 15:48:33 +0800
  
  0cb2e2e0 Browse Files
01 May, 2024 1 commit
- no message · c8bd032f
  杨炀 committed 2024-05-01 09:26:36 +0800
  
  c8bd032f
30 Apr, 2024 1 commit
- no message · 5a7ee012
  杨炀 committed 2024-04-30 10:59:37 +0800
  
  5a7ee012
28 Apr, 2024 1 commit
- no message · da86e13e
  杨炀 committed 2024-04-28 11:04:16 +0800
  
  da86e13e
26 Apr, 2024 1 commit
- 发票 · 0c30f3ed
  杨炀 committed 2024-04-26 14:56:30 +0800
  
  0c30f3ed
25 Apr, 2024 8 commits
- no message · ff5d1fd2
  杨炀 committed 2024-04-25 17:47:31 +0800
  
  ff5d1fd2 Browse Files
- no message · 682aad45
  杨炀 committed 2024-04-25 17:46:46 +0800
  
  682aad45
- Merge branch 'dev' into order · eb4281f9
  杨炀 committed 2024-04-25 16:24:08 +0800
  
  eb4281f9 Browse Files
- no message · 342b46ef
  杨炀 committed 2024-04-25 16:23:45 +0800
  
  342b46ef Browse Files
- no message · 75ed13f5
  杨炀 committed 2024-04-25 15:53:57 +0800
  
  75ed13f5 Browse Files
- Merge branch 'dev' into order · 731a2062
  杨炀 committed 2024-04-25 15:41:59 +0800
  
  731a2062 Browse Files
- no message · 16900587
  杨炀 committed 2024-04-25 15:40:04 +0800
  
  16900587
- no message · 513a4a97
  杨炀 committed 2024-04-25 15:03:01 +0800
  
  513a4a97 Browse Files