Commit Graph

807 Commits (17bd2b7e777eaa68ebe7bd81f5d8131c4b00ceed)

Author SHA1 Message Date
gongfuxiang dc6d38036a 用户位置选择 2024-09-28 13:53:23 +08:00
gongfuxiang 25d59872b1 位置选择组件优化 2024-09-28 12:15:54 +08:00
sws 2463513a01 1.diy---置顶开发 2024-09-28 10:16:32 +08:00
gongfuxiang 243c58d505 用户位置选择 2024-09-28 10:11:19 +08:00
gongfuxiang f62631eb11 页面diy 2024-09-27 20:18:34 +08:00
sws ee9c62d321 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-27 18:56:57 +08:00
于肖磊 732c64f4bf 修改显示 2024-09-27 18:56:48 +08:00
sws f748995bc5 1.diy---置顶开发 2024-09-27 18:53:04 +08:00
sws e9c9dacd5b Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-27 18:46:04 +08:00
于肖磊 272bd02721 修改flex显示逻辑 2024-09-27 18:39:58 +08:00
sws 0cef6bfbb2 1.diy---置顶开发 2024-09-27 18:37:12 +08:00
于肖磊 dc296be817 修改搜索的显示逻辑 2024-09-27 18:36:12 +08:00
于肖磊 402eff04e4 修改商品添加逻辑 2024-09-27 18:12:10 +08:00
于肖磊 47d5c0407d Merge branch 'dev-sws' into dev-yxl 2024-09-27 18:03:53 +08:00
sws ba239c95fa 1.diy---置顶开发 2024-09-27 17:58:51 +08:00
于肖磊 e12fbb3250 Merge branch 'dev' into dev-yxl 2024-09-27 17:51:34 +08:00
于肖磊 9415b557c9 修改商品显示 2024-09-27 17:51:03 +08:00
于肖磊 51091feb54 修改输入框边线为白色的时候,默认给一个borderborder 2024-09-27 17:41:12 +08:00
于肖磊 ac17f63d02 修改输入框逻辑显示 2024-09-27 17:35:57 +08:00
于肖磊 474aba4a2e Merge branch 'dev-sws' into dev-yxl 2024-09-27 17:02:22 +08:00
于肖磊 a6eb0b9b21 修改输入框显示问题 2024-09-27 16:59:50 +08:00
sws 4f44c73939 1.diy---置顶开发 2024-09-27 13:38:38 +08:00
gongfuxiang 2d073bff0e 新增扫码协议处理,底部菜单实时更新 2024-09-27 11:22:36 +08:00
sws 358f305b8f Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-27 10:52:06 +08:00
sws 32530c1bf6 Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-27 10:51:57 +08:00
sws d3b6c8c160 1.diy---置顶开发 2024-09-27 10:51:46 +08:00
于肖磊 97d3e18307 Merge branch 'dev' into dev-yxl 2024-09-27 09:32:59 +08:00
gongfuxiang 91dfe59177 弹窗组件适配底部菜单 2024-09-27 01:04:54 +08:00
gongfuxiang bf04bcd934 购买弹窗适配底部菜单 2024-09-27 00:07:25 +08:00
gongfuxiang 3d87f143da 返回处理 2024-09-26 23:30:08 +08:00
gongfuxiang dd38e239fc merge 2024-09-26 22:07:08 +08:00
gongfuxiang 8ebbc04a84 底部菜单 2024-09-26 20:16:42 +08:00
于肖磊 32c8aa81e3 修改顶部图片不显示 2024-09-26 18:58:27 +08:00
sws 6f436bb6ca 1.diy---置顶开发 2024-09-26 18:53:54 +08:00
sws 834fa81488 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-26 18:17:51 +08:00
sws cb473644f6 1.diy---置顶开发 2024-09-26 18:17:42 +08:00
于肖磊 e2407729e2 修改diy页面显示 2024-09-26 18:17:32 +08:00
sws 92cb458637 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-26 18:10:19 +08:00
sws 59b5278578 Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-26 18:10:09 +08:00
于肖磊 21a7dabf73 修改显示 2024-09-26 18:09:56 +08:00
sws 0b28a40eae 1.diy---置顶开发 2024-09-26 18:09:42 +08:00
gongfuxiang 7ec3d16e14 底部菜单适配购物车页面 2024-09-26 16:51:45 +08:00
sws 0b679046dc 1.diy---置顶开发 2024-09-26 16:43:27 +08:00
sws f8e5eed6cf 1.diy---置顶开发 2024-09-26 16:28:19 +08:00
于肖磊 a316771992 Merge branch 'dev-sws' into dev-yxl 2024-09-26 16:00:59 +08:00
于肖磊 987b8d0c59 修改页面显示 2024-09-26 16:00:26 +08:00
gongfuxiang 444a585e2b cart 2024-09-26 15:58:55 +08:00
gongfuxiang 9cb0803d3c 门店购物车 2024-09-26 14:59:53 +08:00
sws ffd3174ca9 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-26 14:58:33 +08:00
sws 3915794ff0 1.diy---置顶开发 2024-09-26 14:57:24 +08:00
gongfuxiang 2e8b810df8 底部菜单切换 2024-09-26 14:47:02 +08:00
于肖磊 6e156b8350 修改显示 2024-09-26 14:43:52 +08:00
gongfuxiang b00a91b5bf Merge branch 'dev-sws' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-26 14:28:57 +08:00
gongfuxiang aeb702c1b6 diy菜单 2024-09-26 14:28:07 +08:00
sws 3227ab2fca Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-26 14:27:42 +08:00
sws a989fd7310 1.diy---置顶开发 2024-09-26 14:27:31 +08:00
于肖磊 71aca9c056 修改页面显示逻辑 2024-09-26 11:32:11 +08:00
sws 8fbf55ad7c 1.diy---置顶开发 2024-09-26 11:21:03 +08:00
sws ca06132453 1.diy---置顶开发 2024-09-26 11:18:29 +08:00
于肖磊 5da270ba8f Merge branch 'dev-sws' into dev-yxl 2024-09-26 11:12:34 +08:00
sws 7f57d7d3e8 1.diy---代码优化 2024-09-26 11:06:38 +08:00
sws 30753d11f6 1.diy---代码优化 2024-09-26 11:05:33 +08:00
于肖磊 5604038744 修改字段显示 2024-09-26 11:03:45 +08:00
sws 0e7774761e 1.diy---代码优化 2024-09-26 10:52:50 +08:00
sws e48c8182c9 1.diy---代码优化 2024-09-26 10:50:30 +08:00
sws 1595447515 1.diy---代码优化 2024-09-26 10:20:11 +08:00
sws 63bfe88b42 1.diy---代码优化 2024-09-26 10:16:10 +08:00
sws 2b1ad42974 1.diy---代码优化 2024-09-26 10:14:41 +08:00
sws dc4a5de169 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-26 10:07:02 +08:00
sws 90bef1a766 1.diy---代码优化 2024-09-26 10:06:49 +08:00
于肖磊 8edcfe4ecb 修改参数传递 2024-09-26 10:06:20 +08:00
于肖磊 e9b03b307f 修改组件传参数 2024-09-26 09:59:23 +08:00
gongfuxiang 35a6a514fe diy底部菜单优化 2024-09-26 02:08:49 +08:00
gongfuxiang df6378e379 diy底部菜单优化 2024-09-26 02:06:13 +08:00
gongfuxiang 327ada1c6c diy页面开发 2024-09-26 01:31:08 +08:00
gongfuxiang 20710d8b23 细节优化 2024-09-26 00:23:30 +08:00
gongfuxiang ca0e078c7d 底部菜单 2024-09-25 21:02:06 +08:00
gongfuxiang 99be8e206b 底部菜单 2024-09-25 19:23:57 +08:00
gongfuxiang ea9697e061 diy merge 2024-09-25 19:18:53 +08:00
gongfuxiang 6eea3f4285 diy 2024-09-25 19:16:14 +08:00
sws 8fcfa3ef3b Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-25 18:46:59 +08:00
sws bd5578e5d1 1.diy---代码优化 2024-09-25 18:46:50 +08:00
sws 3b95bb173b 1.diy---代码优化 2024-09-25 18:00:16 +08:00
sws 2a494f5bc7 1.diy---代码优化 2024-09-25 17:09:55 +08:00
于肖磊 30c17b784e 修改组件调用 2024-09-25 16:48:39 +08:00
于肖磊 43692681b4 Merge branch 'dev-sws' into dev-yxl 2024-09-25 16:47:41 +08:00
于肖磊 657c60c117 修改显示 2024-09-25 16:47:05 +08:00
sws bfb21af9d1 1.diy---代码优化 2024-09-25 16:42:29 +08:00
sws f8432afc83 1.diy---header 2024-09-25 16:39:28 +08:00
sws 45dfd5e1f9 1.diy---header 2024-09-25 15:48:17 +08:00
sws 647e10f25b Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-25 15:30:52 +08:00
sws 1409a3c2fc 1.diy---header 2024-09-25 15:30:44 +08:00
于肖磊 0cab5023c3 修改页面逻辑显示 2024-09-25 15:19:14 +08:00
sws b011861500 1.diy---header 2024-09-25 14:42:08 +08:00
sws bca5b9cda2 1.diy---header 2024-09-25 14:29:09 +08:00
sws 7b59cc3a3d 1.diy---header 2024-09-25 14:07:34 +08:00
sws 1fb728f493 1.diy---header 2024-09-25 14:00:46 +08:00
sws 3248f6de48 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-25 13:56:04 +08:00
sws 6f6ae5f5f9 1.diy---header 2024-09-25 13:55:55 +08:00
于肖磊 726731f080 Merge branch 'dev-sws' into dev-yxl 2024-09-25 13:55:37 +08:00
于肖磊 fb02387014 修改标签获取 2024-09-25 13:55:16 +08:00
sws d457edbc53 1.diy---header 2024-09-25 13:47:45 +08:00
sws 296fbf939e Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-25 13:39:23 +08:00
sws 6b5a3d94cc 1.diy---header 2024-09-25 13:39:15 +08:00
于肖磊 9c2d6919ee 修改标签 2024-09-25 13:39:01 +08:00
于肖磊 fe47901c1a 修改标签名称 2024-09-25 13:35:34 +08:00
于肖磊 e594fb7c0d Merge branch 'dev-sws' into dev-yxl 2024-09-25 12:03:36 +08:00
sws 22c6541846 1.diy---header 2024-09-25 12:01:20 +08:00
sws 9472b81077 1.diy---header 2024-09-25 11:56:33 +08:00
于肖磊 82a289946e 修改商品购买显示逻辑 2024-09-25 11:51:00 +08:00
sws aebcd3a203 1.diy---header 2024-09-25 11:40:12 +08:00
sws 1c0b883a7c Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-25 11:02:03 +08:00
sws 72ab207e9e 1.diy---header 2024-09-25 11:01:54 +08:00
gongfuxiang abab4c1e35 diy 2024-09-25 10:58:02 +08:00
sws 797b34abae Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-25 09:57:45 +08:00
sws 155dad2da4 1.diy---header 2024-09-25 09:56:47 +08:00
于肖磊 2758de9a3c 修改内容显示 2024-09-24 18:46:41 +08:00
于肖磊 d1057544d7 Merge branch 'dev-sws' into dev-yxl 2024-09-24 18:44:37 +08:00
于肖磊 221995e78e 修改报错问题 2024-09-24 18:44:13 +08:00
sws 82e2316d40 1.diy---header 2024-09-24 18:01:05 +08:00
于肖磊 d4c3f6c739 修改问题处理 2024-09-24 16:48:10 +08:00
于肖磊 cadcc7505b 修改秒杀显示 2024-09-24 16:41:47 +08:00
于肖磊 3e2d76d277 Merge branch 'dev-sws' into dev-yxl 2024-09-24 16:30:57 +08:00
于肖磊 f57adb5859 新增选项卡轮播 2024-09-24 16:30:34 +08:00
sws 11562048ea 1.diy---header 2024-09-24 16:24:16 +08:00
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