wxd / MShopWeApp

Merged
Merge Request #547 · created by 后端研发-苏明海 2020-10-29 07:51:49 UTC

Qa

From qa into master

1 participants

Link here
后端研发-苏明海 @season 2020-10-29 07:51:57 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-29 07:51:57 UTC
mentioned in commit 891142a85b6e0863af0d799f3f59a2ad2af518e1
Write

Preview

mentioned in commit 891142a85b6e0863af0d799f3f59a2ad2af518e1 Edit in fullscreen

Comments are parsed with GitLab Flavored Markdown

Attach files by dragging & dropping or selecting them.

Cancel

29 Oct, 2020

3 commits

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

See merge request !546
```
后端研发-苏明海 authored
2020-10-29 15:51:32 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
6677b673
```
添加客户

See merge request !545
```
后端研发-苏明海 authored
2020-10-29 15:51:12 +0800
Browse Code »
添加客户
c83ee0ec

后端研发-倪永富 authored
2020-10-29 09:15:36 +0800
Browse Code »

28 Oct, 2020

9 commits

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

See merge request !544
```
后端研发-苏明海 authored
2020-10-28 16:53:30 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
d944d080
```
1. 加 转圈圈的效果

See merge request !543
```
后端研发-苏明海 authored
2020-10-28 16:53:14 +0800
Browse Code »
1. 加转圈圈的效果
9c43e71a

yvan.ni authored
2020-10-28 16:52:27 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
97e7986c
```
Test

See merge request !542
```
后端研发-苏明海 authored
2020-10-28 14:57:04 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
49684b61
```
Dev

See merge request !541
```
后端研发-苏明海 authored
2020-10-28 14:56:19 +0800
Browse Code »
1。类别显示 ...
4547134d
```
2。  购物车多个商品多少促销活动
3。  尾款切换地址
```
yvan.ni authored
2020-10-28 14:55:46 +0800
Browse Code »
添加客户
a10da174

后端研发-倪永富 authored
2020-10-28 09:49:49 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
b7d57c4b
```
Test

See merge request !540
```
后端研发-苏明海 authored
2020-10-28 09:36:58 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
07b38de4
```
Dev

See merge request !539
```
后端研发-苏明海 authored
2020-10-28 09:36:28 +0800
Browse Code »

27 Oct, 2020

11 commits

1.. 助力的任务显示
2d595433

yvan.ni authored
2020-10-27 17:30:27 +0800
Browse Code »
助力活动-分享图样式修改
37c5a890

后端研发-倪永富 authored
2020-10-27 17:24:52 +0800
Browse Code »
1。移动swiper的时候
6f51e350

yvan.ni authored
2020-10-27 16:55:55 +0800
Browse Code »
助力活动背景样式修复
6cd328e5

后端研发-倪永富 authored
2020-10-27 16:34:36 +0800
Browse Code »
助力活动样式修改
48746970

后端研发-倪永富 authored
2020-10-27 16:21:38 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
67f7712a

后端研发-倪永富 authored
2020-10-27 15:55:14 +0800
Browse Code »
积分购
59db24d1

后端研发-倪永富 authored
2020-10-27 15:54:30 +0800
Browse Code »
优惠券分享的标题
d2ae5662

yvan.ni authored
2020-10-27 15:50:36 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
c7ab0d76

yvan.ni authored
2020-10-27 15:32:40 +0800
Browse Code »
1. 立即购买和购物车购买时，切换地址时，优惠券的使用bug修复 ...
4564568f
```
2.   助力活动的bug修复
```
yvan.ni authored
2020-10-27 15:32:12 +0800
Browse Code »
免费优惠券列表
3798c3ff

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

26 Oct, 2020

9 commits

关闭海报问题修改
9d42975f

后端研发-倪永富 authored
2020-10-26 17:55:23 +0800
Browse Code »
分享海报页面排版优化，增加转发好友和保存到相册，点击海报进入图片预览
ad261438

后端研发-倪永富 authored
2020-10-26 17:48:59 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
f4d14d66
```
Dev

See merge request !538
```
后端研发-苏明海 authored
2020-10-26 16:53:22 +0800
Browse Code »
1. 会员中心首页的我的权益的显示问题
de3f7688

yvan.ni authored
2020-10-26 15:56:01 +0800
Browse Code »
这个页面要放在美导小程序
803e006a

yvan.ni authored
2020-10-26 13:48:30 +0800
Browse Code »
1. 登陆成功的图片显示 ...
10315c7c
```
2.   分享跳转内页
```
yvan.ni authored
2020-10-26 11:20:21 +0800
Browse Code »
优惠券列表样式修改
05cca8f8

后端研发-倪永富 authored
2020-10-26 10:48:18 +0800
Browse Code »
1. json 删除pages/shop_details/shop_details
909a4e22

yvan.ni authored
2020-10-26 10:27:21 +0800
Browse Code »
1. 测试的内容优化
ee9138f0

yvan.ni authored
2020-10-26 09:27:41 +0800
Browse Code »

24 Oct, 2020

3 commits

助力活动修改3
ab0817df

后端研发-倪永富 authored
2020-10-24 17:52:02 +0800
Browse Code »
助力活动修改
8edf9639

后端研发-倪永富 authored
2020-10-24 17:37:03 +0800
Browse Code »
助力活动背景色修改
70ad39fb

后端研发-倪永富 authored
2020-10-24 15:20:23 +0800
Browse Code »

23 Oct, 2020

4 commits

1. 美导分享回来，美导业绩归属的bug优化
3dcfcc3b

yvan.ni authored
2020-10-23 16:41:49 +0800
Browse Code »
1. 活动的分享优化商品的分享优化 ...
c7930fd4
```
2.   购物车的功能优化
```
yvan.ni authored
2020-10-23 11:49:44 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
2176743c
```
Dev

See merge request !537
```
后端研发-苏明海 authored
2020-10-23 09:28:24 +0800
Browse Code »
1. 会员中心的按钮要全部显示 pageSize=100 ...
b7df6b4b
```
2.  助力活动的  不限任务数量
3.  等级卡的显示
```
yvan.ni authored
2020-10-23 09:25:33 +0800
Browse Code »

19 Oct, 2020

5 commits

1. 直播分享 2. 券分享
61d2c4bd

yvan.ni authored
2020-10-19 11:42:25 +0800
Browse Code »
1. 会员中心的过滤器
aa9333db

yvan.ni authored
2020-10-19 10:32:01 +0800
Browse Code »
直播间的分享
daf2d441

yvan.ni authored
2020-10-19 10:13:06 +0800
Browse Code »
判断登陆
67ee3d41

yvan.ni authored
2020-10-19 10:10:38 +0800
Browse Code »
1，商品，活动分享的代码
ab004f4f

yvan.ni authored
2020-10-19 09:54:29 +0800
Browse Code »

17 Oct, 2020

1 commit

直播列表分享
136c6bae

后端研发-倪永富 authored
2020-10-17 17:59:48 +0800
Browse Code »

16 Oct, 2020

6 commits

优惠券列表
87ca01df

后端研发-倪永富 authored
2020-10-16 16:50:48 +0800
Browse Code »
助力活动
a3e88280

后端研发-倪永富 authored
2020-10-16 11:42:43 +0800
Browse Code »
修改分享
75fb6036

后端研发-倪永富 authored
2020-10-16 11:09:06 +0800
Browse Code »
分享修改
15ea84f3

后端研发-倪永富 authored
2020-10-16 11:01:52 +0800
Browse Code »
分享好友和生成海报
6590a053

后端研发-倪永富 authored
2020-10-16 10:41:22 +0800
Browse Code »
添加客户、活动分享
cfe045e0

后端研发-倪永富 authored
2020-10-16 09:17:15 +0800
Browse Code »

15 Oct, 2020

3 commits

app.wss
7e27c3cf

后端研发-倪永富 authored
2020-10-15 14:38:12 +0800
Browse Code »
暂无数据组件
c05d6050

后端研发-倪永富 authored
2020-10-15 13:56:02 +0800
Browse Code »
商品分享
c4bf7823

后端研发-倪永富 authored
2020-10-15 11:02:20 +0800
Browse Code »

Merged Merge Request #547 · created by 后端研发-苏明海 2020-10-29 07:51:49 UTC $('.time_ago').timeago().tooltip()

Qa

How to merge

Merged by 后端研发-苏明海 2020-10-29 07:51:57 UTC $('.time_ago').timeago().tooltip()

29 Oct, 2020

28 Oct, 2020

27 Oct, 2020

26 Oct, 2020

24 Oct, 2020

23 Oct, 2020

19 Oct, 2020

17 Oct, 2020

16 Oct, 2020

15 Oct, 2020

Merged
Merge Request #547 · created by 后端研发-苏明海 2020-10-29 07:51:49 UTC

Merged by 后端研发-苏明海 2020-10-29 07:51:57 UTC