Commit Graph

134 Commits

Author SHA1 Message Date
lr 0e9104f253 客服 2025-02-28 22:22:37 +08:00
lr d4f75ca431 客服 2025-02-28 22:20:00 +08:00
sx 1fb340263b 2025.02.28 工作代码提交 2025-02-28 19:19:35 +08:00
sx ff3913769c 合并代码 2025-02-28 14:57:12 +08:00
sx 16d69c5116 修改文案 2025-02-28 13:15:03 +08:00
sx 944f9da0ed Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp
# Conflicts:
#	jiuyi2/pages.json
2025-02-28 13:12:50 +08:00
sx a16fa0f199 2025.02.28 工作代码提交 2025-02-28 13:09:49 +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
sx 4f84721a49 合并代码 2025-02-26 09:16:19 +08:00
sx ce71b7942c Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp
# Conflicts:
#	jiuyi2/pages/news/chat/chat.vue
2025-02-25 18:43:15 +08:00
sx 8e2a23ed69 2025.02.25 工作代码提交 app权限提示的弹窗 2025-02-25 18:39:55 +08:00
lr 3deaf329cd 消息验证实名 2025-02-25 18:38:24 +08:00
lr 88d6c7746e 1 2025-02-24 16:46:10 +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
sx 29e82bd8a4 合并代码 2025-02-23 20:20:36 +08:00
lr a8684b1956 视频搜索 2025-02-23 18:07:34 +08:00
lr 1e8c025c37 视频搜索 2025-02-23 15:23:44 +08:00
sx c7f8afcde4 合并代码 2025-02-23 13:37:16 +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 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 5257e255e5 合并代码 2025-02-20 15:40: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 eff7819402 合并代码 2025-02-19 18:04:30 +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 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