Commits · 5aeb20fe825ebcaf3be53fa80a360869ef4360d9 · jijin / dance-pc

11 May, 2024 15 commits
- 判断登录 · 5aeb20fe
  zhangmeng committed 2024-05-11 15:52:39 +0800
  
  5aeb20fe Browse Files
- 判断登录 · c35101ac
  zhangmeng committed 2024-05-11 15:49:21 +0800
  
  c35101ac Browse Files
- 判断时候登录 · 0423aa10
  zhangmeng committed 2024-05-11 15:45:48 +0800
  
  0423aa10 Browse Files
- 忽略文件 · 94015fdf
  zhangmeng committed 2024-05-11 15:06:45 +0800
  
  94015fdf Browse Files
- 英文翻译 · 6f6513ec
  zhangmeng committed 2024-05-11 15:05:43 +0800
  
  6f6513ec
- 英文翻译 · 61d4c814
  zhangmeng committed 2024-05-11 15:03:59 +0800
  
  61d4c814 Browse Files
- 修改bug · 9f9b357d
  zhangmeng committed 2024-05-11 14:53:42 +0800
  
  9f9b357d Browse Files
- 修改bug · 258970a6
  zhangmeng committed 2024-05-11 14:26:58 +0800
  
  258970a6 Browse Files
- 修改bug · 85992641
  zhangmeng committed 2024-05-11 14:02:19 +0800
  
  85992641 Browse Files
- 限制 · 699508a6
  zhangmeng committed 2024-05-11 11:56:33 +0800
  
  699508a6 Browse Files
- logo修改 · 36dfb833
  zhangmeng committed 2024-05-11 11:53:58 +0800
  
  36dfb833 Browse Files
- 修改bug · 23e23209
  zhangmeng committed 2024-05-11 11:39:53 +0800
  
  23e23209 Browse Files
- 页面权限 · 3a5fc119
  zhangmeng committed 2024-05-11 11:21:28 +0800
  
  3a5fc119 Browse Files
- 订单倒计时 · 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