xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 02:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
938 Commits 2 Branches 32 Tags 340 MiB
9f7ce41eac
Commit Graph

938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lin
9f7ce41eac 页面优化 
1.添加PC端订单支付 弹出支付二维码
2.添加确认订单的面包屑  从购物车和其他方向进去的不同显示
3.修改移动端按钮和合计样式显示问题
4.添加购物车的全选功能
5.添加支付页面面包屑功能
6.修改订单详情页 添加面包屑和分割线
7.添加购物车数量编辑的保存
 2022-03-24 17:05:47 +08:00
lin
9f955a34eb 迭代功能需求 
1.修改用户信息存储位置
2.修复订单显示的问题
3.修改优惠卷显示文字显示和选择提示
4.修复地址列表排版错位的问题
5.添加搜索链接跳转查询
 2022-03-23 18:04:14 +08:00
lin
6f8a8c628d Merge branch 'sit-Carl' into sit-Carl-lin-dev 2022-03-22 10:46:46 +08:00
lin
393f9b71cd 修改 
1.修改记住登录态的方法
 2022-03-21 19:11:38 +08:00
Admin
47982a5126
!250 Leung 
Merge pull request !250 from Admin/LTL_20220314
 2022-03-21 11:11:15 +00:00
Admin
0c0ee6e965
!249 lin 
Merge pull request !249 from Admin/sit-Carl-lin-dev
 2022-03-21 11:10:31 +00:00
lin
0f7931155a 修改 
1.修改价格显示问题
2.分化用户数据和添加cookit等静态方法
 2022-03-21 19:08:34 +08:00
602090531@qq.com
e8f076477c 解决未到生效时间优惠券显示的问题 2022-03-21 18:49:40 +08:00
Admin
1b2386c330
!248 modify debugger 
Merge pull request !248 from Admin/LTL_20220314
 2022-03-21 10:27:11 +00:00
602090531@qq.com
7bb6b8e2d0 校验优惠券最低金额、最低购买数量 2022-03-21 18:23:03 +08:00
lin
7f40887829 修复 
1.修改折扣1折显示问题
2.修改取消订单请求两次的问题
 2022-03-21 17:32:56 +08:00
lin
c07b3a5c5a 修改订单显示问题 2022-03-21 16:43:29 +08:00
lin
b5755eab6d Merge branch 'sit-Carl' into sit-Carl-lin-dev 2022-03-21 16:37:30 +08:00
Admin
2a4dcd3091
!247 order Service debugger 
Merge pull request !247 from Admin/LTL_20220314
 2022-03-21 08:14:33 +00:00
602090531@qq.com
30fdd63443 解决未到生效时间优惠券显示的问题 2022-03-21 16:11:23 +08:00
lin
55e070939c upload 
1.修改H5的打包错误
 2022-03-21 15:47:47 +08:00
Admin
890175116f
!246 1 
Merge pull request !246 from Admin/sit-Leung-v3
 2022-03-21 07:47:13 +00:00
Vion
fd0f024346 Coupon displaying updated 2022-03-21 15:45:01 +08:00
Admin
7145ea8c81
!245 debugger 
Merge pull request !245 from Admin/LTL_20220314
 2022-03-20 17:25:15 +00:00
602090531@qq.com
cf44fb3cb2 解决未到生效时间优惠券显示的问题 2022-03-20 17:59:13 +08:00
Admin
eb31e0bff4
!244 debugger 
Merge pull request !244 from Admin/LTL_20220314
 2022-03-19 11:50:18 +00:00
602090531@qq.com
a3bd3ced1e 重写优惠券实现逻辑的问题 2022-03-19 17:58:47 +08:00
Admin
df365dd6f8
!243 Leung 
Merge pull request !243 from Admin/LTL_20220314
 2022-03-18 11:17:13 +00:00
602090531@qq.com
b5bcc2db8c 重写了优惠券的逻辑 2022-03-18 18:57:10 +08:00
Admin
b55269b686
!242 Leung 
Merge pull request !242 from Admin/LTL_20220314
 2022-03-18 02:52:38 +00:00
602090531@qq.com
914d64f597 解决未到生效时间优惠券显示的问题 2022-03-18 10:35:06 +08:00
Admin
741c77672d
!241 Leung 
Merge pull request !241 from Admin/LTL_20220314
 2022-03-17 08:13:59 +00:00
602090531@qq.com
f17784ec71 解决未到生效时间优惠券显示的问题 2022-03-17 16:07:50 +08:00
Admin
0ebe725aa5
!240 Leung 
Merge pull request !240 from Admin/LTL_20220314
 2022-03-17 07:46:36 +00:00
602090531@qq.com
671bb459a3 解决未到生效时间优惠券显示的问题 2022-03-17 15:42:54 +08:00
602090531@qq.com
8f5ab606ce Merge branch 'sit-Carl' into LTL_20220314 
# Conflicts:
#	smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
 2022-03-17 15:35:27 +08:00
602090531@qq.com
57f05da254 解决未到生效时间优惠券显示的问题 2022-03-17 15:26:05 +08:00
602090531@qq.com
b9361b8eea 记录解密后的data的log数据 2022-03-17 10:09:27 +08:00
Admin
ffb99232e8
!237 adding AES logic . 
Merge pull request !237 from Admin/sit-Carl-V3
 2022-03-16 09:11:47 +00:00
376654749@qq.com
359d746638 modify order logic 2022-03-16 17:01:21 +08:00
Admin
4af5435bb8
!236 add resp body log 
Merge pull request !236 from Admin/LTL_20220314
 2022-03-16 02:28:49 +00:00
Admin
54dcb5edd3
!235 adding filter coupon logic 
Merge pull request !235 from Admin/sit-Leung-v3
 2022-03-16 02:23:05 +00:00
602090531@qq.com
e4fa95fbbc 增加日志列的数据记录 2022-03-16 10:12:47 +08:00
Vion
cf90ce9009 Combined product Coupon amount calculating issue fixed 2022-03-15 20:07:55 +08:00
Admin
112d563d65
!234 modify order logic 
Merge pull request !234 from Admin/sit-Carl-V3
 2022-03-15 08:35:56 +00:00
376654749@qq.com
cd6a9f9e27 modify order logic 2022-03-15 16:31:35 +08:00
Admin
569ed71177
!233 adding filter coupon logic 
Merge pull request !233 from Admin/sit-Leung-v3
 2022-03-15 08:21:40 +00:00
376654749@qq.com
1417dbc64f adding CouponGetAllEntity logic 2022-03-15 14:59:42 +08:00
Vion
037201858f Coupon displaying issue 2022-03-15 14:48:03 +08:00
Admin
9d80bc9c62
!232 adding filter coupon logic 
Merge pull request !232 from Admin/sit-Leung-v3
 2022-03-15 04:24:50 +00:00
Vion
f396c57394 Coupon displaying bug fixed 2022-03-15 12:13:17 +08:00
Admin
1efbae411c
!230 adding filter coupon logic 
Merge pull request !230 from Admin/sit-Carl-V3
 2022-03-15 03:43:11 +00:00
376654749@qq.com
a18da2e2e5 adding order logic 2022-03-15 11:40:13 +08:00
Vion
30293b2313 Settlement coupon param updated 2022-03-14 18:05:40 +08:00
Admin
b33986f504
!228 generate fitler logic 
Merge pull request !228 from Admin/sit-Carl-V3
 2022-03-14 09:23:46 +00:00