wxd / MShopWeApp

Merged
Merge Request #533 · created by 后端研发-苏明海 2020-10-12 08:58:49 UTC

Qa

From qa into master

1 participants

Link here
后端研发-苏明海 @season 2020-10-12 08:59:15 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-10-12 08:59:16 UTC
mentioned in commit 5523fab79b12e751c135c8e08a009136c51f4de6
Write

Preview

mentioned in commit 5523fab79b12e751c135c8e08a009136c51f4de6 Edit in fullscreen

Comments are parsed with GitLab Flavored Markdown

Attach files by dragging & dropping or selecting them.

Cancel

12 Oct, 2020

3 commits

Merge branch 'test' into 'qa' ...
e4a6e744
```
Test

See merge request !532
```
后端研发-苏明海 authored
2020-10-12 15:16:39 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
7f93792c
```
购物车，收货地址 一开始没有，新增收货地址之后，价格要有物流费用

See merge request !531
```
后端研发-苏明海 authored
2020-10-12 15:16:14 +0800
Browse Code »
购物车，收货地址一开始没有，新增收货地址之后，价格要有物流费用
e28c9b0b

yvan.ni authored
2020-10-12 15:01:37 +0800
Browse Code »

10 Oct, 2020

9 commits

Merge branch 'test' into 'qa' ...
9c88ee64
```
Test

See merge request !530
```
后端研发-苏明海 authored
2020-10-10 14:13:20 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
34b2d07b
```
Dev

See merge request !529
```
后端研发-苏明海 authored
2020-10-10 14:12:57 +0800
Browse Code »
等级卡功能，要判断是不是等级卡购买返回的
400d2ce2

yvan.ni authored
2020-10-10 14:08:52 +0800
Browse Code »
1. 奇怪的跳俩次的优化
f861783e

yvan.ni authored
2020-10-10 11:28:38 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
6616dcb9
```
Test

See merge request !528
```
后端研发-苏明海 authored
2020-10-10 11:17:37 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
46a4fa44
```
1.  在调用接口获取会员信息的时候，要用随机码，避免接口的缓存

See merge request !527
```
后端研发-苏明海 authored
2020-10-10 11:16:28 +0800
Browse Code »
1. 在调用接口获取会员信息的时候，要用随机码，避免接口的缓存
7cd66b07

yvan.ni authored
2020-10-10 11:13:12 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
ead10665
```
Test

See merge request !526
```
后端研发-苏明海 authored
2020-10-10 09:54:06 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
4ba92120
```
Dev

See merge request !525
```
后端研发-苏明海 authored
2020-10-10 09:53:50 +0800
Browse Code »

09 Oct, 2020

5 commits

1. 绑定如果失败，要重新授权 ...
87bfec95
```
2.   秒杀  等级卡显示 购买返回
3.  参团分享图
```
yvan.ni authored
2020-10-09 17:42:57 +0800
Browse Code »
等级卡立即续费的时候。要用手店价格来计算优惠金额
9011c26f

yvan.ni authored
2020-10-09 15:57:06 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
e03ddeb8
```
Test

See merge request !524
```
后端研发-苏明海 authored
2020-10-09 14:12:12 +0800
Browse Code »

Merge branch 'dev' into 'test' ...

8406f5b1

1， 自定义海报不显示的bug

2.   优惠促销的商品，在再来一单的时候，要判断是不是优惠活动过期

See merge request !523

authored

2020-10-09 14:11:56 +0800

Browse Code »

1，自定义海报不显示的bug ...
dfebcf4e
```
2.   优惠促销的商品，在再来一单的时候，要判断是不是优惠活动过期
```
yvan.ni authored
2020-10-09 14:08:28 +0800
Browse Code »

08 Oct, 2020

8 commits

Merge branch 'test' into 'qa' ...
1fabf2e4
```
Test

See merge request !522
```
后端研发-苏明海 authored
2020-10-08 17:26:31 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
648b9603
```
Dev

See merge request !521
```
后端研发-苏明海 authored
2020-10-08 17:26:16 +0800
Browse Code »
1. 提交订单的页面等级卡购买后价格正确获取
f5e763bd

yvan.ni authored
2020-10-08 17:23:56 +0800
Browse Code »
1. 小程序拼团单独购买要显示等级卡价格
70ccaaa4

yvan.ni authored
2020-10-08 16:39:09 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
52a8ebb6
```
Test

See merge request !520
```
后端研发-苏明海 authored
2020-10-08 15:23:32 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
9dcbc6f8
```
1.   再来一单的优化

2.    分类的样式的修复

See merge request !519
```
后端研发-苏明海 authored
2020-10-08 15:23:04 +0800
Browse Code »
1. 再来一单的优化 ...
5bb02757
```
2.    分类的样式的修复
```
yvan.ni authored
2020-10-08 15:19:39 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
d601dec5
```
Dev

See merge request !518
```
后端研发-苏明海 authored
2020-10-08 10:30:50 +0800
Browse Code »

07 Oct, 2020

2 commits

1. 再来一单的排版
f23e5534

yvan.ni authored
2020-10-07 15:59:46 +0800
Browse Code »
1、再来一单要有能够计算等级卡的价格
ef376fca

yvan.ni authored
2020-10-07 09:11:07 +0800
Browse Code »

06 Oct, 2020

5 commits

1。秒杀再来一单的功能，提交订单时候无法提交的bug优化
7a70bfe0

yvan.ni authored
2020-10-06 17:09:32 +0800
Browse Code »
1。分享海报默认海报时的bug修复
936600b2

yvan.ni authored
2020-10-06 16:22:03 +0800
Browse Code »
门店和导购修改次数
f8ade779

yvan.ni authored
2020-10-06 15:12:05 +0800
Browse Code »
1. 立即购买的礼品限制次数 ...
fc03f7dc
```
2.   阶梯团 物流的参团的bug优化
3.   门店和导购的每个月的修改次数的优化
```
yvan.ni authored
2020-10-06 15:08:36 +0800
Browse Code »
1. 提交订单的页面显示等级卡时，要*购卡数量 ...
cc5e428c
```
2.  积分购再购买的时候，要处理is_integral_normal=1
```
yvan.ni authored
2020-10-06 09:56:42 +0800
Browse Code »

05 Oct, 2020

5 commits

1. 拼团在购买的时候优化--当商品的配送方式是物流的时候
f9fdd19b

后端研发-倪永富 authored
2020-10-05 20:19:03 +0800
Browse Code »
1. 自定义海报
2abc3a97

yvan.ni authored
2020-10-05 16:26:45 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
967bea42
```
Dev

See merge request !517
```
后端研发-苏明海 authored
2020-10-05 14:28:27 +0800
Browse Code »
1. 提交订单页面显示购买等级卡优惠 ...
aa559957
```
2.   积分购，拼团的普通购买再来一单的功能的bug优化
```
yvan.ni authored
2020-10-05 14:25:42 +0800
Browse Code »
1 购物车的样式的修复
aab08626

yvan.ni authored
2020-10-05 10:21:11 +0800
Browse Code »

30 Sep, 2020

7 commits

助力活动自定义
a0960568

后端研发-倪永富 authored
2020-09-30 15:51:26 +0800
Browse Code »
等级卡样式调整
1886bf45

后端研发-倪永富 authored
2020-09-30 15:28:59 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
a165bbe9

后端研发-倪永富 authored
2020-09-30 14:41:42 +0800
Browse Code »
搜索页搜索框下表头标题点击样式修改
d4b72bc9

后端研发-倪永富 authored
2020-09-30 14:41:37 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
7c57779e
```
Dev

See merge request !516
```
后端研发-苏明海 authored
2020-09-30 10:07:31 +0800
Browse Code »
分类
eaaf19ff

yvan.ni authored
2020-09-30 09:29:44 +0800
Browse Code »
已售要显示
bf8fbc67

yvan.ni authored
2020-09-30 09:29:28 +0800
Browse Code »

29 Sep, 2020

3 commits

1. 测试返回的16条BUG。和优化
7aef3a0c

yvan.ni authored
2020-09-29 15:42:04 +0800
Browse Code »
搜索列表和等级卡样式调整
0dd9c405

后端研发-倪永富 authored
2020-09-29 10:16:48 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
8ed9007d

后端研发-倪永富 authored
2020-09-29 09:18:31 +0800
Browse Code »

28 Sep, 2020

2 commits

退货原因选项修改
67244f43

WXD-SEASON\season authored
2020-09-28 17:08:15 +0800
Browse Code »
直播列表因定参数修复
c9c4cc70

WXD-SEASON\season authored
2020-09-28 16:17:57 +0800
Browse Code »

26 Sep, 2020

3 commits

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

See merge request !515
```
后端研发-苏明海 authored
2020-09-26 17:24:26 +0800
Browse Code »
1。再来一单的优化
ed5f0506

yvan.ni authored
2020-09-26 17:21:10 +0800
Browse Code »
评价有礼自定义链接
8bd975eb

WXD-SEASON\season authored
2020-09-26 16:35:18 +0800
Browse Code »

25 Sep, 2020

6 commits

cart2 商品金额加圆角
3d40cd53

后端研发-倪永富 authored
2020-09-25 17:36:55 +0800
Browse Code »
购物车的样式因为导航的修改也要调整
63467632

yvan.ni authored
2020-09-25 17:01:31 +0800
Browse Code »
如果商品不存在，就要清理掉
9bad401f

yvan.ni authored
2020-09-25 16:50:11 +0800
Browse Code »
导航栏偏高修正
635754ab

yvan.ni authored
2020-09-25 16:41:13 +0800
Browse Code »
提示成功的突破
f8293f18

yvan.ni authored
2020-09-25 16:40:42 +0800
Browse Code »
1. 显示订单价格有改~~~
44754d6a

yvan.ni authored
2020-09-25 09:33:32 +0800
Browse Code »

24 Sep, 2020

3 commits

1. OA单和 12点优化的内容
a4ededa5

yvan.ni authored
2020-09-24 17:39:08 +0800
Browse Code »
截取等级卡名称
e644836f

后端研发-倪永富 authored
2020-09-24 15:58:39 +0800
Browse Code »
解除等级卡名称被js截取
de4dad92

后端研发-倪永富 authored
2020-09-24 13:56:01 +0800
Browse Code »

22 Sep, 2020

2 commits

提交订单页（团购、支付尾款、普通提交）样式修改
90b370d5

后端研发-倪永富 authored
2020-09-22 16:28:58 +0800
Browse Code »
1.购物车的样式，结算栏的样式调整
8deb2342

yvan.ni authored
2020-09-22 09:33:37 +0800
Browse Code »

21 Sep, 2020

5 commits

提交订单页定位图标高度修改
bf5667c3

后端研发-倪永富 authored
2020-09-21 17:58:40 +0800
Browse Code »
提交订单页商品图片圆角显示（2）
e6fec669

后端研发-倪永富 authored
2020-09-21 17:51:14 +0800
Browse Code »
提交订单页商品图圆角显示
373b32ed

后端研发-倪永富 authored
2020-09-21 17:42:54 +0800
Browse Code »
提交订单页样式修改
6401bb39

后端研发-倪永富 authored
2020-09-21 17:36:52 +0800
Browse Code »
提交订单样式修改
a0f4b1cb

后端研发-倪永富 authored
2020-09-21 16:21:39 +0800
Browse Code »

Merged Merge Request #533 · created by 后端研发-苏明海 2020-10-12 08:58:49 UTC $('.time_ago').timeago().tooltip()

Qa

How to merge

Merged by 后端研发-苏明海 2020-10-12 08:59:15 UTC $('.time_ago').timeago().tooltip()

12 Oct, 2020

10 Oct, 2020

09 Oct, 2020

08 Oct, 2020

07 Oct, 2020

06 Oct, 2020

05 Oct, 2020

30 Sep, 2020

29 Sep, 2020

28 Sep, 2020

26 Sep, 2020

25 Sep, 2020

24 Sep, 2020

22 Sep, 2020

21 Sep, 2020

Merged
Merge Request #533 · created by 后端研发-苏明海 2020-10-12 08:58:49 UTC

Merged by 后端研发-苏明海 2020-10-12 08:59:15 UTC