wxd / MShopWeApp | GitLab

Merged
Merge Request #637 · created by 后端研发-苏明海 2021-04-23 01:18:40 UTC

Qa

From qa into master

1 participants

Link here
后端研发-苏明海 @season 2021-04-23 01:19:32 UTC
mentioned in commit 8274bcf6c07f5e1b18d881c14a9995a4776a10ed
Write

Preview

mentioned in commit 8274bcf6c07f5e1b18d881c14a9995a4776a10ed Edit in fullscreen

Comments are parsed with GitLab Flavored Markdown

Attach files by dragging & dropping or selecting them.

Cancel
Link here
后端研发-苏明海 @season 2021-04-23 01:19:33 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

22 Apr, 2021

20 commits

Merge branch 'test' into 'qa' ...
06f5b7c4
```
Test

See merge request !636
```
后端研发-苏明海 authored
2021-04-22 18:43:08 +0800
Browse Code »
成功成为分销商
33dbe505

yvan.ni authored
2021-04-22 18:42:58 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
8c84503c
```
成功成为分销商

See merge request !635
```
后端研发-苏明海 authored
2021-04-22 18:42:56 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
e668f1d3
```
分销的接口

See merge request !634
```
后端研发-苏明海 authored
2021-04-22 18:42:43 +0800
Browse Code »
分销的接口
8e446fca

yvan.ni authored
2021-04-22 18:41:19 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
308856a8
```
Test

See merge request !633
```
后端研发-苏明海 authored
2021-04-22 18:39:55 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
2742d35c
```
Dev

See merge request !632
```
后端研发-苏明海 authored
2021-04-22 18:33:44 +0800
Browse Code »
预约服务storageID为空修改
4d32da13

taiyuan authored
2021-04-22 17:35:30 +0800
Browse Code »
预约服务storageId设置
ee37b3ac

taiyuan authored
2021-04-22 17:05:26 +0800
Browse Code »
预约服务美容师id修改
8ae99d0a

taiyuan authored
2021-04-22 16:46:19 +0800
Browse Code »
协助预约stoid取a.stoid
8901f59d

taiyuan authored
2021-04-22 16:29:01 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
cd73661c

taiyuan authored
2021-04-22 15:56:44 +0800
Browse Code »
修改协助预约
69cb3adc

taiyuan authored
2021-04-22 15:56:40 +0800
Browse Code »
不需要的插件
86b834a1

yvan.ni authored
2021-04-22 14:51:46 +0800
Browse Code »
预约服务修改
2ac8d1df

taiyuan authored
2021-04-22 11:34:17 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
6913340f

taiyuan authored
2021-04-22 11:14:19 +0800
Browse Code »
修改卡项列表、历史预约、服务项目、预约服务
d24847bc

taiyuan authored
2021-04-22 11:14:15 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
fcb52b91
```
Dev

See merge request !631
```
后端研发-苏明海 authored
2021-04-22 10:47:30 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
41e2d97d

yvan.ni authored
2021-04-22 10:45:17 +0800
Browse Code »
分销的手机号码输入错误的bug修复
ab1eca12

yvan.ni authored
2021-04-22 10:44:48 +0800
Browse Code »

21 Apr, 2021

21 commits

app.json分包新增分页
e662d353

taiyuan authored
2021-04-21 17:46:00 +0800
Browse Code »
卡项列表和服务项目修改
ce01d1cf

taiyuan authored
2021-04-21 17:29:49 +0800
Browse Code »
协助预约修改历史预约和我的项目
7f9ce66d

taiyuan authored
2021-04-21 17:01:04 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
fc014691

taiyuan authored
2021-04-21 16:44:23 +0800
Browse Code »
协助预约修改
06a92134

taiyuan authored
2021-04-21 16:44:17 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
84aa8d1c
```
Test

See merge request !630
```
后端研发-苏明海 authored
2021-04-21 16:42:18 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
2ef45846
```
商品列表的bug的优化

See merge request !629
```
后端研发-苏明海 authored
2021-04-21 16:42:05 +0800
Browse Code »
商品列表的bug的优化
73c8498c

yvan.ni authored
2021-04-21 16:40:47 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
78a11a64
```
Test

See merge request !628
```
后端研发-苏明海 authored
2021-04-21 10:24:44 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
f4cec55c
```
白屏的处理

See merge request !627
```
后端研发-苏明海 authored
2021-04-21 10:24:30 +0800
Browse Code »
白屏的处理
343702e5

yvan.ni authored
2021-04-21 10:24:20 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
0624a72c
```
Test

See merge request !626
```
后端研发-苏明海 authored
2021-04-21 09:49:20 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
ef6f6e17
```
Dev

See merge request !625
```
后端研发-苏明海 authored
2021-04-21 09:49:09 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
6dc842d2

yvan.ni authored
2021-04-21 09:42:26 +0800
Browse Code »
白屏的bug优化
8e46cfd6

yvan.ni authored
2021-04-21 09:42:18 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
de2085bf
```
Test

See merge request !624
```
后端研发-苏明海 authored
2021-04-21 09:29:54 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
6a5766ca
```
去掉

See merge request !623
```
后端研发-苏明海 authored
2021-04-21 09:29:31 +0800
Browse Code »
去掉
3bb79dab

WXD-SEASON\season authored
2021-04-21 09:29:16 +0800
Browse Code »
Merge branch 'test' into 'qa' ...
ec571448
```
Test

See merge request !622
```
后端研发-苏明海 authored
2021-04-21 09:22:59 +0800
Browse Code »
Merge branch 'dev' into 'test' ...
bb138527
```
Dev

See merge request !621
```
后端研发-苏明海 authored
2021-04-21 09:22:29 +0800
Browse Code »
1. 白屏的bug优化
0f4ba510

yvan.ni authored
2021-04-21 08:58:07 +0800
Browse Code »

20 Apr, 2021

23 commits

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

yvan.ni authored
2021-04-20 17:34:22 +0800
Browse Code »
1. 价格排序 ...
9daf4439
```
2、 弹窗
```
yvan.ni authored
2021-04-20 17:34:15 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
ffba0e20

taiyuan authored
2021-04-20 16:41:19 +0800
Browse Code »
服务卡项分享-tab点击激活样式修改
2a3fb66b

taiyuan authored
2021-04-20 16:41:14 +0800
Browse Code »
指甲油的NaN bug的优化
6e7ea1c7

yvan.ni authored
2021-04-20 16:17:05 +0800
Browse Code »
首页顶部：z-index: 100000
82183194

yvan.ni authored
2021-04-20 16:04:30 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
ac7bb383

yvan.ni authored
2021-04-20 15:58:50 +0800
Browse Code »
分销分享人的bug优化
d26035e3

yvan.ni authored
2021-04-20 15:58:42 +0800
Browse Code »
服务卡项修改
d7c16e20

taiyuan authored
2021-04-20 15:56:05 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
00ef6b5a

taiyuan authored
2021-04-20 15:03:00 +0800
Browse Code »
上下架搜索框修改
d582f224

taiyuan authored
2021-04-20 15:02:56 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
7f1c74a2

yvan.ni authored
2021-04-20 14:39:39 +0800
Browse Code »
分享测试
5d59c127

yvan.ni authored
2021-04-20 14:39:28 +0800
Browse Code »
排序字段修改
a9e82794

WXD-SEASON\season authored
2021-04-20 14:39:14 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
d18d66d2

taiyuan authored
2021-04-20 14:24:49 +0800
Browse Code »
分销上下架搜索框问题修复
13d4b1eb

taiyuan authored
2021-04-20 14:24:37 +0800
Browse Code »
商品列表价格排序
55ba473e

WXD-SEASON\season authored
2021-04-20 14:10:50 +0800
Browse Code »
上下架价格排序prom_price
617cee6f

WXD-SEASON\season authored
2021-04-20 11:36:16 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
d7aba51f

taiyuan authored
2021-04-20 11:07:27 +0800
Browse Code »
卡项列表和卡项详情
9f9035a5

taiyuan authored
2021-04-20 11:07:21 +0800
Browse Code »
增加协助预约功能
5a439273

taiyuan authored
2021-04-20 11:04:02 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
89ffb03d

yvan.ni authored
2021-04-20 10:10:57 +0800
Browse Code »
1. 小程序解绑后，会员的缓存会重新定义，不会一直在线，造成下单失败 ...
0c818e64
```
2.  分销的验证的优化
```
yvan.ni authored
2021-04-20 10:10:47 +0800
Browse Code »

19 Apr, 2021

2 commits

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

taiyuan authored
2021-04-19 11:48:42 +0800
Browse Code »
上下架商品默认降序排列，搜索框无法搜索问题修改
763c4721

taiyuan authored
2021-04-19 11:47:58 +0800
Browse Code »

17 Apr, 2021

9 commits

1.要清理定时器， 2. 要计算获取会员信息
6fc46e49

yvan.ni authored
2021-04-17 17:19:33 +0800
Browse Code »
分销的bug优化
f47c7ea2

yvan.ni authored
2021-04-17 17:16:52 +0800
Browse Code »
分享的修改
1729af8e

yvan.ni authored
2021-04-17 14:37:52 +0800
Browse Code »
分销首页增加下内边距
fae48d13

taiyuan authored
2021-04-17 11:17:42 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
3277f795

taiyuan authored
2021-04-17 11:06:17 +0800
Browse Code »
我的小店除价格外默认降序排列
6c4216cd

taiyuan authored
2021-04-17 11:06:13 +0800
Browse Code »
首页的分享修改
8faf04dd

yvan.ni authored
2021-04-17 10:59:16 +0800
Browse Code »
下架商品必营取消多选框
d5de6d66

taiyuan authored
2021-04-17 10:13:37 +0800
Browse Code »
上下架商品修改和我的小店价格排序修改
464e4dae

taiyuan authored
2021-04-17 10:03:05 +0800
Browse Code »

16 Apr, 2021

12 commits

request.js修改
03f7613b

taiyuan authored
2021-04-16 18:09:56 +0800
Browse Code »
流动资金提现样式修改
0dbc349e

taiyuan authored
2021-04-16 18:08:29 +0800
Browse Code »
上下架商品-商品信息样式修改
acb55ffa

taiyuan authored
2021-04-16 17:45:59 +0800
Browse Code »
app.wxs增加公共样式
88453b22

taiyuan authored
2021-04-16 17:29:48 +0800
Browse Code »
分销订单分成显示修改
151cddd9

taiyuan authored
2021-04-16 17:01:21 +0800
Browse Code »
上架商品新增参数searchType=2
6bc6cfeb

taiyuan authored
2021-04-16 16:47:00 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
79797705

taiyuan authored
2021-04-16 16:41:15 +0800
Browse Code »
上下架商品样式修改
7ec1bb7c

taiyuan authored
2021-04-16 16:41:09 +0800
Browse Code »
1. 图片加载要有lazy-load ...
d56835df
```
2. 商品在调用接口的buy优化
```
yvan.ni authored
2021-04-16 16:04:58 +0800
Browse Code »
白屏优化
291e7234

yvan.ni authored
2021-04-16 11:23:41 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
3b2ffe8f

yvan.ni authored
2021-04-16 09:16:55 +0800
Browse Code »
分销测试返回的bug修复
f2daf8fd

yvan.ni authored
2021-04-16 09:16:44 +0800
Browse Code »

15 Apr, 2021

4 commits

服务卡项详情
2a8fd16f

taiyuan authored
2021-04-15 17:08:48 +0800
Browse Code »
服务卡项分享修改
90864bdf

taiyuan authored
2021-04-15 15:27:02 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
da586178

taiyuan authored
2021-04-15 15:14:16 +0800
Browse Code »
服务卡项分享
c76ead9d

taiyuan authored
2021-04-15 15:14:09 +0800
Browse Code »

14 Apr, 2021

5 commits

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

yvan.ni authored
2021-04-14 15:39:24 +0800
Browse Code »
小程序促销赠品数量的优化，和getphone/getphone 的优化
b9b0bcfa

yvan.ni authored
2021-04-14 15:37:38 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
029bc730

taiyuan authored
2021-04-14 11:17:27 +0800
Browse Code »
服务卡项列表和详情页
f5370a6b

taiyuan authored
2021-04-14 11:16:56 +0800
Browse Code »
促销的数量的优化
5356a473

yvan.ni authored
2021-04-14 11:12:58 +0800
Browse Code »

13 Apr, 2021

9 commits

重新下单的bug修复
2388cf59

yvan.ni authored
2021-04-13 14:40:33 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
5f492b88

yvan.ni authored
2021-04-13 14:03:30 +0800
Browse Code »
订单的重新支付时的bug
5bf764d5

yvan.ni authored
2021-04-13 14:03:22 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
368474d9

taiyuan authored
2021-04-13 11:08:36 +0800
Browse Code »
app.js 和 app.json
b8dd997b

taiyuan authored
2021-04-13 11:08:17 +0800
Browse Code »
分销-上下架商品商品价格显示问题修改
80914ccf

taiyuan authored
2021-04-13 11:06:35 +0800
Browse Code »
添加is_overdue字段，判断是不是要验证小程序过期
86d675f4

yvan.ni authored
2021-04-13 09:38:53 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
04c1fbc1

yvan.ni authored
2021-04-13 09:21:05 +0800
Browse Code »
删除一个没用的文件
cb548f18

yvan.ni authored
2021-04-13 09:20:55 +0800
Browse Code »

12 Apr, 2021

3 commits

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

taiyuan authored
2021-04-12 15:44:58 +0800
Browse Code »
分销功能修改
d3e32ed8

taiyuan authored
2021-04-12 15:44:35 +0800
Browse Code »
分享的错误的修改
70bde620

yvan.ni authored
2021-04-12 09:46:59 +0800
Browse Code »

10 Apr, 2021

4 commits

Merge branch 'dev' into 'test' ...
44ec97cd
```
Dev

See merge request !620
```
后端研发-苏明海 authored
2021-04-10 18:02:46 +0800
Browse Code »
分享成为下线的判读，分享人一定要是分销商、 ...
db20f6e0
```
首页分享的bug修复
```
yvan.ni authored
2021-04-10 17:26:17 +0800
Browse Code »
会员注册
a7a94d21

yvan.ni authored
2021-04-10 16:43:34 +0800
Browse Code »
首页打一下日志
06c34027

yvan.ni authored
2021-04-10 16:42:12 +0800
Browse Code »

08 Apr, 2021

2 commits

上下架价格显示修改
609f70af

taiyuan authored
2021-04-08 15:03:34 +0800
Browse Code »
上下架商品商品价格修改
16f90668

taiyuan authored
2021-04-08 14:47:48 +0800
Browse Code »

06 Apr, 2021

12 commits

非分销会员图片
c9fdd107

taiyuan authored
2021-04-06 15:39:10 +0800
Browse Code »
非分销会员异常情况提示
1bd39260

taiyuan authored
2021-04-06 15:14:49 +0800
Browse Code »
更新app.js、app.json
e2e52d8f

taiyuan authored
2021-04-06 14:21:08 +0800
Browse Code »
分销首页放在主包
085ffd13

taiyuan authored
2021-04-06 14:15:52 +0800
Browse Code »
删除temp页面
1482b39a

taiyuan authored
2021-04-06 10:22:52 +0800
Browse Code »
分销跳转改回原样
5cea4575

taiyuan authored
2021-04-06 10:21:39 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
4125a80f

taiyuan authored
2021-04-06 10:15:35 +0800
Browse Code »
分销跳转
1b7744df

taiyuan authored
2021-04-06 10:15:16 +0800
Browse Code »
123
ff54a522

yvan.ni authored
2021-04-06 09:50:54 +0800
Browse Code »
123
341c2648

yvan.ni authored
2021-04-06 09:43:25 +0800
Browse Code »
服务分享
1dfbcf3b

taiyuan authored
2021-04-06 09:41:58 +0800
Browse Code »
app.json
529162f2

taiyuan authored
2021-04-06 09:39:10 +0800
Browse Code »

02 Apr, 2021

10 commits

地址的显示
8ed2b438

yvan.ni authored
2021-04-02 17:46:17 +0800
Browse Code »
积分购，老会员成为下线的条件
6a5af45f

yvan.ni authored
2021-04-02 17:43:39 +0800
Browse Code »
我的小店修改
06b1492c

taiyuan authored
2021-04-02 17:16:38 +0800
Browse Code »
富哥关于我的小店的提交
09e99c13

taiyuan authored
2021-04-02 17:13:27 +0800
Browse Code »
我的小店js修改
2955a937

taiyuan authored
2021-04-02 17:11:55 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev ...
e58833ba
```
# Conflicts:
#	packageA/pages/distribution/shop/shop.js
```
yvan.ni authored
2021-04-02 17:09:55 +0800
Browse Code »
我的小店
d9d162e4

yvan.ni authored
2021-04-02 17:03:30 +0800
Browse Code »
增加分销入口
74d7ebad

taiyuan authored
2021-04-02 16:58:29 +0800
Browse Code »
我的小店点击全部商品和新品
72137b2c

taiyuan authored
2021-04-02 16:55:23 +0800
Browse Code »
我的小店全部商品和新品点击请求商品列表
b1e1b58d

taiyuan authored
2021-04-02 14:05:22 +0800
Browse Code »

01 Apr, 2021

13 commits

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

yvan.ni authored
2021-04-01 15:27:29 +0800
Browse Code »
分销我的小店
df434a62

yvan.ni authored
2021-04-01 15:27:20 +0800
Browse Code »
提现额度字段修改
bc0182db

taiyuan authored
2021-04-01 14:35:30 +0800
Browse Code »
排行榜修改
634b4932

taiyuan authored
2021-04-01 14:34:54 +0800
Browse Code »
排行榜修改
53feab09

taiyuan authored
2021-04-01 11:28:32 +0800
Browse Code »
排行榜文字提示修改
220a64eb

taiyuan authored
2021-04-01 11:27:33 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
737c2bf5

taiyuan authored
2021-04-01 11:22:31 +0800
Browse Code »
图片
046513c4

taiyuan authored
2021-04-01 11:21:20 +0800
Browse Code »
首页分享给朋友
93ca5c87

yvan.ni authored
2021-04-01 11:18:42 +0800
Browse Code »
分销功能颜色样式修改
326d5cb8

taiyuan authored
2021-04-01 11:15:40 +0800
Browse Code »
分销功能点击关闭按钮返回会员中心
00dbf556

taiyuan authored
2021-04-01 11:13:18 +0800
Browse Code »
分销功能图标修改
0d1ba725

taiyuan authored
2021-04-01 11:09:36 +0800
Browse Code »
图标
9b2ce373

taiyuan authored
2021-04-01 10:03:46 +0800
Browse Code »

30 Mar, 2021

6 commits

全局样式增加
4867840b

taiyuan authored
2021-03-30 18:07:49 +0800
Browse Code »
分销功能修改
0a961791

taiyuan authored
2021-03-30 18:07:19 +0800
Browse Code »
分销功能
d2e6b095

taiyuan authored
2021-03-30 16:15:04 +0800
Browse Code »
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
aadb3c44

taiyuan authored
2021-03-30 16:07:49 +0800
Browse Code »
分销功能
a5121a32

taiyuan authored
2021-03-30 16:04:48 +0800
Browse Code »
授权登录
13025086

yvan.ni authored
2021-03-30 11:30:10 +0800
Browse Code »