xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-07 20:56:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 09f61bc114
         !101 2022-1-24Leung Merge pull request !101 from Admin/sit-Leung Admin 2022-01-24 12:43:42 +0000
  • cd45fca6c0 Order confirm page refined Vion 2022-01-24 20:42:51 +0800
  • 25a45f2e60
         !100 2022-1-24 Leung Merge pull request !100 from Admin/sit-Leung Admin 2022-01-24 12:32:06 +0000
  • d6d51f9f5d Coupon flow refined Vion 2022-01-24 20:30:59 +0800
  • fb61b06bde Merge branch 'sit-Leung' into sit-jiamin-v2 952108534@qq.com 2022-01-24 20:01:51 +0800
  • a2a6ca14bd 更改样式 952108534@qq.com 2022-01-24 19:29:33 +0800
  • 65a32b5546
         !99 2022-1-24 Carl Merge pull request !99 from Admin/sit-Carl-V3 Admin 2022-01-24 10:44:22 +0000
  • 563b3d7c74
         !98 2022-1-24 Jiamin Merge pull request !98 from Admin/sit-jiamin-v2 Admin 2022-01-24 10:43:27 +0000
  • 97367c37e5
         !97 2022-1-24 Leung Merge pull request !97 from Admin/sit-Leung Admin 2022-01-24 10:42:27 +0000
  • bae8ab4422 modify coupon logic ,adding 3 verfiy Carl 2022-01-24 18:24:58 +0800
  • cab59567e8 Coupon % calculation refined Vion 2022-01-24 18:17:07 +0800
  • de8d67fc51 Coupon flow refined Vion 2022-01-24 18:01:51 +0800
  • 69c2664e21 更改 952108534@qq.com 2022-01-24 17:41:52 +0800
  • 438f85e398 只让优惠券未使用出现立即使用的按钮 952108534@qq.com 2022-01-24 17:26:32 +0800
  • c64561457a 用户注册添加优惠券 952108534@qq.com 2022-01-24 16:50:55 +0800
  • 72a1c2226b
         !96 2022-1-24 Carl Merge pull request !96 from Admin/sit-Carl-V3 Admin 2022-01-24 08:44:09 +0000
  • ded0f746b0 Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3 Carl 2022-01-24 16:41:33 +0800
  • dcf2ab1953 adding install cart verification Carl 2022-01-24 16:41:26 +0800
  • 7b30bcfae8
         !95 2022-1-24 Jiamin Merge pull request !95 from Admin/sit-jiamin-v2 Admin 2022-01-24 07:37:14 +0000
  • 78038b2a78
         !94 2022-1-24 Leung Merge pull request !94 from Admin/sit-Leung Admin 2022-01-24 07:35:50 +0000
  • ab70862f63 Coupon flow completed Vion 2022-01-24 15:28:57 +0800
  • adf7febb65 更改 952108534@qq.com 2022-01-24 14:48:10 +0800
  • 4be3eb430e 更改 952108534@qq.com 2022-01-24 14:15:39 +0800
  • fdac7a62b1 Error page hyperlink updated Vion 2022-01-24 12:02:35 +0800
  • d0addceabe iPhone font size fixed, index mobile video player added Vion 2022-01-24 12:01:28 +0800
  • 8716e07403 Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl Vion 2022-01-24 10:18:11 +0800
  • 82bab052ce
         !93 2022-1-23 Jiamin Merge pull request !93 from Admin/sit-jiamin-v2 Admin 2022-01-23 14:39:05 +0000
  • 0b368d860a Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl Vion 2022-01-23 22:39:01 +0800
  • c3d0f841cf
         !92 2022-1-23 Leung Merge pull request !92 from Admin/sit-Leung Admin 2022-01-23 14:38:04 +0000
  • 25e5be80fb Payment bug fixed Vion 2022-01-23 22:34:10 +0800
  • 9fda9e4478 Payment bug fixed Vion 2022-01-23 22:30:57 +0800
  • 42afa7dffa Merge branch 'sit-Carl' into sit-jiamin-v2 952108534@qq.com 2022-01-23 22:15:37 +0800
  • 9b03ea93b9 更改 952108534@qq.com 2022-01-23 22:12:15 +0800
  • a80acba99f Confirm btn removed Vion 2022-01-23 22:05:40 +0800
  • 14bba229ea
         !91 2022-1-23 JiaMin Merge pull request !91 from Admin/sit-jiamin-v2 Admin 2022-01-23 13:49:02 +0000
  • ee970415ea
         !90 2022-1-23 Leung Merge pull request !90 from Admin/sit-Leung Admin 2022-01-23 13:46:07 +0000
  • 19c43e0de1
         !89 2022-1-23 Carl Merge pull request !89 from Admin/sit-Carl-V3 Admin 2022-01-23 13:43:15 +0000
  • d59ae7cca5 后台增加以下功能： 1：微信回调后自动获取商品积分 Carl 2022-01-23 21:40:52 +0800
  • 5b52ef02d4 更改 952108534@qq.com 2022-01-23 21:35:49 +0800
  • 74f4cc1a5f Merge branch 'sit-Leung' into sit-jiamin-v2 952108534@qq.com 2022-01-23 21:11:26 +0800
  • 560d9b5c1c Payment bug fixed Vion 2022-01-23 21:10:24 +0800
  • 40223bf98c 更新 952108534@qq.com 2022-01-23 21:08:30 +0800
  • a60fbe5921 更改 952108534@qq.com 2022-01-23 19:52:05 +0800
  • 42e06ba213 Merge remote-tracking branch 'origin/sit-Leung' into sit-jiamin-v2 952108534@qq.com 2022-01-23 19:36:32 +0800
  • fcedb5d01e 更改提交 952108534@qq.com 2022-01-23 19:32:59 +0800
  • c5e5978615 Payment flow refined Vion 2022-01-23 19:29:46 +0800
  • 64e16eb673
         !88 2022-1-23 Carl Merge pull request !88 from Admin/sit-Carl-V3 Admin 2022-01-23 10:27:45 +0000
  • a7f61f9fb4 Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3 Carl 2022-01-23 18:25:50 +0800
  • 9fce9da12e 后台做以下更改： 1：insertCartProductInfo 新增basePiont 2：getCartProductInfo 新增basePiont 3：新增借口监听支付回调royalcanin/monitorOrderNotify（入参为OrderNumber） 成功回调为 :{ "code": 1, "msg": "SUCCESS", "success": true, "data": null } 失败回调为：{ "code": 9009, "msg": "没有该订单回调数据！", "success": false, "data": null } Carl 2022-01-23 18:25:36 +0800
  • 065db958c7 Merge remote-tracking branch 'origin/sit-Leung' into sit-jiamin-v2 952108534@qq.com 2022-01-23 17:26:35 +0800
  • e0d50bf974 提交更改 952108534@qq.com 2022-01-23 17:17:22 +0800
  • 8ff86279a0 Payment flow refine Vion 2022-01-23 16:50:49 +0800
  • 9b4f71074a Merge branch 'sit-Carl' into sit-Leung Vion 2022-01-23 15:08:04 +0800
  • 477d0e8602 Error page template added Vion 2022-01-23 14:55:21 +0800
  • e072f56de3
         !87 he Merge pull request !87 from Admin/sit-He-v3 Admin 2022-01-23 06:40:42 +0000
  • 924a83a7e0 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-He-v3 Admin 2022-01-23 06:40:06 +0000
  • 2ff3a5d256 changemessage summation 2022-01-23 13:46:22 +0800
  • 92b2aa9346
         !85 2022-1-22 Jiamin Merge pull request !85 from Admin/sit-jiamin-v2 Admin 2022-01-23 05:07:59 +0000
  • 7455d73e63 Merge branch 'sit-Leung' into sit-jiamin-v2 952108534@qq.com 2022-01-23 12:59:13 +0800
  • 2f5ef11c15 Breadcrumbs added except : order list / shopping cart / coupon list / address management Vion 2022-01-23 12:44:49 +0800
  • 0617f2461c 更改 952108534@qq.com 2022-01-23 11:32:06 +0800
  • fcb6dc26bd Breadcrumbs 0 version Vion 2022-01-23 11:30:31 +0800
  • 43857121c4
         !84 2022-1-23 Leung Merge pull request !84 from Admin/sit-Leung Admin 2022-01-22 16:38:30 +0000
  • 08c6c0cae9
         !83 2022-1-23 Carl Merge pull request !83 from Admin/sit-Carl-V3 Admin 2022-01-22 16:33:37 +0000
  • 4a54185c01 搞定了，后台更新了以下几点： 1：getCartProductInfo 新增了“leftAllotment”字段 2：insertCartProductInfo 新增了“leftAllotment”字段 3：generateOrderWX 入参新增了“basePoint” 4：updateOrderWX微信回调方法，新增了自动增加该账户积分信息。 Carl 2022-01-23 00:27:22 +0800
  • 9df46a5ab3 地址样式修改 952108534@qq.com 2022-01-22 23:21:22 +0800
  • 358f0f66b9 Rx goods modified Vion 2022-01-22 23:04:56 +0800
  • 4b27f68340 d 952108534@qq.com 2022-01-22 22:55:40 +0800
  • 3403570766 更改地址以及其它 952108534@qq.com 2022-01-22 22:54:24 +0800
  • a17b8204db 更改 952108534@qq.com 2022-01-22 22:26:44 +0800
  • 144e0820bf Removing cart item API param corrected Vion 2022-01-22 22:04:06 +0800
  • 46417f10ff Merge branch 'sit-jiamin-v2' of https://gitee.com/carl_Ming_1/smart-admin into sit-jiamin-v2 952108534@qq.com 2022-01-22 22:02:51 +0800
  • bfa62a1cd9 添加 952108534@qq.com 2022-01-22 21:58:34 +0800
  • df498f597a
         !82 2022-1-22 Jiamin Merge pull request !82 from Admin/sit-jiamin-v2 Admin 2022-01-22 13:54:35 +0000
  • cac6711624
         !81 2022-1-22 Leung Merge pull request !81 from Admin/sit-Leung Admin 2022-01-22 13:52:42 +0000
  • 09ed52dcfc 更改 952108534@qq.com 2022-01-22 21:40:38 +0800
  • 2abc052087 提交 952108534@qq.com 2022-01-22 21:40:23 +0800
  • faa6511d6e 地址修改 952108534@qq.com 2022-01-22 21:05:00 +0800
  • d4ca5020a0 更改地址 952108534@qq.com 2022-01-22 21:00:10 +0800
  • d311233774 更改 952108534@qq.com 2022-01-22 21:40:38 +0800
  • ba07129304 提交 952108534@qq.com 2022-01-22 21:40:23 +0800
  • 0833e998ea Bug list updated Vion 2022-01-22 21:34:50 +0800
  • 51c5e9b763 地址修改 952108534@qq.com 2022-01-22 21:05:00 +0800
  • 07a61c642e 更改地址 952108534@qq.com 2022-01-22 21:00:10 +0800
  • 2bf308092d
         !80 2022-1-22 Merge pull request !80 from Admin/sit-jiamin-v2 Admin 2022-01-22 12:21:38 +0000
  • 99926260b9 更改 952108534@qq.com 2022-01-22 20:11:58 +0800
  • d2e2d45395
         !79 2022-01-22 Jiamin Merge pull request !79 from Admin/sit-jiamin-v2 Admin 2022-01-22 11:56:03 +0000
  • ace8787e9a
         !78 2022-01-22 Merge pull request !78 from Admin/sit-Leung Admin 2022-01-22 11:54:37 +0000
  • 95614b9c66 订单 952108534@qq.com 2022-01-22 19:22:17 +0800
  • c6267a73ee Rx goods supported / Product detail multi-specification added / "window" in fetch removed Vion 2022-01-22 19:20:04 +0800
  • 276c1bd403
         fix -v Admin 2022-01-22 08:24:06 +0000
  • 8418a1489f
         fix Admin 2022-01-22 08:18:06 +0000
  • 6dd0c8fdad
         fix Admin 2022-01-22 08:09:10 +0000
  • 74d336c4d6
         fix Admin 2022-01-22 08:08:45 +0000
  • 397a96f2b9
         test Admin 2022-01-22 07:44:42 +0000
  • b0de4dea5c
         tes Admin 2022-01-22 07:43:53 +0000
  • c991eb3b06
         fix Admin 2022-01-22 07:39:22 +0000
  • 79ff28e63d
         !77 2022-1-22 He Merge pull request !77 from Admin/sit-He-v3 Admin 2022-01-22 07:25:47 +0000
  • c1bf773be0
         !76 2022-1-22 Leung Merge pull request !76 from Admin/sit-Leung Admin 2022-01-22 07:24:57 +0000
  • 791bca1277 Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-Leung Admin 2022-01-22 07:24:35 +0000