Commit Graph

775 Commits (f6e74b12cb7233a0c5fe78b0ca9fd3befcce2a24)

Author SHA1 Message Date
YunaiV f6e74b12cb Merge branch 'develop' of https://gitee.com/yudaocode/yudao-mall-uniapp
# Conflicts:
#	pages/chat/components/messageList.vue
#	uni_modules/z-paging/changelog.md
#	uni_modules/z-paging/components/z-paging-cell/z-paging-cell.vue
#	uni_modules/z-paging/components/z-paging-empty-view/z-paging-empty-view.vue
#	uni_modules/z-paging/components/z-paging-swiper-item/z-paging-swiper-item.vue
#	uni_modules/z-paging/components/z-paging-swiper/z-paging-swiper.vue
#	uni_modules/z-paging/components/z-paging/components/z-paging-load-more.vue
#	uni_modules/z-paging/components/z-paging/components/z-paging-refresh.vue
#	uni_modules/z-paging/components/z-paging/css/z-paging-main.css
#	uni_modules/z-paging/components/z-paging/js/modules/back-to-top.js
#	uni_modules/z-paging/components/z-paging/js/modules/common-layout.js
#	uni_modules/z-paging/components/z-paging/js/modules/data-handle.js
#	uni_modules/z-paging/components/z-paging/js/modules/i18n.js
#	uni_modules/z-paging/components/z-paging/js/modules/load-more.js
#	uni_modules/z-paging/components/z-paging/js/modules/nvue.js
#	uni_modules/z-paging/components/z-paging/js/modules/refresher.js
#	uni_modules/z-paging/components/z-paging/js/modules/scroller.js
#	uni_modules/z-paging/components/z-paging/js/modules/virtual-list.js
#	uni_modules/z-paging/components/z-paging/js/z-paging-constant.js
#	uni_modules/z-paging/components/z-paging/js/z-paging-enum.js
#	uni_modules/z-paging/components/z-paging/js/z-paging-main.js
#	uni_modules/z-paging/components/z-paging/js/z-paging-utils.js
#	uni_modules/z-paging/components/z-paging/z-paging.vue
#	uni_modules/z-paging/package.json
#	uni_modules/z-paging/readme.md
2025-05-12 21:26:31 +08:00
芋道源码 c17228b0d7
!146 客服聊天列表使用scroll-view原生组件,移除 z-paging 组件
Merge pull request !146 from puhui999/dev
2025-05-12 13:25:49 +00:00
YunaiV 5071816ea0 feat:【MALL 商城】商城分佣提现,完成对微信转账(小程序)的对接 2025-05-11 12:39:23 +08:00
YunaiV 62d1f4f273 feat:【MALL 商城】商城分佣提现,初步对接成功微信支付 2025-05-11 09:08:18 +08:00
YunaiV 098057b2de feat:【MALL 商城】佣金提现,优化字段,以及支持更多 API 自动打款 2025-05-10 10:07:27 +08:00
puhui999 af596bcc70 【代码优化】客服消息日期位置调整 2025-05-08 18:16:18 +08:00
puhui999 e0f7ec3629 【功能完善】客服消息输入键盘弹起适配 2025-05-08 17:49:12 +08:00
puhui999 9f1cd4c3a7 【功能完善】客服底部安全区适配 2025-05-08 17:31:14 +08:00
puhui999 8456d0a8b3 【功能完善】客服聊天查看最新消息和回到底部 2025-05-08 17:01:57 +08:00
puhui999 13f674ab4b 【功能完善】客服聊天历史数据加载和回到顶部 2025-05-08 16:35:01 +08:00
puhui999 c149a54e83 【代码优化】客服聊天 2025-05-08 16:18:27 +08:00
puhui999 7e6a3bbad3 【代码优化】移除 z-paging 组件使用 uniapp 原生 scroll-view 实现区域滚动 2025-05-07 18:05:48 +08:00
YunaiV 1948aae067 fix:支付结果页,state.orderId => state.id 2025-05-05 22:06:50 +08:00
YunaiV 4d308078fa reactor:【INFRA】文件上传 api,增加 directory 参数,去除 path 参数,并支持按照日期分目录、文件名不再使用 sha256 而是时间戳 2025-05-02 20:59:30 +08:00
YunaiV db60915de6 fix:【商城】店铺装修-标题栏:之前 bgImgUrl 不对的问题(彻底修复) 2025-05-01 12:07:01 +08:00
YunaiV 8ef7c89735 feat:【商城】店铺装修-标题栏:增加 skew 标题栏。同时,代码回到 titleStyles、descStyles 风格 2025-05-01 10:24:52 +08:00
YunaiV 500b377b4f feat:【商城】店铺装修-优惠劵:展示优惠、剩余信息 2025-05-01 08:53:12 +08:00
YunaiV ad7de47a47 feat:【商城】店铺装修-优惠劵:展示优惠、剩余信息 2025-05-01 08:51:50 +08:00
YunaiV c95f621144 reactor:getSystemInfoSync =》 getWindowInfo,解决 device 2025-04-29 20:38:50 +08:00
YunaiV 9582d5944e update:lime-painter 从 1.9.5 升级到1.9.6.6 2025-04-29 20:38:14 +08:00
YunaiV 82aada5ecd reactor:osName 的获取,从 getSystemInfoSync 迁移到 getDeviceInfo
reactor:pixelRatio/windowHeight/windowWidth 的获取,从 getSystemInfoSync 迁移到 getWindowInfo
2025-04-29 20:13:18 +08:00
YunaiV 04bb5e65d3 reactor:platform 的获取,从 getSystemInfoSync 迁移到 getAppBaseInfo 2025-04-29 19:58:27 +08:00
YunaiV 90e22374ee fix:refreshToken 接口的 showLoading 拼成了 loading 问题 2025-04-29 19:27:48 +08:00
YunaiV 3e7fd5277c reactor:优化前端直传,支持 H5 2025-04-29 19:03:06 +08:00
YunaiV 8c821bf8ad fix:解决微信小程序上传失败的问题(开启 es5 转换、postcss) 2025-04-29 14:00:28 +08:00
YunaiV 5da0382a25 reactor:解决微信小程序的「代码质量」在「JS 文件」提示:主包内,不应该存在主包未使用的 JS 文件 2025-04-29 12:07:11 +08:00
YunaiV f646458b15 reactor:useWebSocket.js 挪到 chat 包下,有利于分包 2025-04-29 11:57:38 +08:00
YunaiV 68ed6e1810 update:z-paging from 2.7.11 => 2.8.6 2025-04-29 11:53:42 +08:00
YunaiV c7d101cd05 fix:商品不存在时,不展示 empty 的情况 2025-04-29 11:47:50 +08:00
YunaiV 49dbce22d1 reactor:将 getWeekTimes、getMonthTimes 抽到 utils 统一复用 2025-04-28 23:30:24 +08:00
YunaiV 349a4bb0a9 feat:【MALL】App 售后筛选时,增加 status 过滤 2025-04-28 23:17:16 +08:00
YunaiV 600a29b50b feat:处理 detail-activity-tip.vue 的 type 判断 2025-04-28 23:05:16 +08:00
YunaiV 791e99057c feat:H5 访问域名,改为 .env 配置 2025-04-28 23:01:34 +08:00
芋道源码 20e7593e14
!144 增加拒绝用户协议与隐私协议,补充相关逻辑 满足部分应用分发市场的审核需求
Merge pull request !144 from huppygo/master
2025-04-28 14:57:49 +00:00
YunaiV e2fb99ae60 reactor:移除 countDown 组件,使用 s-count-down 组件 2025-04-28 22:54:42 +08:00
YunaiV 01adbff523 reactor:utils 挪到 helper 目录下 2025-04-28 22:47:00 +08:00
YunaiV dfe4a33e2d reactor:consts 挪到 helper 目录下 2025-04-28 22:43:30 +08:00
YunaiV 997404dfb4 feat:处理部分 todo 逻辑 2025-04-28 21:17:18 +08:00
YunaiV 08e7b32fc3 reactor:清理部分 TODO 2025-04-28 09:50:50 +08:00
YunaiV 93ce26f6be bugfix: 修复购物车页面刷新时底部导航消失的问题 2025-04-28 09:25:13 +08:00
YunaiV 158b0aa435 Merge branch 'master' of https://github.com/yudaocode/yudao-mall-uniapp 2025-04-28 09:24:34 +08:00
芋道源码 70a69bdfe6
Merge pull request #20 from ForeverNewbee/bugfix-cart-refresh-no-tabbar
bugfix: 修复购物车页面刷新时底部导航消失的问题
2025-04-28 09:24:26 +08:00
YunaiV 4b3c699270 sync:微信公众号网页授权登录,自动获取登录入口的准确路径 7a8298aeed 2025-04-28 00:23:33 +08:00
YunaiV da9588c263 sync:单词修改,授权弹框修复 decd3a5108
sync:小程序、h5登录弹框样式修改 4aaf21084b
2025-04-28 00:22:41 +08:00
YunaiV 00f57159b4 sync:修复上传删除文件问题 00ac44d1df 2025-04-28 00:17:43 +08:00
YunaiV ff9211e557 sync:富文本默认行高问题修复 97d31ae859
sync: 修复富文本显示问题 6976caf8e8
2025-04-28 00:10:57 +08:00
YunaiV e9ebe236e6 sync:订单结果页添加支付询问对话框,版本获取方法修改,更新README 024f311235 2025-04-28 00:01:33 +08:00
YunaiV 9e96df4651 sync:修复app端video层级过高问题 839a01f8b5 2025-04-27 23:53:20 +08:00
YunaiV c10a1c9adc sync:每次进入购物车页面请求列表 b858147579 2025-04-27 23:51:08 +08:00
YunaiV 39e04ae78d sync:购物车针对已存在商品被下架 样式 逻辑修改 c752b19acd 2025-04-27 23:48:43 +08:00