Browse Source

优化分享

pull/19/head
zyronon 4 years ago
parent
commit
19f7d0548a
  1. BIN
      src/assets/img/icon/components/gray-close-full3.png
  2. BIN
      src/assets/img/icon/components/share/bizhi.webp
  3. BIN
      src/assets/img/icon/components/share/code.png
  4. BIN
      src/assets/img/icon/components/share/collect-yellow.png
  5. BIN
      src/assets/img/icon/components/share/collect.png
  6. BIN
      src/assets/img/icon/components/share/comeon.webp
  7. BIN
      src/assets/img/icon/components/share/comeonlook.webp
  8. BIN
      src/assets/img/icon/components/share/copy.png
  9. BIN
      src/assets/img/icon/components/share/dislike.png
  10. BIN
      src/assets/img/icon/components/share/dou.webp
  11. BIN
      src/assets/img/icon/components/share/download.png
  12. BIN
      src/assets/img/icon/components/share/duoshan-logo2.png
  13. BIN
      src/assets/img/icon/components/share/link.png
  14. BIN
      src/assets/img/icon/components/share/qq.webp
  15. BIN
      src/assets/img/icon/components/share/share.png
  16. BIN
      src/assets/img/icon/components/share/warning.png
  17. BIN
      src/assets/img/icon/components/share/wechat.webp
  18. BIN
      src/assets/img/icon/components/share/wechatquan.png
  19. 1
      src/components/dialog/FromBottomDialog.vue
  20. 227
      src/pages/home/components/VideoShare.vue

BIN
src/assets/img/icon/components/gray-close-full3.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

BIN
src/assets/img/icon/components/share/bizhi.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
src/assets/img/icon/components/share/code.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
src/assets/img/icon/components/share/collect-yellow.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
src/assets/img/icon/components/share/collect.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
src/assets/img/icon/components/share/comeon.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
src/assets/img/icon/components/share/comeonlook.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
src/assets/img/icon/components/share/copy.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
src/assets/img/icon/components/share/dislike.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

BIN
src/assets/img/icon/components/share/dou.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
src/assets/img/icon/components/share/download.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
src/assets/img/icon/components/share/duoshan-logo2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
src/assets/img/icon/components/share/link.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

BIN
src/assets/img/icon/components/share/qq.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
src/assets/img/icon/components/share/share.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
src/assets/img/icon/components/share/warning.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
src/assets/img/icon/components/share/wechat.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
src/assets/img/icon/components/share/wechatquan.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 KiB

1
src/components/dialog/FromBottomDialog.vue

@ -133,7 +133,6 @@ export default {
afterLeave() { afterLeave() {
}, },
hide(val = false) { hide(val = false) {
this.$emit('update:modelValue', val) this.$emit('update:modelValue', val)
this.$emit('cancel') this.$emit('cancel')

227
src/pages/home/components/VideoShare.vue

@ -2,108 +2,119 @@
<from-bottom-dialog <from-bottom-dialog
:page-id="pageId" :page-id="pageId"
v-model="modelValue" v-model="modelValue"
@cancel="closeShare" @cancel="closeShare1"
:touch-moved="false" :touch-moved="false"
maskMode="light" maskMode="light"
height="60vh" height="60vh"
mode="light"> mode="light">
<div class="video-share"> <div class="video-share">
<svg width="200" height="200" viewBox="0 0 200 200">
<circle
:r="10"
:cx="100"
:cy="100"
:stroke-width="3"
:stroke="'darkgrey'"
fill="none"
/>
<circle
:r="10"
:cx="100"
:cy="100"
:stroke-width="3"
:stroke="'#514F56'"
:stroke-dasharray="`30,100000`"
fill="none"
stroke-linecap="round"
/>
</svg>
<div class="shares"> <div class="shares">
<div class="to">
<div class="wrapper">
<!-- <div class="loading">-->
<!-- <div class="quan1"></div>-->
<!-- <div class="quan2"></div>-->
<!-- </div>-->
</div>
</div>
<div class="to" @click="closeShare($emit('share2WeChat'))"> <div class="to" @click="closeShare($emit('share2WeChat'))">
<img src="@/assets/img/icon/components/share/wechat.webp" alt=""> <div class="wrapper">
<img src="@/assets/img/icon/components/share/wechat.webp" alt="">
</div>
<span>微信</span> <span>微信</span>
</div> </div>
<div class="to" @click="closeShare($emit('showShare2WeChatZone'))"> <div class="to" @click="closeShare($emit('showShare2WeChatZone'))">
<img src="@/assets/img/icon/components/share/wechatquan.png" alt=""> <div class="wrapper">
<img src="@/assets/img/icon/components/share/wechatquan.png" alt="">
</div>
<span>朋友圈</span> <span>朋友圈</span>
</div> </div>
<div class="to" @click="closeShare($emit('share2QQZone'))"> <template v-if="false">
<img src="@/assets/img/icon/components/share/qq.webp" alt=""> <div class="to" @click="closeShare($emit('share2QQZone'))">
<span>QQ</span> <img src="@/assets/img/icon/components/share/qq.webp" alt="">
</div> <span>QQ</span>
<div class="to" @click="canDownload && closeShare($emit('download'))"
:style="{ opacity : canDownload ? '1' : '0.5' }">
<img src="@/assets/img/icon/components/share/download.png" alt="">
<span>保存本地</span>
</div>
<div class="to" @click="$nav('/home/report',{mode:this.mode})">
<img src="@/assets/img/icon/components/share/warning.png" alt="">
<span>举报</span>
</div>
<div class="to" @click="copyLink">
<img src="@/assets/img/icon/components/share/copy.png" alt="">
<span>复制口令</span>
</div>
<div class="to" @click="toggleCollect">
<img v-if="isCollect" src="@/assets/img/icon/components/share/collect-yellow.png" alt="">
<img v-else src="@/assets/img/icon/components/share/collect.png" alt="">
<span>收藏</span>
</div>
<div class="to" @click="$no">
<img src="@/assets/img/icon/components/video/comeonlook.webp" alt="">
<span>一起看</span>
</div>
<div class="to" @click="copyLink">
<img src="@/assets/img/icon/components/share/link.png" alt="">
<span>复制链接</span>
</div>
<div class="to" @click="$no">
<img src="@/assets/img/icon/components/video/dou.webp" alt="">
<span>帮上热门</span>
</div>
<template v-if="isShowMore">
<div class="to" @click="closeShare($emit('showShareDuoshan'))">
<img src="@/assets/img/icon/components/video/duoshan.png" alt="">
<span>多闪</span>
</div> </div>
<div class="to" @click="$no"> <div class="to" @click="canDownload && closeShare($emit('download'))"
<img src="@/assets/img/icon/components/video/totoutiao.webp" alt=""> :style="{ opacity : canDownload ? '1' : '0.5' }">
<span>今日头条</span> <img src="@/assets/img/icon/components/share/download.png" alt="">
<span>保存本地</span>
</div> </div>
</template> <div class="to" @click="$nav('/home/report',{mode:this.mode})">
<template v-else> <img src="@/assets/img/icon/components/share/warning.png" alt="">
<div class="to" @click="$no"> <span>举报</span>
<img src="@/assets/img/icon/components/share/share.png" alt=""> </div>
<span>更多分享</span> <div class="to" @click="copyLink">
<img src="@/assets/img/icon/components/share/copy.png" alt="">
<span>复制口令</span>
</div>
<div class="to" @click="toggleCollect">
<img v-if="isCollect" src="@/assets/img/icon/components/share/collect-yellow.png" alt="">
<img v-else src="@/assets/img/icon/components/share/collect.png" alt="">
<span>收藏</span>
</div> </div>
</template>
<!-- todo-->
<div class="to" @click="closeShare($emit('dislike'))">
<img src="@/assets/img/icon/components/share/dislike.png" alt="">
<span>不感兴趣</span>
</div>
<div class="to" @click="$no">
<img src="@/assets/img/icon/components/video/bizhi.webp" alt="">
<span>动态壁纸</span>
</div>
<div class="to" @click="closeShare($emit('showDouyinCode'))">
<img src="@/assets/img/icon/components/video/qrcode.png" alt="">
<span>抖音码</span>
</div>
<template v-if="false">
<div class="to" @click="$no"> <div class="to" @click="$no">
<img src="@/assets/img/icon/components/video/torichang.png" alt=""> <img src="@/assets/img/icon/components/share/comeon.webp" alt="">
<span>分享日常</span> <span>一起看</span>
</div> </div>
<div class="to" @click="closeShare($emit('ShareToFriend'))"> <div class="to" @click="copyLink">
<img src="@/assets/img/icon/components/video/tofriend.webp" alt=""> <img src="@/assets/img/icon/components/share/link.png" alt="">
<span>私信朋友</span> <span>复制链接</span>
</div> </div>
<div class="to" @click="$no">
<div class="to" @click="closeShare($emit('share2Webo'))"> <img src="@/assets/img/icon/components/share/dou.webp" alt="">
<img src="@/assets/img/icon/components/video/toweibo.webp" alt=""> <span>帮上热门</span>
<span>微博</span> </div>
<template v-if="isShowMore">
<div class="to" @click="closeShare($emit('showShareDuoshan'))">
<img src="@/assets/img/icon/components/video/duoshan.png" alt="">
<span>多闪</span>
</div>
<div class="to" @click="$no">
<img src="@/assets/img/icon/components/video/totoutiao.webp" alt="">
<span>今日头条</span>
</div>
</template>
<template v-else>
<div class="to" @click="$no">
<img src="@/assets/img/icon/components/share/share.png" alt="">
<span>更多分享</span>
</div>
</template>
<div class="to" @click="closeShare($emit('dislike'))">
<img src="@/assets/img/icon/components/share/dislike.png" alt="">
<span>不感兴趣</span>
</div> </div>
<div class="to" @click="$no"> <div class="to" @click="$no">
<img src="@/assets/img/icon/components/video/comeonplay.png" alt=""> <img src="@/assets/img/icon/components/share/bizhi.webp" alt="">
<span>合拍</span> <span>动态壁纸</span>
</div> </div>
<div class="to" @click="closeShare($emit('play-feedback'))"> <div class="to" @click="closeShare($emit('showDouyinCode'))">
<img src="@/assets/img/icon/components/video/feedback.webp" alt=""> <img src="@/assets/img/icon/components/share/code.png" alt="">
<span>播放反馈</span> <span>抖音码</span>
</div> </div>
</template> </template>
</div> </div>
@ -153,13 +164,14 @@ export default {
default: true default: true
}, },
}, },
computed: { computed: {
...mapState(['friends']), ...mapState(['friends']),
}, },
data() { data() {
return { return {
isCollect: false, isCollect: false,
isShowMore: false, isShowMore: true,
} }
}, },
methods: { methods: {
@ -184,6 +196,9 @@ export default {
}, },
closeShare() { closeShare() {
// this.$emit("update:modelValue", false) // this.$emit("update:modelValue", false)
},
closeShare1() {
this.$emit("update:modelValue", false)
} }
} }
} }
@ -254,9 +269,10 @@ export default {
} }
} }
@icon-width: 5.8rem;
.shares { .shares {
@space-width: 1.5rem; @space-width: 1.5rem;
@icon-width: 3.8rem;
overflow-x: scroll; overflow-x: scroll;
display: flex; display: flex;
@ -266,16 +282,25 @@ export default {
margin-left: @space-width; margin-left: @space-width;
margin-bottom: @space-width; margin-bottom: @space-width;
img { .wrapper {
box-sizing: border-box;
background: white; background: white;
padding: 1rem;
width: @icon-width; width: @icon-width;
height: @icon-width; height: @icon-width;
padding: 1.2rem;
border-radius: 1.5rem; border-radius: 1.5rem;
display: flex;
align-items: center;
justify-content: center;
img {
width: 100%;
//height: 100%;
}
} }
span { span {
margin-top: .2rem; margin-top: .7rem;
color: black; color: black;
font-size: 1rem; font-size: 1rem;
display: block; display: block;
@ -283,6 +308,36 @@ export default {
} }
} }
} }
.loading {
width: 60%;
height: 60%;
position: relative;
@border-width: 3.1px;
.quan1 {
position: absolute;
box-sizing: border-box;
width: 100%;
height: 100%;
border: @border-width solid darkgrey;
border-radius: 50%;
}
.quan2 {
position: absolute;
box-sizing: border-box;
width: 100%;
height: 100%;
border: @border-width solid #514F56;
border-radius: 50%;
}
}
} }
</style> </style>

Loading…
Cancel
Save