|
|
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 |
|
|
|
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 |
|
