wxd / MShopWeApp

Dev

From dev into test

1 participants

Link here
后端研发-苏明海 @season 2022-03-22 01:14: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 2022-03-22 01:14:15 UTC
mentioned in commit aa2d3aaf7876191a3e92908dbe917a10803c9eb3
Write

Preview

mentioned in commit aa2d3aaf7876191a3e92908dbe917a10803c9eb3 Edit in fullscreen

Comments are parsed with GitLab Flavored Markdown

Attach files by dragging & dropping or selecting them.

Cancel

预售、商品、个人中心、幸运购、服务卡客服修改
eeec174b

后端研发-苏泰源 authored
2022-03-10 18:15:14 +0800
Browse Code »
个人中心修改
0542df7a

后端研发-苏泰源 authored
2022-03-10 17:31:47 +0800
Browse Code »

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

8bfb88a5

# Conflicts:
#	app.js
#	packageA/pages/goodsInfo/goodsInfo.js
#	packageA/pages/goodsInfo/goodsInfo.wxml
#	packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
#	packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
#	packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
#	packageC/pages/presell/goodsInfo/goodsInfo.js
#	packageC/pages/presell/goodsInfo/goodsInfo.wxml
#	pages/goods/goodsInfo/goodsInfo.js
#	pages/goods/goodsInfo/goodsInfo.wxml
#	pages/user/index/index.js
#	pages/user/index/index.wxml
#	pages/user/index/index.wxss

2022-03-10 17:30:21 +0800

Browse Code »

联系客服修改
c601fde7

后端研发-苏泰源 authored
2022-03-10 17:14:51 +0800
Browse Code »
测肤的bug优化
6cc98719

yvan.ni authored
2022-03-10 17:10:02 +0800
Browse Code »
1.分享的会员的user_id,分销的上下级关系的bug优化。打开相册，分享，预览图片，照相扫描，聊天，打电话，获取微信地址的时候。 ...
b988d311
```
2.自定义模板时候，首页分享空白页的OA单优化
3. 测肤的分享和生成海报的bug优化
```
yvan.ni authored
2022-03-10 17:08:27 +0800
Browse Code »
购买卡颜色修改
07d0fe14

WXD-SEASON\season authored
2022-03-10 14:55:42 +0800
Browse Code »
预售、幸运购联系客服修改
127cc347

后端研发-苏泰源 authored
2022-03-10 14:21:10 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev ...
a6163eaa
```
# Conflicts:
#	app.js
```
后端研发-苏泰源 authored
2022-03-10 13:54:09 +0800
Browse Code »
个人中心、商品详情联系客服修改
0f89417e

后端研发-苏泰源 authored
2022-03-10 13:50:20 +0800
Browse Code »
推送失败重试
54585d17

abson authored
2022-03-10 11:42:23 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
dff482a6

abson authored
2022-03-10 11:41:59 +0800
Browse Code »
11
d7b6a36b

abson authored
2022-03-10 11:39:47 +0800
Browse Code »
oa 单
69e7d515

abson authored
2022-03-10 11:38:56 +0800
Browse Code »
scroll-view
6ec9400c

abson authored
2022-03-10 11:37:23 +0800
Browse Code »
app 打电话，和微信聊天组件
3f63d801

yvan.ni authored
2022-03-10 11:35:04 +0800
Browse Code »
服务卡秒杀-单独购买
03f818f4

后端研发-苏泰源 authored
2022-03-10 11:28:34 +0800
Browse Code »
测肤报告测肤的bug优化
f5c4b92a

yvan.ni authored
2022-03-10 09:01:10 +0800
Browse Code »
1.分享的会员的user_id,分销的上下级关系的bug优化。打开相册，分享，预览图片，照相扫描，聊天，打电话，获取微信地址的时候。 ...
928d2dff
```
2.自定义模板时候，首页分享空白页的OA单优化
3. 测肤的分享和生成海报的bug优化
```
yvan.ni authored
2022-03-10 08:57:22 +0800
Browse Code »

重复提交
a9c74c81

abson authored
2022-03-08 11:51:20 +0800
Browse Code »

Merged Merge Request #978 · created by 后端研发-苏明海 2022-03-22 01:14:00 UTC $('.time_ago').timeago().tooltip()

Dev

How to merge

Merged by 后端研发-苏明海 2022-03-22 01:14:15 UTC $('.time_ago').timeago().tooltip()

21 Mar, 2022

19 Mar, 2022

18 Mar, 2022

17 Mar, 2022

16 Mar, 2022

15 Mar, 2022

14 Mar, 2022

12 Mar, 2022

11 Mar, 2022

10 Mar, 2022

09 Mar, 2022

08 Mar, 2022

Merged
Merge Request #978 · created by 后端研发-苏明海 2022-03-22 01:14:00 UTC

Merged by 后端研发-苏明海 2022-03-22 01:14:15 UTC