Commit Graph

615 Commits

Author SHA1 Message Date
momo
e9f862e144 fix:优化 2023-09-21 10:51:04 +08:00
momo
4f61702e14 fix:购物车下单 2023-09-21 10:30:36 +08:00
laodaming
8806dbb034 fix 2023-09-21 10:12:14 +08:00
laodaming
b992a052ce fix 2023-09-20 18:27:32 +08:00
laodaming
18aaef0e31 fix 2023-09-20 17:11:48 +08:00
laodaming
e1364838da 11 2023-09-20 16:47:59 +08:00
laodaming
be80525878 11 2023-09-20 16:46:30 +08:00
momo
572dfe1b96 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-20 15:07:23 +08:00
momo
ed5dce9ff0 fix:购物车下单 2023-09-20 15:07:12 +08:00
laodaming
30fd11bb37 Merge branch 'develop' into feature/mhw-v1.01 2023-09-20 13:57:38 +08:00
laodaming
039137ce23 11 2023-09-20 12:13:27 +08:00
momo
ca12242768 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-20 11:40:06 +08:00
momo
b45da2b637 fix:购物车下单 2023-09-20 11:39:56 +08:00
laodaming
f284702448 11 2023-09-20 11:05:59 +08:00
laodaming
d8707e3a4a 添加购物车新增灯光信息保存 2023-09-20 11:02:46 +08:00
momo
cde43f16db Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-19 17:28:24 +08:00
momo
75849f0ab8 fix:合图调整 2023-09-19 17:28:14 +08:00
laodaming
3f4d808fda 11 2023-09-19 17:24:47 +08:00
momo
ab5f908300 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-19 15:59:49 +08:00
momo
078b797c94 fix:合图调整 2023-09-19 15:59:44 +08:00
laodaming
720a9ab78b 11 2023-09-19 15:34:52 +08:00
momo
f7c3ccd01d fix:合图调整 2023-09-19 14:55:26 +08:00
laodaming
b19a16e5a0 合并develop 2023-09-19 14:06:54 +08:00
momo
dbb1591cbb fix:合图调整 2023-09-19 12:04:51 +08:00
laodaming
19958a80de fix 2023-09-19 10:36:33 +08:00
laodaming
49785df983 fix 2023-09-18 17:53:05 +08:00
laodaming
49cc50ff4e fix 2023-09-18 15:57:36 +08:00
laodaming
ceec00c528 fix 2023-09-18 15:18:55 +08:00
laodaming
464218ad62 Merge branch 'develop' into feature/mhw-v1.01 2023-09-18 14:44:28 +08:00
laodaming
5e2760849c fix 2023-09-18 14:23:57 +08:00
laodaming
1a7ce5013e fix 2023-09-18 12:31:51 +08:00
laodaming
b07473478b fix 2023-09-18 11:45:29 +08:00
momo
86450d3c9d Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-15 17:59:59 +08:00
laodaming
ab6f3249a2 fix 2023-09-15 17:59:33 +08:00
momo
751232c32e Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-15 17:59:04 +08:00
momo
ca7cf4c81e fix:合并 2023-09-15 17:58:45 +08:00
laodaming
da8f88b3e6 fix 2023-09-15 16:30:01 +08:00
laodaming
6987f2c2d1 fix 2023-09-15 15:27:39 +08:00
laodaming
ee92468392 fix 2023-09-15 14:52:36 +08:00
laodaming
fd16d6ac67 fix 2023-09-15 14:19:14 +08:00
momo
e4343eb2d6 Merge branch 'feature/mhw-v1.01' of gitee.com:fusenpack/fusenapi into feature/mhw-v1.01 2023-09-15 10:35:56 +08:00
momo
f3a29225e0 fix:合并 2023-09-15 10:35:13 +08:00
laodaming
5df0a0f184 fix 2023-09-15 10:23:40 +08:00
momo
6606173050 feat:新增api 2023-09-14 18:43:10 +08:00
laodaming
9c178b2add fix 2023-09-14 18:33:29 +08:00
laodaming
0bb11f975d 新增更新购物车购买数量接口 2023-09-14 15:46:37 +08:00
laodaming
13d5219e53 fix 2023-09-14 14:11:22 +08:00
laodaming
a8b85fad02 fix 2023-09-13 17:27:16 +08:00
laodaming
417228ce05 fix 2023-09-13 17:20:39 +08:00
laodaming
9e4703bd1f fix 2023-09-13 16:44:23 +08:00
laodaming
0aef122f1b 11 2023-09-12 18:09:38 +08:00
laodaming
4a09fc3955 11 2023-09-12 17:05:41 +08:00
laodaming
7c6f8c5594 11 2023-09-12 15:37:22 +08:00
laodaming
983492f7b1 11 2023-09-12 15:35:09 +08:00
laodaming
3e714a5db6 删除无用的服务 2023-09-12 15:23:41 +08:00
laodaming
0a7e56f726 删除无用的服务 2023-09-12 11:57:58 +08:00
laodaming
899581ba63 fix 2023-09-11 16:20:09 +08:00
momo
c61c8a4933 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-08 11:47:59 +08:00
momo
7543f99f8b fix:设置当前logo 2023-09-08 11:47:53 +08:00
momo
6cc35e6198 feat:用户设置logo 2023-09-07 18:52:01 +08:00
laodaming
172ec53785 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-07 18:28:27 +08:00
laodaming
cb682a7ac0 fix 2023-09-07 18:28:19 +08:00
momo
818eee78be fix:logo历史列表调整 2023-09-07 16:54:49 +08:00
laodaming
4399c2c02e fix 2023-09-06 15:24:51 +08:00
laodaming
6d20c95f0b fix 2023-09-06 15:06:50 +08:00
laodaming
60f74f2297 fix 2023-09-06 15:04:51 +08:00
laodaming
13d91699f0 fix 2023-09-06 14:35:42 +08:00
laodaming
9dc6581a8c fix 2023-09-06 12:21:58 +08:00
laodaming
b9532ebe86 11 2023-09-06 10:00:09 +08:00
laodaming
d2bb801fb4 fix 2023-09-05 18:29:44 +08:00
laodaming
262c8dc1b5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-05 16:35:10 +08:00
laodaming
4fbbbb27df fix 2023-09-05 16:35:02 +08:00
eson
63937ea358 fix 2023-09-05 15:44:17 +08:00
eson
81ad6122a7 fix 2023-09-05 15:00:45 +08:00
laodaming
2e9b107375 fix 2023-09-04 17:11:40 +08:00
eson
19b10262b1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-04 16:59:48 +08:00
eson
03bd7cd5eb fix 2023-09-04 16:59:43 +08:00
laodaming
9861475aa1 fix 2023-09-04 16:54:55 +08:00
laodaming
2eb552e303 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-04 16:43:42 +08:00
laodaming
c65db5fe94 fix 2023-09-04 16:43:32 +08:00
eson
397dda8ebf Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-04 16:23:16 +08:00
eson
dc21c51a0c fix 2023-09-04 16:23:11 +08:00
laodaming
1da29bb715 fix 2023-09-04 15:00:11 +08:00
laodaming
f6e2edf3a8 fix 2023-09-04 14:46:25 +08:00
9c89f0fe4a TODO: password 2023-09-04 01:40:28 +08:00
31f46b64b5 fix 2023-09-04 00:06:55 +08:00
eson
41e935bc65 fix 2023-08-31 16:17:32 +08:00
momo
d299a2aa3a feat:图片缩放 2023-08-30 18:56:06 +08:00
eson
fc96d181b3 fix 2023-08-29 18:13:49 +08:00
eson
15692d6075 fix 2023-08-29 18:06:39 +08:00
eson
8908273af5 fix 2023-08-29 14:27:00 +08:00
momo
d241b8da6c fix:用户信息调整 2023-08-29 11:35:53 +08:00
eson
8c30648d3e fix 2023-08-28 17:20:08 +08:00
1bb5d4518a fix 2023-08-27 23:54:28 +08:00
momo
bb77d8f9aa fix:上下2 2023-08-25 16:46:58 +08:00
laodaming
190010a6fe fix 2023-08-24 15:59:55 +08:00
laodaming
991f3c5cd5 fix 2023-08-24 15:51:32 +08:00
laodaming
dcdc949a90 fix 2023-08-24 15:45:23 +08:00
eson
bcd79f828c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-24 11:47:39 +08:00
eson
d8ddad6fe9 修复json的类型影响 2023-08-24 11:47:22 +08:00
momo
5443ad654c fix:裁剪业务逻辑调整 2023-08-23 17:51:51 +08:00
laodaming
b2460bbc87 fix 2023-08-23 17:35:43 +08:00
eson
d31e84c425 修改数据库字段 2023-08-23 16:51:47 +08:00
laodaming
b91c8d75f0 fix 2023-08-23 15:08:45 +08:00
momo
89d8a8963c fix:裁剪业务逻辑调整 2023-08-23 14:22:36 +08:00
momo
1e25f79d4a fix:裁剪业务逻辑调整 2023-08-23 11:41:02 +08:00
momo
2ef3547724 fix:裁剪业务逻辑调整 2023-08-23 11:09:14 +08:00
eson
37c2144725 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-22 13:43:41 +08:00
momo
462ac4915b fix:base上传强制更新 2023-08-22 10:54:33 +08:00
momo
80a9517a1f fix:base上传强制更新 2023-08-22 10:48:10 +08:00
eson
d35ffd793a Merge branch 'develop' into feature/auth 2023-08-22 10:34:21 +08:00
laodaming
6a912a145e fix 2023-08-21 10:21:02 +08:00
Hiven
fa97e20ae1 fix:图片裁剪 2023-08-18 17:38:12 +08:00
Hiven
05137f3fe5 fix:上传大图限制 2023-08-18 16:47:22 +08:00
laodaming
37d32a26ab fix 2023-08-18 10:26:33 +08:00
laodaming
f892a216d6 fix 2023-08-17 18:19:15 +08:00
eson
d012ef5f83 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-17 14:10:20 +08:00
Hiven
c3cd57b7e5 fix:上传模块调整 2023-08-17 11:46:17 +08:00
laodaming
a022e5a8d9 fix 2023-08-16 12:16:23 +08:00
eson
6fe706e9e7 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-16 10:43:33 +08:00
eson
e565565627 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-16 10:22:12 +08:00
laodaming
ac1800bb26 fix 2023-08-15 19:43:50 +08:00
laodaming
35cb2ef1ce fix 2023-08-15 17:10:43 +08:00
laodaming
c4dc31493a fix 2023-08-15 16:50:35 +08:00
Hiven
76e0884c11 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 11:20:19 +08:00
Hiven
90229ca23e fix:重构合图模块 2023-08-15 11:20:09 +08:00
laodaming
c5ef6cfa14 fix 2023-08-15 11:18:22 +08:00
Hiven
d1c6f5cdc5 fix:重构合图模块 2023-08-15 10:58:24 +08:00
Hiven
fde5ef8b25 feat:新增商户列表/保存用户信息 2023-08-14 14:41:54 +08:00
Hiven
57e635c26c feat:新增商户列表/保存用户信息 2023-08-14 14:40:50 +08:00
eson
187cb48a41 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-14 14:12:33 +08:00
eson
117330ee16 基本完成重置密码和忘记密码 2023-08-14 14:09:38 +08:00
laodaming
35b02302eb fix 2023-08-14 12:30:14 +08:00
laodaming
2bb1c73e4a fix 2023-08-14 11:35:23 +08:00
laodaming
cfc7b22090 fix 2023-08-14 11:04:25 +08:00
laodaming
48afd3105f fix 2023-08-11 18:59:03 +08:00
eson
ae07370214 重置密码 2023-08-11 17:39:18 +08:00
laodaming
dbe6e99f2d fix 2023-08-11 14:52:16 +08:00
eson
9664271474 修改Wid为string 2023-08-11 12:07:26 +08:00
Hiven
83b0b7f5ab fix:修复上传 2023-08-10 19:08:06 +08:00
eson
432db5aec5 Merge branch 'develop' into feature/auth 2023-08-10 17:31:03 +08:00
eson
8c07a5f5d7 保存为了 websocket 2023-08-10 16:25:41 +08:00
Hiven
13ad52d095 fix:修复上传 2023-08-10 15:23:28 +08:00
eson
05e8def85a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-09 14:21:22 +08:00
Hiven
d5e5cdc8f0 feat:获取资源详情 2023-08-09 14:18:27 +08:00
laodaming
2ed06a6df0 fix 2023-08-09 14:12:58 +08:00
Hiven
d810b87c09 feat:合图功能,封装上传base64等等 2023-08-09 11:46:24 +08:00
eson
056101121b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-09 10:29:53 +08:00
laodaming
2f1ef81263 fix 2023-08-08 17:03:54 +08:00
laodaming
584498f556 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-08 16:27:53 +08:00
laodaming
6d58e6bb22 fix 2023-08-08 16:27:42 +08:00
eson
d7345b577c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-08 15:21:56 +08:00
Hiven
399d3b9157 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-08 14:55:28 +08:00
Hiven
1887b6e7b6 =fix:修复 2023-08-08 14:55:17 +08:00
eson
8bea89754b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-08 14:18:45 +08:00
laodaming
9e5b08b9eb fix 2023-08-08 12:56:53 +08:00
Hiven
2cd24098df Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 19:41:50 +08:00
Hiven
f87842deb4 fix:修复 2023-08-07 19:41:44 +08:00
laodaming
2c27b85c33 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 17:20:03 +08:00
laodaming
74708d3b21 fix 2023-08-07 17:19:55 +08:00
Hiven
e2e2880514 fix:调整 2023-08-07 17:10:09 +08:00
laodaming
7510b363d6 fix 2023-08-07 12:31:31 +08:00
Hiven
869873deda Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 11:34:28 +08:00
Hiven
39fe427f8e fix:文件上传--base64 2023-08-07 11:34:22 +08:00
laodaming
36efad44df fix 2023-08-07 11:25:06 +08:00
laodaming
a106082364 fix 2023-08-07 10:48:14 +08:00
laodaming
d5a6f780a5 fix 2023-08-04 16:50:01 +08:00
Hiven
56acf68393 fix:接口调整 2023-08-03 18:27:52 +08:00
Hiven
6158779a95 调整 2023-08-03 17:37:25 +08:00
Hiven
39ffc78d6d 用户模块--logo列表 2023-08-03 14:38:17 +08:00
Hiven
d06241b267 上传logo 2023-08-02 18:14:53 +08:00
Hiven
3388b446fd 上传完善 2023-08-02 11:30:27 +08:00
Hiven
d75bc8f2be 上传完善 2023-08-02 11:13:52 +08:00
laodaming
dab5320444 fix 2023-08-02 10:08:14 +08:00
Hiven
a0ed98d2d1 多文件上传--前端 2023-08-01 19:49:56 +08:00
Hiven
4a2a7822b7 多文件上传--后端 2023-08-01 18:15:55 +08:00
laodaming
c75e55a5cf fix 2023-08-01 10:30:57 +08:00
Hiven
1225a4efdc 退款 2023-07-28 19:03:36 +08:00
eson
719c41db00 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-07-28 13:10:32 +08:00
Hiven
335ecc1f41 分支合并 2023-07-28 11:20:12 +08:00
Hiven
334ea4aa3f 支付成功回调 2023-07-28 11:15:42 +08:00
laodaming
15b2a80f58 fix 2023-07-28 10:42:04 +08:00
laodaming
a158f562b6 fix 2023-07-28 10:37:23 +08:00
laodaming
164c737dd3 fix 2023-07-28 10:20:35 +08:00
laodaming
cf30fc2b88 fix 2023-07-27 17:07:54 +08:00
eson
42a965ab39 解决冲突 2023-07-27 16:54:57 +08:00
eson
d635811b5f Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-07-27 16:49:25 +08:00
eson
0ce35645b2 for save 2023-07-27 16:48:43 +08:00
laodaming
5532cd1a11 fix 2023-07-27 16:13:06 +08:00
laodaming
7297a1ef02 fix 2023-07-27 15:46:07 +08:00
laodaming
c375d17c07 fix 2023-07-27 14:10:41 +08:00
laodaming
8469253131 fix 2023-07-27 12:32:03 +08:00
529a02ac75 需要合并新代码 2023-07-27 00:03:38 +08:00
Hiven
dbf500813c 支付成功通知 2023-07-26 19:23:16 +08:00
laodaming
3deda93e7e fix 2023-07-26 16:47:53 +08:00
laodaming
999dc36e76 fix 2023-07-26 11:53:06 +08:00
Hiven
e05fcd8248 合并代码 2023-07-26 11:09:18 +08:00
Hiven
95baad761a 支付模块 2023-07-26 11:06:05 +08:00
laodaming
c7536d0fdb fix 2023-07-26 11:02:30 +08:00
laodaming
b0f598af68 fix 2023-07-25 18:04:01 +08:00
laodaming
d0fc91b61b fix 2023-07-25 17:41:38 +08:00
laodaming
9c72a8a4c9 fix 2023-07-25 17:10:50 +08:00
eson
a248c6cbeb TODO: Email Valid Url 2023-07-24 19:43:56 +08:00
eson
b43b5dbd59 fix 2023-07-24 19:17:02 +08:00
Hiven
05e5842992 Merge branch 'develop' into orders 2023-07-24 19:15:33 +08:00
laodaming
fc59840235 fix 2023-07-24 18:08:19 +08:00
Hiven
fd9e30ea74 订单列表--完善 2023-07-24 18:04:24 +08:00
laodaming
9d4bbbf80b fix 2023-07-24 18:02:30 +08:00
eson
a10e100364 save 2023-07-24 17:22:06 +08:00
laodaming
7e22f47a0d fix 2023-07-24 16:07:05 +08:00
eson
4c2f823178 可以登录 2023-07-24 12:32:05 +08:00
eson
98ae3e2106 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-24 12:18:43 +08:00
eson
900d5bf24b 修改表单 2023-07-24 12:18:27 +08:00
laodaming
1e2f6d8b7f fix 2023-07-24 10:30:08 +08:00
Hiven
6b3ad339c6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-21 18:17:43 +08:00
Hiven
a65efe5777 订单列表 2023-07-21 18:17:01 +08:00
laodaming
80a94de6df fix 2023-07-21 17:49:02 +08:00
laodaming
9400fcfaeb fix 2023-07-21 17:32:15 +08:00
laodaming
91131161c9 fix 2023-07-21 17:31:28 +08:00
laodaming
133af63064 fix 2023-07-21 17:20:46 +08:00
eson
efde0005f9 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-21 15:20:56 +08:00
eson
2825f8ae54 所有序列化, 都加入 BeforeLogic AfterLogic方法. 便于处理 w r的传递的参数 2023-07-21 15:20:18 +08:00
eson
373d5dca45 处理 有问题的handler 2023-07-21 14:20:21 +08:00
laodaming
0311bf82fc fix 2023-07-21 14:15:43 +08:00
laodaming
7e4708e8d8 fix 2023-07-21 14:07:42 +08:00
laodaming
985fc93d00 fix 2023-07-21 11:34:36 +08:00
eson
44a3666d68 修改tpl的参数传入问题 2023-07-21 11:24:26 +08:00
eson
728aeb17e2 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-21 10:28:36 +08:00
eson
65d0663d28 修复模板的问题 2023-07-21 10:28:17 +08:00
laodaming
421b63846a fix 2023-07-20 17:47:28 +08:00
laodaming
0e72027ff3 fix 2023-07-20 17:35:13 +08:00
eson
fd1a56c11a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-07-20 16:34:08 +08:00
eson
7c2762065c 修复模板 2023-07-20 16:32:41 +08:00
Hiven
903891000a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-20 15:55:49 +08:00
Hiven
b93c2d4708 调整 2023-07-20 15:55:01 +08:00
laodaming
8a1209c6f0 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-20 15:46:05 +08:00
laodaming
5ef3b40dfe fix 2023-07-20 15:45:58 +08:00
Hiven
810f4fbee7 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-07-20 15:44:06 +08:00
Hiven
92110e02a6 接口调整 2023-07-20 15:43:48 +08:00
laodaming
bf3d9f9631 fix 2023-07-20 15:27:17 +08:00
laodaming
9ff4468778 fix 2023-07-20 14:56:28 +08:00
Hiven
f2eec528ce 调整 2023-07-20 14:46:13 +08:00
Hiven
52d47f78ac 获取用户订单列表接口,以及工具方法 2023-07-20 14:43:59 +08:00
laodaming
4a2230d90c fix 2023-07-20 12:27:07 +08:00
laodaming
b8333ecaf8 fix 2023-07-20 11:08:35 +08:00
laodaming
3bd08c8c2b fix 2023-07-19 19:33:26 +08:00
laodaming
31132364ad fix 2023-07-19 19:29:50 +08:00
laodaming
db15103c93 fix 2023-07-19 16:13:06 +08:00
laodaming
bd127a7884 fix 2023-07-19 14:58:05 +08:00
laodaming
f09220cf2d fix 2023-07-19 14:01:53 +08:00