sws
|
8110d6c05f
|
1.diy---header
|
2024-09-24 15:32:12 +08:00 |
|
sws
|
0f4039691b
|
1.diy---header
|
2024-09-24 15:10:26 +08:00 |
|
sws
|
78e74c3c8f
|
Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws
|
2024-09-24 14:17:28 +08:00 |
|
sws
|
b5f0b58ec3
|
1.diy---选项卡
|
2024-09-24 14:17:18 +08:00 |
于肖磊
|
c4aba4ee4f
|
修改页面显示
|
2024-09-24 10:17:40 +08:00 |
|
sws
|
8b2e33ba24
|
1.diy---选项卡
|
2024-09-23 13:39:26 +08:00 |
|
sws
|
2f23450ac8
|
Merge remote-tracking branch 'origin/dev-yxl' into dev-sws
|
2024-09-23 11:44:48 +08:00 |
|
sws
|
745948194f
|
Merge remote-tracking branch 'origin/dev-yxl' into dev-sws
|
2024-09-23 11:21:47 +08:00 |
|
sws
|
80fc0a243a
|
1.diy---选项卡
|
2024-09-23 11:20:02 +08:00 |
|
于肖磊
|
a1a7c99ead
|
秒杀逻辑修改
|
2024-09-20 18:15:23 +08:00 |
|
于肖磊
|
ad6d6ba97a
|
Merge branch 'dev-sws' into dev-yxl
|
2024-09-20 17:18:59 +08:00 |
|
sws
|
94184a6b00
|
1.diy---选项卡
|
2024-09-20 17:18:00 +08:00 |
|
于肖磊
|
37792a2ea2
|
Merge branch 'dev-sws' into dev-yxl
|
2024-09-20 16:54:10 +08:00 |
|
sws
|
68f19bbb0b
|
1.diy---选项卡
|
2024-09-20 16:53:30 +08:00 |
|
于肖磊
|
4e3a8bcd94
|
解决冲突
|
2024-09-20 16:52:40 +08:00 |
|
于肖磊
|
0661bea400
|
秒杀页面修改1
|
2024-09-20 16:50:45 +08:00 |
|
于肖磊
|
9ac3be58cd
|
秒杀页面修改
|
2024-09-20 16:19:17 +08:00 |
|
于肖磊
|
c855af7a68
|
秒杀修改
|
2024-09-20 16:16:40 +08:00 |
|
sws
|
c0235dc0ec
|
1.diy---选项卡
|
2024-09-20 15:57:04 +08:00 |
|
sws
|
b0d13dd213
|
1.diy---选项卡
|
2024-09-20 15:52:22 +08:00 |
|
sws
|
28eb3d484f
|
1.diy---选项卡
|
2024-09-20 12:00:57 +08:00 |
|
sws
|
0e083a2b36
|
1.diy---选项卡
|
2024-09-20 10:49:14 +08:00 |
|
sws
|
0c23eb497a
|
Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws
|
2024-09-20 10:42:43 +08:00 |
|
sws
|
6f061dcd37
|
1.diy---选项卡
|
2024-09-20 10:42:26 +08:00 |
|
于肖磊
|
b219deff3e
|
新增秒杀组件
|
2024-09-20 10:41:34 +08:00 |
|
sws
|
d1a7a33198
|
1.diy---选项卡
|
2024-09-20 10:16:05 +08:00 |
|
sws
|
4efca75ac1
|
Merge remote-tracking branch 'origin/dev-yxl' into dev-sws
|
2024-09-19 18:10:34 +08:00 |
|
sws
|
900908bc6c
|
1.diy---选项卡
|
2024-09-19 18:09:42 +08:00 |
|
于肖磊
|
c6337499b2
|
修改商品显示
|
2024-09-19 17:11:13 +08:00 |
|
于肖磊
|
3420d8dd1b
|
修改自定义组件的显示
|
2024-09-19 16:57:10 +08:00 |
|
于肖磊
|
cfffb723f1
|
自定义组件迁移
|
2024-09-19 16:46:09 +08:00 |
|
于肖磊
|
d5434fd92e
|
修改问题
|
2024-09-19 15:54:30 +08:00 |
|
于肖磊
|
4a400d9816
|
解决冲突
|
2024-09-19 15:32:39 +08:00 |
|
于肖磊
|
7ac30532d9
|
新增数据魔方处理
|
2024-09-19 15:31:18 +08:00 |
|
sws
|
c52df12043
|
1.diy---选项卡
|
2024-09-19 09:52:10 +08:00 |
|
sws
|
c0519ad200
|
1.diy---图片魔方
|
2024-09-18 17:26:18 +08:00 |
|
sws
|
4e5991030f
|
1.diy---图片魔方
|
2024-09-18 16:36:49 +08:00 |
|
sws
|
569d0a27b0
|
1.diy---图片魔方
|
2024-09-14 17:41:17 +08:00 |
|
sws
|
b48d530096
|
Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws
|
2024-09-14 14:15:21 +08:00 |
|
sws
|
28018d6b48
|
1.diy---公告
|
2024-09-14 14:15:08 +08:00 |
|
于肖磊
|
ae180d00d1
|
Merge branch 'dev-sws' into dev-yxl
|
2024-09-13 16:48:15 +08:00 |
|
于肖磊
|
0f53f0ff8c
|
格式化代码
|
2024-09-13 16:47:46 +08:00 |
|
sws
|
ec1788a022
|
Merge remote-tracking branch 'origin/dev-yxl' into dev-sws
|
2024-09-13 15:12:05 +08:00 |
|
sws
|
231eef0697
|
1.diy---优惠券接口联调
|
2024-09-13 15:11:58 +08:00 |
|
于肖磊
|
d1bb6c3715
|
修改商品选项卡的显示
|
2024-09-13 15:01:05 +08:00 |
|
于肖磊
|
aef6fbef45
|
新增商品选项卡显示1
|
2024-09-13 14:54:48 +08:00 |
|
于肖磊
|
83069fd9b2
|
新增商品选项卡显示
|
2024-09-13 14:54:39 +08:00 |
|
于肖磊
|
73994859ab
|
修改页面显示
|
2024-09-13 14:14:36 +08:00 |
|
sws
|
935ce453ed
|
1.diy---优惠券接口联调
|
2024-09-13 10:51:35 +08:00 |
|
sws
|
bd260bd946
|
1.diy---优惠券接口联调
|
2024-09-13 10:41:32 +08:00 |
|
sws
|
d42944d658
|
1.diy---优惠券接口联调
|
2024-09-13 09:46:35 +08:00 |
|
sws
|
07cdc724c8
|
Merge remote-tracking branch 'origin/dev-yxl' into dev-sws
|
2024-09-12 18:51:58 +08:00 |
|
sws
|
0645649733
|
1.diy---优惠券接口联调
|
2024-09-12 18:51:39 +08:00 |
|
于肖磊
|
80b6e22299
|
修改显示逻辑
|
2024-09-12 18:48:48 +08:00 |
|
于肖磊
|
2a9d9d3a27
|
Merge branch 'dev-sws' into dev-yxl
|
2024-09-12 17:51:23 +08:00 |
|
于肖磊
|
7c47982882
|
修改页面显示
|
2024-09-12 17:50:46 +08:00 |
|
sws
|
88d66f5573
|
Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws
|
2024-09-12 17:45:59 +08:00 |
|
sws
|
442d2ff4a3
|
1.diy---赋值优化为this.setData
|
2024-09-12 17:45:37 +08:00 |
|
sws
|
e15814ec64
|
1.diy---赋值优化为this.setData
|
2024-09-12 17:34:08 +08:00 |
|
于肖磊
|
03733438ab
|
修改显示效果
|
2024-09-12 16:24:48 +08:00 |
|
sws
|
ef9d478172
|
1.diy---- 热区
|
2024-09-12 15:25:01 +08:00 |
|
sws
|
3ca555cc2f
|
Merge remote-tracking branch 'origin/dev-yxl' into dev-sws
|
2024-09-12 15:08:44 +08:00 |
|
sws
|
9b02ca78bd
|
1.diy---- 热区
|
2024-09-12 15:08:33 +08:00 |
|
于肖磊
|
50e82a7d33
|
修改传递参数为setData
|
2024-09-12 14:27:14 +08:00 |
|
于肖磊
|
297ab5dd32
|
Merge branch 'dev-sws' into dev-yxl
|
2024-09-12 14:13:56 +08:00 |
|
于肖磊
|
3d7058406b
|
修改视频播放逻辑
|
2024-09-12 14:13:16 +08:00 |
|
sws
|
25a84d3c4e
|
Merge remote-tracking branch 'origin/dev-yxl' into dev-sws
|
2024-09-12 11:29:51 +08:00 |
|
sws
|
5c40f01c37
|
1.diy---- 热区
|
2024-09-12 11:26:33 +08:00 |
|
于肖磊
|
719bbd1e7b
|
Merge branch 'dev-sws' into dev-yxl
|
2024-09-12 11:18:34 +08:00 |
|
于肖磊
|
6f3b3174ad
|
添加视频播放逻辑
|
2024-09-12 11:18:01 +08:00 |
|
sws
|
2afe15ca05
|
1.diy---- 热区
|
2024-09-12 11:08:22 +08:00 |
|
于肖磊
|
6ecd4bcbe2
|
Merge branch 'dev-sws' into dev-yxl
|
2024-09-12 10:37:29 +08:00 |
|
sws
|
1967d1184d
|
1.diy---- 热区
|
2024-09-11 18:52:08 +08:00 |
|
于肖磊
|
6a0da4284d
|
修改搜索显示
|
2024-09-11 18:51:34 +08:00 |
|
sws
|
adfe8bbe8e
|
1.diy---- 热区
|
2024-09-11 17:47:12 +08:00 |
|
sws
|
f177d3a762
|
1.diy---- 热区
|
2024-09-11 17:43:45 +08:00 |
|
sws
|
e755ec2e0a
|
1.diy---- 热区
|
2024-09-11 17:42:58 +08:00 |
|
sws
|
76d30e9317
|
1.diy---- 热区
|
2024-09-11 16:23:23 +08:00 |
|
sws
|
92dbf3bd39
|
1.diy---- 文章选项卡开发
|
2024-09-11 16:22:36 +08:00 |
|
sws
|
b0ef9665fc
|
1.diy---- 文章选项卡开发
|
2024-09-11 16:13:27 +08:00 |
|
sws
|
40d462cd0e
|
1.diy---- 文章选项卡开发
|
2024-09-11 15:49:55 +08:00 |
|
sws
|
fc608f86ae
|
1.diy---- 文章选项卡开发
|
2024-09-11 15:32:58 +08:00 |
|
sws
|
5eca36f886
|
1.diy---- 文章选项卡开发
|
2024-09-11 15:24:51 +08:00 |
|
sws
|
8191054ab6
|
1.diy---- 文章列表开发
|
2024-09-11 10:57:27 +08:00 |
|
sws
|
1ee1844a2f
|
Merge remote-tracking branch 'origin/dev-yxl' into dev-sws
|
2024-09-11 09:39:12 +08:00 |
|
sws
|
73214732bc
|
1.diy---- 文章列表开发
|
2024-09-11 09:39:02 +08:00 |
|
于肖磊
|
bef93af5c8
|
轮播图显示效果
|
2024-09-10 18:21:03 +08:00 |
|
于肖磊
|
ed670fca51
|
Merge branch 'dev-sws' into dev-yxl
|
2024-09-10 17:55:15 +08:00 |
|
于肖磊
|
3046166540
|
修改轮播显示
|
2024-09-10 17:54:27 +08:00 |
|
sws
|
3ff7d082c9
|
1.diy---- 文章列表开发
|
2024-09-10 17:54:16 +08:00 |
|
sws
|
4104e2bc7f
|
1.diy---- 文章列表开发
|
2024-09-10 16:39:36 +08:00 |
|
sws
|
9fe526066c
|
Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws
|
2024-09-10 16:35:32 +08:00 |
|
sws
|
6bb32b020f
|
1.diy---- 文章列表开发
|
2024-09-10 16:35:24 +08:00 |
|
于肖磊
|
fe18d85df6
|
新增轮播图
|
2024-09-10 16:35:09 +08:00 |
|
于肖磊
|
f071982663
|
新增轮播图
|
2024-09-10 16:34:53 +08:00 |
|
sws
|
ae16b3d2d5
|
1.diy---- 文章列表开发
|
2024-09-10 16:27:11 +08:00 |
|
sws
|
9f479fed11
|
1.diy---- 文章列表开发
|
2024-09-10 16:20:00 +08:00 |
|
sws
|
8d068fdf19
|
1.diy---- 文章列表开发
|
2024-09-10 16:15:09 +08:00 |
|
sws
|
fb8761f309
|
1.diy---- 视频开发
|
2024-09-10 14:19:36 +08:00 |
|
sws
|
57e19dcd0e
|
Merge remote-tracking branch 'origin/dev-yxl' into dev-sws
|
2024-09-10 09:41:58 +08:00 |
|
sws
|
a449a4c7f3
|
1.diy---- 用户信息开发
|
2024-09-10 09:41:47 +08:00 |
|
于肖磊
|
7d023c9af7
|
新增辅助空白
|
2024-09-10 09:39:53 +08:00 |
|
于肖磊
|
c09f13190f
|
新增辅助空白显示
|
2024-09-10 09:39:40 +08:00 |
|
sws
|
9149312b78
|
Merge remote-tracking branch 'origin/dev-yxl' into dev-sws
|
2024-09-09 18:41:16 +08:00 |
|
sws
|
853b58be20
|
1.diy---- 富文本开发
|
2024-09-09 18:35:29 +08:00 |
|
sws
|
6fc9d759f4
|
1.diy---- 富文本开发
|
2024-09-09 18:33:28 +08:00 |
|
sws
|
dae75da270
|
1.diy---- 富文本开发
|
2024-09-09 18:25:40 +08:00 |
|
于肖磊
|
9580e4f3c9
|
修改文本标题显示逻辑
|
2024-09-09 18:11:36 +08:00 |
|
sws
|
ac46edf680
|
1.diy---- 富文本开发
|
2024-09-09 18:00:35 +08:00 |
|
sws
|
cfb55052e9
|
Merge remote-tracking branch 'origin/dev-yxl' into dev-sws
|
2024-09-09 17:49:53 +08:00 |
|
于肖磊
|
da6faba9cb
|
解决冲突
|
2024-09-09 17:46:08 +08:00 |
|
sws
|
03bfb4c0b9
|
1.diy---- footer开发
|
2024-09-09 17:44:33 +08:00 |
|
sws
|
6c06dd50d0
|
1.diy---- footer开发
|
2024-09-09 17:29:06 +08:00 |
|
于肖磊
|
58acab4f4f
|
新增文本标题
|
2024-09-09 16:50:56 +08:00 |
|
sws
|
38c8a4ce35
|
1.diy开发
|
2024-09-09 16:50:45 +08:00 |
|
于肖磊
|
a159e2fb28
|
修改跳转地址
|
2024-09-09 16:15:22 +08:00 |
|
于肖磊
|
1725ee69ce
|
新增悬浮按钮
|
2024-09-09 15:48:24 +08:00 |
|
sws
|
e443ecd02d
|
1.解决报错
|
2024-09-09 15:20:59 +08:00 |
|
sws
|
e6504326ee
|
Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws
|
2024-09-09 15:17:40 +08:00 |
|
sws
|
206cabfd3b
|
进销存:
1.diy装修渲染布局
sws-2024-09-09
|
2024-09-09 15:16:38 +08:00 |
|
于肖磊
|
0120ba46ad
|
新增悬浮按钮
|
2024-09-09 15:09:54 +08:00 |
|
sws
|
dc91746f84
|
进销存:
1.diy装修渲染布局
sws-2024-09-09
|
2024-09-09 14:59:10 +08:00 |
|
sws
|
709e8aa1c6
|
进销存:
1.diy装修渲染布局
sws-2024-09-05
|
2024-09-06 15:28:48 +08:00 |
|
sws
|
742a7c5008
|
进销存:
1.diy装修渲染布局
sws-2024-09-05
|
2024-09-05 17:31:04 +08:00 |