67 Commits

Author SHA1 Message Date
赵毅
62442b4798 feat : 合并代码 2025-07-18 16:51:59 +08:00
4c379ec7e5 feat:新增物品详情注释 2025-07-18 16:47:54 +08:00
d803aeff4c Merge branch 'feature/yi'
# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/kitchen/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/reservation/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map
#	unpackage/dist/dev/mp-weixin/project.private.config.json
2025-07-18 16:36:30 +08:00
41ea48b154 feat:支付问题 2025-07-18 15:55:39 +08:00
赵毅
15d42c2df1 feat : 合并代码 2025-07-18 10:48:02 +08:00
赵毅
f8c37680a4 style : 优化商城首页左侧菜单栏的选中样式 2025-07-18 10:41:08 +08:00
赵毅
dfbfb0440e fix : 修改商城首页商品加入购物车时的购物车的数量显示问题 2025-07-18 10:16:02 +08:00
3a5ff55440 feat: 合并代码解决冲突 2025-07-18 09:58:20 +08:00
29dfab5b6d feat: 收货地址相关接口调用And地区选择器组件bug修复 2025-07-18 09:53:16 +08:00
53d506c084 feat:调用购物车 默认地址接口 修改商品详情bug 2025-07-17 18:31:40 +08:00
赵毅
fdd5bbfb3b feat : 对接商城首页接口 2025-07-17 18:25:20 +08:00
b8aacb162f feat:商品信息购物车数量问题 2025-07-17 15:34:49 +08:00
fb7bb4aa9f feat:调用购物车 商品接口-v2 2025-07-17 10:18:22 +08:00
2c3b890ef1 feat:购物车地址页完成 2025-07-15 17:35:24 +08:00
e30d9cf0f8 feat:新增购物车页 2025-07-15 16:37:46 +08:00
c2a2f16b55 合并处理-v1 2025-07-09 11:09:37 +08:00
a6f89f0a9a 电商完成 2025-07-09 10:15:30 +08:00