Commit Graph

1078 Commits (a8ae53ce80b8d71e127bdb65b1908144cb1237e3)

Author SHA1 Message Date
于肖磊 fe0e757a10 修改轮播滚动效果 2024-10-22 15:11:10 +08:00
sws 1a1abf5785 1.支付宝小程序兼容性优化 2024-10-22 14:37:47 +08:00
于肖磊 ebc9405dd0 修改页面问题显示 2024-10-22 14:22:24 +08:00
于肖磊 9761acca73 Merge branch 'dev-sws' into dev-yxl 2024-10-22 14:07:45 +08:00
于肖磊 2e5536e67b 修改页面显示 2024-10-22 14:07:24 +08:00
sws 18f6c7f87a Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-22 14:07:07 +08:00
sws 532b57a4db 1.支付宝小程序兼容性优化 2024-10-22 14:06:56 +08:00
gongfuxiang 15b12f57e1 支付宝小程序卡顿修复,导航胶囊修复 2024-10-22 14:02:55 +08:00
于肖磊 d0d3b902da Merge branch 'dev-sws' into dev-yxl 2024-10-22 13:38:06 +08:00
于肖磊 0c713ad4f0 修改轮播显示逻辑 2024-10-22 13:37:40 +08:00
sws b931266ed5 1.支付宝小程序兼容性优化 2024-10-22 13:37:19 +08:00
gongfuxiang 2dc7b8deaf 无评价数据样式优化 2024-10-22 12:00:29 +08:00
sws 913ac49ce1 1.支付宝小程序兼容性优化 2024-10-22 11:09:27 +08:00
sws d530e87c23 1.选项卡优化 2024-10-22 10:11:37 +08:00
sws 99d3eb5dd4 1.选项卡优化 2024-10-22 10:02:29 +08:00
gongfuxiang 9074b930a0 h5导航优化 2024-10-21 22:42:25 +08:00
gongfuxiang 7fdc156da3 细节 2024-10-21 21:29:38 +08:00
gongfuxiang 1bca78e9f3 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev 2024-10-21 19:19:24 +08:00
于肖磊 bf2f56aac4 修改选项卡轮播显示 2024-10-21 19:18:45 +08:00
gongfuxiang e40f2319db Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev 2024-10-21 19:15:38 +08:00
于肖磊 4fec8cce82 修改页面显示 2024-10-21 19:10:14 +08:00
gongfuxiang 967034fa95 支付宝客服标签错误修复 2024-10-21 18:55:42 +08:00
gongfuxiang 152fe1dad1 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev 2024-10-21 18:45:39 +08:00
gongfuxiang e492c9434f 冲突 2024-10-21 18:45:28 +08:00
于肖磊 e88b348772 解决冲突 2024-10-21 18:22:44 +08:00
sws 64637212f2 1.选项卡风格三优化 2024-10-21 18:21:05 +08:00
于肖磊 4977f581ac 修改图片大小显示 2024-10-21 18:18:57 +08:00
gongfuxiang dfbc0eb2ab Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev 2024-10-21 17:50:56 +08:00
gongfuxiang bf98ad0c8d 门店细节优化 2024-10-21 17:50:42 +08:00
于肖磊 3ca1781337 Merge branch 'dev-sws' into dev-yxl 2024-10-21 17:11:42 +08:00
于肖磊 cab437d218 修改数据魔方图片圆角 2024-10-21 16:32:54 +08:00
sws 507253f623 1.选项卡风格三优化 2024-10-21 16:03:39 +08:00
于肖磊 f2d4b751a0 Merge branch 'dev-sws' into dev-yxl 2024-10-21 15:50:45 +08:00
于肖磊 bad61e1ad2 修改数据魔方问题 2024-10-21 15:49:37 +08:00
sws 8010cc8c9e 1.代码优化 2024-10-21 15:37:50 +08:00
sws a545392f50 1.代码优化 2024-10-21 15:20:06 +08:00
于肖磊 b0c4fdb70e 修改显示逻辑 2024-10-21 14:27:52 +08:00
sws 379155a673 1.代码优化 2024-10-21 14:25:39 +08:00
于肖磊 6d17b34db3 Merge branch 'dev-sws' into dev-yxl 2024-10-21 14:05:30 +08:00
于肖磊 3ac7d759f9 修改图片魔方和数据魔方的数据显示 2024-10-21 13:59:28 +08:00
sws c20286714d 1.选项卡对齐问题 2024-10-21 13:46:42 +08:00
于肖磊 34c3b21fc2 修改数据魔方的显示 2024-10-21 11:45:45 +08:00
于肖磊 24f1fa2f5f 解决冲突 2024-10-21 11:09:40 +08:00
于肖磊 1d6fd63b28 修改选项卡轮播显示 2024-10-21 11:08:26 +08:00
sws 6c379da5a5 1.解决图片魔方报错问题
2.解决视频封面没有占满的问题
3.解决选项卡渲染传参错误问题
2024-10-21 10:21:31 +08:00
gongfuxiang f12f956b8e 商品购买按钮背景色修复 2024-10-21 01:26:55 +08:00
gongfuxiang 4fbfd1fef8 商品购买按钮背景色修复 2024-10-21 01:05:53 +08:00
gongfuxiang 7421ec4c54 商品购买按钮背景色修复 2024-10-21 01:00:30 +08:00
gongfuxiang fd626f7461 cart nav 2024-10-20 22:50:33 +08:00
gongfuxiang ce8b52fefa 细节优化 2024-10-20 21:12:19 +08:00
gongfuxiang f81ee3a8fd 细节优化 2024-10-19 19:48:55 +08:00
gongfuxiang b9e7483f7b 底部菜单间距优化 2024-10-19 19:17:20 +08:00
gongfuxiang 970dbbcf65 底部菜单间距优化 2024-10-19 19:13:21 +08:00
于肖磊 474d6163b5 修改自定义高度处理 2024-10-19 18:27:04 +08:00
于肖磊 ed95f36600 Merge branch 'dev-sws' into dev-yxl 2024-10-19 18:26:05 +08:00
sws ba2179460a 1.第一个组件距离顶部导航的距离计算 2024-10-19 18:23:58 +08:00
sws f8d32b6c07 1.第一个组件距离顶部导航的距离计算 2024-10-19 18:16:07 +08:00
于肖磊 2c34f4e02c 修改高度处理 2024-10-19 17:24:17 +08:00
于肖磊 80e8ffcdbf 修改数据魔方的处理 2024-10-19 16:33:49 +08:00
于肖磊 68c033b4fb 标题逻辑处理 2024-10-19 16:31:32 +08:00
于肖磊 ce503dda5b Merge branch 'dev-sws' into dev-yxl 2024-10-19 16:15:58 +08:00
于肖磊 1e36f83d3b 修改文件问题 2024-10-19 16:04:31 +08:00
sws 66a2fa167f 1.第一个组件距离顶部导航的距离计算 2024-10-19 16:03:14 +08:00
sws 1fca81001b 1.第一个组件距离顶部导航的距离计算 2024-10-19 16:01:55 +08:00
于肖磊 fc92dda4d2 Merge branch 'dev-sws' into dev-yxl 2024-10-18 18:18:40 +08:00
于肖磊 7cb680e3af 添加注释 2024-10-18 18:18:08 +08:00
sws dc4ac50cb9 1.增加注释 2024-10-18 18:16:18 +08:00
sws 5583b149ad 1.增加注释 2024-10-18 18:15:44 +08:00
gongfuxiang 3fe40595e2 Merge branch 'dev-sws' of gitee.com:zongzhige/shopxo-uniapp into dev 2024-10-18 16:52:47 +08:00
gongfuxiang bc25c36495 diy 2024-10-18 16:52:40 +08:00
sws 2005fa918e Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-18 16:51:20 +08:00
于肖磊 5e843d38ff 修改手机显示 2024-10-18 16:02:03 +08:00
sws 007b36dd9f 1.文章优化 2024-10-18 15:34:18 +08:00
于肖磊 e998b632a6 修改页面显示 2024-10-18 15:15:51 +08:00
于肖磊 ccc889b2f1 修改指示器显示 2024-10-18 11:15:45 +08:00
于肖磊 a38c39b8ee 修改页面显示 2024-10-18 11:01:51 +08:00
gongfuxiang 328d4b031e 细节调整 2024-10-18 10:26:37 +08:00
sws 16c660e2e5 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-17 18:12:53 +08:00
sws c0cac29acf Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-17 18:10:02 +08:00
于肖磊 d0591ee353 Merge branch 'dev-sws' into dev-yxl 2024-10-17 18:05:13 +08:00
于肖磊 33238137d9 修改轮播图指示器问题 2024-10-17 18:04:46 +08:00
sws 3066154e5e 1.顶部导航优化 2024-10-17 18:01:19 +08:00
于肖磊 5fce4f7f0c 修改商品显示逻辑 2024-10-17 17:52:31 +08:00
sws 123ea8e299 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-17 17:29:50 +08:00
sws f2357b6bb0 1.顶部导航优化 2024-10-17 17:28:36 +08:00
于肖磊 ee8a668e31 Merge branch 'dev-sws' into dev-yxl 2024-10-17 17:28:03 +08:00
于肖磊 e69dd8d55f 修改页面显示 2024-10-17 17:27:27 +08:00
gongfuxiang e6eec2458a 批发优化 2024-10-17 16:18:52 +08:00
sws f9b153be00 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-17 15:10:56 +08:00
sws e39f21653d 1.顶部导航优化 2024-10-17 15:10:06 +08:00
于肖磊 e477b65407 修改首页显示 2024-10-17 15:09:31 +08:00
sws 537a91cf14 1.顶部导航优化 2024-10-17 11:24:12 +08:00
sws bd0688eefc Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-17 10:50:42 +08:00
sws e7b67cfe0a 1.顶部导航优化 2024-10-17 10:50:29 +08:00
gongfuxiang 2cab5c4312 Merge branch 'dev-sws' of gitee.com:zongzhige/shopxo-uniapp into dev 2024-10-16 19:45:39 +08:00
gongfuxiang 666cc4ff23 支持一键切换原生底部菜单 2024-10-16 19:45:34 +08:00
于肖磊 bc07456438 修改文件逻辑 2024-10-16 18:08:00 +08:00
于肖磊 0da00c506a Merge branch 'dev-sws' into dev-yxl 2024-10-16 17:04:41 +08:00
于肖磊 68d544d8f0 问题修复 2024-10-16 17:03:12 +08:00
sws 7ce0445481 1.选项卡优化 2024-10-16 16:45:06 +08:00
于肖磊 b09cacec95 修改页面显示 2024-10-16 14:58:08 +08:00
于肖磊 f60ebcd6ec 修改搜索逻辑 2024-10-16 14:09:05 +08:00
于肖磊 b996e95ae0 修改问题修复 2024-10-16 14:05:37 +08:00
于肖磊 744b961aec 修改自定义显示逻辑 2024-10-16 13:43:02 +08:00
于肖磊 cbdbc95d8c 修改页面修改逻辑 2024-10-16 12:43:57 +08:00
于肖磊 9fb25729a4 Merge branch 'dev-sws' into dev-yxl 2024-10-16 11:58:03 +08:00
于肖磊 1d0c14d098 修改页面设置获取方式 2024-10-16 11:56:23 +08:00
sws 8724d24234 Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-16 11:52:53 +08:00
gongfuxiang 08bc73e561 icon,富文本视频优化 2024-10-16 11:35:21 +08:00
sws 2c57f1bce9 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-16 11:11:12 +08:00
gongfuxiang b585458224 icon优化 2024-10-16 10:52:17 +08:00
于肖磊 5358b6c734 修改页面显示逻辑 2024-10-16 10:34:55 +08:00
sws 490b3ae036 Merge remote-tracking branch 'origin/dev-yxl' into dev-sws 2024-10-16 10:06:02 +08:00
sws f0815b4b3a Merge remote-tracking branch 'origin/dev-yxl' into dev-sws 2024-10-16 10:03:47 +08:00
sws 02bfaa823d 1.bug测试修改 2024-10-16 10:03:11 +08:00
于肖磊 540757819a 修改富文本逻辑处理 2024-10-16 09:54:39 +08:00
sws 83c893415c Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-15 18:38:31 +08:00
sws 6d4c564335 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-15 18:38:00 +08:00
sws 4d38c59987 1.bug测试修改 2024-10-15 18:36:57 +08:00
sws 42481f3851 1.bug测试修改 2024-10-15 18:36:30 +08:00
于肖磊 17bd2b7e77 修改搜索逻辑处理 2024-10-15 18:16:38 +08:00
于肖磊 daf9f03186 Merge branch 'dev-sws' into dev-yxl 2024-10-15 14:43:28 +08:00
于肖磊 880e92a21b 修改页面显示 2024-10-15 14:43:07 +08:00
sws 980fa21b34 1.bug测试修改 2024-10-15 14:40:17 +08:00
gongfuxiang 716093c8a3 seach icon 2024-10-15 14:32:32 +08:00
于肖磊 5faceda678 修改icon显示和自定义的处理逻辑 2024-10-15 11:53:14 +08:00
gongfuxiang 3e7ada35e2 细节icon优化 2024-10-15 11:32:42 +08:00
gongfuxiang ec5c5db5ee 新增搜索开始页面 2024-10-15 00:31:55 +08:00
gongfuxiang 5414b98e4a icon样式优化 2024-10-14 14:35:45 +08:00
gongfuxiang 14748d12da 导航增加返回 2024-10-13 17:45:16 +08:00
gongfuxiang ee31ea2ab4 搜索新增商品产地,新增数据读取方法 2024-10-13 13:29:11 +08:00
gongfuxiang a5d9decd88 Merge branch 'dev-sws' of gitee.com:zongzhige/shopxo-uniapp into dev 2024-10-12 20:59:35 +08:00
于肖磊 de8529901a 修改搜索显示逻辑 2024-10-12 18:19:27 +08:00
于肖磊 240fdfc3f3 修改自定义显示逻辑 2024-10-12 18:06:29 +08:00
于肖磊 7220e07b6e 自定义日志删除 2024-10-12 17:45:41 +08:00
于肖磊 0ec279e305 自定义逻辑修改 2024-10-12 17:44:32 +08:00
sws b8c5c1a6f5 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-12 17:22:38 +08:00
于肖磊 01087ac61a 自定义逻辑修改 2024-10-12 17:21:08 +08:00
sws aea8b9198c 1.head优化 2024-10-12 17:18:00 +08:00
于肖磊 fd5e87158f 修改秒杀逻辑 2024-10-12 17:09:50 +08:00
于肖磊 6b7b3e08cc Merge branch 'dev-sws' into dev-yxl 2024-10-12 16:29:09 +08:00
于肖磊 ac0ea0478a 修改搜索显示 2024-10-12 16:28:08 +08:00
于肖磊 5892dd1e91 修改问题处理 2024-10-12 16:14:12 +08:00
sws 5c6fca6714 1.导航组优化 2024-10-12 10:15:17 +08:00
gongfuxiang aa7d03c7ce Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev 2024-10-11 20:19:57 +08:00
gongfuxiang cee6bcd550 初始化配置优化 2024-10-11 20:18:53 +08:00
于肖磊 b072572244 修改图片魔方显示逻辑 2024-10-11 19:13:51 +08:00
于肖磊 a8c458e0a7 修改页面显示逻辑 2024-10-11 18:22:23 +08:00
于肖磊 75b14b1d8f Merge branch 'dev-sws' into dev-yxl 2024-10-11 17:23:45 +08:00
于肖磊 8ff7976d26 Merge branch 'dev' into dev-yxl 2024-10-11 16:46:20 +08:00
sws 9e3b887aee Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-11 16:46:03 +08:00
gongfuxiang e0dfe9fdcf 客服 2024-10-11 16:45:37 +08:00
于肖磊 d4b4304d3c 修改搜索逻辑处理 2024-10-11 16:29:36 +08:00
于肖磊 d9c67aea05 自定义面板修改完成 2024-10-11 15:27:30 +08:00
sws e2f6d79735 1.head优化 2024-10-11 15:14:33 +08:00
于肖磊 dbbdbe99c5 修改数据显示逻辑 2024-10-11 15:10:10 +08:00
sws e2204ec646 1.head优化 2024-10-11 14:59:08 +08:00
于肖磊 532f732584 Merge branch 'dev-sws' into dev-yxl 2024-10-11 14:44:36 +08:00
于肖磊 c3ff714643 修改数据魔方显示 2024-10-11 14:44:09 +08:00
sws 0682a2fd76 1.导航组优化 2024-10-11 14:37:56 +08:00
sws 8809e21a64 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-11 13:54:52 +08:00
于肖磊 425a9584fd 自定义修改 2024-10-11 12:01:37 +08:00
sws 8a3bc7fe9c 1.顶部导航新增字段 2024-10-11 10:53:16 +08:00
gongfuxiang d4c6391e63 diy 2024-10-11 09:59:33 +08:00
gongfuxiang 38daaed12f 顶部导航颜色设置 2024-10-10 20:32:58 +08:00
gongfuxiang c2d3ca7a6a 顶部导航颜色设置 2024-10-10 20:32:19 +08:00
gongfuxiang 10dafc898c diy 2024-10-10 18:45:47 +08:00
gongfuxiang 1d1eae1b3d Merge branch 'dev-sws' of gitee.com:zongzhige/shopxo-uniapp into dev 2024-10-10 18:43:02 +08:00
sws fa53abc582 1.设置顶部导航的默认颜色 2024-10-10 18:32:29 +08:00
gongfuxiang 56c5c0f33e diy 2024-10-10 18:29:45 +08:00
于肖磊 b67783bfdc 修改显示 2024-10-10 18:27:05 +08:00
于肖磊 b4614863bf Merge branch 'dev-sws' into dev-yxl 2024-10-10 18:18:41 +08:00
于肖磊 5b0921e075 修改手机端的显示逻辑 2024-10-10 18:18:13 +08:00
于肖磊 475970ef9a 修改属性显示逻辑 2024-10-10 17:53:56 +08:00
sws bda5fd05ba 1.head的logo大小修改为28px 2024-10-10 17:49:07 +08:00
sws 21b43b6299 1.导航组图片大小改为36 2024-10-10 17:46:03 +08:00
sws 2994d6032a 1.优惠券优化 2024-10-10 17:27:29 +08:00
于肖磊 f1ac36da1d 修改自定义显示 2024-10-10 17:13:18 +08:00
sws c71ab3faa2 1.导航组图片大小改为40 2024-10-10 17:06:37 +08:00
sws 4c057d2262 1.背景色优化 2024-10-10 16:51:33 +08:00
sws 5b4597130c 1.背景色优化 2024-10-10 16:40:03 +08:00
sws 42a4a2435a 1.新增page背景 2024-10-10 14:39:29 +08:00
sws f0696d0eef Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-10 14:04:55 +08:00
sws a24f13b188 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-10 14:04:46 +08:00
sws 497c13d416 1.head的logo大小修改为25px 2024-10-10 14:03:17 +08:00
gongfuxiang 0566717669 Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev 2024-10-10 09:39:33 +08:00
gongfuxiang 46fd476bd2 细节优化,多商户支持二级分类 2024-10-09 23:38:41 +08:00
于肖磊 3915500bc6 Merge branch 'dev-sws' into dev-yxl 2024-10-09 17:53:08 +08:00
sws 9c9ccadb6b 1.更新icon 2024-10-09 17:52:05 +08:00
于肖磊 fe4706710b 修改自定义显示逻辑 2024-10-09 17:48:55 +08:00
于肖磊 308dcd0b88 Merge branch 'dev-sws' into dev-yxl 2024-10-09 17:44:00 +08:00
于肖磊 c931d0e952 修改头部显示逻辑 2024-10-09 17:43:23 +08:00
sws 17216cbcae 1.更新icon 2024-10-09 16:24:29 +08:00
sws 03432fc43f 1.解决视频不显示的问题 2024-10-09 14:28:04 +08:00
于肖磊 c0be9db0b7 修改轮播图视频播放显示 2024-10-09 14:18:23 +08:00
于肖磊 38bd4655ce Merge branch 'dev-sws' into dev-yxl 2024-10-09 11:20:43 +08:00
于肖磊 da9856c530 修改商品显示问题 2024-10-09 11:19:37 +08:00
于肖磊 6e51456be9 修改商品加购问题 2024-10-09 11:01:27 +08:00
sws 4832197586 1.解决视频不显示的问题 2024-10-09 10:50:00 +08:00
sws d46656c78f 1.页面优化刷新闪烁问题 2024-10-09 10:33:53 +08:00