Commit Graph

138 Commits

Author SHA1 Message Date
sx 87a8de6cb5 合并代码 2025-02-18 14:09:40 +08:00
sx c133ca0915 合并代码 2025-02-18 14:09:21 +08:00
sx ccb6b7af80 视频详情点赞 弹窗 青少年模式流程问题 2025-02-18 14:08:33 +08:00
lr 1e374dd8df 1 2025-02-18 12:49:47 +08:00
lr e2c3fff951 1 2025-02-18 12:30:44 +08:00
lr 8eb011d332 1 2025-02-18 11:43:39 +08:00
lr 5612f07709 榴莲果配置 扫码加好友 2025-02-18 11:39:50 +08:00
lr d77e175b52 榴莲果配置 扫码加好友 2025-02-18 11:38:36 +08:00
sx e13df41690 解决无法启动的问题 2025-02-18 09:14:34 +08:00
sx 91fb53f5cc 工作代码提交 2025-02-17 21:45:13 +08:00
sx 32003e8f29 Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp
# Conflicts:
#	jiuyi2/common/js/config.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat_modules_group-module__js.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat_modules_group-module__js.js.map
#	jiuyi2/unpackage/dist/cache/.vite/deps/_metadata.json
#	jiuyi2/unpackage/dist/cache/.vite/deps/crypto-js.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/crypto-js.js.map
#	jiuyi2/unpackage/dist/cache/.vite/deps/tim-upload-plugin.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/tim-upload-plugin.js.map
#	jiuyi2/vite.config.js
2025-02-17 19:42:26 +08:00
sx 65f386e8ed 2025.02.17 工作代码提交 2025-02-17 19:26:33 +08:00
lr e6d75c5a01 1 2025-02-17 09:08:15 +08:00
sx caa0b30ee6 合并代码 2025-02-16 22:35:46 +08:00
lr c1e32ecc20 修改聊天记录头像不一致 2025-02-16 22:34:16 +08:00
sx 243e1b1d03 2025.02.15 工作代码提交 修复已经设置了二级密码没有先验证的bug 2025-02-15 21:58:36 +08:00
sx 069ec46cb9 添加忽略文件 2025-02-15 16:35:36 +08:00
sx 0afeee6877 Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp
# Conflicts:
#	jiuyi2/common/js/config.js
#	jiuyi2/components/index/indexVideo.vue
#	jiuyi2/pages/shop/commodity/components/jy-commodity-foot/index.vue
#	jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat_modules_group-module__js.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/@tencentcloud_chat_modules_group-module__js.js.map
#	jiuyi2/unpackage/dist/cache/.vite/deps/_metadata.json
#	jiuyi2/unpackage/dist/cache/.vite/deps/crypto-js.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/crypto-js.js.map
#	jiuyi2/unpackage/dist/cache/.vite/deps/tim-upload-plugin.js
#	jiuyi2/unpackage/dist/cache/.vite/deps/tim-upload-plugin.js.map
#	jiuyi2/vite.config.js
2025-02-15 16:30:06 +08:00
sx 12437feec2 合并代码 2025-02-15 16:21:05 +08:00
sx 684f621e4b 添加h5模块访问代理 修改用户登录请求data传参为query 2025-02-15 16:19:19 +08:00
sx 2e76dd427e 2025.02.15 工作代码提交 2025-02-15 16:10:05 +08:00
lr f27b183cfc 登录 2025-02-15 16:09:39 +08:00
sx 4f178171c2 2025.02.14 代码提交 2025-02-15 08:59:41 +08:00
sx 86b12b8537 合并代码 2025-02-13 22:24:30 +08:00
sx 61537cc3bd 九亿商家端静态页 2025-02-13 09:59:20 +08:00
sx 56ab4cb220 2025.02.12 工作代码提交 2025-02-12 17:03:02 +08:00
sx b56aae7b27 2025.2.11 工作代码提交 2025-02-12 09:05:14 +08:00
sx 28843fa3d3 合并代码 2025-02-11 09:34:58 +08:00
sx f8b2923b57 合并代码 2025-02-09 21:32:55 +08:00
sx 35d0dde6c4 合并代码 2025-02-08 18:25:43 +08:00
sx 42072a546e 合并代码 2025-02-07 11:24:41 +08:00
sx 998330c02b 合并代码 2025-02-06 23:49:25 +08:00
sx 36df835adf 合并代码 2025-02-06 23:34:13 +08:00
sx 2bb07b4957 合并代码 2025-02-05 23:29:54 +08:00
sx 06f743bb30 合并代码 2025-02-05 13:08:47 +08:00
sx fcfca79f99 合并代码 2025-02-05 10:12:50 +08:00
sx c9986210c9 合并代码 2025-02-04 22:53:12 +08:00
sx b65cbd6417 合并代码 2025-02-04 20:44:28 +08:00
sx 9f02c72dbd 合并代码 2025-02-04 13:45:10 +08:00
sx 933dc40ea2 合并代码 2025-02-03 20:36:02 +08:00
sx 407f3b0a0f 合并代码 2025-02-03 09:05:19 +08:00
sx 6e948972e8 合并代码 2025-01-25 21:43:01 +08:00
sx 9fbf092756 合并代码 2025-01-23 22:26:04 +08:00
sx 9b9b2a568d 合并代码 2025-01-23 21:29:16 +08:00
sx ec7d686245 合并代码 2025-01-23 00:57:47 +08:00
sx 204261ac3c 合并代码 2025-01-21 22:33:44 +08:00
sx 6e9ca6a925 合并代码 2025-01-21 09:39:21 +08:00
sx 5f802e60ac 合并代码 2025-01-19 22:56:45 +08:00
sx d56e2e6666 合并代码 2025-01-19 13:55:21 +08:00
sx 53bc5bb6df 合并代码 2025-01-16 20:18:22 +08:00