Skip to content

Commit

Permalink
save
Browse files Browse the repository at this point in the history
  • Loading branch information
zyronon committed Mar 31, 2024
1 parent e53c2db commit a8f0f64
Show file tree
Hide file tree
Showing 49 changed files with 1,590 additions and 653 deletions.
653 changes: 653 additions & 0 deletions public/data/goods.json

Large diffs are not rendered by default.

File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added public/images/icon/love.webp
Binary file not shown.
5 changes: 5 additions & 0 deletions src/api/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import request from "../utils/request";
export function userinfo(params, data) {
return request({url: '/user/userinfo', method: 'get', params, data})
}

export function userVideoList(params, data) {
return request({url: '/user/video_list', method: 'get', params, data})
}
Expand All @@ -21,4 +22,8 @@ export function userCollect(params, data) {

export function recommendedPost(params, data) {
return request({url: '/post/recommended', method: 'get', params, data})
}

export function recommendedShop(params, data) {
return request({url: '/shop/recommended', method: 'get', params, data})
}
65 changes: 0 additions & 65 deletions src/assets/data/goods.js

This file was deleted.

25 changes: 18 additions & 7 deletions src/components/DouyinCode.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<div class="DouyinCode" v-if="modelValue">
<div class="content">
<div class="video-poster">
<img src="../assets/img/poster/1.jpg" class="poster">
<img :src="_checkImgUrl(item.video.cover.url_list[0])" class="poster">
</div>
<div class="desc">
<div class="left">
<div class="user">@名字</div>
<div class="title">#窃书不能算偷……窃书!……读书人的事,能算偷么?</div>
<div class="user">@{{item.author.nickname}}</div>
<div class="title">{{item.desc}}</div>
</div>
<img class="code" src="../assets/img/icon/components/video/douyin-code.jpg" alt="">
</div>
Expand Down Expand Up @@ -43,9 +43,12 @@
</transition>
</template>
<script>
import {_checkImgUrl} from "@/utils";
export default {
name: "DouyinCode",
props: {
item:{},
modelValue: false
},
data() {
Expand All @@ -55,6 +58,7 @@ export default {
created() {
},
methods: {
_checkImgUrl,
cancel() {
this.$emit('update:modelValue', false)
}
Expand Down Expand Up @@ -87,16 +91,22 @@ export default {
overflow: hidden;
.desc {
margin-bottom: 20rem;
display: flex;
gap: 20rem;
padding: 10rem;
.left {
font-size: 18rem;
.title {
margin-top: 10rem;
font-size: 14rem;
color: var(--second-text-color);
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box; //作为弹性伸缩盒子模型显示。
-webkit-box-orient: vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
-webkit-line-clamp: 1; //显示的行
}
}
.code {
Expand Down Expand Up @@ -134,11 +144,11 @@ export default {
.shares {
display: flex;
padding-right: @space-width * 2;
margin-bottom: @space-width;
gap: 20rem;
padding-left: 20rem;
.share-to {
margin-left: 28rem;
margin-bottom: @space-width;
img {
width: @icon-width;
Expand All @@ -159,6 +169,7 @@ export default {
.cancel {
font-size: 16rem;
background: rgb(38, 38, 38);
color: rgba(white,.8);
padding: 15rem;
text-align: center;
}
Expand Down
13 changes: 7 additions & 6 deletions src/components/Share.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</div>
<div class="shares list">
<template v-if="mode === 'video'">
<div class="option" @click.stop="$no">
<div class="option" @click.stop="closeShare($emit('ShareToFriend'))">
<img class="avatar" src="../assets/img/icon/components/video/torichang.png" alt="">
<span>转发</span>
</div>
Expand All @@ -51,7 +51,7 @@
<img class="small" src="../assets/img/icon/components/video/warring.png" alt="">
<span>举报</span>
</div>
<div class="option" @click.stop="$nav('/home/report',{mode:this.mode})">
<div class="option" @click.stop="closeShare($emit('ShareToFriend'))">
<Icon icon="ion:paper-plane"/>
<span>私信朋友</span>
</div>
Expand All @@ -73,7 +73,7 @@
<span>不感兴趣</span>
</div>
<div class="option" @click.stop="closeShare($emit('showDouyinCode'))">
<img class="small" src="../assets/img/icon/components/video/dislike.png" alt="">
<Icon icon="tabler:photo"/>
<span>生成图片</span>
</div>
<div class="option" @click.stop="$no">
Expand Down Expand Up @@ -133,7 +133,7 @@ import Check from "./Check";
import FromBottomDialog from "./dialog/FromBottomDialog";
import DouyinCode from "./DouyinCode";
import {useBaseStore} from "@/store/pinia";
import {$no} from "@/utils";
import {$no, _copy} from "@/utils";
export default {
name: "Share",
Expand All @@ -144,6 +144,7 @@ export default {
},
props: {
modelValue: false,
item: {},
videoId: {
type: String,
default: null
Expand All @@ -170,8 +171,7 @@ export default {
}
},
data() {
return {
}
return {}
},
methods: {
$no,
Expand All @@ -180,6 +180,7 @@ export default {
this.$showLoading()
await this.$sleep(500)
this.$hideLoading()
_copy(this.item.share_info.share_link_desc + this.item.share_info.share_url)
//TODO 抖音样式改了
this.$notice('复制成功')
},
Expand Down
6 changes: 3 additions & 3 deletions src/components/dialog/FromBottomDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export default {
},
borderRadius: {
type: String,
default: '5rem 5rem 0 0'
default: '15rem 15rem 0 0'
},
tag: {
type: String,
Expand Down Expand Up @@ -218,11 +218,11 @@ export default {
}
.heng-gang {
border-radius: 5rem 5rem 0 0;
border-radius: 15rem 15rem 0 0;
z-index: 3;
width: 100%;
position: fixed;
height: 20rem;
height: 30rem;
display: flex;
transform: translateY(-24rem);
justify-content: center;
Expand Down
Loading

0 comments on commit a8f0f64

Please sign in to comment.