Commit Graph

77 Commits

Author SHA1 Message Date
df0b3cc4f8 jjj 2025-02-07 10:07:22 +08:00
d4c6a1cfa4 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
# Conflicts:
#	package-lock.json
2025-01-02 11:20:26 +08:00
2073904697 hello 2025-01-02 11:18:59 +08:00
2be612dc5e hello 2025-01-02 11:13:50 +08:00
69ea204d48 给后端使用的版本 2025-01-02 10:46:42 +08:00
20ac0825b0 给后端使用的版本 2025-01-02 10:12:11 +08:00
f1a76acdff 给后端使用的版本 2025-01-02 10:07:36 +08:00
1ef72442d8 商城的实体类商品业务流程全部完成,这一版是等测试版本 2024-12-21 21:23:49 +08:00
7336a57f67 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu 2024-12-20 19:41:20 +08:00
e1ec6146fa 添加了订单状态页面,接口部分完成连接 2024-12-20 19:41:09 +08:00
ec281332f2 Merge remote-tracking branch 'origin/master' 2024-12-20 19:40:11 +08:00
cc4a9248cb 001 2024-12-20 19:39:50 +08:00
9792a3fb8d Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu 2024-12-19 15:54:50 +08:00
9246a0686c 购物车完成,解决计算精度问题 2024-12-19 15:54:40 +08:00
547320e0c3 Merge remote-tracking branch 'origin/master' 2024-12-19 15:52:32 +08:00
836f6e80f3 001 2024-12-19 15:52:16 +08:00
983276be5c Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu 2024-12-18 19:40:56 +08:00
6a0aad3fdf 购物车修改 2024-12-18 19:40:47 +08:00
7f3f7e14fb 001 2024-12-18 19:37:51 +08:00
45f43ae9c0 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu 2024-12-17 11:09:45 +08:00
c89f1f8d38 实体类商品接入微信支付,修改了字体 2024-12-17 11:09:39 +08:00
e4c7346713 001 2024-12-17 11:09:21 +08:00
7937827ce5 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
# Conflicts:
#	pages.json
2024-12-17 11:04:11 +08:00
a5efa6d1d2 Merge remote-tracking branch 'origin/master' 2024-12-17 11:01:54 +08:00
a0726463bc 001 2024-12-17 10:59:51 +08:00
d8282a52cd 实体类商品接入微信支付,修改了字体 2024-12-17 10:52:57 +08:00
83b7f8264f Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
# Conflicts:
#	unpackage/dist/dev/mp-weixin/pages/workshop/index/index.js
#	unpackage/dist/dev/mp-weixin/pages/workshop/index/index.wxml
2024-12-12 10:17:54 +08:00
a8095be224 001 2024-12-12 10:17:33 +08:00
8b8342b0b2 压缩整包 2024-12-12 10:14:44 +08:00
f8fb16c4dd 压缩整包 2024-12-12 10:14:25 +08:00
4df55ee87a 非遗工坊首页、服务类展示 2024-12-10 15:05:57 +08:00
9b581df06c Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
# Conflicts:
#	pages.json
#	unpackage/dist/dev/mp-weixin/app.js
#	unpackage/dist/dev/mp-weixin/app.json
#	unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js
2024-12-10 15:04:45 +08:00
a5becf53ac 非遗工坊首页、服务类展示 2024-12-10 15:04:13 +08:00
ea5855a3ca 001 2024-12-10 15:02:06 +08:00
6382845f8b Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu 2024-12-04 13:49:30 +08:00
7d2f662690 12 2024-12-04 13:49:24 +08:00
c91a5e4a0f 001 2024-12-04 13:47:36 +08:00
c162646791 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
# Conflicts:
#	unpackage/dist/dev/mp-weixin/app.js
#	unpackage/dist/dev/mp-weixin/app.json
2024-12-04 13:46:55 +08:00
6f1f5fa550 123 2024-12-04 13:45:39 +08:00
cbb91c63dc 123 2024-12-04 13:44:32 +08:00
e2a57e1490 123 2024-12-04 13:33:43 +08:00
34570c4996 123 2024-12-04 11:16:42 +08:00
3f60e6eff1 001 2024-12-04 10:39:41 +08:00
ac248217c3 Merge remote-tracking branch 'origin/master' 2024-12-02 11:38:04 +08:00
8685288021 12 2024-12-02 11:36:40 +08:00
70a4accda5 001 2024-12-02 11:01:34 +08:00
99d45bd090 123 2024-12-02 10:35:41 +08:00
0b35b8492b 批量购买,购物车,订单详情 2024-11-15 14:22:52 +08:00
aed8fae442 购物车、批量购买完成,修改了单个商品购买的逻辑 2024-11-11 08:33:32 +08:00
a85d2e6e47 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
# Conflicts:
#	pages.json
#	unpackage/dist/dev/mp-weixin/app.js
#	unpackage/dist/dev/mp-weixin/app.json
2024-11-09 23:06:20 +08:00