Commit Graph

657 Commits

Author SHA1 Message Date
Carl
0c5e6bc33a debugger 2022-01-29 19:14:35 +08:00
Carl
80ac6d1cef debugger 2022-01-29 19:08:12 +08:00
Carl
177b49f4fd debugger 2022-01-29 02:28:57 +08:00
Carl
47c5c1b785 debugger 2022-01-29 02:21:44 +08:00
Carl
49abd63ff9 debugger 2022-01-29 02:14:05 +08:00
Carl
2274267b6f debugger 2022-01-29 02:11:18 +08:00
Admin
68156909be
!127 2022-1-28 Leung
Merge pull request !127 from Admin/sit-Leung
2022-01-28 10:21:30 +00:00
Vion
8c8ee3f4f0 ENV setting file 2022-01-28 18:20:09 +08:00
Vion
6725fb9961 Web code updated 2022-01-28 18:19:40 +08:00
Carl
035d392e76 fix The server time zone value 'Coordinated Universal Time' is unrecognized or represents more than one 2022-01-28 18:05:26 +08:00
Carl
0eb02c313b fix The server time zone value 'Coordinated Universal Time' is unrecognized or represents more than one 2022-01-28 17:58:00 +08:00
Carl
99f4df3c1f fix The server time zone value 'Coordinated Universal Time' is unrecognized or represents more than one 2022-01-28 17:13:18 +08:00
Carl
6496bd0083 fix without basePoint and paytype 2022-01-28 17:00:14 +08:00
Carl
58bf9c6d02 rel 2022-01-28 14:31:42 +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
Admin
edaf520a86
!115 2022-1-26 Carl
Merge pull request !115 from Admin/sit-Carl-V3
2022-01-26 11:02:58 +00:00
Carl
e41361dc6c add sale value 1 2022-01-26 19:00:05 +08:00
Admin
14f71dfd26
!114 2022-1-26 Carl
Merge pull request !114 from Admin/sit-Carl-V3
2022-01-26 09:53:04 +00:00