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

660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vion
8eef8b3495 Payment method validation updated 2022-01-30 15:42:27 +08:00
Vion
2fdfb0e9c1 Frontend layout fixed 2022-01-30 15:07:06 +08:00
Vion
b3c21bb35f Removing domain at prd env 2022-01-29 15:24:05 +08:00
Vion
3672d64473 Merge branch 'sit-Carl' into sit-Leung 
# Conflicts:
#	rc-busness/pages/index.vue
#	rc-busness/pages/productdetails/producted.vue
 2022-01-29 15:02:58 +08:00
Vion
17e2df0019 Env data updated 2022-01-29 11:50:10 +08:00
Admin
9903ba3816
!128 2022-1-29 Jiamin 
Merge pull request !128 from Admin/sit-jiamin-v2
 2022-01-29 03:43:32 +00:00
952108534@qq.com
c0d3a3fbd1 页面 2022-01-28 18:51:02 +08:00
Vion
8c8ee3f4f0 ENV setting file 2022-01-28 18:20:09 +08:00
952108534@qq.com
8baf7eb678 更改 2022-01-28 18:19:40 +08:00
Vion
6725fb9961 Web code updated 2022-01-28 18:19:40 +08:00
Admin
fbe893551a
!126 2022-1-28 Carl 
Merge pull request !126 from Admin/sit-Carl-V3
 2022-01-28 08:24:50 +00:00
Carl
505bf618ac fix without basePoint and paytype 2022-01-28 16:23:11 +08:00
Admin
7c70711caf
!125 2022-1-28 Carl 
Merge pull request !125 from Admin/sit-Carl-V3
 2022-01-28 07:52:37 +00:00
Carl
d42c9546ec add paymentAmount logic 2022-01-28 15:47:23 +08:00
952108534@qq.com
cbe204d689 Merge branch 'sit-Leung' into sit-jiamin-v2 2022-01-28 15:06:58 +08:00
952108534@qq.com
c9c50b3a63 跳转 2022-01-28 14:05:04 +08:00
952108534@qq.com
c98990f728 更改首页 2022-01-28 14:04:55 +08:00
Vion
61c365c3fc Merge branch 'sit-Carl' into sit-Leung 2022-01-28 11:54:13 +08:00
Admin
a8916ce195
!124 2022-1-28 Jiamin 
Merge pull request !124 from Admin/sit-jiamin-v2
 2022-01-28 03:45:55 +00:00
952108534@qq.com
d0ea3582dd 图片的更改 2022-01-28 11:40:45 +08:00
952108534@qq.com
fc3314230d 图片 2022-01-28 11:32:54 +08:00
952108534@qq.com
f52c13b63e 商品详情页商品有送积分就显示 2022-01-28 11:14:43 +08:00
Vion
808807c563 Redirect to userPayData.wxPay 2022-01-27 17:40:14 +08:00
Admin
99c31501e2
!123 2022-1-27 Jiamin 
Merge pull request !123 from Admin/sit-jiamin-v2
 2022-01-27 08:57:01 +00:00
Admin
16a3ef66e8
!122 2022-1-27 Leung 
Merge pull request !122 from Admin/sit-Leung
 2022-01-27 08:56:04 +00:00
Admin
c8cfdcb1c9
!121 2022-1-27 Carl 
Merge pull request !121 from Admin/sit-Carl-V3
 2022-01-27 08:55:13 +00:00
Vion
300788a552 Payment method consolidated 2022-01-27 16:55:00 +08:00
Carl
9b1f623be0 add 2022-01-27 16:54:13 +08:00
952108534@qq.com
564a4f9e6f 更改产品详情页样式 2022-01-27 16:45:48 +08:00
952108534@qq.com
fd881817e4 更改 2022-01-27 16:30:27 +08:00
952108534@qq.com
83e69b2a28 更改 2022-01-27 16:28:23 +08:00
952108534@qq.com
03f91822aa Merge branch 'sit-Leung' into sit-jiamin-v2 2022-01-27 15:40:29 +08:00
952108534@qq.com
4a2be0272c 图片 2022-01-27 15:38:28 +08:00
952108534@qq.com
83358b4e5b 首页轮播图等 2022-01-27 15:38:06 +08:00
952108534@qq.com
20a26ed361 更改样式 2022-01-27 11:29:56 +08:00
Admin
aeec63e7a3
!120 2022-1-27 Leung 
Merge pull request !120 from Admin/sit-Leung
 2022-01-27 03:25:24 +00:00
952108534@qq.com
bf18eb7b1e 样式更改 2022-01-27 11:24:49 +08:00
Vion
7912abdabc userpay error fix 2022-01-27 11:24:31 +08:00
Admin
eb676f8cc0
!119 2022-1-27 Carl 
Merge pull request !119 from Admin/sit-jiamin-v2
 2022-01-27 03:20:13 +00:00
Admin
02322a4837
!118 2022-1-27 Leung 
Merge pull request !118 from Admin/sit-Leung
 2022-01-27 03:19:12 +00:00
Admin
8034d50994
!117 2022-1-27 Carl 
Merge pull request !117 from Admin/sit-Carl-V3
 2022-01-27 03:18:15 +00:00
Carl
04a2710347 fix 2022-01-27 11:15:06 +08:00
Vion
31fe06b2c2 Merge branch 'sit-Carl' into sit-Leung 
# Conflicts:
#	rc-busness/pages/personal/userpay.vue
 2022-01-27 09:52:47 +08:00
Vion
8ef3530438 Payment flow refined 2022-01-27 09:42:33 +08:00
Vion
f058f0a1e0 temp payment method integration 2022-01-26 19:39:20 +08:00
952108534@qq.com
8b890c44d7 Merge branch 'sit-Carl' into sit-jiamin-v2 2022-01-26 19:33:04 +08:00
952108534@qq.com
b796a256df Merge branch 'sit-Leung' into sit-jiamin-v2 2022-01-26 19:32:16 +08:00
952108534@qq.com
0274793731 更改登录以及产品详情页 2022-01-26 19:31:17 +08:00
Admin
53d71fe478
!116 2022-1-26 Carl 
Merge pull request !116 from Admin/sit-Carl-V3
 2022-01-26 11:21:17 +00:00
Carl
59b505dd8f add sale value 1 2022-01-26 19:20:10 +08:00