Commit Graph

615 Commits

Author SHA1 Message Date
eson
d9d16753c0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-20 13:25:40 +08:00
eson
48a63dad45 logo search 2023-10-20 13:25:35 +08:00
laodaming
4973687e07 fix 2023-10-20 11:47:46 +08:00
laodaming
0b274c4755 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-20 11:46:58 +08:00
laodaming
82f1e3984f fix 2023-10-20 11:46:51 +08:00
eson
cd4ca1c1e0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-20 11:42:03 +08:00
eson
4f07c86e7e logo search 2023-10-20 11:41:50 +08:00
laodaming
4aaf1a1587 fix 2023-10-20 10:59:36 +08:00
laodaming
0c3fe73ce2 fix 2023-10-20 10:54:37 +08:00
laodaming
1a9f117530 fix 2023-10-20 10:53:37 +08:00
laodaming
f739f7bc0e fix 2023-10-20 10:47:24 +08:00
laodaming
ff1698a49c fix 2023-10-20 10:33:33 +08:00
laodaming
dc959ec49b fix 2023-10-19 18:42:28 +08:00
laodaming
ee37c10399 fix 2023-10-19 11:59:10 +08:00
laodaming
05ec312127 fix 2023-10-19 11:51:49 +08:00
laodaming
bbf5cb03ad fix 2023-10-19 11:21:25 +08:00
eson
b53313811b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/debug-token 2023-10-18 10:23:12 +08:00
momo
bcf9dd8ab9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-17 18:32:51 +08:00
momo
6ae2cce870 feat:新增订单发票,下单地址调整 2023-10-17 18:32:43 +08:00
eson
e00dc9f3cf debug toekn 2023-10-17 17:25:48 +08:00
laodaming
c79a1aab49 fix 2023-10-17 16:19:44 +08:00
laodaming
0c5a5a466f fix 2023-10-17 15:56:48 +08:00
laodaming
68a31236b3 整合目前新的详情接口 2023-10-17 15:40:44 +08:00
laodaming
ea1335607a 整合目前新的详情接口 2023-10-17 15:33:46 +08:00
laodaming
77caf2e631 fix 2023-10-16 18:54:23 +08:00
eson
8af873ac42 fix 2023-10-16 15:19:25 +08:00
laodaming
23b2eded5a fix 2023-10-13 18:17:31 +08:00
laodaming
f65ff33e19 fix 2023-10-11 19:12:45 +08:00
laodaming
2e4be2800f fix 2023-10-11 18:54:14 +08:00
eson
9bb5f1b2dd contact us 2023-10-11 12:23:41 +08:00
laodaming
ce31946e53 fix 2023-10-10 15:09:20 +08:00
laodaming
8f92776103 fix 2023-10-10 15:08:41 +08:00
laodaming
8593eb2dd3 fix 2023-10-10 14:59:00 +08:00
laodaming
0ce7cf8f17 fix 2023-10-09 17:56:28 +08:00
momo
17dc892c07 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 18:38:45 +08:00
momo
634f1b9584 fix:新增订单关闭 2023-10-08 18:38:39 +08:00
laodaming
8d4901cdcd fix 2023-10-08 18:00:21 +08:00
laodaming
4dce0d7087 fix 2023-10-08 17:04:37 +08:00
momo
88f407edb9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 15:48:34 +08:00
momo
6dc591283e fix:合图调整 2023-10-08 15:48:22 +08:00
laodaming
ddfe91a42e 新增获取收藏列表接口 2023-10-08 15:29:03 +08:00
eson
bdf0dd7605 info address default 2023-10-08 12:18:58 +08:00
laodaming
b93691a0bf 增加收藏页的添加和删除接口 2023-10-08 12:04:00 +08:00
laodaming
0fde3c8d91 fix 2023-10-08 10:33:25 +08:00
laodaming
f933fcac69 fix 2023-10-08 10:31:42 +08:00
momo
3f78cfd824 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 18:37:04 +08:00
momo
ae2c41364f fix:删除订单 2023-10-07 18:36:59 +08:00
laodaming
0350315354 fix 2023-10-07 18:09:17 +08:00
laodaming
d4867a7089 删除产品服务不用的接口 2023-10-07 17:42:34 +08:00
laodaming
e46ac8ff63 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 17:08:01 +08:00
laodaming
734c4e9102 fix 2023-10-07 17:07:53 +08:00
eson
da162f859e Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-07 16:59:56 +08:00
eson
586e02c842 info address used 2023-10-07 16:59:52 +08:00
laodaming
560bc9a7d2 fix 2023-10-07 16:58:22 +08:00
laodaming
87dd183279 fix 2023-10-07 14:24:57 +08:00
momo
ce35498c7e fix调整 2023-10-07 13:41:06 +08:00
momo
c2f61fc61a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 11:32:16 +08:00
momo
122d558765 fix:合图调整 2023-10-07 11:32:11 +08:00
laodaming
aafcbfcf50 fix 2023-10-07 10:43:33 +08:00
eson
f7d0a6422e info address used 2023-09-28 17:06:38 +08:00
eson
db0c8a2532 info get profile 2023-09-28 15:26:02 +08:00
eson
6072341a2b info get profile 2023-09-28 14:42:26 +08:00
eson
91bc3310a1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-28 13:25:12 +08:00
eson
d92c77766c info get profile 2023-09-28 13:25:06 +08:00
laodaming
fbeebabf27 fix 2023-09-27 17:52:03 +08:00
eson
2eadff7876 info get profile 2023-09-27 11:30:17 +08:00
eson
b571b1b31c info get profile 2023-09-26 17:57:54 +08:00
eson
54613f5be0 info get profile 2023-09-26 17:45:07 +08:00
eson
194dc50eaa info get profile 2023-09-26 17:20:44 +08:00
eson
93b0cadea9 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 17:16:15 +08:00
eson
f387e46977 info get profile 2023-09-26 17:16:10 +08:00
laodaming
821cbb8879 fix 2023-09-26 15:28:17 +08:00
eson
4dfeebeaed Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 15:02:13 +08:00
eson
31debda97f info update profile 2023-09-26 15:02:09 +08:00
laodaming
d45a0eb680 fix 2023-09-26 14:23:09 +08:00
eson
c42c37f65e info address 2023-09-26 12:24:09 +08:00
eson
79120e1fd9 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 12:08:57 +08:00
eson
6a41be4f3a info address 2023-09-26 12:08:51 +08:00
laodaming
01cc115a60 fix 2023-09-26 11:40:27 +08:00
laodaming
f615e4fe77 fix 2023-09-26 11:10:41 +08:00
laodaming
916e050585 fix 2023-09-26 10:54:11 +08:00
eson
5b3e3f047e info address 2023-09-26 10:45:53 +08:00
b03e2d020f info address 2023-09-26 00:02:50 +08:00
eson
cef9dfa34d info 2023-09-25 18:42:45 +08:00
eson
c1203e8989 info 2023-09-25 16:01:28 +08:00
eson
8fe6e8be74 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-25 15:58:40 +08:00
eson
f2a0c7608e info 2023-09-25 15:58:33 +08:00
laodaming
c34811df83 fix 2023-09-22 17:21:40 +08:00
laodaming
2054b9ec97 fix 2023-09-22 17:04:01 +08:00
momo
c2723861fa fix:支付 2023-09-22 12:12:33 +08:00
momo
0f7514b5bd fix:支付 2023-09-22 11:00:54 +08:00
momo
fead7c6ae9 fix:支付 2023-09-22 10:39:02 +08:00
momo
046c31c898 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-21 19:02:05 +08:00
momo
be786a4d4c fix:支付 2023-09-21 19:01:48 +08:00
laodaming
e87dd4f800 fix 2023-09-21 15:40:56 +08:00
laodaming
affd0dc9bb fix 2023-09-21 14:41:20 +08:00
momo
f10e556a0a Merge branch 'feature/mhw-v1.01' into develop 2023-09-21 14:27:47 +08:00
momo
30ae7eb814 fix:订单详情 2023-09-21 12:11:15 +08:00
laodaming
7dbf909a9a fix 2023-09-21 11:42:31 +08:00
laodaming
37fc648025 Merge branch 'develop' into feature/mhw-v1.01 2023-09-21 11:15:56 +08:00
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