Commit Graph

88 Commits

Author SHA1 Message Date
sx 134facabb2 2025.03.12 工作代码提交 2025-03-12 22:11:26 +08:00
sx fc83ac9e06 2025.03.09 工作代码提交 2025-03-10 08:52:36 +08:00
sx 8fd05cc702 2025.03.07 工作代码提交 2025-03-08 09:40:51 +08:00
sx 4c8f2050e8 2024.03.05~2024.03.06 工作代码提交 2025-03-06 22:00:21 +08:00
sx bcd5428f82 2025.03.04工作代码提交
软件更新
2025-03-04 17:10:55 +08:00
sx e5384d3995 2025.03.01~2025.03.03 工作代码提交
解决富文本在app端异常的问题
添加消息聊天页去举报的功能
账单调整
种子明细
2025-03-04 09:03:08 +08:00
sx b8527dc284 合并代码 2025-03-01 09:05:16 +08:00
sx 1fb340263b 2025.02.28 工作代码提交 2025-02-28 19:19:35 +08:00
lr 9377e4e869 店铺首页 2025-02-28 11:51:55 +08:00
sx 4402fdd67a 2025.02.27 工作代码提交 2025-02-27 14:53:04 +08:00
lr 8e157f6996 修改邮箱 账号 手机号 登录密码 2025-02-26 16:36:32 +08:00
lr 3deaf329cd 消息验证实名 2025-02-25 18:38:24 +08:00
lr e0f2b6be60 举报 拉黑 查看评论 2025-02-24 16:25:26 +08:00
lr 4e88cbdefc 举报 拉黑 查看评论 2025-02-24 16:25:08 +08:00
sx 0a930aa170 Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp
# Conflicts:
#	jiuyi2/common/js/config.js
#	jiuyi2/vite.config.js
2025-02-23 20:22:45 +08:00
lr 1e8c025c37 视频搜索 2025-02-23 15:23:44 +08:00
sx 0a6bc47efe Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp 2025-02-23 13:34:00 +08:00
sx d9f56e0fbb 合并代码 2025-02-23 13:32:05 +08:00
lr 1d2efd6397 消息 2025-02-23 10:59:37 +08:00
lr 61dd26ab64 消息 2025-02-22 17:13:30 +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 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 9fd01b453f Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp 2025-02-19 18:03:14 +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 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 1e374dd8df 1 2025-02-18 12:49:47 +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 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 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