From 8ec9c517c58b70918f2d72f2bfa6ab4b0a4145f9 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Fri, 19 Aug 2022 18:03:39 +0800
Subject: [PATCH] 局部细节调整
---
src/components/mini/box-friend.vue | 4
src/components/mini/box15-videoPlayBox.vue | 16 ++
src/assets/md.less | 22 ++-
src/components/mini/mdDetail.vue | 8
src/assets/iconfont.css | 206 ++++++++++++++++++++++++++++++++++
src/components/group/MyVideo.vue | 3
src/assets/OwO.json | 3
src/components/mini/tagInfo.vue | 44 -------
src/components/group/tool.vue | 18 +-
9 files changed, 257 insertions(+), 67 deletions(-)
diff --git a/src/assets/OwO.json b/src/assets/OwO.json
index 390a2d0..ba3b4ea 100644
--- a/src/assets/OwO.json
+++ b/src/assets/OwO.json
@@ -6,6 +6,9 @@
"text": "Author: DIYgod"
},
{
+ "icon": "눈_눈",
+ "text": "兵长的眼神"
+ },{
"icon": "|´・ω・)ノ",
"text": "Hi"
},
diff --git a/src/assets/iconfont.css b/src/assets/iconfont.css
new file mode 100644
index 0000000..f3a0c39
--- /dev/null
+++ b/src/assets/iconfont.css
@@ -0,0 +1,206 @@
+@font-face {
+ font-family: "iconfont"; /* Project id 2762112 */
+ src: url('iconfont.woff2?t=1658051690338') format('woff2'),
+ url('iconfont.woff?t=1658051690338') format('woff');
+}
+
+.iconfont {
+ font-family: "iconfont" !important;
+ font-size: 16px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-dingwei1:before {
+ content: "\e8ae";
+}
+
+.icon-xiangji1:before {
+ content: "\e77f";
+}
+
+.icon-fuzhi1:before {
+ content: "\e637";
+}
+
+.icon-banquan:before {
+ content: "\e6b5";
+}
+
+.icon-guanbi2:before {
+ content: "\e62d";
+}
+
+.icon-sign-review:before {
+ content: "\e878";
+}
+
+.icon-huati1:before {
+ content: "\e659";
+}
+
+.icon-shouye1:before {
+ content: "\e62b";
+}
+
+.icon-shouye2:before {
+ content: "\e635";
+}
+
+.icon-icon1:before {
+ content: "\e651";
+}
+
+.icon-icon2:before {
+ content: "\e652";
+}
+
+.icon-icon3:before {
+ content: "\e65f";
+}
+
+.icon-icon4:before {
+ content: "\e68e";
+}
+
+.icon-nengliang:before {
+ content: "\e719";
+}
+
+.icon-shouye:before {
+ content: "\e628";
+}
+
+.icon-views:before {
+ content: "\e650";
+}
+
+.icon-aixin:before {
+ content: "\e63c";
+}
+
+.icon-icon-14-xinchuangkoudakai:before {
+ content: "\e667";
+}
+
+.icon-huati:before {
+ content: "\e665";
+}
+
+.icon-quanpingmu:before {
+ content: "\e732";
+}
+
+.icon-yuanquanquan:before {
+ content: "\e653";
+}
+
+.icon-713bianjiqi_yinyong:before {
+ content: "\e65d";
+}
+
+.icon-tongji:before {
+ content: "\e60f";
+}
+
+.icon-bianji:before {
+ content: "\e629";
+}
+
+.icon-icon:before {
+ content: "\e693";
+}
+
+.icon-renyuan:before {
+ content: "\e645";
+}
+
+.icon-tupian2:before {
+ content: "\ec2a";
+}
+
+.icon-fasong:before {
+ content: "\e60a";
+}
+
+.icon-changyong_huifu:before {
+ content: "\e6b1";
+}
+
+.icon-weixiao-:before {
+ content: "\e62a";
+}
+
+.icon-pinglun-1:before {
+ content: "\e633";
+}
+
+.icon-subway-solid:before {
+ content: "\e788";
+}
+
+.icon-icon_on_the_left:before {
+ content: "\e623";
+}
+
+.icon-icon_on_the_right:before {
+ content: "\e627";
+}
+
+.icon-taiyang:before {
+ content: "\e697";
+}
+
+.icon-sousuo1:before {
+ content: "\e684";
+}
+
+.icon-kong:before {
+ content: "\e708";
+}
+
+.icon-daohang:before {
+ content: "\e626";
+}
+
+.icon-tuding:before {
+ content: "\e644";
+}
+
+.icon-sousuo:before {
+ content: "\e6aa";
+}
+
+.icon-A:before {
+ content: "\e6f2";
+}
+
+.icon-rili:before {
+ content: "\e625";
+}
+
+.icon-shaixuan_2:before {
+ content: "\e6e3";
+}
+
+.icon-404:before {
+ content: "\e61c";
+}
+
+.icon-biaoqian1:before {
+ content: "\f078";
+}
+
+.icon-yejian:before {
+ content: "\e61e";
+}
+
+.icon-heianmoshi:before {
+ content: "\e781";
+}
+
+.icon-sousuofenlei:before {
+ content: "\e649";
+}
+
diff --git a/src/assets/md.less b/src/assets/md.less
index 4cce72f..6e9b3a3 100644
--- a/src/assets/md.less
+++ b/src/assets/md.less
@@ -17,15 +17,19 @@
}
}
- img{
- max-width: -webkit-fill-available;
- display: inline;
- box-shadow: 0 0 4px rgba(0,0,0,0.5);
- overflow: visible;
- border-radius: 12px;
- -webkit-filter: drop-shadow(4px 4px 10px rgba(0,0,0,.5));
- filter: drop-shadow(4px 4px 10px rgba(0,0,0,.5));
- }
+ p{
+ text-indent: 2rem;
+ }
+
+ // img{
+ // max-width: -webkit-fill-available;
+ // display: inline;
+ // box-shadow: 0 0 4px rgba(0,0,0,0.5);
+ // overflow: visible;
+ // border-radius: 12px;
+ // -webkit-filter: drop-shadow(4px 4px 10px rgba(0,0,0,.5));
+ // filter: drop-shadow(4px 4px 10px rgba(0,0,0,.5));
+ // }
h1, h2, h3, h4 {
color: #111111;
font-weight: 400;
diff --git a/src/components/group/MyVideo.vue b/src/components/group/MyVideo.vue
index 378918b..9b57872 100644
--- a/src/components/group/MyVideo.vue
+++ b/src/components/group/MyVideo.vue
@@ -75,6 +75,9 @@
this.visible = false;
},
afterClose() {
+ //关闭视频播放
+ this.$refs.videoDetail.$refs.videoPlayBox.pauseMyVideo()
+
this.$emit("closeMyVideo")
}
},
diff --git a/src/components/group/tool.vue b/src/components/group/tool.vue
index a0dc0dc..83952df 100644
--- a/src/components/group/tool.vue
+++ b/src/components/group/tool.vue
@@ -3,6 +3,10 @@
<div style="padding-left:5px;" class="myButton">
<div>
+ <a-button @click="()=>this.$router.back(-1)">
+ 后退
+ <a-icon type="left" />
+ </a-button>
<a-button v-if="!drawerStatus" @click="changeDrawerStatus">
展开
<a-icon type="down" />
@@ -13,15 +17,6 @@
</a-button>
</div>
<div v-if="drawerStatus">
- <a-button @click="()=>this.$router.back(-1)">
- 后退
- <a-icon type="left" />
- </a-button>
-
- <a-button @click="showPreview">
- 预览
- <a-icon type="youtube" />
- </a-button>
<a-button @click="showScreen" v-if="!screen">
拉伸
<a-icon type="arrows-alt" />
@@ -30,6 +25,11 @@
缩小
<a-icon type="shrink" />
</a-button>
+
+ <a-button @click="showPreview">
+ 预览
+ <a-icon type="youtube" />
+ </a-button>
<a-button @click="showModal">
日志
<a-icon type="plus-circle" />
diff --git a/src/components/mini/box-friend.vue b/src/components/mini/box-friend.vue
index 33fdc88..47ecd44 100644
--- a/src/components/mini/box-friend.vue
+++ b/src/components/mini/box-friend.vue
@@ -1,6 +1,7 @@
<template>
<div class="myFriend">
- <div v-for="temp in list">
+ <div v-if="list.length==0" class="mySecret"> 空空如也..</div>
+ <div v-for="temp in list" v-else>
<h1>{{temp.groupName}}</h1>
<hr>
<div class="link-box">
@@ -204,6 +205,7 @@
width: calc(100% / 3 - 8rem);
}
}
+
@media screen and (max-width: 1438px) and (min-width: 791px) {
.link-box a {
margin: 0 0.9375rem 3.75rem;
diff --git a/src/components/mini/box15-videoPlayBox.vue b/src/components/mini/box15-videoPlayBox.vue
index 6685448..4ce96af 100644
--- a/src/components/mini/box15-videoPlayBox.vue
+++ b/src/components/mini/box15-videoPlayBox.vue
@@ -7,6 +7,7 @@
<div id="videoPlay" ref="myVdeoPlay"></div>
</div>
<div style="border-radius: 0 0 4px 4px;">
+
<div style="padding: 10px 0px;">
音量 :
<a-slider v-model="volumeInit" :default-value="0.1" :step="0.1" :max="1" @change="changeVolume" />
@@ -16,6 +17,7 @@
{{Math.floor(duration/60)}}:{{Math.floor(duration%60)}}
<a-slider v-model="currentTime" :max="duration" @afterChange="changeTime" />
</div>
+
<a-collapse activeKey="playHistory">
<a-collapse-panel key="playHistory" header="播放记录">
<div v-for="(item,index) in playHistory">
@@ -102,6 +104,10 @@
},
methods: {
+ pauseMyVideo() {
+ this.dp.pause();
+ this.isPlaying = false;
+ },
togglePlay() {
this.dp.toggle();
this.isPlaying = !this.isPlaying;
@@ -175,7 +181,7 @@
}
this.dp.switchVideo(this.playingVideoData)
-
+
},
//播放器初始化
init() {
@@ -248,6 +254,14 @@
position: relative;
}
+ .mark {
+ border-radius: 14px;
+ background: #00000073;
+ width: 100%;
+ height: 100%;
+ pointer-events: none;
+ }
+
.playItem:hover {
//transform: scale(1.1) translate3d(0, 0, 0);
}
diff --git a/src/components/mini/mdDetail.vue b/src/components/mini/mdDetail.vue
index e9e1b54..b85966b 100644
--- a/src/components/mini/mdDetail.vue
+++ b/src/components/mini/mdDetail.vue
@@ -6,7 +6,7 @@
</a-button>
</div> -->
- <div class="headertop filter-dot headertop-bar">
+ <div class="headertop filter-dot headertop-bar " v-if="coverURL.length>0">
<figure class="centerbg" v-bind:style="{'background-image':'url('+this.coverURL+')'}">
</figure>
</div>
@@ -50,8 +50,8 @@
</pre>
</div>
- <div class="markdown-body article-detail" v-else>
- <vue-markdown :source="source"></vue-markdown>
+ <div class="markdown-body article-detail " v-else>
+ <vue-markdown :source="source" ></vue-markdown>
</div>
</div>
@@ -123,7 +123,7 @@
value: '',
disabled: false
},
- coverURL: "http://t.inleft.com/share/media_photo/background.jpg"
+ coverURL: ""
}
},
created() {
diff --git a/src/components/mini/tagInfo.vue b/src/components/mini/tagInfo.vue
index cfe2479..99aa9fb 100644
--- a/src/components/mini/tagInfo.vue
+++ b/src/components/mini/tagInfo.vue
@@ -34,30 +34,8 @@
</p>
</a-timeline-item>
- <!-- <a-timeline-item color="">
- <h3 class="layui-timeline-title">后续blog风格设计..</h3>
- <a-icon type="container" slot="dot" style="font-size: 18px;" />
- <br>
- <ul>
- <li> 第一要义 干净,凝练</li>
- <li> 交互感:动效(适量,微小,无感知,恰到好处)</li>
- <li> 响应式布局下,统一页边距,字体,行间距,圆角</li>
- </ul>
- </a-timeline-item>
- -->
+
<!--
- 它叫 faye's theme 出自高瞰/的独立游戏(寻找天堂)
-
- 时间:2020.02某个不眠的深夜
- 音源/录像: es110的内置录音/mi 9的普通摄像
- 剪辑:pr(其实就贴了一张图,一镜到底)
-
- 对我而言,2018-2020发生了很多事情,
- 为此放弃了很多东西,不得不说那是一段不愿意回忆起的日子
- 2019年8月 我的挚友找了个梯子给我找来了这个谱子
- 它更像一副良药,缓慢而温和治愈我
- 以上.送给那些孤独的朋友..
-
寻找天堂这部作品更引起了我的共鸣
这个时间点之前,瞰哥还有另一个神作,去月球,我也很喜欢这个
讲的是一个十分感人的爱情故事
@@ -66,24 +44,6 @@
因而<<to the moon>> 这首曲子也在我的曲库里
-->
- <!--
- 这首曲子叫卡农/canon(也是一种调式,不过大家都这么称呼它)
- 或者矫情一点,我一般叫它 Canon In D Arranged By George Winston
- 如它的名字所见,谱子出自乔治·温斯顿,
- (有些难度的地方我可能自己做了简化处理,比如最后的几小节,所以有谱子对不上也是正常的,因为这个是属于我的卡农(骄傲.jpg))
- 时间:来自年代久远的2016.09 某个没课的下午
- 音源/录像: 舍友的iphone
- 剪辑:手机版的小影
-
- canon不是我第一首学会弹的曲子,如果要算的话,应该是完整学会的第二首曲子,不过却是我最喜欢的曲子,没有之一
-
- 平常练琴带的耳机,特地拿出来录音已经是征得舍友同意,不然我也拿不到他的手机,哈哈(那年iPhone的录音确实比国产的安卓要好)
- 没有感情的弹琴机器,也有可能是当时的电子琴表达不出来的我的情绪,现在回听,很多细节也没有处理好,剪辑衔接更是烂的一批,
- 不过不妨碍我多年之后还是能津津有味地欣赏,哈哈
-
- 这是一首为自己而弹的曲子,或多或少可能在大学以前听过,真正感到震撼的时刻,应该是在乐团里,现场听队友演凑,乡下孩子没见过世面,当时真的是感觉惊为天人,
- "教练我要学这个!!"
- -->
<br>
<h3 class="layui-timeline-title">那些对我而言,有意义的时刻..</h3>
<br>
@@ -186,10 +146,8 @@
<p>阿里云初代机 启动</p>
</a-timeline-item>
-
<!-- <a-timeline-item color="">
<a-icon slot="dot" type="align-left" style="font-size: 18px;" />
-
<br><em>爱她所爱,思她所思,为她承担伤痛</em>
<br>度过苦难 无论贫寒,无论卑贱或富贵
<br>无论身处乱世还是神所不顾 我都愿为她拔剑而战
--
Gitblit v1.9.1