wxd / MShopWeApp

Merged
Merge Request #1013 · created by 后端研发-苏明海 2022-04-21 01:22:52 UTC

Qa

From qa into master

1 participants

Link here
后端研发-苏明海 @season 2022-04-21 01:23:01 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 2022-04-21 01:23:01 UTC
mentioned in commit 6a3e85f0d8d1d55a82ccf95ab56e51dd3d27e5eb
Write

Preview

mentioned in commit 6a3e85f0d8d1d55a82ccf95ab56e51dd3d27e5eb Edit in fullscreen

Comments are parsed with GitLab Flavored Markdown

Attach files by dragging & dropping or selecting them.

Cancel

20 Apr, 2022

6 commits

Merge branch 'test' into 'qa' ...
37eb2da3
```
Test

See merge request !1012
```
后端研发-苏明海 authored
2022-04-20 10:57:59 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
785d8889
```
小程序购物车，优化多赠品的bug

See merge request !1011
```
后端研发-苏明海 authored
2022-04-20 10:57:47 +0800
Browse Code »
小程序购物车，优化多赠品的bug
64681b7a

yvan.ni authored
2022-04-20 10:56:36 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
09f1474a
```
Test

See merge request !1010
```
后端研发-苏明海 authored
2022-04-20 10:54:54 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
aa3adeb5
```
Dev

See merge request !1009
```
后端研发-苏明海 authored
2022-04-20 10:54:39 +0800
Browse Code »
组合购使用券之后，erp无法调单的优化
e6622b89

yvan.ni authored
2022-04-20 10:49:47 +0800
Browse Code »

19 Apr, 2022

1 commit

购物车购买
eea1c463

yvan.ni authored
2022-04-19 17:16:51 +0800
Browse Code »

18 Apr, 2022

3 commits

Merge branch 'test' into 'qa' ...
28cdbb7c
```
Test

See merge request !1008
```
后端研发-苏明海 authored
2022-04-18 11:23:32 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
10c027ac
```
礼包前端的优化

See merge request !1007
```
后端研发-苏明海 authored
2022-04-18 11:23:15 +0800
Browse Code »
礼包前端的优化
8ff9f7da

yvan.ni authored
2022-04-18 11:05:12 +0800
Browse Code »

16 Apr, 2022

4 commits

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

See merge request !1006
```
后端研发-苏明海 authored
2022-04-16 18:20:42 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
74e275fd
```
Dev

See merge request !1005
```
后端研发-苏明海 authored
2022-04-16 18:20:09 +0800
Browse Code »
小程序点判断
f7efac82

yvan.ni authored
2022-04-16 17:50:01 +0800
Browse Code »
多增品多门店的时候的优化
0537cc9f

yvan.ni authored
2022-04-16 17:23:34 +0800
Browse Code »

15 Apr, 2022

4 commits

测肤的bug优化
cd9501ab

yvan.ni authored
2022-04-15 16:37:40 +0800
Browse Code »
报警的优化
2f665e6c

yvan.ni authored
2022-04-15 16:26:33 +0800
Browse Code »
小程序先走赠品的数量的优化
7d4f2863

yvan.ni authored
2022-04-15 16:24:39 +0800
Browse Code »
超出限购次数的优化
0104f600

yvan.ni authored
2022-04-15 10:36:07 +0800
Browse Code »

14 Apr, 2022

1 commit

1. 报警错误的优化 ...
71d8574e
```
2. 测肤的优化
```
yvan.ni authored
2022-04-14 10:49:37 +0800
Browse Code »

13 Apr, 2022

1 commit

1. 预售购买要带场景 ...
6e76da51
```
2.  多赠品的优化
```
yvan.ni authored
2022-04-13 22:05:40 +0800
Browse Code »

12 Apr, 2022

5 commits

1. 视频号商品在支付拼团尾款的时候要带场景 ...
dd20e2fe
```
2.  多赠品的优化
```
yvan.ni authored
2022-04-12 21:55:47 +0800
Browse Code »
测肤优化，会员每日使用次数
6be0cc8c

yvan.ni authored
2022-04-12 16:59:03 +0800
Browse Code »
测肤测试返回优化
6d4a388a

abson authored
2022-04-12 16:34:00 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
03ca390c

yvan.ni authored
2022-04-12 08:32:32 +0800
Browse Code »
小程序多赠品测试的bug返回
a721e7e7

yvan.ni authored
2022-04-12 08:32:15 +0800
Browse Code »

10 Apr, 2022

3 commits

商品详情页、购物车页限购提示修改
adf33573

后端研发-苏泰源 authored
2022-04-10 19:13:13 +0800
Browse Code »
限购提示修改
e3469899

后端研发-苏泰源 authored
2022-04-10 19:00:18 +0800
Browse Code »
商品限购提示修改
2c96057b

后端研发-苏泰源 authored
2022-04-10 18:57:18 +0800
Browse Code »

09 Apr, 2022

10 commits

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
107a1b31

后端研发-苏泰源 authored
2022-04-09 23:51:30 +0800
Browse Code »
秒杀和拼单分享海报修改
1d69edcd

后端研发-苏泰源 authored
2022-04-09 23:51:23 +0800
Browse Code »
获取视频号的场景
e9dd25b7

yvan.ni authored
2022-04-09 18:07:45 +0800
Browse Code »
scene不清理
33e872cf

yvan.ni authored
2022-04-09 16:17:20 +0800
Browse Code »
1. 赠品数量错误 ...
909540bd
```
2.  按钮错误
```
yvan.ni authored
2022-04-09 15:53:49 +0800
Browse Code »
bug优化
f1a3ea47

yvan.ni authored
2022-04-09 15:34:59 +0800
Browse Code »
打日志
873d9d93

yvan.ni authored
2022-04-09 14:39:10 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
f34e3334

后端研发-苏泰源 authored
2022-04-09 10:14:42 +0800
Browse Code »
拼单点击增加传参
c43e6db6

后端研发-苏泰源 authored
2022-04-09 10:14:33 +0800
Browse Code »
服务卡拼团的排版
682f2146

yvan.ni authored
2022-04-09 10:09:52 +0800
Browse Code »

08 Apr, 2022

4 commits

样式冲突修改
5dc62ef6

yvan.ni authored
2022-04-08 17:50:38 +0800
Browse Code »
手机段判断视频号场景
0b41d793

yvan.ni authored
2022-04-08 14:36:03 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
528800d0

yvan.ni authored
2022-04-08 09:12:08 +0800
Browse Code »
领取券要带入skinface_id
f07d6cec

yvan.ni authored
2022-04-08 09:11:53 +0800
Browse Code »

07 Apr, 2022

6 commits

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
bee7e3fb

后端研发-苏泰源 authored
2022-04-07 20:17:50 +0800
Browse Code »
限时团购、拼单列表、拼单自定义模块点击跳转修改
0695355a

后端研发-苏泰源 authored
2022-04-07 20:17:37 +0800
Browse Code »
优惠促销优惠券和商品详情优惠券冲突解决
0b05dccc

abson authored
2022-04-07 16:34:22 +0800
Browse Code »
oa 自测
ba26d6da

abson authored
2022-04-07 15:16:22 +0800
Browse Code »
oa
d5cd7a75

abson authored
2022-04-07 14:21:58 +0800
Browse Code »
1.测肤2期 ...
a4acbec5
```
2.多赠品
```
yvan.ni authored
2022-04-07 14:20:03 +0800
Browse Code »

05 Apr, 2022

4 commits

秒杀和拼单商品分享海报修改
7c7f22c4

后端研发-苏泰源 authored
2022-04-05 22:18:01 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
6a796952

后端研发-苏泰源 authored
2022-04-05 22:14:02 +0800
Browse Code »
增加服务卡拼单有关页面
4752cb6a

后端研发-苏泰源 authored
2022-04-05 22:13:57 +0800
Browse Code »
服务卡自定义模版分页大小设置，商品拼团和秒杀分享海报修改
40496a9d

后端研发-苏泰源 authored
2022-04-05 22:10:13 +0800
Browse Code »

02 Apr, 2022

2 commits

sahochuan
c4aa8d4c

abson authored
2022-04-02 18:24:48 +0800
Browse Code »
app.js get请求超时解决
e183300d

abson authored
2022-04-02 18:20:50 +0800
Browse Code »

30 Mar, 2022

5 commits

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
51096a59

后端研发-苏泰源 authored
2022-03-30 17:11:44 +0800
Browse Code »
服务卡、幸运购、商品详情、购物车超出提示修改为toast方式
f449806e

后端研发-苏泰源 authored
2022-03-30 17:11:38 +0800
Browse Code »
登录成功、支付成功提示图标由感叹号改为打勾
fb827e92

后端研发-苏泰源 authored
2022-03-30 16:15:31 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
2d2e3e4a

后端研发-苏泰源 authored
2022-03-30 12:25:10 +0800
Browse Code »
分类页品牌字母索引修改
203eefa9

后端研发-苏泰源 authored
2022-03-30 12:24:37 +0800
Browse Code »

28 Mar, 2022

2 commits

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
709f058a

后端研发-苏泰源 authored
2022-03-28 17:45:50 +0800
Browse Code »
天美对比功能优化-直播组件排版
d57b0ce1

后端研发-苏泰源 authored
2022-03-28 17:45:36 +0800
Browse Code »

Merged Merge Request #1013 · created by 后端研发-苏明海 2022-04-21 01:22:52 UTC $('.time_ago').timeago().tooltip()

Qa

How to merge

Merged by 后端研发-苏明海 2022-04-21 01:23:01 UTC $('.time_ago').timeago().tooltip()

20 Apr, 2022

19 Apr, 2022

18 Apr, 2022

16 Apr, 2022

15 Apr, 2022

14 Apr, 2022

13 Apr, 2022

12 Apr, 2022

10 Apr, 2022

09 Apr, 2022

08 Apr, 2022

07 Apr, 2022

05 Apr, 2022

02 Apr, 2022

30 Mar, 2022

28 Mar, 2022

Merged
Merge Request #1013 · created by 后端研发-苏明海 2022-04-21 01:22:52 UTC

Merged by 后端研发-苏明海 2022-04-21 01:23:01 UTC