Commit Graph

807 Commits (17bd2b7e777eaa68ebe7bd81f5d8131c4b00ceed)

Author SHA1 Message Date
sws 674960e58e Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-08 16:19:23 +08:00
sws 303ae77f75 1.文章和商品选项卡优化
2.页面设置风格五地址优化
2024-10-08 16:19:14 +08:00
于肖磊 7dedddeab6 Merge branch 'dev-sws' into dev-yxl 2024-10-08 15:42:06 +08:00
于肖磊 37955fc598 修改页面显示 2024-10-08 15:41:13 +08:00
gongfuxiang e9d9949812 Merge branch 'dev-sws' into dev 2024-10-08 15:11:10 +08:00
sws c7767b184f Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-10-08 14:48:41 +08:00
于肖磊 871c19dec4 页面添加监听事件 2024-10-08 14:48:12 +08:00
sws 9080565311 1.diy的header对齐优化 2024-10-08 14:47:39 +08:00
于肖磊 813a54060c 修改uniapp显示 2024-10-08 14:29:54 +08:00
于肖磊 94adb20493 修改显示逻辑 2024-10-08 11:48:10 +08:00
于肖磊 0b694ee052 Merge branch 'dev-sws' into dev-yxl 2024-10-08 10:43:28 +08:00
于肖磊 d8712774a2 修改自定义显示 2024-10-08 10:43:11 +08:00
sws bc4324701b 1.diy的header对齐优化 2024-10-08 10:42:49 +08:00
于肖磊 ea88f7ed05 修改自定义图标大小控制 2024-10-08 10:18:27 +08:00
于肖磊 ba000bd630 修改自定义逻辑 2024-10-08 10:12:22 +08:00
gongfuxiang 4d876890e1 门店购物车导航 2024-09-30 18:44:42 +08:00
sws 4f54133a82 Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-30 18:27:21 +08:00
gongfuxiang 01478d4df0 底部菜单角标,商品详情底部导航 2024-09-30 17:53:59 +08:00
gongfuxiang ac074750af 底部菜单角标处理 2024-09-30 11:56:41 +08:00
gongfuxiang e3de0f26b4 细节优化 2024-09-29 23:58:39 +08:00
gongfuxiang 6ad95bba68 微信隐私提示提到公共组件 2024-09-29 19:21:58 +08:00
gongfuxiang fc73e1e7ae app管理,用户基础使用提到公共层 2024-09-29 17:33:51 +08:00
gongfuxiang 2bb8a68597 Merge branch 'dev-sws' into dev 2024-09-29 16:41:52 +08:00
gongfuxiang ef83f28ed3 增加common组件onshow事件 2024-09-29 16:41:49 +08:00
sws 9a1c42d76c 1.定位 2024-09-29 15:43:24 +08:00
sws 3e4cabb704 1.定位 2024-09-29 15:41:57 +08:00
sws 0afdc5dccf Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-29 14:59:41 +08:00
sws da0f432e65 1.解决轮播样式1,2在uniapp上轮播显示轮播间距的问题 2024-09-29 14:36:38 +08:00
sws 7f7407be7e 1.解决轮播样式1,2在uniapp上轮播显示轮播间距的问题 2024-09-29 14:21:28 +08:00
gongfuxiang 47bf26f127 Merge branch 'dev-sws' into dev 2024-09-29 14:17:22 +08:00
sws 1a7584238b 1.diy---用户信息加链接 2024-09-29 14:17:06 +08:00
gongfuxiang 8543c21efc Merge branch 'dev-sws' into dev 2024-09-29 14:14:09 +08:00
gongfuxiang 73f923a566 细节优化 2024-09-29 14:09:26 +08:00
sws 7a64ae7dbe 1.diy---置顶开发 2024-09-29 11:40:18 +08:00
gongfuxiang aa7bcbf554 细节优化 2024-09-29 01:18:25 +08:00
gongfuxiang c75f07e400 细节优化 2024-09-28 22:25:13 +08:00
gongfuxiang e4392c9ccc 细节优化 2024-09-28 22:12:57 +08:00
gongfuxiang b798f6dcc8 细节优化 2024-09-28 21:24:27 +08:00
gongfuxiang 22ba5b0c6f icon居中优化 2024-09-28 20:53:09 +08:00
gongfuxiang 0670cd9cdd Merge branch 'dev-sws' into dev 2024-09-28 20:42:55 +08:00
gongfuxiang a3d1335ac8 细节优化 2024-09-28 20:42:27 +08:00
sws af7f2147d1 1.diy---置顶开发 2024-09-28 19:24:13 +08:00
sws 4cee900821 1.diy---置顶开发 2024-09-28 19:00:33 +08:00
sws dd4be2f6da 1.diy---置顶开发 2024-09-28 19:00:20 +08:00
gongfuxiang 9e94034bd1 商品页面适配底部导航 2024-09-28 18:04:03 +08:00
sws c9ca517971 1.diy---置顶开发 2024-09-28 17:47:13 +08:00
sws efbac250fc 1.diy---置顶开发 2024-09-28 17:32:23 +08:00
gongfuxiang f03e1ea9c4 Merge branch 'dev-sws' into dev 2024-09-28 15:29:27 +08:00
gongfuxiang cb1dc46775 细节优化 2024-09-28 15:29:10 +08:00
sws 2fecf2b5ac Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws 2024-09-28 13:58:26 +08:00
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