Commit Graph

47 Commits

Author SHA1 Message Date
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
6dd7e88be0 主分支冲突的提交 2024-11-09 23:05:41 +08:00
03ee367334 购物车 2024-11-09 23:05:00 +08:00
c9237d26d1 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu 2024-11-09 17:43:29 +08:00
50f9382e66 oooo 2024-11-09 17:43:22 +08:00
282999cca7 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu 2024-11-07 19:54:46 +08:00
2e59fdb8d6 地址信息完成 2024-11-07 19:54:27 +08:00
aa07f25e3b Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
o.O
2024-11-07 19:53:54 +08:00
42f2d8d6b5 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
# Conflicts:
#	unpackage/dist/dev/mp-weixin/project.config.json
2024-11-06 20:47:27 +08:00
195c74c473 地址信息 2024-11-06 20:46:53 +08:00
0584de58dc Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu 2024-11-06 20:43:48 +08:00
f566e3016f 用户订单 2024-11-06 20:43:16 +08:00
aa303ea9f6 合并提交 2024-11-06 20:01:33 +08:00
da0eb2b6c6 合并提交 2024-11-06 08:30:21 +08:00
4d897090b2 地址布局修改,分类类别修改 2024-11-06 08:26:18 +08:00
3f2a000aae 订单提交 2024-11-05 20:08:32 +08:00
720638b1a9 订单页面 2024-11-05 14:39:58 +08:00
4f7d1308d1 商品详情,待支付页面完成 2024-11-04 07:34:53 +08:00
9da2ec9681 id 2024-11-01 19:56:26 +08:00
df74b056e2 11.1 2024-11-01 13:17:08 +08:00
117330e15b 订单相关页面 2024-10-19 16:31:40 +08:00
bc491f8fb0 收货地址信息、购物车、商品详情,本地图片+样式完毕 2024-10-19 00:55:25 +08:00
92d29a2edd 文件路径更改 2024-10-18 22:49:08 +08:00
8f3374f5fc 大合集 2024-10-18 19:52:46 +08:00
d61915696c 商城页面样式修改 2024-10-18 13:56:23 +08:00
7369a153db 1111 2024-10-18 13:36:00 +08:00
a897991583 新增商品订单待支付,商品订单关闭 2024-10-17 23:36:06 +08:00
55d046a298 第一次提交,首页、购物车首页、我的首页、商城页面完成 2024-10-17 13:04:16 +08:00