wxd / MShopWeApp | GitLab

Merged
Merge Request #950 · created by 后端研发-苏明海 2022-01-18 01:20:35 UTC

Qa

From qa into master

1 participants

Link here
后端研发-苏明海 @season 2022-01-18 01:20:46 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-01-18 01:20:46 UTC
mentioned in commit e3d3de69004cca64c6d05c8011a7c9c13b097ea9
Write

Preview

mentioned in commit e3d3de69004cca64c6d05c8011a7c9c13b097ea9 Edit in fullscreen

Comments are parsed with GitLab Flavored Markdown

Attach files by dragging & dropping or selecting them.

Cancel

17 Jan, 2022

3 commits

Merge branch 'test' into 'qa' ...
67196f4c
```
Test

See merge request !949
```
后端研发-苏明海 authored
2022-01-17 16:02:00 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
e95b6b4d
```
普通商品，积分购 不包邮地区

See merge request !948
```
后端研发-苏明海 authored
2022-01-17 16:01:42 +0800
Browse Code »
普通商品，积分购不包邮地区
d3963a46

abson authored
2022-01-17 14:18:03 +0800
Browse Code »

15 Jan, 2022

6 commits

Merge branch 'test' into 'qa' ...
3e71aa87
```
Test

See merge request !947
```
后端研发-苏明海 authored
2022-01-15 14:03:26 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
edbc6c61
```
不包邮商品，地区 重量问题

See merge request !946
```
后端研发-苏明海 authored
2022-01-15 14:03:13 +0800
Browse Code »
不包邮商品，地区重量问题
1a59d68f

abson authored
2022-01-15 13:55:32 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
211edbb3
```
Test

See merge request !945
```
后端研发-苏明海 authored
2022-01-15 09:26:51 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
68309ba1
```
qa oa单优化

See merge request !944
```
后端研发-苏明海 authored
2022-01-15 09:26:37 +0800
Browse Code »
qa oa单优化
83cf3dbd

abson authored
2022-01-15 09:17:14 +0800
Browse Code »

14 Jan, 2022

9 commits

Merge branch 'test' into 'qa' ...
0dd81f8d
```
Test

See merge request !943
```
后端研发-苏明海 authored
2022-01-14 18:12:53 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
1498bf17
```
预售重量

See merge request !942
```
后端研发-苏明海 authored
2022-01-14 18:12:39 +0800
Browse Code »
预售重量
a8d2d181

abson authored
2022-01-14 17:30:56 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
91a7fa8e
```
Test

See merge request !941
```
后端研发-苏明海 authored
2022-01-14 14:40:16 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
b6c8f4ba
```
Dev

See merge request !940
```
后端研发-苏明海 authored
2022-01-14 14:40:01 +0800
Browse Code »
拼团2
dfc5414c

abson authored
2022-01-14 10:12:34 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
6b8a4eb7

abson authored
2022-01-14 10:12:11 +0800
Browse Code »
拼团
e60b7e15

abson authored
2022-01-14 10:12:00 +0800
Browse Code »
OA搭配购自选问题
7a7bdb5c

泉州测试 authored
2022-01-14 10:10:49 +0800
Browse Code »

13 Jan, 2022

3 commits

积分购物流超重优化
b39365c7

abson authored
2022-01-13 17:15:20 +0800
Browse Code »
OA分销会员字号调整
e597e10b

泉州测试 authored
2022-01-13 11:31:54 +0800
Browse Code »
物流
b29b5dd8

abson authored
2022-01-13 09:54:53 +0800
Browse Code »

12 Jan, 2022

2 commits

隐藏预热活动
57973d9d

泉州测试 authored
2022-01-12 19:49:59 +0800
Browse Code »
chaol
23650d5e

abson authored
2022-01-12 14:39:54 +0800
Browse Code »

11 Jan, 2022

8 commits

Merge branch 'test' into 'qa' ...
7f95c206
```
Test

See merge request !939
```
后端研发-苏明海 authored
2022-01-11 18:02:40 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
11b9325b
```
Dev

See merge request !938
```
后端研发-苏明海 authored
2022-01-11 18:02:26 +0800
Browse Code »
暂时隐藏预售预热
0e2bcd18

泉州测试 authored
2022-01-11 16:07:28 +0800
Browse Code »
立即支付要控制不能点两次
756e5565

yvan.ni authored
2022-01-11 15:36:51 +0800
Browse Code »
修改分销团队会员显示字号
4aff0b4e

泉州测试 authored
2022-01-11 11:23:14 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
763e1ef0
```
Test

See merge request !937
```
后端研发-苏明海 authored
2022-01-11 09:30:41 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
25b828e9
```
Dev

See merge request !936
```
后端研发-苏明海 authored
2022-01-11 09:30:08 +0800
Browse Code »
超量倍增
c014c3a8

abson authored
2022-01-11 09:18:13 +0800
Browse Code »

10 Jan, 2022

1 commit

OA团购预热
bb047c76

泉州测试 authored
2022-01-10 14:20:59 +0800
Browse Code »

08 Jan, 2022

10 commits

购买车，结算页超量倍增
90dbc8d7

abson authored
2022-01-08 17:39:55 +0800
Browse Code »
}
70e3c1b8

abson authored
2022-01-08 11:39:18 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
92f00020

abson authored
2022-01-08 11:38:58 +0800
Browse Code »
多个了}
b7b7bad0

abson authored
2022-01-08 11:38:48 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
140515e5

后端研发-苏泰源 authored
2022-01-08 11:34:32 +0800
Browse Code »
sceneValue改为scene
44ebbc0b

后端研发-苏泰源 authored
2022-01-08 11:34:03 +0800
Browse Code »
拼单分享
564c5e00

abson authored
2022-01-08 11:27:31 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
0a6617c4

abson authored
2022-01-08 11:03:01 +0800
Browse Code »
组合购分享给好友加入购物车，没有反应的bug优化
5a407f47

yvan.ni authored
2022-01-08 10:19:08 +0800
Browse Code »
oa单测试返回
4070f44c

abson authored
2022-01-08 09:23:39 +0800
Browse Code »

07 Jan, 2022

7 commits

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

yvan.ni authored
2022-01-07 16:11:02 +0800
Browse Code »
小程序检查更新
60727c92

yvan.ni authored
2022-01-07 16:10:34 +0800
Browse Code »
幸运购海报scene值修改
f0a6983c

后端研发-苏泰源 authored
2022-01-07 14:25:06 +0800
Browse Code »
幸运购分享海报修改
cb47566f

后端研发-苏泰源 authored
2022-01-07 11:50:00 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
e596c694

后端研发-苏泰源 authored
2022-01-07 11:06:51 +0800
Browse Code »
幸运购
00cc3dc3

后端研发-苏泰源 authored
2022-01-07 11:06:34 +0800
Browse Code »
评价
a57894a1

WXD-SEASON\season authored
2022-01-07 09:11:13 +0800
Browse Code »

05 Jan, 2022

4 commits

拼单分享会员身份权限
298b7a25

abson authored
2022-01-05 16:21:54 +0800
Browse Code »
报警提示的优化
f54b3e8f

yvan.ni authored
2022-01-05 14:58:25 +0800
Browse Code »
oa测试返回
78d663c2

abson authored
2022-01-05 14:24:52 +0800
Browse Code »
积分购添加虚拟销量
6708cc76

yvan.ni authored
2022-01-05 14:07:10 +0800
Browse Code »

04 Jan, 2022

4 commits

OA修改分销会员显示格式
b8a162b4

泉州测试 authored
2022-01-04 21:26:56 +0800
Browse Code »
fixedOA预售预热活动修改
0fbb22af

泉州测试 authored
2022-01-04 21:13:34 +0800
Browse Code »
预约修改时间优化
5739e8f1

WXD-SEASON\season authored
2022-01-04 14:42:42 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
63a4326f
```
Dev

See merge request !935
```
后端研发-苏明海 authored
2022-01-04 14:29:45 +0800
Browse Code »

31 Dec, 2021

8 commits

活动分享页分享幸运购活动问题修改
ca2bca5b

后端研发-苏泰源 authored
2021-12-31 15:50:40 +0800
Browse Code »
服务卡项订单详情
a419f615

后端研发-苏泰源 authored
2021-12-31 15:48:01 +0800
Browse Code »
自定义服务卡项模板
03a2439e

后端研发-苏泰源 authored
2021-12-31 15:46:54 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
e15ae076

后端研发-苏泰源 authored
2021-12-31 11:04:30 +0800
Browse Code »
商品分组样式调整
59d8080a

后端研发-苏泰源 authored
2021-12-31 11:04:20 +0800
Browse Code »
公众号组件推迟显示
1dbfc0aa

yvan.ni authored
2021-12-31 10:45:37 +0800
Browse Code »
判断顶部的关注公众号的组件的显示
f93e22b7

yvan.ni authored
2021-12-31 09:53:50 +0800
Browse Code »
评价有礼
8f151bd4

yvan.ni authored
2021-12-31 09:27:58 +0800
Browse Code »

30 Dec, 2021

17 commits

首页
dabb535a

yvan.ni authored
2021-12-30 18:12:57 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
5d566ccb

yvan.ni authored
2021-12-30 18:12:36 +0800
Browse Code »
首页，评价有礼
ad422e94

yvan.ni authored
2021-12-30 18:12:28 +0800
Browse Code »
OA搭配促销使用优惠卷
c5f945f6

泉州测试 authored
2021-12-30 17:56:08 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
4e839bd6

泉州测试 authored
2021-12-30 17:54:25 +0800
Browse Code »
OA搭配购使用优惠卷
9007ce83

泉州测试 authored
2021-12-30 17:54:11 +0800
Browse Code »
礼包券的说明
e8a6cbaa

yvan.ni authored
2021-12-30 17:03:12 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
b96b1e35

yvan.ni authored
2021-12-30 16:38:46 +0800
Browse Code »
优惠券显示
dafec629

yvan.ni authored
2021-12-30 16:38:38 +0800
Browse Code »
引用
6bcbaa7e

abson authored
2021-12-30 16:06:21 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
4e956944

abson authored
2021-12-30 16:05:53 +0800
Browse Code »
积分签到路径引用错误
2cd12bc2

abson authored
2021-12-30 16:05:44 +0800
Browse Code »
1、购买限制使用优惠券 ...
78622ca5
```
2、首页公众号关注
```
yvan.ni authored
2021-12-30 15:44:57 +0800
Browse Code »
go——url
ab3add0b

abson authored
2021-12-30 15:21:05 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
15867d13

abson authored
2021-12-30 15:20:24 +0800
Browse Code »
G_FILTER.WXS
076c0d3a

abson authored
2021-12-30 15:20:13 +0800
Browse Code »
OA搭配促销增加优惠卷开关
a5d71c59

泉州测试 authored
2021-12-30 11:25:37 +0800
Browse Code »

29 Dec, 2021

5 commits

oa/115415
cb26cfe7

abson authored
2021-12-29 20:46:44 +0800
Browse Code »
报警优化
c76f0518

yvan.ni authored
2021-12-29 11:03:28 +0800
Browse Code »
订单自提还会显示物流公司的bug
bb66b66f

yvan.ni authored
2021-12-29 10:47:29 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
a82319fc

后端研发-苏泰源 authored
2021-12-29 09:47:07 +0800
Browse Code »
促销栏样式调整
9e8470a4

后端研发-苏泰源 authored
2021-12-29 09:46:35 +0800
Browse Code »

28 Dec, 2021

4 commits

优化空白行
c2f9aaf0

abson authored
2021-12-28 19:53:59 +0800
Browse Code »
oa/115679 超量倍增逻辑更改
8e201614

abson authored
2021-12-28 16:37:29 +0800
Browse Code »
oa单优化
61488783

abson authored
2021-12-28 09:16:13 +0800
Browse Code »
OA单提交
ba998f66

yvan.ni authored
2021-12-28 09:03:09 +0800
Browse Code »

25 Dec, 2021

30 commits

is_coupon
62602345

yvan.ni authored
2021-12-25 17:48:26 +0800
Browse Code »
推送
2423f1ab

abson authored
2021-12-25 17:29:20 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
fb93cc75

abson authored
2021-12-25 17:28:09 +0800
Browse Code »
注册推送
19b5008e

abson authored
2021-12-25 17:27:55 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
a26f7075

后端研发-苏泰源 authored
2021-12-25 16:55:06 +0800
Browse Code »
商品列表样式修改
1b583787

后端研发-苏泰源 authored
2021-12-25 16:54:57 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
2edb747f

泉州测试 authored
2021-12-25 16:53:55 +0800
Browse Code »
组合购预热商品页
56cd5e3e

泉州测试 authored
2021-12-25 16:53:47 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
c3bc66e6

后端研发-苏泰源 authored
2021-12-25 16:47:42 +0800
Browse Code »
优惠券和商品列表修改
c2b4d10c

后端研发-苏泰源 authored
2021-12-25 16:47:38 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
5df9b85a

泉州测试 authored
2021-12-25 16:37:38 +0800
Browse Code »
组合购预热商品页
c7cc9fd3

泉州测试 authored
2021-12-25 16:37:30 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
abdca505

后端研发-苏泰源 authored
2021-12-25 16:32:23 +0800
Browse Code »
会员中心优惠券修改
b5175d36

后端研发-苏泰源 authored
2021-12-25 16:32:16 +0800
Browse Code »
OA预售预热商品页
cb60e625

泉州测试 authored
2021-12-25 16:26:52 +0800
Browse Code »
会员中心二维码窗口滚动问题修改
c6f90d07

后端研发-苏泰源 authored
2021-12-25 16:17:18 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
6821ba5f

后端研发-苏泰源 authored
2021-12-25 15:41:08 +0800
Browse Code »
商品列表标题字体大小修改
1d8f2181

后端研发-苏泰源 authored
2021-12-25 15:41:04 +0800
Browse Code »
更改团购预热商品页时间文字
ddf4cb1d

泉州测试 authored
2021-12-25 15:39:04 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
3d7ee4c2

后端研发-苏泰源 authored
2021-12-25 15:30:23 +0800
Browse Code »
cart2
1ef5e861

后端研发-苏泰源 authored
2021-12-25 15:29:58 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
cffa5a26

yvan.ni authored
2021-12-25 14:41:04 +0800
Browse Code »
OA单
d2a832fc

yvan.ni authored
2021-12-25 14:40:20 +0800
Browse Code »
Merge remote-tracking branch 'refs/remotes/origin/dev' ...
8155bceb
```
Conflicts:
	packageB/pages/zuhegou/list/list.wxml
	pages/goods/goodsInfo/goodsInfo.js
```
泉州测试 authored
2021-12-25 14:38:45 +0800
Browse Code »
oa单
a4b53fb1

abson authored
2021-12-25 14:16:19 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
71b7a794

abson authored
2021-12-25 14:15:43 +0800
Browse Code »
oa单处理
e6412d6d

abson authored
2021-12-25 14:15:29 +0800
Browse Code »
批量预约显示
1d84b63e

WXD-SEASON\season authored
2021-12-25 14:15:06 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev ...
8a1b1544
```
# Conflicts:
#	pages/goods/goodsInfo/goodsInfo.js
#	pages/goods/goodsInfo/goodsInfo.wxss
```
后端研发-苏泰源 authored
2021-12-25 14:02:06 +0800
Browse Code »
商品分组修改
4a56429a

后端研发-苏泰源 authored
2021-12-25 13:58:32 +0800
Browse Code »

24 Dec, 2021

2 commits

促销栏点击礼包
5e304a63

后端研发-苏泰源 authored
2021-12-24 15:04:12 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
26b73d9b

泉州测试 authored
2021-12-24 10:43:36 +0800
Browse Code »

23 Dec, 2021

2 commits

礼包详情控制按钮显示
8ca3a9e8

后端研发-苏泰源 authored
2021-12-23 15:35:48 +0800
Browse Code »
促销礼包点击跳转等
28115e6d

后端研发-苏泰源 authored
2021-12-23 15:34:09 +0800
Browse Code »

22 Dec, 2021

3 commits

OA搭配促销增加使用优惠卷开关
e9aec8f8

泉州测试 authored
2021-12-22 17:14:38 +0800
Browse Code »
OA搭配促销添加使用优惠卷开关
df453f1b

泉州测试 authored
2021-12-22 16:43:08 +0800
Browse Code »
Merge refs/remotes/origin/dev into refs/heads/dev
cf3cea80

泉州测试 authored
2021-12-22 09:44:38 +0800
Browse Code »

20 Dec, 2021

2 commits

团购预热模块
c740cde2

泉州测试 authored
2021-12-20 10:42:18 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
8d05f38b

泉州测试 authored
2021-12-20 10:41:26 +0800
Browse Code »

18 Dec, 2021

2 commits

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

泉州测试 authored
2021-12-18 10:48:29 +0800
Browse Code »
预售_组合购添加预热
d923de19

泉州测试 authored
2021-12-18 10:47:38 +0800
Browse Code »

16 Dec, 2021

4 commits

幸运购海报
a4fdee1c

泉州测试 authored
2021-12-16 15:09:04 +0800
Browse Code »
OA分销会员标识颜色
ff1f74be

泉州测试 authored
2021-12-16 09:44:50 +0800
Browse Code »
OA分销会员标识
3aa1a3e2

泉州测试 authored
2021-12-16 09:42:46 +0800
Browse Code »
OA分销关系备注
28443585

泉州测试 authored
2021-12-16 09:16:18 +0800
Browse Code »

15 Dec, 2021

3 commits

活动分享修改
9ccea267

后端研发-苏泰源 authored
2021-12-15 14:28:30 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
a15f9c46

后端研发-苏泰源 authored
2021-12-15 09:11:56 +0800
Browse Code »
活动分享
826ea456

后端研发-苏泰源 authored
2021-12-15 09:11:48 +0800
Browse Code »