Commits · 8a97f5a22d75ea6e854169e6a93e2916da19b9bb · 汤强勇 / webBuild · GitLab

09 Sep, 2019 2 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · 8a97f5a2
```
commitId:5e317b01 ====== 09/09/19 13:18:52 - andyxiezhonglong - 修改上个版本遗留代码

See merge request !15
```
  谢中龙 authored Sep 09, 2019
  8a97f5a2 Browse Files
- commitId:5e317b01 ====== 09/09/19 13:18:52 - andyxiezhonglong - 修改上个版本遗留代码 · fcd37e2b
  谢中龙 authored Sep 09, 2019
  
  fcd37e2b Browse Files
20 Aug, 2019 2 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · 34c4881e
```
Wx mall

See merge request !13
```
  谢中龙 authored Aug 20, 2019
  34c4881e Browse Files
- commitId:cfad32a6 ====== 08/19/19 16:14:02 - xuwk - 鼎元支付信息获取方式修改 · f51a6bc5
  谢中龙 authored Aug 20, 2019
  
  f51a6bc5 Browse Files
17 Aug, 2019 3 commits
- commitId:be42c69c ====== 08/17/19 13:29:10 - andyxiezhonglong - Merge branch… · 7073e800
```
commitId:be42c69c ====== 08/17/19 13:29:10 - andyxiezhonglong - Merge branch 'wx-mall6.33.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.33.0
```
  谢中龙 authored Aug 17, 2019
  7073e800 Browse Files
- commitId:a517aa84 ====== 08/17/19 10:33:22 - andyxiezhonglong - 新增dingyuan支付 · 2862b729
  谢中龙 authored Aug 17, 2019
  
  2862b729 Browse Files
- commitId:6ece0aa8 ====== 08/16/19 19:17:19 - andyxiezhonglong - 增加dingyuan支付类型判断 · 249ebbe9
  谢中龙 authored Aug 17, 2019
  
  249ebbe9 Browse Files
24 Jul, 2019 1 commit
- Merge branch 'wxMall_PRD' into 'wxMall_UAT' · 393ac458
```
Wx mall to uat

See merge request !12
```
  谢中龙 authored Jul 24, 2019
  393ac458 Browse Files
18 Jul, 2019 10 commits
- Merge branch 'wxMall_UAT' into 'wxMall_PRD' · 16e90957
```
Wx mall uat

See merge request !11
```
  谢中龙 authored Jul 18, 2019
  16e90957 Browse Files
- Merge branch 'wxMall' into 'wxMall_UAT' · 18869079
```
Wx mall

See merge request !10
```
  谢中龙 authored Jul 18, 2019
  18869079 Browse Files
- commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch… · ad305bea
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 18, 2019
  ad305bea Browse Files
- commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch… · 0565c3fb
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 18, 2019
  0565c3fb Browse Files
- commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch… · 4e94c055
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 18, 2019
  4e94c055 Browse Files
- commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch… · cc75e838
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 18, 2019
  cc75e838 Browse Files
- Merge branch 'wxMall' into 'wxMall_UAT' · 5e7870a1
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch…

See merge request !9
```
  谢中龙 authored Jul 18, 2019
  5e7870a1 Browse Files
- commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch… · d000196a
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 18, 2019
  d000196a Browse Files
- Merge branch 'wxMall' into 'wxMall_UAT' · 03be984b
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch…

See merge request !8
```
  谢中龙 authored Jul 18, 2019
  03be984b Browse Files
- commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch… · d913cbba
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 18, 2019
  d913cbba Browse Files
16 Jul, 2019 2 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · 9dd698b6
```
commitId:7038054e ====== 07/16/19 13:39:19 - andyxiezhonglong - 修改bug

See merge request !7
```
  谢中龙 authored Jul 16, 2019
  9dd698b6 Browse Files
- commitId:7038054e ====== 07/16/19 13:39:19 - andyxiezhonglong - 修改bug · 0a4288ff
  谢中龙 authored Jul 16, 2019
  
  0a4288ff Browse Files
15 Jul, 2019 3 commits
- Merge branch 'wxMall_UAT' into 'wxMall_PRD' · ba9602a2
```
Wx mall uat

See merge request !6
```
  谢中龙 authored Jul 15, 2019
  ba9602a2 Browse Files
- Merge branch 'wxMall' into 'wxMall_UAT' · ec46790e
```
commitId:79fc12b3 ====== 07/15/19 16:32:41 - renxl - 6.30.0 满减满赠 - 线上、线下订单：校验会员参与限制次数  --- 传入当前门店；

See merge request !5
```
  谢中龙 authored Jul 15, 2019
  ec46790e Browse Files
- commitId:79fc12b3 ====== 07/15/19 16:32:41 - renxl - 6.30.0 满减满赠 - 线上、线下订单：校验会员参与限制次数 --- 传入当前门店； · 257d17ae
  谢中龙 authored Jul 15, 2019
  
  257d17ae Browse Files
12 Jul, 2019 2 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · 3fa75fd2
```
commitId:e66a0164 ====== 07/12/19 13:32:08 - andyxiezhonglong - 注册文案规则，门店自提搜索不出

See merge request !4
```
  谢中龙 authored Jul 12, 2019
  3fa75fd2 Browse Files
- commitId:e66a0164 ====== 07/12/19 13:32:08 - andyxiezhonglong - 注册文案规则，门店自提搜索不出 · 65d0ea3f
  谢中龙 authored Jul 12, 2019
  
  65d0ea3f Browse Files
11 Jul, 2019 4 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · b53d6cf8
```
Wx mall

See merge request !3
```
  谢中龙 authored Jul 11, 2019
  b53d6cf8 Browse Files
- commitId:71af6661 ====== 07/11/19 17:49:06 - andyxiezhonglong - 修改退货状态展示 · 6e7757ab
  谢中龙 authored Jul 11, 2019
  
  6e7757ab Browse Files
- commitId:f8b95b26 ====== 07/11/19 10:21:25 - andyxiezhonglong - Merge branch… · ad32f12e
```
commitId:f8b95b26 ====== 07/11/19 10:21:25 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 11, 2019
  ad32f12e Browse Files
- Merge branch 'wxMall' into 'wxMall_UAT' · 45ad5a2e
```
Wx mall

See merge request !1
```
  谢中龙 authored Jul 11, 2019
  45ad5a2e Browse Files
09 Jul, 2019 2 commits
- commitId:82ec3b0d ====== 07/09/19 16:37:19 - andyxiezhonglong - 修改样式 · 81dacbf2
  谢中龙 authored Jul 09, 2019
  
  81dacbf2 Browse Files
- commitId:82ec3b0d ====== 07/09/19 16:37:19 - andyxiezhonglong - 修改样式 · e9fbdf12
  谢中龙 authored Jul 09, 2019
  
  e9fbdf12 Browse Files
08 Jul, 2019 1 commit
- Merge branch 'wxMall' into wxMall_UAT · e5f38bb7
  liuying authored Jul 08, 2019
  
  e5f38bb7 Browse Files
05 Jul, 2019 8 commits
- commitId:891b6be ====== 2019/7/5 15:05:51 - liuying - 去除弹框 · e4ca350c
  liuying authored Jul 05, 2019
  
  e4ca350c Browse Files
- commitId:81e3f59 ====== 2019/7/5 14:51:01 - liuying - 提交位置修改为腾讯 · 0523e09f
  liuying authored Jul 05, 2019
  
  0523e09f Browse Files
- commitId:1dee388 ====== 2019/7/5 14:26:05 - liuying - 修改定位问题 · d2db6f12
  liuying authored Jul 05, 2019
  
  d2db6f12 Browse Files
- commitId:1db9869 ====== 2019/7/5 13:58:12 - liuying - 提交测试 · 5c938414
  liuying authored Jul 05, 2019
  
  5c938414 Browse Files
- commitId:52387e9 ====== 2019/7/5 11:51:07 - liuying - Merge branch… · 6afc3238
```
commitId:52387e9 ====== 2019/7/5 11:51:07 - liuying - Merge branch 'wx-mall6.29.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.29.0
```
  liuying authored Jul 05, 2019
  6afc3238 Browse Files
- commitId:bc30b94 ====== 2019/7/5 11:48:54 - liuying - 增加弹框提示 · 6269b4de
  liuying authored Jul 05, 2019
  
  6269b4de Browse Files
- commitId:a77d93d ====== 2019/7/5 11:28:34 - liuying - 修改门店列表去除空白页门店列表逻辑修改为：… · dfcdaec2
```
commitId:a77d93d ====== 2019/7/5 11:28:34 - liuying - 修改门店列表 去除空白页 门店列表逻辑修改为： //进入界面之后 就获取一下门店列表 ， 等待定位成功   //若用户点击允许 则直接进入门店首页 ，禁止 停留到该界面
```
  liuying authored Jul 05, 2019
  dfcdaec2 Browse Files
- commitId:5d8cdaf ====== 2019/7/5 10:50:18 - liuying - Merge branch… · 1553fdcc
```
commitId:5d8cdaf ====== 2019/7/5 10:50:18 - liuying - Merge branch 'wx-mall6.29.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.29.0
```
  liuying authored Jul 05, 2019
  1553fdcc Browse Files