Commit Graph

679 Commits

Author SHA1 Message Date
Carl
3ca9cbe111 debugger 2022-01-30 15:52:41 +08:00
Carl
3deeab7bc2 debugger 2022-01-30 13:26:41 +08:00
Carl
59c3378371 Merge remote-tracking branch 'origin/pro-Carl' into pro-Carl 2022-01-30 12:49:04 +08:00
Carl
a48ebf09cd debugger 2022-01-30 12:48:45 +08:00
Admin
f37aea01d9
!129 2022-1-30 Leung
Merge pull request !129 from Admin/sit-Leung
2022-01-29 18:46:35 +00:00
Carl
1831007a0b debugger 2022-01-30 02:44:51 +08:00
Carl
801ac2979c debugger 2022-01-29 19:40:10 +08:00
Carl
990743412a debugger 2022-01-29 19:29:22 +08:00
Carl
bb2c4903ce debugger 2022-01-29 19:25:33 +08:00
Carl
0c5e6bc33a debugger 2022-01-29 19:14:35 +08:00
Carl
80ac6d1cef debugger 2022-01-29 19:08:12 +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
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
952108534@qq.com
c0d3a3fbd1 页面 2022-01-28 18:51:02 +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
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
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
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
Carl
58bf9c6d02 rel 2022-01-28 14:31:42 +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