wxd / MShopWeApp

29 May, 2020

13 commits

Merge branch 'test' into 'qa' ...
306bbd4e
```
Test

See merge request !435
```
后端研发-苏明海 authored
2020-05-29 11:27:23 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
f2b2df7a
```
Dev

See merge request !434
```
后端研发-苏明海 authored
2020-05-29 11:27:06 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
33dc45f6

yvan.ni authored
2020-05-29 11:26:14 +0800
Browse Code »
商品详情页面的底部按钮
7f707a49

yvan.ni authored
2020-05-29 11:26:00 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
4fc720db
```
Test

See merge request !432
```
后端研发-苏明海 authored
2020-05-29 11:25:19 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
65371f49
```
JSON修改

See merge request !431
```
后端研发-苏明海 authored
2020-05-29 11:25:04 +0800
Browse Code »
JSON修改
542fd2b2

season authored
2020-05-29 11:24:30 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
2c4389ba
```
Test

See merge request !429
```
后端研发-苏明海 authored
2020-05-29 11:22:55 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
57ba7ddc
```
Dev

See merge request !425
```
后端研发-苏明海 authored
2020-05-29 11:03:50 +0800
Browse Code »
store_id 显示修改
96d0f02c

yvan.ni authored
2020-05-29 11:00:02 +0800
Browse Code »
燕云提的qa提的俩个问题
202437c3

yvan.ni authored
2020-05-29 09:46:26 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
acc9e176
```
会员中心

所有的卡都关闭，就不显示等级卡

See merge request !424
```
后端研发-苏明海 authored
2020-05-29 09:03:42 +0800
Browse Code »
会员中心 ...
ca8977ef
```
所有的卡都关闭，就不显示等级卡
```
yvan.ni authored
2020-05-29 09:02:32 +0800
Browse Code »

28 May, 2020

6 commits

Merge branch 'test' into 'qa' ...
2a4b4bb5
```
Test

See merge request !423
```
后端研发-苏明海 authored
2020-05-28 18:30:24 +0800
Browse Code »
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次，提交订单有送赠品未支付，取消订单，已赠数会退回，但此时再去购买优惠商品就不再显示赠品了 ...

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

6 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 »