Commit Graph

10 Commits

Author SHA1 Message Date
d47dd5fa3b chenxinzhi 2024-10-18 15:54:07 +08:00
6f323d02f8 23333 2024-10-18 15:19:20 +08:00
8ba6e9c665 123 2024-10-18 14:40:29 +08:00
62d2a6dcc3 1 2024-10-18 14:01:05 +08:00
be93b02bb5 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
# Conflicts:
#	pages/Shopping-cart/productmain/productmain.vue
#	unpackage/dist/dev/mp-weixin/app.js
#	unpackage/dist/dev/mp-weixin/app.json
#	unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxss
2024-10-18 13:57:24 +08:00
d61915696c 商城页面样式修改 2024-10-18 13:56:23 +08:00
6983933400 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
# Conflicts:
#	pages.json
#	pages/store-home/main/main.vue
#	unpackage/dist/dev/mp-weixin/app.js
#	unpackage/dist/dev/mp-weixin/app.json
2024-10-18 13:36:34 +08:00
c2283ca65c wsdwe 2024-10-18 13:33:34 +08:00
a897991583 新增商品订单待支付,商品订单关闭 2024-10-17 23:36:06 +08:00
55d046a298 第一次提交,首页、购物车首页、我的首页、商城页面完成 2024-10-17 13:04:16 +08:00