diff --git a/common/css/page.css b/common/css/page.css index 8ee8b5c9..7d105ff0 100644 --- a/common/css/page.css +++ b/common/css/page.css @@ -832,7 +832,9 @@ button[disabled].bg-grey { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; + /* #ifndef APP-NVUE */ max-width: 100%; + /* #endif */ } .multi-text { max-width: 100%; diff --git a/components/popup/popup.vue b/components/popup/popup.vue index 795804b6..e1ce0f6b 100644 --- a/components/popup/popup.vue +++ b/components/popup/popup.vue @@ -40,10 +40,10 @@ propMask: { type: Boolean, default: true, - }, - propMaskTap: { - type: Boolean, - default: true, + }, + propMaskTap: { + type: Boolean, + default: true, }, propAnimation: { type: Boolean, @@ -93,7 +93,7 @@ }, methods: { // 事件处理 - on_mask_tap: function on_mask_tap() { + on_mask_tap: function on_mask_tap() { if(this.propMaskTap) { this.$emit( 'onclose', @@ -101,7 +101,7 @@ detail: {}, }, {} - ); + ); } }, // 初初始化处理 @@ -126,9 +126,11 @@ left = (width - 800) / 2; } // #endif + // #ifndef APP-NVUE this.setData({ popup_content_style: 'left:' + left + 'px;' + (this.propTop ? 'top:' + this.propTop : '') + ';' + (this.propBottom ? 'bottom:' + this.propBottom : '') + ';padding-bottom:' + tabbar_height + 'rpx;', }); + // #endif }, }, }; diff --git a/pages.json b/pages.json index 8b526f9d..7a9af231 100644 --- a/pages.json +++ b/pages.json @@ -2193,9 +2193,6 @@ } ] }, - "easycom": { - "autoscan": true - }, "condition" : { //模式配置,仅开发期间生效 "current": 0, //当前激活的模式(list 的索引项) "list": [ diff --git a/components/h5-hls-video/h5-hls-video.vue b/pages/plugins/live/pull/components/h5-hls-video/h5-hls-video.vue similarity index 100% rename from components/h5-hls-video/h5-hls-video.vue rename to pages/plugins/live/pull/components/h5-hls-video/h5-hls-video.vue diff --git a/pages/plugins/live/pull/components/live-content/live-content.vue b/pages/plugins/live/pull/components/live-content/live-content.vue index 1a574cf4..18bf8b29 100644 --- a/pages/plugins/live/pull/components/live-content/live-content.vue +++ b/pages/plugins/live/pull/components/live-content/live-content.vue @@ -143,6 +143,8 @@ + + @@ -151,6 +153,7 @@ import componentIcon from "@/pages/plugins/live/pull/components/icon/icon.vue"; import componentPopup from "@/pages/plugins/live/pull/components/popup/popup"; import componentLikeButton from "@/pages/plugins/live/pull/components/like-button/like-button"; + import componentSharePopup from "@/pages/plugins/live/pull/components/share-popup/share-popup.vue"; import { isEmpty } from '@/common/js/common/common.js'; const app = getApp(); export default { @@ -159,7 +162,8 @@ componentGoods, componentIcon, componentPopup, - componentLikeButton + componentLikeButton, + componentSharePopup }, props: { liveConfig: { @@ -558,6 +562,19 @@ share_event() { // 分享菜单处理 app.globalData.page_share_handle(); + const share_info = { + title: this.live_data.title, + desc: this.live_data.describe, + path: "/pages/plugins/live/pull/pull", + query: "id=" + this.live_data.id, + img: this.live_data.icon || "", + }; + // 调取分享弹窗 + if ((this.$refs.share || null) != null) { + this.$refs.share.init({ + share_info: share_info + }); + } }, } } diff --git a/pages/plugins/live/pull/components/share-popup/share-popup.vue b/pages/plugins/live/pull/components/share-popup/share-popup.vue new file mode 100644 index 00000000..1a2d724e --- /dev/null +++ b/pages/plugins/live/pull/components/share-popup/share-popup.vue @@ -0,0 +1,318 @@ + + + diff --git a/pages/plugins/live/pull/components/video/video.vue b/pages/plugins/live/pull/components/video/video.vue index 1c277478..ef21a24a 100644 --- a/pages/plugins/live/pull/components/video/video.vue +++ b/pages/plugins/live/pull/components/video/video.vue @@ -11,7 +11,11 @@