Commit Graph

140 Commits

Author SHA1 Message Date
9d3aa0c4c4 hello 2025-02-25 14:06:07 +08:00
683b01ed30 hello 2025-02-24 15:24:22 +08:00
e4b0f779f9 hello 2025-02-24 15:17:43 +08:00
ffdb535fec 完成了服务类商品弹窗 2025-02-24 09:34:57 +08:00
22e0acfd08 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu 2025-02-20 11:52:54 +08:00
51480a0dbf 333 2025-02-20 11:52:50 +08:00
a8977e708d 2.19 2025-02-19 12:06:34 +08:00
d800c5c58e hello 2025-02-19 10:53:49 +08:00
dca49ff661 Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
# Conflicts:
#	pages.json
2025-02-18 14:46:34 +08:00
df0b3cc4f8 jjj 2025-02-07 10:07:22 +08:00
370cc4b6bc 删除了没用的,增加地址定位,优化常规类商品详情和订单 2025-01-13 14:38:48 +08:00
0fd87acc48 服务类商品、购物车样式 2025-01-09 10:50:05 +08:00
8dd0c2617f Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
# Conflicts:
#	node_modules/@babel/runtime/package.json
#	node_modules/complex.js/package.json
#	node_modules/decimal.js/package.json
#	node_modules/escape-latex/package.json
#	node_modules/fraction.js/package.json
#	node_modules/javascript-natural-sort/package.json
#	node_modules/mathjs/package.json
#	node_modules/regenerator-runtime/package.json
#	node_modules/seedrandom/package.json
#	node_modules/tiny-emitter/package.json
#	node_modules/typed-function/package.json
2025-01-02 11:25:14 +08:00
54d0379258 给后端使用的版本 2025-01-02 11:24:54 +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