theluyuan/litemall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • a914d22b66 zhifu master theluyuan 2021-12-07 10:05:20 +08:00
  • bdb7b98397 doc linlinjava 2021-08-03 00:08:39 +08:00
  • 2f4d305dfa 小程序增加商品分页 (#487) 端午安康 2021-08-02 23:57:20 +08:00
  • 14b6d0e9c8 Merge branch 'master' of https://github.com/linlinjava/litemall linlinjava 2021-07-18 23:36:04 +08:00
  • 17bbd6c1d8 fix[litemall-vue] linlinjava 2021-07-18 23:35:51 +08:00
  • b48e997854 build(deps): bump hibernate-validator from 6.1.0.Final to 6.1.5.Final (#484) dependabot[bot] 2021-07-18 23:33:24 +08:00
  • ce2720b5e7 fix[litemall-wx]: #473 linlinjava 2021-05-19 23:48:16 +08:00
  • 47e6e25495 chore linlinjava 2021-05-19 21:53:01 +08:00
  • 9f42815388 使用GitHub actions作为CI (#477) Mincong Huang 2021-05-19 15:38:13 +02:00
  • 8c1b5d5788 线程池问题修复-WxHomeController (#470) 端午安康 2021-05-19 21:37:53 +08:00
  • e6289129f1 build(deps): bump url-parse from 1.4.7 to 1.5.1 in /litemall-vue (#479) dependabot[bot] 2021-05-19 21:35:40 +08:00
  • 74b05f3a60 build(deps): bump lodash from 4.17.20 to 4.17.21 in /litemall-vue (#480) dependabot[bot] 2021-05-19 21:35:30 +08:00
  • e9d40356e4 build(deps): bump hosted-git-info from 2.8.8 to 2.8.9 in /litemall-vue (#482) dependabot[bot] 2021-05-19 21:35:19 +08:00
  • fc2f694edd fix[litemall-wx]: ScrollView高度设置增加像素单位 (#481) uuz.vva 2021-05-19 21:24:40 +08:00
  • bd5e56abc4 添加函数返回 (#478) uuz.vva 2021-05-03 00:13:14 +08:00
  • 092c8af0d1 chore[litemall-wx, renard-wx]]:登录接口调整 linlinjava 2021-04-18 19:38:12 +08:00
  • 4514653a2c Merge branch 'master' of https://gitee.com/linlinjava/litemall linlinjava 2021-04-18 19:28:09 +08:00
  • b93b341c51 !60 feat:小程序登录、用户信息相关接口调整. Merge pull request !60 from yy/feature_20210416_update_wxapi linlinjava 2021-04-18 19:26:35 +08:00
  • 19f883959d !1 feat:小程序登录、用户信息相关接口调整. Merge pull request !1 from yy/ym_dev yy 2021-04-16 11:26:03 +08:00
  • 4a1a172ec4 feat:小程序登录、用户信息相关接口调整. yy 2021-04-16 11:24:17 +08:00
  • ac3575aba9 feat:小程序登录、用户信息相关接口调整. yy 2021-04-16 11:02:36 +08:00
  • aac2cffcaa Merge branch 'master' of https://github.com/linlinjava/litemall linlinjava 2021-04-13 13:41:14 +08:00
  • 7c099e647d [litemall-admin-api]: #I3I94X linlinjava 2021-04-12 11:09:50 +08:00
  • 1f51be0266 build(deps): bump guava from 25.1-jre to 29.0-jre (#471) dependabot[bot] 2021-04-01 23:27:36 +08:00
  • d616a64606 Merge branch 'master' of https://github.com/linlinjava/litemall linlinjava 2021-03-14 13:29:34 +08:00
  • e9182f2c66 #468 linlinjava 2021-03-14 13:24:57 +08:00
  • aaa9494e0b build(deps): bump elliptic from 6.5.3 to 6.5.4 in /litemall-vue (#467) dependabot[bot] 2021-03-14 13:24:29 +08:00
  • ba439aa710 Merge branch 'dev' of https://github.com/linlinjava/litemall into dev linlinjava 2021-01-19 22:35:16 +08:00
  • 69de3b5418 小程序中增加对promise.finally操作的支持 (#458) Longmain 2021-01-18 21:38:42 +08:00
  • c13ccea867 Merge branch 'dev' of https://github.com/linlinjava/litemall into dev linlinjava 2021-01-14 23:54:03 +08:00
  • 46d2a4e080 完成收藏功能针对topic的实现 (#456) Longmain 2021-01-14 23:52:08 +08:00
  • 97338d2092 [release]: v1.8.0 linlinjava 2021-01-10 18:04:52 +08:00
  • 18510318a1 chore linlinjava 2021-01-10 18:01:46 +08:00
  • c733a28a3e chore linlinjava 2021-01-10 16:51:51 +08:00
  • 5f0542209c build(deps): bump axios from 0.19.2 to 0.21.1 in /litemall-vue (#452) dependabot[bot] 2021-01-10 16:35:21 +08:00
  • d9070cbabb chore[litemall-admin]: revert update linlinjava 2020-12-27 21:00:02 +08:00
  • 17b4d28060 chore[litemall-admin]: update linlinjava 2020-12-27 19:48:12 +08:00
  • cd32740e0d Merge branch 'master' of https://gitee.com/linlinjava/litemall linlinjava 2020-12-27 14:39:26 +08:00
  • 679117d53b feat: 支持验证码 linlinjava 2020-12-27 14:38:48 +08:00
  • d2c79cee6b !54 修复编辑优惠券看不到 商品或类目列表的问题 Merge pull request !54 from 滑稽刘/N/A linlinjava 2020-12-15 08:11:37 +08:00
  • 747a3e7f0e 修复编辑优惠券看不到 商品或类目列表的问题 滑稽刘 2020-12-13 16:34:32 +08:00
  • 519d7b1509 build(deps): bump highlight.js from 9.18.1 to 9.18.5 in /litemall-vue (#445) dependabot[bot] 2020-11-29 14:22:51 +08:00
  • 401ce6c8d3 Merge branch 'master' of https://github.com/linlinjava/litemall linlinjava 2020-11-29 14:19:24 +08:00
  • 35bf2e5492 feat[litemall-admin,litemall-admin-api]:订单收款 linlinjava 2020-11-29 14:12:09 +08:00
  • 3ed76ec730 feat[litemall-admin,litemall-admin-api]:订单列表，订单æ”收款 linlinjava 2020-11-29 14:12:09 +08:00
  • c0541fdeaf chore linlinjava 2020-11-29 13:41:24 +08:00
  • 2a6ab95809 Merge branch 'master' of https://gitee.com/linlinjava/litemall linlinjava 2020-11-29 12:08:28 +08:00
  • 1e37ac4589 chore linlinjava 2020-11-29 12:05:34 +08:00
  • f50138243c chore linlinjava 2020-11-29 11:12:07 +08:00
  • be8cfb3e56 !53 评论列表返回评价等级 Merge pull request !53 from 滑稽刘/N/A linlinjava 2020-11-26 14:24:34 +08:00
  • 5172853a30 评论列表返回评价等级 滑稽刘 2020-11-26 11:52:30 +08:00
  • d4dde95b46 fix[litemall-admin]: gitee #I1X232 linlinjava 2020-11-22 21:01:43 +08:00
  • d8f59965f2 fix[litemall-admin]: gitee #I1X21W linlinjava 2020-11-22 20:56:06 +08:00
  • 7684810beb fix linlinjava 2020-11-22 12:40:03 +08:00
  • 79135cc1a7 chore linlinjava 2020-11-22 09:36:53 +08:00
  • 599158a3d8 Merge branch 'gouxionglai-master' linlinjava 2020-11-01 18:49:01 +08:00
  • f781cdeb7e chore linlinjava 2020-11-01 18:46:55 +08:00
  • 909974d6c6 Merge branch 'master' of https://github.com/gouxionglai/litemall into gouxionglai-master linlinjava 2020-11-01 18:43:30 +08:00
  • c4da8fb5b0 chore: druid升级1.2.1 linlinjava 2020-11-01 18:22:10 +08:00
  • aabc261708 chore: shiro升级版本1.6.0 linlinjava 2020-11-01 17:14:39 +08:00
  • 40df965c6f 1.wx：补充售罄的CSS gouxionglai 2020-10-28 11:38:46 +08:00
  • 741e1ebb7f 1.admin：去掉规格图片 2.wx：选择不同规格时展示不同图片，默认第一张。 gouxionglai 2020-10-28 10:52:57 +08:00
  • 5af77957b6 Merge pull request #2 from linlinjava/master 端午安康 2020-10-20 11:50:47 +08:00
  • 9cf5856446 fix linlinjava 2020-09-28 09:29:07 +08:00
  • 04d4fc9c41 !50 fix:售后退款只退一部分会失败的问题 Merge pull request !50 from 宋浩志/N/A linlinjava 2020-09-27 09:33:27 +08:00
  • 332e93199b fix:售后退款只退一部分会失败的问题 宋浩志 2020-09-26 12:30:03 +08:00
  • 2b69527d0d 阿里云发送短信优化，在返回错误后记录日志以及返回发送失败状态 (#429) changyang liu 2020-08-21 16:41:08 +08:00
  • 2f3ef296f2 Merge pull request #1 from linlinjava/master 端午安康 2020-08-04 10:20:46 +08:00
  • 83711ec270 build(deps): bump elliptic from 6.5.2 to 6.5.3 in /litemall-vue (#422) dependabot[bot] 2020-08-03 09:54:41 +08:00
  • 749e6ab251 chore: 小程序端取消手机号码校验，后端减弱手机号码校验。 linlinjava 2020-07-31 11:54:23 +08:00
  • 9d5aafff75 修改litemall-admin专题topic.vue页面批量删除按钮权限错误 (#421) laiyingzeng 2020-07-29 09:54:50 +08:00
  • a54ba21386 serverTimezone=UTC 导致数据库取出来时间早8个小时 (#420) lagelanren 2020-07-28 21:53:41 +08:00
  • 8353ed1054 build(deps): bump lodash from 4.17.15 to 4.17.19 in /litemall-vue (#419) dependabot[bot] 2020-07-22 20:45:32 +08:00
  • 0262f38cf8 解决mysql-connector-java为8.0.16时MyBatis Generator无法生成XXXByPrimaryKey相关方法 (#418) laiyingzeng 2020-07-19 23:33:45 +08:00
  • 199c56007c !47 完善会员管理,添加用户id查询和用户编辑 Merge pull request !47 from 滑稽刘/master linlinjava 2020-07-18 23:26:46 +08:00
  • 2365bed6f4 chore: 数据库驱动名称更新 linlinjava 2020-07-05 13:30:49 +08:00
  • 8dd7c4bb2c 完善会员管理,添加用户id查询和用户编辑 滑稽刘 2020-07-05 11:25:23 +08:00
  • c0d5ebc53f Merge branch 'master' of https://gitee.com/linlinjava/litemall Junling Bu 2020-07-03 10:44:23 +08:00
  • fa189cdcf4 build(deps): bump mysql-connector-java from 5.1.46 to 8.0.16 (#410) dependabot[bot] 2020-07-03 10:43:20 +08:00
  • 25518ade9f build(deps): bump mysql-connector-java in /litemall-db (#411) dependabot[bot] 2020-07-03 10:43:00 +08:00
  • d0a5ee239f !46 限制加入自己开团团购部分加入判空，否则其他用户无法惨团 Merge pull request !46 from 滑稽刘/master linlinjava 2020-07-03 10:41:52 +08:00
  • 27e6d275d1 限制加入自己开团团购部分加入判空，否则用户无法惨团 滑稽刘 2020-07-02 21:08:49 +08:00
  • 1a6e2e9a85 Merge branch 'dev' of https://github.com/linlinjava/litemall Junling Bu 2020-06-29 15:40:45 +08:00
  • 04c716de05 修复收货地址页面导航栏重复 (#409) Batur 2020-06-29 15:39:55 +08:00
  • eeeaf3815c !44 添加售后详情状态显示，添加订单根据id查询 Merge pull request !44 from 滑稽刘/master linlinjava 2020-06-27 16:40:10 +08:00
  • 9d2c07a11f 添加售后详情状态显示，添加订单根据id查询 滑稽刘 2020-06-27 15:23:15 +08:00
  • 7ff311b604 添加售后状态显示，添加订单根据id查询 滑稽刘 2020-06-27 15:17:51 +08:00
  • ef91b166f3 !42 修复了售后详情无法点击的问题 Merge pull request !42 from 滑稽刘/master linlinjava 2020-06-27 12:57:08 +08:00
  • 67ba9dcaeb 修复了售后详情无法点击的问题 滑稽刘 2020-06-27 11:14:01 +08:00
  • 0395ecd391 Merge branch 'master' of https://github.com/linlinjava/litemall Junling Bu 2020-06-26 09:14:13 +08:00
  • 4e9f960d4c Repair when docker compose up, docker_litemall service occurre log error, like this "The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server" (#407) Alex HE 2020-06-26 09:13:28 +08:00
  • 7836237d70 修复优惠券优惠金额计算错误bug (#406) Tyson 2020-06-26 09:12:14 +08:00
  • 2410955929 !40 更改一处sql字段的注释 Merge pull request !40 from 九月家的敖烈/master linlinjava 2020-06-26 09:10:51 +08:00
  • 2b481b4337 更正sql中litemall_aftersale表的deleted字段的注释 九月家的敖烈 2020-06-22 21:50:59 +08:00
  • dd9a81dff6 fix[litemall-wx]: 小错误 Junling Bu 2020-06-16 22:35:15 +08:00
  • 2ad7b00cca chore[litemall-wx-api]: 接口方法缩小 Junling Bu 2020-06-14 21:22:42 +08:00
  • eac36ce3c8 Merge branch 'master' of https://github.com/linlinjava/litemall Junling Bu 2020-06-14 11:05:08 +08:00
  • d611977ca4 优惠券支持分类和指定商品使用 (#398) Tyson 2020-06-14 11:04:21 +08:00
  • 9c38739559 !39 update litemall-wx/pages/index/index.wxml. Merge pull request !39 from 徐波/N/A linlinjava 2020-06-13 16:05:04 +08:00
  • a7a76a9551 update litemall-wx/pages/index/index.wxml. 空白显示分类问题 徐波 2020-06-13 13:24:06 +08:00