Commits · d79c4bc9bc225d268a225ba8e2704f64dbe622d5 · clique / clique-web

23 Jan, 2022 2 commits
- Merge branch 'feature/1月22日会员卡优化' of http://git.gicdev.com/clique/clique-web into dev · d79c4bc9
  chenyu authored Jan 23, 2022
  
  d79c4bc9 Browse Files
- update: update · c3b8df93
  chenyu authored Jan 23, 2022
  
  c3b8df93 Browse Files
20 Jan, 2022 2 commits
- update: build · b8af1c1c
  liuchenxi authored Jan 20, 2022
  
  b8af1c1c Browse Files
- Merge branch 'feature/1月迭代-年前' · 873d7a75
  liuchenxi authored Jan 20, 2022
  
  873d7a75 Browse Files
11 Jan, 2022 2 commits

Merge branch 'feature/1月迭代-年前' into dev · 6250c5a4

# Conflicts:
#	dist/index.html
#	dist/static/js/10.e595220b8f908da126fb.js.map
#	dist/static/js/11.6ceb856a24cd48965712.js.map
#	dist/static/js/12.aceac45e9f61f38c4df5.js.map
#	dist/static/js/13.27b91aa0ae95700cfa84.js
#	dist/static/js/14.bf21f99ec45bc38c3caa.js.map
#	dist/static/js/15.10941fc837a82e7fb415.js.map
#	dist/static/js/16.54e18151bb7c6fa78089.js.map
#	dist/static/js/17.214b2699697c8d262547.js.map
#	dist/static/js/18.f7aa00758a5a88cdf277.js.map
#	dist/static/js/19.2fafc72e8baaaf9f47a1.js.map
#	dist/static/js/20.ef938e3378ae39d9aa78.js.map
#	dist/static/js/21.525dbf8118be1920c388.js.map
#	dist/static/js/22.af1ae1b170b7f8120b9d.js.map
#	dist/static/js/23.fba53382c3e3f84eb78f.js.map
#	dist/static/js/24.5cb22b566e13b15c35c8.js.map
#	dist/static/js/25.21239219d85defe5d10c.js.map
#	dist/static/js/26.33742474be75fdb65dfd.js.map
#	dist/static/js/27.35f58c9ddbe7c64f5f48.js.map
#	dist/static/js/28.d3563c978cd36ce16782.js.map
#	dist/static/js/29.1209c1e98fcbf794a936.js.map
#	dist/static/js/30.457d9d337b3455876a51.js.map
#	dist/static/js/31.35a63d5da2112a12c4aa.js.map
#	dist/static/js/32.d49003d17452bc78e445.js.map
#	dist/static/js/33.5075d3c43adc30caed4d.js.map
#	dist/static/js/34.a6aa953460e246b74104.js.map
#	dist/static/js/35.b82c23248198463a02eb.js.map
#	dist/static/js/39.bae0c8006d56c96f1965.js
#	dist/static/js/39.bae0c8006d56c96f1965.js.map
#	dist/static/js/40.6e67f0e5fdc095d44edd.js
#	dist/static/js/41.d6cef65dd8fa6e92f28d.js
#	dist/static/js/42.0f52d0981564c135a4fe.js
#	dist/static/js/42.967aaf73197d36304ecc.js
#	dist/static/js/42.967aaf73197d36304ecc.js.map
#	dist/static/js/43.5c71ed961e41f281d90b.js
#	dist/static/js/43.5c71ed961e41f281d90b.js.map
#	dist/static/js/43.c15d634a3b283251085f.js
#	dist/static/js/43.c15d634a3b283251085f.js.map
#	dist/static/js/5.307b129f1a13ed13c71d.js.map
#	dist/static/js/6.e6c86fd0100c3f880882.js.map
#	dist/static/js/7.d55f58fa44f2860e9e48.js.map
#	dist/static/js/8.0f3943c3b5490c246227.js.map
#	dist/static/js/9.9e3105c825be19fecbdf.js.map
#	dist/static/js/main.3102f756c1a873ac65e6.js
#	dist/static/js/vendor.45c914c901c445b900a1.js
#	dist/static/js/vendor.45c914c901c445b900a1.js.map

authored Jan 11, 2022

6250c5a4 Browse Files

update: 门店选择器支持展示品牌名 · aa4e6d2f
liuchenxi authored Jan 11, 2022

aa4e6d2f Browse Files

04 Jan, 2022 1 commit
- update: dist · d57842f0
  caoyanzhi authored Jan 04, 2022
  
  d57842f0 Browse Files
31 Dec, 2021 3 commits
- update: dist · c24389da
  chenyu authored Dec 31, 2021
  
  c24389da Browse Files
- Merge branch 'feature/12月迭代' of http://git.gicdev.com/clique/clique-web into dev · 691f79fc
  chenyu authored Dec 31, 2021
  
  691f79fc Browse Files
- update: update · f28539c3
  chenyu authored Dec 31, 2021
  
  f28539c3 Browse Files
30 Dec, 2021 6 commits
- update: dist · 59108842
  chenyu authored Dec 30, 2021
  
  59108842 Browse Files
- Merge branch 'feature/12月迭代' of http://git.gicdev.com/clique/clique-web into dev · 36883f6a
  chenyu authored Dec 30, 2021
  
  36883f6a Browse Files
- update: update · d7f5d378
  chenyu authored Dec 30, 2021
  
  d7f5d378 Browse Files
- update: dist · be851cf3
  chenyu authored Dec 30, 2021
  
  be851cf3 Browse Files
- Merge branch 'feature/12月迭代' of http://git.gicdev.com/clique/clique-web into dev · e3a584e6
  chenyu authored Dec 30, 2021
  
  e3a584e6 Browse Files
- update: update · dd319e9d
  chenyu authored Dec 30, 2021
  
  dd319e9d Browse Files
23 Dec, 2021 4 commits
- update: dist · 62527271
  caoyanzhi authored Dec 23, 2021
  
  62527271 Browse Files
- update: dist · fb46050c
  caoyanzhi authored Dec 23, 2021
  
  fb46050c Browse Files
- Merge branch 'bugfix/修复生产环境跳转到测试环境的bug' into dev · 33c5d5c8
```
# Conflicts:
#	dist/static/js/manifest.b6239e839c8627d701f8.js.map
```
  caoyanzhi authored Dec 23, 2021
  33c5d5c8 Browse Files
- update: 修复生产环境跳转到测试环境的bug · 440008f9
  caoyanzhi authored Dec 23, 2021
  
  440008f9 Browse Files
14 Dec, 2021 1 commit
- update: dist · 90fdcd7e
  caoyanzhi authored Dec 14, 2021
  
  90fdcd7e Browse Files
13 Dec, 2021 6 commits
- update: dist · 0b8ab751
  caoyanzhi authored Dec 13, 2021
  
  0b8ab751 Browse Files
- Merge branch 'bugfix/会员体系时间控件调整' into dev · 30dddd5e
  caoyanzhi authored Dec 13, 2021
  
  30dddd5e Browse Files
- update: 会员体系时间控件调整 · dc761d0d
  caoyanzhi authored Dec 13, 2021
  
  dc761d0d Browse Files
- update: dist · ba9bb8c0
  caoyanzhi authored Dec 13, 2021
  
  ba9bb8c0 Browse Files
- Merge branch 'bugfix/会员体系时间控件调整' into dev · 78486bfc
  caoyanzhi authored Dec 13, 2021
  
  78486bfc Browse Files
- update: 会员体系时间控件调整 · ec9567ff
  caoyanzhi authored Dec 13, 2021
  
  ec9567ff Browse Files
10 Dec, 2021 3 commits

update: dist · 463ea310
caoyanzhi authored Dec 10, 2021

463ea310 Browse Files

Merge branch 'bugfix/会员体系时间控件调整' into dev · 6d968b9c

# Conflicts:
#	dist/index.html
#	dist/static/js/31.35a63d5da2112a12c4aa.js
#	dist/static/js/31.7a2d3c119bafba7c628a.js
#	dist/static/js/31.8357340bca71b3619149.js
#	dist/static/js/32.6e1035bcc8bab3787127.js
#	dist/static/js/32.d49003d17452bc78e445.js
#	dist/static/js/32.fb81c47e965fac12a2b5.js
#	dist/static/js/36.8638479df13c9528f19d.js
#	dist/static/js/36.91fa9488365c82e00a79.js
#	dist/static/js/40.aa1deef176b420fd3ccb.js
#	package-lock.json

authored Dec 10, 2021

6d968b9c Browse Files

update: 调整时间控件 · 5978b3f7
caoyanzhi authored Dec 10, 2021

5978b3f7 Browse Files

07 Dec, 2021 4 commits

update: dist · b6b43084
caoyanzhi authored Dec 07, 2021

b6b43084 Browse Files

Merge branch 'feature/组件引入调整' · 969e2faa

# Conflicts:
#	dist/index.html
#	dist/static/js/11.1313bab962008b7d57ae.js
#	dist/static/js/12.5cf1a714af685cf7e660.js
#	dist/static/js/13.45c27de40fd84a7a5a5e.js
#	dist/static/js/13.45c27de40fd84a7a5a5e.js.map
#	dist/static/js/14.54bf708f7452b9370f43.js
#	dist/static/js/15.ace0a4b648edbdb19fed.js
#	dist/static/js/18.9e9f658bcf6bd85267ff.js
#	dist/static/js/20.1911d12749e4e14cb406.js
#	dist/static/js/21.d2159549c2911ce36c38.js
#	dist/static/js/22.2fdcae270e03d780578b.js
#	dist/static/js/24.9ea347b66d2b4d8d47af.js
#	dist/static/js/25.b527765b6c9f12434e39.js
#	dist/static/js/25.b527765b6c9f12434e39.js.map
#	dist/static/js/26.3ac203fc423243a87146.js
#	dist/static/js/27.e01ab8c4ddc119dbf611.js
#	dist/static/js/27.e01ab8c4ddc119dbf611.js.map
#	dist/static/js/28.1519fc01dec579627353.js
#	dist/static/js/29.1a7ea029bdc870805744.js
#	dist/static/js/29.1a7ea029bdc870805744.js.map
#	dist/static/js/30.0c1029866b6183f5bcc7.js
#	dist/static/js/30.0c1029866b6183f5bcc7.js.map
#	dist/static/js/31.17a6c63f27e686669763.js
#	dist/static/js/31.8357340bca71b3619149.js
#	dist/static/js/31.9ff68b0fadb91c34c9f3.js
#	dist/static/js/32.02df071160562b22e44e.js
#	dist/static/js/32.6e1035bcc8bab3787127.js
#	dist/static/js/32.7c4dfd235f32d0901f19.js
#	dist/static/js/33.3b0e6d224c9fc03199a5.js
#	dist/static/js/34.e30398b690c76bb55695.js
#	dist/static/js/34.e30398b690c76bb55695.js.map
#	dist/static/js/35.d5fa042a919b0a7b0536.js
#	dist/static/js/35.d5fa042a919b0a7b0536.js.map
#	dist/static/js/36.525bd9448d857e3e3b6f.js
#	dist/static/js/38.d6df329050dc256742fb.js
#	dist/static/js/38.d6df329050dc256742fb.js.map
#	dist/static/js/39.bf184337ea038ee03723.js
#	dist/static/js/39.bf184337ea038ee03723.js.map
#	dist/static/js/40.20043e2a392f70796604.js
#	dist/static/js/40.aa1deef176b420fd3ccb.js
#	dist/static/js/40.c502c6a8aff7b5fafad5.js
#	dist/static/js/main.7c5590dfd44a5fea3e33.js
#	dist/static/js/main.7c5590dfd44a5fea3e33.js.map
#	dist/static/js/manifest.0eb0bf764f60bcd98aef.js.map
#	dist/static/js/manifest.34bc9e4fe3620e1e830e.js.map
#	dist/static/js/manifest.e4c4b3cad01e18fa6dab.js.map
#	package-lock.json

authored Dec 07, 2021

969e2faa Browse Files

Merge branch 'feature/去掉footer' · 8fbb23db
caoyanzhi authored Dec 07, 2021

8fbb23db Browse Files
udpate: dist · c1d5e824
crushh authored Dec 07, 2021

c1d5e824 Browse Files

30 Nov, 2021 2 commits
- update: dist · b57515da
  crushh authored Nov 30, 2021
  
  b57515da Browse Files
- update: 隐藏归属策略配置 · 21cbd1b8
  crushh authored Nov 30, 2021
  
  21cbd1b8 Browse Files
15 Nov, 2021 3 commits

update: dist · 1a6f3731
caoyanzhi authored Nov 15, 2021

1a6f3731 Browse Files

Merge branch 'feature/去掉footer' into dev · 3dfad239

# Conflicts:
#	dist/index.html
#	dist/static/js/11.1313bab962008b7d57ae.js
#	dist/static/js/12.5cf1a714af685cf7e660.js
#	dist/static/js/13.45c27de40fd84a7a5a5e.js
#	dist/static/js/13.45c27de40fd84a7a5a5e.js.map
#	dist/static/js/14.54bf708f7452b9370f43.js
#	dist/static/js/15.ace0a4b648edbdb19fed.js
#	dist/static/js/18.9e9f658bcf6bd85267ff.js
#	dist/static/js/20.1911d12749e4e14cb406.js
#	dist/static/js/21.d2159549c2911ce36c38.js
#	dist/static/js/22.2fdcae270e03d780578b.js
#	dist/static/js/24.9ea347b66d2b4d8d47af.js
#	dist/static/js/25.b527765b6c9f12434e39.js
#	dist/static/js/25.b527765b6c9f12434e39.js.map
#	dist/static/js/26.3ac203fc423243a87146.js
#	dist/static/js/27.e01ab8c4ddc119dbf611.js
#	dist/static/js/27.e01ab8c4ddc119dbf611.js.map
#	dist/static/js/28.1519fc01dec579627353.js
#	dist/static/js/29.1a7ea029bdc870805744.js
#	dist/static/js/29.1a7ea029bdc870805744.js.map
#	dist/static/js/30.0c1029866b6183f5bcc7.js
#	dist/static/js/30.0c1029866b6183f5bcc7.js.map
#	dist/static/js/31.8357340bca71b3619149.js
#	dist/static/js/31.9ff68b0fadb91c34c9f3.js
#	dist/static/js/31.ca188174817d220af2ce.js
#	dist/static/js/32.02df071160562b22e44e.js
#	dist/static/js/32.6e1035bcc8bab3787127.js
#	dist/static/js/32.c411942f3aadc354965d.js
#	dist/static/js/33.3b0e6d224c9fc03199a5.js
#	dist/static/js/34.e30398b690c76bb55695.js
#	dist/static/js/34.e30398b690c76bb55695.js.map
#	dist/static/js/35.d5fa042a919b0a7b0536.js
#	dist/static/js/35.d5fa042a919b0a7b0536.js.map
#	dist/static/js/36.319e74eab08c100d5caa.js
#	dist/static/js/36.525bd9448d857e3e3b6f.js
#	dist/static/js/38.d6df329050dc256742fb.js
#	dist/static/js/38.d6df329050dc256742fb.js.map
#	dist/static/js/39.bf184337ea038ee03723.js
#	dist/static/js/39.bf184337ea038ee03723.js.map
#	dist/static/js/40.aa1deef176b420fd3ccb.js
#	dist/static/js/40.c502c6a8aff7b5fafad5.js
#	dist/static/js/main.7c5590dfd44a5fea3e33.js
#	dist/static/js/main.7c5590dfd44a5fea3e33.js.map
#	dist/static/js/manifest.0eb0bf764f60bcd98aef.js.map
#	dist/static/js/manifest.e4c4b3cad01e18fa6dab.js.map
#	dist/static/js/manifest.e7c6a26cc51f3de505ea.js.map

authored Nov 15, 2021

3dfad239 Browse Files

update: 去掉footer · c483b43c
caoyanzhi authored Nov 15, 2021

c483b43c Browse Files

12 Nov, 2021 1 commit
- update: 调整打包配置 · abae7449
  caoyanzhi authored Nov 12, 2021
  
  abae7449 Browse Files