wxd / MShopWeApp

Merged
Merge Request #610 · created by 后端研发-苏明海 2021-03-08 15:09:07 UTC

Qa

From qa into master

1 participants

Link here
后端研发-苏明海 @season 2021-03-08 15:09:17 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 2021-03-08 15:09:17 UTC
mentioned in commit 669a7cb5b9e2da75c9da46cafa00299fe87d015b
Write

Preview

mentioned in commit 669a7cb5b9e2da75c9da46cafa00299fe87d015b Edit in fullscreen

Comments are parsed with GitLab Flavored Markdown

Attach files by dragging & dropping or selecting them.

Cancel

08 Mar, 2021

3 commits

Merge branch 'test' into 'qa' ...
2706b36d
```
Test

See merge request !609
```
后端研发-苏明海 authored
2021-03-08 23:08:52 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
86469731
```
优惠券显示优化

See merge request !608
```
后端研发-苏明海 authored
2021-03-08 23:08:22 +0800
Browse Code »
优惠券显示优化
3371af97

WXD-SEASON\season authored
2021-03-08 18:02:48 +0800
Browse Code »

06 Mar, 2021

4 commits

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

See merge request !607
```
后端研发-苏明海 authored
2021-03-06 14:54:11 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
bdc09872
```
Dev

See merge request !606
```
后端研发-苏明海 authored
2021-03-06 14:53:49 +0800
Browse Code »
秒杀自定义模板的bug优化
bdaed009

yvan.ni authored
2021-03-06 14:52:16 +0800
Browse Code »
商品分享海报页样式调整
fb8eccbe

taiyuan authored
2021-03-06 10:36:06 +0800
Browse Code »

05 Mar, 2021

1 commit

小程序的服务时间
88438123

yvan.ni authored
2021-03-05 14:38:28 +0800
Browse Code »

04 Mar, 2021

6 commits

Merge branch 'test' into 'qa' ...
83bd54d3
```
Test

See merge request !605
```
后端研发-苏明海 authored
2021-03-04 17:07:48 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
2d9e4937
```
我的服务 增加 服务记录 入口

See merge request !604
```
后端研发-苏明海 authored
2021-03-04 17:06:35 +0800
Browse Code »
我的服务增加服务记录入口
e317bc08

后端研发-倪永富 authored
2021-03-04 17:05:44 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
2be7c24b
```
Test

See merge request !603
```
后端研发-苏明海 authored
2021-03-04 17:00:47 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
1d47db29
```
Dev

See merge request !602
```
后端研发-苏明海 authored
2021-03-04 17:00:28 +0800
Browse Code »
小程序在设置门店的bug修复
8d1ea610

yvan.ni authored
2021-03-04 16:47:06 +0800
Browse Code »

02 Mar, 2021

3 commits

积分签到的修复
a1d2c509

yvan.ni authored
2021-03-02 18:23:10 +0800
Browse Code »
有补签的积分
4f3ba8ec

yvan.ni authored
2021-03-02 15:09:05 +0800
Browse Code »
签到的优化，
cabe1368

yvan.ni authored
2021-03-02 11:43:20 +0800
Browse Code »

01 Mar, 2021

2 commits

全屏的显示方法
7aaba81c

yvan.ni authored
2021-03-01 18:07:54 +0800
Browse Code »
全屏的修改
fb8b0f1f

yvan.ni authored
2021-03-01 18:05:50 +0800
Browse Code »

27 Feb, 2021

5 commits

积分签到优化
6155b5d2

WXD-SEASON\season authored
2021-02-27 16:01:34 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
57e194ca

yvan.ni authored
2021-02-27 15:36:22 +0800
Browse Code »
签到的时间的显示
15bd4bb9

yvan.ni authored
2021-02-27 15:35:33 +0800
Browse Code »
补签字段修改及首页判断优化
87d7c2d4

WXD-SEASON\season authored
2021-02-27 14:56:20 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
652fcbca
```
Dev

See merge request !601
```
后端研发-苏明海 authored
2021-02-27 14:31:10 +0800
Browse Code »

26 Feb, 2021

7 commits

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

yvan.ni authored
2021-02-26 18:22:49 +0800
Browse Code »
1. 如果读秒发现时间已经结束，要提示活动已经结束 ...
96fd916f
```
2. 组件选择了手动选择时，前端控制只显示手动选择的商品
3. 霸屏功能的优化
```
yvan.ni authored
2021-02-26 18:22:38 +0800
Browse Code »
代金券显示说明
dfb68751

WXD-SEASON\season authored
2021-02-26 16:10:28 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
039e8111

yvan.ni authored
2021-02-26 15:41:59 +0800
Browse Code »
小程序自定义模板的广告图片幻灯片从左往右播放结束后会再从右往左再进行播放应改为与公众号一致
7fd61a42

yvan.ni authored
2021-02-26 15:41:47 +0800
Browse Code »
闪屏样式修改
160faa85

后端研发-倪永富 authored
2021-02-26 14:16:01 +0800
Browse Code »
签到前检测是否登录
fabaab15

后端研发-倪永富 authored
2021-02-26 11:19:27 +0800
Browse Code »

24 Feb, 2021

2 commits

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

yvan.ni authored
2021-02-24 14:49:15 +0800
Browse Code »
封面图固定大小
7194b7d5

yvan.ni authored
2021-02-24 14:49:06 +0800
Browse Code »

23 Feb, 2021

2 commits

限定链接领取
5c905e02

WXD-SEASON\season authored
2021-02-23 17:42:24 +0800
Browse Code »
礼包使用封面图标，如果没有上传封面图就使用礼包图片
f400919d

yvan.ni authored
2021-02-23 10:01:12 +0800
Browse Code »

22 Feb, 2021

1 commit

1. 小程序霸屏 ...
6ab65a3f
```
2.  拼单和秒杀的自定义模板的优化，空的时候要隐藏
```
yvan.ni authored
2021-02-22 16:57:21 +0800
Browse Code »

21 Feb, 2021

1 commit

脚本报错的修改
498e5447

yvan.ni authored
2021-02-21 16:30:28 +0800
Browse Code »

05 Feb, 2021

5 commits

1. 调整推迟的时间
4f42b43f

yvan.ni authored
2021-02-05 22:59:46 +0800
Browse Code »
抢红包问题修改
badf03c8

后端研发-倪永富 authored
2021-02-05 14:59:48 +0800
Browse Code »
红包连续点击问题修改
35e87dd4

后端研发-倪永富 authored
2021-02-05 14:10:05 +0800
Browse Code »
服务记录暂无数据
e35671c4

后端研发-倪永富 authored
2021-02-05 10:05:29 +0800
Browse Code »
首页抢红包显示问题修改
3d2e3add

后端研发-倪永富 authored
2021-02-05 09:33:40 +0800
Browse Code »

03 Feb, 2021

2 commits

首页抢红包
998cabb2

后端研发-倪永富 authored
2021-02-03 17:20:50 +0800
Browse Code »
我的服务页新增服务记录
4c09a945

后端研发-倪永富 authored
2021-02-03 17:12:24 +0800
Browse Code »

01 Feb, 2021

2 commits

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

后端研发-倪永富 authored
2021-02-01 17:01:37 +0800
Browse Code »
抢红包
dd053a03

后端研发-倪永富 authored
2021-02-01 17:00:26 +0800
Browse Code »

29 Jan, 2021

5 commits

积分购活动，在关闭的时候的普通购买
380cb805

yvan.ni authored
2021-01-29 22:54:13 +0800
Browse Code »
店招的样式错误，
ef22d34a

yvan.ni authored
2021-01-29 16:00:24 +0800
Browse Code »
全屏广告的优化
d9720f65

yvan.ni authored
2021-01-29 14:46:49 +0800
Browse Code »
小程序全屏广告
c84026a4

yvan.ni authored
2021-01-29 13:37:04 +0800
Browse Code »
1. 会员没有默认门店的时候，地址会显示空的显示bug
51c3bb3b

yvan.ni authored
2021-01-29 11:05:48 +0800
Browse Code »

26 Jan, 2021

1 commit

data.sele_g在使用是时候，要判断不能为空
69240002

yvan.ni authored
2021-01-26 10:51:00 +0800
Browse Code »

23 Jan, 2021

1 commit

积分购取的名称取活动名称
99115bdb

WXD-SEASON\season authored
2021-01-23 11:05:30 +0800
Browse Code »

20 Jan, 2021

2 commits

Merge branch 'dev' into 'test' ...
383de972
```
秒杀，拼团，促销的分享的插入

See merge request !600
```
后端研发-苏明海 authored
2021-01-20 17:36:29 +0800
Browse Code »
秒杀，拼团，促销的分享的插入
20ed7652

yvan.ni authored
2021-01-20 17:27:47 +0800
Browse Code »

Merged Merge Request #610 · created by 后端研发-苏明海 2021-03-08 15:09:07 UTC $('.time_ago').timeago().tooltip()

Qa

How to merge

Merged by 后端研发-苏明海 2021-03-08 15:09:17 UTC $('.time_ago').timeago().tooltip()

08 Mar, 2021

06 Mar, 2021

05 Mar, 2021

04 Mar, 2021

02 Mar, 2021

01 Mar, 2021

27 Feb, 2021

26 Feb, 2021

24 Feb, 2021

23 Feb, 2021

22 Feb, 2021

21 Feb, 2021

05 Feb, 2021

03 Feb, 2021

01 Feb, 2021

29 Jan, 2021

26 Jan, 2021

23 Jan, 2021

20 Jan, 2021

Merged
Merge Request #610 · created by 后端研发-苏明海 2021-03-08 15:09:07 UTC

Merged by 后端研发-苏明海 2021-03-08 15:09:17 UTC