wxd / MShopWeApp

Merged
Merge Request #423 · created by 后端研发-苏明海 2020-05-28 10:30:16 UTC

Test

From test into qa

1 participants

Show/hide discussion

后端研发-苏明海 started a discussion on commit 00c38f4a

Link here

后端研发-苏明海 @season 2020-05-27 03:38:41 UTC

mentioned in commit 15daee3addb350c55493e61e610deed8e4594a06

Show/hide discussion

后端研发-苏明海 started a discussion on commit 15daee3a

Link here

后端研发-苏明海 @season 2020-05-27 05:49:23 UTC

mentioned in commit 0027ba62f789be4b286a969e27d2572eeacef859

Link here
后端研发-苏明海 @season 2020-05-28 10:30:25 UTC
Status changed to merged
Write

Preview

Status changed to merged Edit in fullscreen

Comments are parsed with GitLab Flavored Markdown

Attach files by dragging & dropping or selecting them.

Cancel
Link here
后端研发-苏明海 @season 2020-05-28 10:30:25 UTC
mentioned in commit 2a4b4bb50f6a822ea1088adf024435a3b0d575df
Write

Preview

mentioned in commit 2a4b4bb50f6a822ea1088adf024435a3b0d575df Edit in fullscreen

Comments are parsed with GitLab Flavored Markdown

Attach files by dragging & dropping or selecting them.

Cancel

28 May, 2020

5 commits

Merge branch 'dev' into 'test' ...
a8ad500c
```
Dev

See merge request !422
```
后端研发-苏明海 authored
2020-05-28 18:29:55 +0800
Browse Code »
1.购物车商品总价
6d1ee43f

yvan.ni authored
2020-05-28 18:13:03 +0800
Browse Code »

1、会员赠品限赠1次，提交订单有送赠品未支付，取消订单，已赠数会退回，但此时再去购买优惠商品就不再显示赠品了 ...

01bdaacb

2、优惠活动减，从购物车提交订单取的是商品金额减去优惠金额去判断是否符合全场包邮，
     但是从商品详情进入点击立即购买取的是商品金额去判断是否符合全场包邮，要优化减去优惠金额后再判断
3、公众号搭配促销可以使用优惠券，但是小程序的不行
4、会出现购买搭配促销商品，使用余额提交还会跳转到微信支会界面
5、一个订单里有一个是做优惠促销限制使用优惠券的商品和
     一个可以正常使用优惠券的商品，小程序订单界面未能显示优惠券

authored

2020-05-28 16:52:49 +0800

Browse Code »

立即购买赠品要有prom_id
ab01a6c4

yvan.ni authored
2020-05-28 12:54:42 +0800
Browse Code »
因为赠品，物流和自选，自提和自选的没有办法同时选
a52a11ba

yvan.ni authored
2020-05-28 10:00:54 +0800
Browse Code »

27 May, 2020

15 commits

Merge branch 'dev' into 'test' ...
56fac99a
```
Dev

See merge request !421
```
后端研发-苏明海 authored
2020-05-27 20:22:09 +0800
Browse Code »
1. 余额购买的计算精度问题，小数点后面999999
878718aa

yvan.ni authored
2020-05-27 19:24:21 +0800
Browse Code »
商品分类默认图片显示修改
f70dc7f5

season authored
2020-05-27 16:29:26 +0800
Browse Code »

1. 取消订单 ...

0d905514

2.  购物车控制送赠品的数量，要小于库存和小于限购
3.  提交订单因为有满0元就可以使用的券的bug优化

authored

2020-05-27 16:17:05 +0800

Browse Code »

注释底部导航
2a731e67

后端研发-倪永富 authored
2020-05-27 13:52:07 +0800
Browse Code »
Revert "Revert "1. 商品再加入购物车要判断是不是积分购。要is_integral_normal=1"" ...
0027ba62
```
This reverts commit 15daee3addb350c55493e61e610deed8e4594a06.
```
season authored
2020-05-27 13:48:43 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
a34e19d2

season authored
2020-05-27 11:47:33 +0800
Browse Code »
回退2020-05-26
27bc0d29

season authored
2020-05-27 11:47:06 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
0b44571d

season authored
2020-05-27 11:37:05 +0800
Browse Code »
Revert "1. 商品再加入购物车要判断是不是积分购。要is_integral_normal=1" ...
15daee3a

1
```
This reverts commit 00c38f4a37a7f7447f38b02afd597d997f16a7c4.
```
season authored
2020-05-27 11:35:03 +0800
Browse Code »
优化商品分类&添加自定义底部导航3
5c2c8c1b

后端研发-倪永富 authored
2020-05-27 10:59:15 +0800
Browse Code »
优化商品分类&添加自定义底部导航2
aa05ad8d

后端研发-倪永富 authored
2020-05-27 10:56:16 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
9b3a4709
```
Dev

See merge request !420
```
后端研发-苏明海 authored
2020-05-27 10:36:37 +0800
Browse Code »
优化商品分类&添加自定义底部导航
7f4b0643

后端研发-倪永富 authored
2020-05-27 10:18:42 +0800
Browse Code »
优化商品分类&添加自定义底部导航
83747aa2

后端研发-倪永富 authored
2020-05-27 10:15:15 +0800
Browse Code »

26 May, 2020

8 commits

Merge branch 'dev' into 'test' ...
39715d29
```
Dev

See merge request !419
```
后端研发-苏明海 authored
2020-05-26 21:15:55 +0800
Browse Code »
1. 商品再加入购物车要判断是不是积分购。要is_integral_normal=1 ...
00c38f4a

1
```
2.  订单优惠活动的价格显示俩位小数
3.  优惠活动的商品，搭配促销的商品。要能够重新支付
```
yvan.ni authored
2020-05-26 21:14:39 +0800
Browse Code »
购物车，和提交订单的页面
77d51cc9

yvan.ni authored
2020-05-26 19:31:56 +0800
Browse Code »
图片转移到分包进去
099d25b5

season authored
2020-05-26 17:58:56 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
0d6dda24
```
优惠促销10个bug优化

See merge request !418
```
后端研发-苏明海 authored
2020-05-26 17:36:32 +0800
Browse Code »
优惠促销10个bug优化
fb00a076

yvan.ni authored
2020-05-26 17:28:49 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
ec18a591
```
Dev

See merge request !417
```
后端研发-苏明海 authored
2020-05-26 14:04:48 +0800
Browse Code »
整单退的控制
4f7a77b8

yvan.ni authored
2020-05-26 09:01:24 +0800
Browse Code »

25 May, 2020

13 commits

commit1
bdb37342

后端研发-倪永富 authored
2020-05-25 17:21:21 +0800
Browse Code »
提交订单的页面，如果是0就不显示
b6693688

yvan.ni authored
2020-05-25 16:32:11 +0800
Browse Code »
json 添加新增的页面
c5f9e9bf

yvan.ni authored
2020-05-25 16:23:59 +0800
Browse Code »
1. 优惠活动测试的bug 优化 10条 ...
b90197be
```
2. 优惠平摊的订单不能单个商品退
```
yvan.ni authored
2020-05-25 16:21:10 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
d5f80d8b

yvan.ni authored
2020-05-25 14:46:55 +0800
Browse Code »
确认订单页
aae0598d

yvan.ni authored
2020-05-25 14:46:44 +0800
Browse Code »
删除去掉
7fe84bf5

season authored
2020-05-25 14:41:02 +0800
Browse Code »
commit1
7a3b8f7f

后端研发-倪永富 authored
2020-05-25 14:18:27 +0800
Browse Code »
commit
6788cfd9

后端研发-倪永富 authored
2020-05-25 14:03:52 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
ef8d0734
```
Dev

See merge request !416
```
后端研发-苏明海 authored
2020-05-25 14:03:07 +0800
Browse Code »
添加回滚到顶部
99308f05

后端研发-倪永富 authored
2020-05-25 11:36:55 +0800
Browse Code »
优化分页控件
792332be

后端研发-倪永富 authored
2020-05-25 09:33:29 +0800
Browse Code »
优化分页控件
3a61c5b4

后端研发-倪永富 authored
2020-05-25 09:10:07 +0800
Browse Code »

23 May, 2020

3 commits

分类列表添加风格页面商品列表
de97d874

后端研发-倪永富 authored
2020-05-23 17:48:07 +0800
Browse Code »
分类列表添加风格页面商品列表
f84d9327

后端研发-倪永富 authored
2020-05-23 17:26:09 +0800
Browse Code »
分类列表添加风格页面商品列表
09b6c3eb

后端研发-倪永富 authored
2020-05-23 15:19:48 +0800
Browse Code »

22 May, 2020

3 commits

Merge branch 'dev' into 'test' ...
3d339cad
```
Dev

See merge request !415
```
后端研发-苏明海 authored
2020-05-22 17:41:21 +0800
Browse Code »
1。多梯位优惠， ...
6deb07e1
```
2. 商品详情页面优惠条件内容的正确显示
```
yvan.ni authored
2020-05-22 15:42:07 +0800
Browse Code »
购物车提交订单的bug优化
486cd165

yvan.ni authored
2020-05-22 13:56:51 +0800
Browse Code »

21 May, 2020

2 commits

Merge branch 'dev' into 'test' ...
bf744eef
```
Dev

See merge request !414
```
后端研发-苏明海 authored
2020-05-21 18:12:24 +0800
Browse Code »
优惠活动，订单优惠，搭配购
11ac3a02

yvan.ni authored
2020-05-21 14:58:55 +0800
Browse Code »

19 May, 2020

1 commit

PLUS停用显示优化
99173cb0

season authored
2020-05-19 14:47:29 +0800
Browse Code »

13 May, 2020