theluyuan/litemall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,120 Commits 1 Branch 0 Tags
4514653a2cd4ab15f57ccfe26d00d6c406d9538c
Commit Graph

1120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
linlinjava
4514653a2c Merge branch 'master' of https://gitee.com/linlinjava/litemall 2021-04-18 19:28:09 +08:00
linlinjava
b93b341c51 !60 feat:小程序登录、用户信息相关接口调整. 
Merge pull request !60 from yy/feature_20210416_update_wxapi
 2021-04-18 19:26:35 +08:00
yy
19f883959d !1 feat:小程序登录、用户信息相关接口调整. 
Merge pull request !1 from yy/ym_dev
 2021-04-16 11:26:03 +08:00
yy
4a1a172ec4 feat:小程序登录、用户信息相关接口调整. 2021-04-16 11:24:17 +08:00
yy
ac3575aba9 feat:小程序登录、用户信息相关接口调整. 2021-04-16 11:02:36 +08:00
linlinjava
aac2cffcaa Merge branch 'master' of https://github.com/linlinjava/litemall 2021-04-13 13:41:14 +08:00
linlinjava
7c099e647d [litemall-admin-api]: #I3I94X 2021-04-12 11:09:50 +08:00
dependabot[bot]
1f51be0266 build(deps): bump guava from 25.1-jre to 29.0-jre (#471) 
Bumps [guava](https://github.com/google/guava) from 25.1-jre to 29.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-04-01 23:27:36 +08:00
linlinjava
d616a64606 Merge branch 'master' of https://github.com/linlinjava/litemall 2021-03-14 13:29:34 +08:00
linlinjava
e9182f2c66 #468 2021-03-14 13:24:57 +08:00
dependabot[bot]
aaa9494e0b build(deps): bump elliptic from 6.5.3 to 6.5.4 in /litemall-vue (#467) 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-14 13:24:29 +08:00
linlinjava
ba439aa710 Merge branch 'dev' of https://github.com/linlinjava/litemall into dev 2021-01-19 22:35:16 +08:00
Longmain
69de3b5418 小程序中增加对promise.finally操作的支持 (#458) 2021-01-18 21:38:42 +08:00
linlinjava
c13ccea867 Merge branch 'dev' of https://github.com/linlinjava/litemall into dev 2021-01-14 23:54:03 +08:00
Longmain
46d2a4e080 完成收藏功能针对topic的实现 (#456) 2021-01-14 23:52:08 +08:00
linlinjava
97338d2092 [release]: v1.8.0 2021-01-10 18:04:52 +08:00
linlinjava
18510318a1 chore 2021-01-10 18:01:46 +08:00
linlinjava
c733a28a3e chore 2021-01-10 16:51:51 +08:00
dependabot[bot]
5f0542209c build(deps): bump axios from 0.19.2 to 0.21.1 in /litemall-vue (#452) 
Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-10 16:35:21 +08:00
linlinjava
d9070cbabb chore[litemall-admin]: revert update 2020-12-27 21:00:02 +08:00
linlinjava
17b4d28060 chore[litemall-admin]: update 2020-12-27 19:48:12 +08:00
linlinjava
cd32740e0d Merge branch 'master' of https://gitee.com/linlinjava/litemall 2020-12-27 14:39:26 +08:00
linlinjava
679117d53b feat: 支持验证码 2020-12-27 14:38:48 +08:00
linlinjava
d2c79cee6b !54 修复编辑优惠券看不到 商品或类目列表的问题 
Merge pull request !54 from 滑稽刘/N/A
 2020-12-15 08:11:37 +08:00
滑稽刘
747a3e7f0e 修复编辑优惠券看不到 商品或类目列表的问题 2020-12-13 16:34:32 +08:00
dependabot[bot]
519d7b1509 build(deps): bump highlight.js from 9.18.1 to 9.18.5 in /litemall-vue (#445) 
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 9.18.1 to 9.18.5.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/9.18.5/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/9.18.1...9.18.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-29 14:22:51 +08:00
linlinjava
401ce6c8d3 Merge branch 'master' of https://github.com/linlinjava/litemall 2020-11-29 14:19:24 +08:00
linlinjava
35bf2e5492 feat[litemall-admin,litemall-admin-api]:订单收款 2020-11-29 14:16:58 +08:00
linlinjava
3ed76ec730 feat[litemall-admin,litemall-admin-api]:订单列表，订单æ”收款 2020-11-29 14:12:09 +08:00
linlinjava
c0541fdeaf chore 2020-11-29 13:41:24 +08:00
linlinjava
2a6ab95809 Merge branch 'master' of https://gitee.com/linlinjava/litemall 2020-11-29 12:08:28 +08:00
linlinjava
1e37ac4589 chore 2020-11-29 12:05:34 +08:00
linlinjava
f50138243c chore 2020-11-29 11:12:07 +08:00
linlinjava
be8cfb3e56 !53 评论列表返回评价等级 
Merge pull request !53 from 滑稽刘/N/A
 2020-11-26 14:24:34 +08:00
滑稽刘
5172853a30 评论列表返回评价等级 2020-11-26 11:52:30 +08:00
linlinjava
d4dde95b46 fix[litemall-admin]: gitee #I1X232 2020-11-22 21:01:43 +08:00
linlinjava
d8f59965f2 fix[litemall-admin]: gitee #I1X21W 2020-11-22 20:56:06 +08:00
linlinjava
7684810beb fix 2020-11-22 12:40:03 +08:00
linlinjava
79135cc1a7 chore 2020-11-22 09:36:53 +08:00
linlinjava
599158a3d8 Merge branch 'gouxionglai-master' 2020-11-01 18:49:01 +08:00
linlinjava
f781cdeb7e chore 2020-11-01 18:48:37 +08:00
linlinjava
909974d6c6 Merge branch 'master' of https://github.com/gouxionglai/litemall into gouxionglai-master 2020-11-01 18:43:30 +08:00
linlinjava
c4da8fb5b0 chore: druid升级1.2.1 2020-11-01 18:22:10 +08:00
linlinjava
aabc261708 chore: shiro升级版本1.6.0 2020-11-01 17:14:39 +08:00
gouxionglai
40df965c6f 1.wx：补充售罄的CSS 2020-10-28 11:38:46 +08:00
gouxionglai
741e1ebb7f 1.admin：去掉规格图片 
2.wx：选择不同规格时展示不同图片，默认第一张。
 2020-10-28 10:52:57 +08:00
端午安康
5af77957b6 Merge pull request #2 from linlinjava/master 
update
 2020-10-20 11:50:47 +08:00
linlinjava
9cf5856446 fix 2020-09-28 09:29:07 +08:00
linlinjava
04d4fc9c41 !50 fix:售后退款只退一部分会失败的问题 
Merge pull request !50 from 宋浩志/N/A
 2020-09-27 09:33:27 +08:00
宋浩志
332e93199b fix:售后退款只退一部分会失败的问题 2020-09-26 12:30:03 +08:00