diff --git a/locale/en.json b/locale/en.json index 01773ed3..ab367f9f 100644 --- a/locale/en.json +++ b/locale/en.json @@ -17,8 +17,15 @@ "add": "Add", "copy": "Copy", "remove": "Remove", + "expand": "Expand", + "retract": "Retract", + "reply": "Reply", "remove_success": "Remove successful", "remove_fail": "Remove failed", + "history": "History", + "history_record": "History record", + "clear": "Clear", + "clear_record": "Clear record", "del": "Delete", "del_record": "Delete record", "del_success": "Delete successful", @@ -49,6 +56,8 @@ "refuse": "Refuse", "buy": "Buy", "complaint": "Complaint", + "comment": "Comment", + "like": "Like", "info": "Info", "web_client": "WebClient", "app_client": "AppClient", @@ -332,8 +341,9 @@ "plugins-certificate-userauth-detail": "Certificate detail", "plugins-goodscompare-index": "Goods Compare", "plugins-video-index": "Short Video List", - "plugins-video-search": "Short video search", "plugins-video-detail": "Short video details", + "plugins-video-search": "Short video search", + "plugins-video-search-record": "Short video searchrecord", "plugins-live-pull": "Live Details", "plugins-complaint-user": "Complaint/Report List", "plugins-complaint-form": "Complaint/Report", @@ -666,7 +676,6 @@ "goods-search": { "j8o278": "Filter out", "t9nikq": "Piece of data", - "pxk051": "clear", "4eerty": "origin", "6n8316": "brand", "v6e5b7": "attribute" @@ -683,8 +692,6 @@ "75l3l2": "Unreturned", "17vy72": "Missing tab data!", "i78v36": "Returning to the store", - "lkld04": "Comment:", - "r6vv25": "Like:", "6rsqp1": "All", "pot64x": "Popular", "8t4j95": "Recommended products", @@ -1551,7 +1558,6 @@ }, "user-order": { "user-order": { - "twc3r7": "comment", "lp1v28": "Urge and urge", "ht65c9": "Suborder", "9l47b6": "form", @@ -1627,15 +1633,11 @@ }, "ask-comments": { "ask-comments": { - "2zlnb5": "Comment(", - "du7rcv": "Like(", "6l6vz7": "word", - "3fcnme": "Reply(", "ymmd24": "Replies", "dfhg54": "View more replies", "5401r1": "Comments", "4l77wt": "View more comments", - "8sjar6": "Reply@", "m67961": "Looking forward to your speech", "3o1rq6": "The maximum input character limit has been exceeded" } @@ -1646,12 +1648,6 @@ "g6mc44": "If you have any questions, please ask other classmates~" } }, - "binding-list": { - "binding-list": { - "2u4v35": "Put it away", - "91d60h": "launch" - } - }, "bottom-line": { "bottom-line": { "44bct2": "I have a bottom line" @@ -2020,5 +2016,19 @@ "54rttr": "Choose other products", "fsdft3": "Feedback on this product" } + }, + "video-search": { + "video-search": { + "sdfgg4": "Sort by", + "gf3212": "Release time", + "iuyt42": "video duration" + } + }, + "video-detail": { + "video-detail": { + "rfsdfg": "Reason for reporting", + "fsdf33": "Please choose a specific type", + "98yyuf": "Please enter your wonderful comment" + } } } \ No newline at end of file diff --git a/locale/zh.json b/locale/zh.json index 3cb11e20..90145c48 100644 --- a/locale/zh.json +++ b/locale/zh.json @@ -17,8 +17,15 @@ "add": "新增", "copy": "复制", "remove": "移除", + "expand": "展开", + "retract": "收起", + "reply": "回复", "remove_success": "移除成功", "remove_fail": "移除失败", + "history": "历史", + "history_record": "历史记录", + "clear": "清除", + "clear_record": "清除记录", "del": "删除", "del_record": "删除记录", "del_success": "删除成功", @@ -49,6 +56,8 @@ "refuse": "拒绝", "buy": "购买", "complaint": "举报", + "comment": "评论", + "like": "点赞", "info": "信息", "web_client": "web端", "app_client": "手机端", @@ -330,8 +339,9 @@ "plugins-certificate-userauth-detail": "资质认证详情", "plugins-goodscompare-index": "商品对比", "plugins-video-index": "短视频列表", - "plugins-video-search": "短视频搜索", "plugins-video-detail": "短视频详情", + "plugins-video-search": "短视频搜索", + "plugins-video-search-record": "短视频搜索记录", "plugins-live-pull": "直播详情", "plugins-complaint-user": "投诉/举报列表", "plugins-complaint-form": "投诉/举报", @@ -657,7 +667,6 @@ "goods-search": { "j8o278": "筛选出", "t9nikq": "条数据", - "pxk051": "清除", "4eerty": "产地", "6n8316": "品牌", "v6e5b7": "属性" @@ -674,8 +683,6 @@ "75l3l2": "未回", "17vy72": "缺失tab数据!", "i78v36": "回到店铺", - "lkld04": "评论:", - "r6vv25": "点赞:", "6rsqp1": "所有", "pot64x": "热门", "8t4j95": "推荐商品", @@ -1541,7 +1548,6 @@ }, "user-order": { "user-order": { - "twc3r7": "评论", "lp1v28": "催催", "ht65c9": "子单", "9l47b6": "表单", @@ -1617,15 +1623,11 @@ }, "ask-comments": { "ask-comments": { - "2zlnb5": "评论(", - "du7rcv": "点赞(", "6l6vz7": "字", - "3fcnme": "回复(", "ymmd24": "条回复", "dfhg54": "查看更多回复", "5401r1": "条评论", "4l77wt": "查看更多评论", - "8sjar6": "回复 @", "m67961": "期待您的发言...", "3o1rq6": "已超过最大输入字符限制" } @@ -1636,12 +1638,6 @@ "g6mc44": "有疑问就问问其他同学吧~" } }, - "binding-list": { - "binding-list": { - "2u4v35": "收起", - "91d60h": "展开" - } - }, "bottom-line": { "bottom-line": { "44bct2": "我是有底线的" @@ -2004,5 +2000,19 @@ "54rttr": "选择其他商品", "fsdft3": "反馈该商品" } + }, + "video-search": { + "video-search": { + "sdfgg4": "排序依据", + "gf3212": "发布时间", + "iuyt42": "视频时长" + } + }, + "video-detail": { + "video-detail": { + "rfsdfg": "举报原因", + "fsdf33": "请选择具体的类型", + "98yyuf": "请输入您的精彩评论" + } } } \ No newline at end of file diff --git a/pages/goods-search/goods-search.vue b/pages/goods-search/goods-search.vue index 4a14a905..91de4c7d 100644 --- a/pages/goods-search/goods-search.vue +++ b/pages/goods-search/goods-search.vue @@ -60,7 +60,7 @@ {{$t('goods-search.goods-search.j8o278')}} {{data_total}} {{$t('goods-search.goods-search.t9nikq')}} - {{$t('goods-search.goods-search.pxk051')}} + {{$t('common.clear')}} - {{$t('ask-comments.ask-comments.2zlnb5')}}{{ data.comments_count }}) + {{$t('common.comment')}}({{ data.comments_count }}) - {{$t('ask-comments.ask-comments.du7rcv')}}{{ data.give_thumbs_count }}) + {{$t('common.like')}}({{ data.give_thumbs_count }}) @@ -31,7 +31,7 @@ {{$t('login.login.n24i5u')}}{{ input_comments_length_value }}{{$t('ask-comments.ask-comments.6l6vz7')}} - + @@ -53,11 +53,11 @@ - {{$t('ask-comments.ask-comments.3fcnme')}}{{ item.comments_count }}) + {{$t('common.reply')}}({{ item.comments_count }}) - {{$t('ask-comments.ask-comments.du7rcv')}}{{ item.give_thumbs_count }}) + {{$t('common.like')}}({{ item.give_thumbs_count }}) @@ -75,11 +75,11 @@ - {{$t('ask-comments.ask-comments.3fcnme')}}{{ comments.comments_count }}) + {{$t('common.reply')}}({{ comments.comments_count }}) - {{$t('ask-comments.ask-comments.du7rcv')}}{{ comments.give_thumbs_count }}) + {{$t('common.like')}}({{ comments.give_thumbs_count }}) @@ -116,7 +116,7 @@ - {{$t('ask-comments.ask-comments.8sjar6')}}{{ input_comments_modal_username }} + {{$t('common.reply')}} @{{ input_comments_modal_username }} @@ -128,7 +128,7 @@ {{$t('login.login.n24i5u')}}{{ input_comments_length_value }}{{$t('ask-comments.ask-comments.6l6vz7')}} - + diff --git a/pages/plugins/binding/components/binding-list/binding-list.vue b/pages/plugins/binding/components/binding-list/binding-list.vue index 00c29255..53c57ed0 100644 --- a/pages/plugins/binding/components/binding-list/binding-list.vue +++ b/pages/plugins/binding/components/binding-list/binding-list.vue @@ -42,7 +42,7 @@ - {{ (item.is_home_show_goods || 0) == 1 ? $t('binding-list.binding-list.2u4v35') : $t('binding-list.binding-list.91d60h') }}{{ item.type_name }}{{$t('common.goods')}} + {{ (item.is_home_show_goods || 0) == 1 ? $t('common.retract') : $t('common.expand') }}{{ item.type_name }}{{$t('common.goods')}} diff --git a/pages/plugins/blog/components/blog-comments/blog-comments.vue b/pages/plugins/blog/components/blog-comments/blog-comments.vue index e593374b..6e914e95 100644 --- a/pages/plugins/blog/components/blog-comments/blog-comments.vue +++ b/pages/plugins/blog/components/blog-comments/blog-comments.vue @@ -2,16 +2,16 @@ - {{$t('user-order.user-order.twc3r7')}}{{ data.comments_count || '' }} + {{$t('common.comment')}}{{ data.comments_count || '' }} - {{$t('ask-comments.ask-comments.2zlnb5')}}{{ data.comments_count }}) + {{$t('common.comment')}}({{ data.comments_count }}) - {{$t('ask-comments.ask-comments.du7rcv')}}{{ data.give_thumbs_count }}) + {{$t('common.like')}}({{ data.give_thumbs_count }}) @@ -31,7 +31,7 @@ {{$t('login.login.n24i5u')}}{{ input_comments_length_value }}{{$t('ask-comments.ask-comments.6l6vz7')}} - + @@ -51,11 +51,11 @@ - {{$t('ask-comments.ask-comments.3fcnme')}}{{ item.comments_count }}) + {{$t('common.reply')}}({{ item.comments_count }}) - {{$t('ask-comments.ask-comments.du7rcv')}}{{ item.give_thumbs_count }}) + {{$t('common.like')}}({{ item.give_thumbs_count }}) @@ -73,7 +73,7 @@ - {{$t('ask-comments.ask-comments.3fcnme')}}{{ comments.comments_count }}) + {{$t('common.reply')}}({{ comments.comments_count }}) - {{$t('ask-comments.ask-comments.du7rcv')}}{{ comments.give_thumbs_count }}) + {{$t('common.like')}}({{ comments.give_thumbs_count }}) @@ -124,7 +124,7 @@ - {{$t('ask-comments.ask-comments.8sjar6')}}{{ input_comments_modal_username }} + {{$t('common.reply')}} @{{ input_comments_modal_username }} @@ -136,7 +136,7 @@ {{$t('login.login.n24i5u')}}{{ input_comments_length_value }}{{$t('ask-comments.ask-comments.6l6vz7')}} - + diff --git a/pages/plugins/blog/index/index.vue b/pages/plugins/blog/index/index.vue index 76a9a173..bec37d03 100644 --- a/pages/plugins/blog/index/index.vue +++ b/pages/plugins/blog/index/index.vue @@ -24,8 +24,8 @@ {{ blog_main_name }}: {{ item.blog_data.blog_count }} - {{ $t('index.index.lkld04') }}{{ item.blog_data.comments_count }} - {{ $t('index.index.r6vv25') }}{{ item.blog_data.give_thumbs_count }} + {{$t('common.comment')}}:{{ item.blog_data.comments_count }} + {{$t('common.like')}}:{{ item.blog_data.give_thumbs_count }} diff --git a/pages/plugins/live/pull/mixins/mixins.js b/pages/plugins/live/pull/mixins/mixins.js index 06726330..c55d88ca 100644 --- a/pages/plugins/live/pull/mixins/mixins.js +++ b/pages/plugins/live/pull/mixins/mixins.js @@ -45,8 +45,11 @@ export default { onLoad(params) { // 调用公共事件方法 app.globalData.page_event_onload_handle(params); + // 设置参数 - this.params = app.globalData.launch_params_handle(params); + this.setData({ + params: app.globalData.launch_params_handle(params), + }); }, /** @@ -56,14 +59,13 @@ export default { // 调用公共事件方法 app.globalData.page_event_onshow_handle(); - // 分享菜单处理 - app.globalData.page_share_handle(); - const data = uni.getWindowInfo(); this.windowWidth = data.windowWidth > 800 ? 800 : data.windowWidth; this.windowHeight = data.windowHeight; + // 初始化 this.init(); + // 页面显示时,连接直播间socket, 避免用户切换到其他页面,再切换回来时,socket连接断开 if (this.$refs.liveContent) { this.$refs.liveContent.socket_connect(); @@ -72,6 +74,9 @@ export default { if (this.$refs.liveVideo) { this.$refs.liveVideo.reload_video(); } + + // 分享菜单处理 + app.globalData.page_share_handle(); }, /** diff --git a/pages/plugins/shop/search/search.vue b/pages/plugins/shop/search/search.vue index fb009e95..26cc96a5 100644 --- a/pages/plugins/shop/search/search.vue +++ b/pages/plugins/shop/search/search.vue @@ -37,7 +37,7 @@ {{$t('goods-search.goods-search.j8o278')}} {{data_total}} {{$t('goods-search.goods-search.t9nikq')}} - {{$t('goods-search.goods-search.pxk051')}} + {{$t('common.clear')}} diff --git a/pages/plugins/video/components/comment-info.vue b/pages/plugins/video/components/comment-info.vue index 09a80e8d..6e4797c2 100644 --- a/pages/plugins/video/components/comment-info.vue +++ b/pages/plugins/video/components/comment-info.vue @@ -27,7 +27,7 @@ {{ propComment.add_time }} - {{ propReplyContent }}({{ propComment.comments_count }}) + {{ propReplyContent || $t('common.reply') }}({{ propComment.comments_count }}) @@ -56,7 +56,7 @@ }, propReplyContent: { type: String, - default: '回复' + default: '' }, // 控制下拉菜单显示状态 propDropDownVisible: { @@ -68,8 +68,8 @@ return { // 下拉菜单选项数据 dropdownOptions: [ - { label: '删除', type: 'delete' }, - { label: '举报', type: 'report' } + { label: this.$t('common.del'), type: 'delete' }, + { label: this.$t('common.complaint'), type: 'report' } ] }; }, diff --git a/pages/plugins/video/components/comment-more.vue b/pages/plugins/video/components/comment-more.vue index cebdacf1..1a6e5ae9 100644 --- a/pages/plugins/video/components/comment-more.vue +++ b/pages/plugins/video/components/comment-more.vue @@ -1,7 +1,7 @@