Commit Graph

88 Commits

Author SHA1 Message Date
lr 1e8c025c37 视频搜索 2025-02-23 15:23:44 +08:00
sx 409f137e89 Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp
# Conflicts:
#	jiuyi2/common/js/config.js
#	jiuyi2/pages/mine/setting/usePay.vue
#	jiuyi2/pages/mine/switch-accounts/index.vue
#	jiuyi2/pages/news/news.vue
#	jiuyi2/vite.config.js
2025-02-21 18:01:09 +08:00
lr a0925a4ec7 消息 2025-02-21 17:57:08 +08:00
sx 69babb6f3e 2025.02.21 工作代码 2025-02-21 17:56:36 +08:00
sx c4a23be60c 2025.02.20 工作代码提交 2025-02-21 10:03:50 +08:00
sx 3e4f7e3c09 Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp 2025-02-20 15:49:11 +08:00
sx 38c39e1930 合并代码 2025-02-20 15:48:53 +08:00
lr 46f55d8b0e 消息 2025-02-20 15:46:10 +08:00
sx 4e769f24ed Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp 2025-02-20 15:39:41 +08:00
sx fcdc7ad20a 商品详情发布富文本 2025-02-20 15:38:59 +08:00
lr e290d77397 消息列表 2025-02-20 15:12:53 +08:00
sx b33123604d 合并代码 2025-02-19 18:45:15 +08:00
sx 9fd01b453f Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp 2025-02-19 18:03:14 +08:00
sx a3f0bb6703 2025 02 19 工作代码提交 2025-02-19 18:02:15 +08:00
sx 0ee1576f8b 2025 02 19 工作代码提交
榴莲果树兑换和样式 卷轴兑换流程
2025-02-19 16:54:49 +08:00
lr 307b25d08d 消息 2025-02-19 16:36:12 +08:00
lr b1b68d68ef 1 2025-02-18 18:09:05 +08:00
sx 0084fe8aa1 修复 私聊聊天 头像不正确的bug 2025-02-18 15:02:33 +08:00
sx 0fa8e522b1 Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp
# Conflicts:
#	jiuyi2/common/js/config.js
#	jiuyi2/vite.config.js
2025-02-18 14:11:54 +08:00
sx ccb6b7af80 视频详情点赞 弹窗 青少年模式流程问题 2025-02-18 14:08:33 +08:00
lr e2c3fff951 1 2025-02-18 12:30:44 +08:00
lr 5612f07709 榴莲果配置 扫码加好友 2025-02-18 11:39:50 +08:00
lr d77e175b52 榴莲果配置 扫码加好友 2025-02-18 11:38:36 +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
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 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 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 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 36df835adf 合并代码 2025-02-06 23:34:13 +08:00
sx 2bb07b4957 合并代码 2025-02-05 23:29:54 +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