-
搜索
@@ -47,7 +47,7 @@
-
+
diff --git a/src/pages/home/slide/Slide0.vue b/src/pages/home/slide/Slide0.vue
index 82afb19..84e5147 100644
--- a/src/pages/home/slide/Slide0.vue
+++ b/src/pages/home/slide/Slide0.vue
@@ -62,7 +62,7 @@
import SlideItem from '@/components/slide/SlideItem.vue'
import { onMounted, onUnmounted, reactive, ref } from 'vue'
import bus, { EVENT_KEY } from '@/utils/bus'
-import Utils from '@/utils'
+import { _stopPropagation } from '@/utils'
import SlideList from './SlideList.vue'
import { recommendedVideo } from '@/api/videos'
@@ -94,7 +94,7 @@ const state = reactive({
})
function showSubType(e) {
- Utils.$stopPropagation(e)
+ _stopPropagation(e)
console.log('subTypeRef')
state.subTypeHeight = subTypeRef.value.getBoundingClientRect().height + 'px'
state.subTypeVisible = true
@@ -107,7 +107,7 @@ function pageClick(e) {
if (state.subTypeVisible) {
state.subTypeIsTop = state.subTypeVisible = false
bus.emit(EVENT_KEY.CLOSE_SUB_TYPE)
- Utils.$stopPropagation(e)
+ _stopPropagation(e)
}
}
diff --git a/src/pages/home/slide/Slide2.vue b/src/pages/home/slide/Slide2.vue
index f828764..0e78377 100644
--- a/src/pages/home/slide/Slide2.vue
+++ b/src/pages/home/slide/Slide2.vue
@@ -1,7 +1,7 @@
-
+
![]()
{{ i.nickname }}
@@ -33,7 +33,7 @@
import SlideItem from '@/components/slide/SlideItem.vue'
import { onMounted, onUnmounted, reactive, ref } from 'vue'
import bus, { EVENT_KEY } from '@/utils/bus'
-import Utils, { _checkImgUrl } from '@/utils'
+import { _checkImgUrl, _stop, _stopPropagation } from '@/utils'
import SlideList from './SlideList.vue'
import { recommendedVideo } from '@/api/videos'
import { useBaseStore } from '@/store/pinia'
@@ -46,10 +46,6 @@ const props = defineProps({
}
})
-function stop(e) {
- e.stopPropagation()
-}
-
const subTypeRef = ref(null)
const state = reactive({
index: 0,
@@ -61,7 +57,7 @@ const state = reactive({
})
function showSubType(e) {
- Utils.$stopPropagation(e)
+ _stopPropagation(e)
console.log('subTypeRef')
state.subTypeHeight = subTypeRef.value.getBoundingClientRect().height + 'px'
state.subTypeVisible = true
@@ -74,7 +70,7 @@ function pageClick(e) {
if (state.subTypeVisible) {
state.subTypeIsTop = state.subTypeVisible = false
bus.emit(EVENT_KEY.CLOSE_SUB_TYPE)
- Utils.$stopPropagation(e)
+ _stopPropagation(e)
}
}
diff --git a/src/pages/home/slide/SlideList.vue b/src/pages/home/slide/SlideList.vue
index f200c22..45a3393 100644
--- a/src/pages/home/slide/SlideList.vue
+++ b/src/pages/home/slide/SlideList.vue
@@ -103,11 +103,11 @@ async function getData(refresh = false) {
// function dislike() {
// listRef.value.dislike(state.list[1])
// state.list[state.index] = state.list[1]
-// $notice('操作成功，将减少此类视频的推荐')
+// _notice('操作成功，将减少此类视频的推荐')
// }
// function end() {
-// // this.$notice('暂时没有更多了')
+// // _notice('暂时没有更多了')
// }
function click(uniqueId) {
diff --git a/src/pages/login/OtherLogin.vue b/src/pages/login/OtherLogin.vue
index 957cb96..7e36605 100644
--- a/src/pages/login/OtherLogin.vue
+++ b/src/pages/login/OtherLogin.vue
@@ -58,19 +58,19 @@
mode="white"
>
-
+
今日头条登录
-
今日头条登录
+
QQ登录
-
QQ登录
+
微信登录
-
微信登录
+
微博登录
@@ -87,6 +87,7 @@ import Tooltip from './components/Tooltip'
import LoginInput from './components/LoginInput'
import Base from './Base.js'
import FromBottomDialog from '../../components/dialog/FromBottomDialog'
+import { _no } from '@/utils'
export default {
name: 'OtherLogin',
@@ -106,12 +107,13 @@ export default {
computed: {},
created() {},
methods: {
+ _no,
async getCode() {
let res = await this.check()
if (res) {
this.loading = true
setTimeout(() => {
- this.$nav('/login/verification-code')
+ this.$router.push('/login/verification-code')
}, 2000)
}
},
diff --git a/src/pages/login/RetrievePassword.vue b/src/pages/login/RetrievePassword.vue
index 6738c40..03d814d 100644
--- a/src/pages/login/RetrievePassword.vue
+++ b/src/pages/login/RetrievePassword.vue
@@ -69,6 +69,7 @@ import Check from '../../components/Check'
import LoginInput from './components/LoginInput'
import Tooltip from './components/Tooltip'
import Base from './Base'
+import { _hideLoading, _showConfirmDialog, _showLoading, _showNoticeDialog, _sleep } from '@/utils'
export default {
name: 'RetrievePassword',
@@ -100,13 +101,13 @@ export default {
},
methods: {
getVoiceCode() {
- return this.$showNoticeDialog(
+ return _showNoticeDialog(
'语音验证码',
'我们将以电话的方式告知你验证码，请注意接听',
'',
() => {
setTimeout(() => {
- this.$showConfirmDialog(
+ _showConfirmDialog(
'',
'您的手机可能由于空号/欠费/停机无法收到验证码，请恢复手机号状态，如果' +
'您因为换号无法收到验证码，可以尝试找回账号',
@@ -124,9 +125,9 @@ export default {
},
//TODO loading样式不对
async sendCode() {
- this.$showLoading()
- await this.$sleep(500)
- this.$hideLoading()
+ _showLoading()
+ await _sleep(500)
+ _hideLoading()
this.isSendVerificationCode = true
},
async login() {
diff --git a/src/pages/me/Me.less b/src/pages/me/Me.less
index a3c5278..d63255c 100644
--- a/src/pages/me/Me.less
+++ b/src/pages/me/Me.less
@@ -29,8 +29,8 @@
justify-content: center;
.resource {
- width: 100vw;
- max-height: 100vw;
+ width: 100%;
+ max-height: 100%;
}
.download {
@@ -48,7 +48,7 @@
position: absolute;
top: 0;
left: 0;
- width: 100vw;
+ width: 100%;
height: calc(var(--vh, 1vh) * 100);
z-index: 3;
}
@@ -190,7 +190,8 @@
.poster {
border-radius: 4rem;
width: 100%;
- height: calc((100vw - 34rem) / 3);
+ height: 130rem;
+ max-height: calc((100vw - 34rem) / 3);
display: block;
}
@@ -207,7 +208,7 @@
.float {
position: fixed;
box-sizing: border-box;
- width: 100vw;
+ width: 100%;
z-index: 2;
display: flex;
justify-content: space-between;
diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue
index c3f6dac..4486795 100644
--- a/src/pages/me/Me.vue
+++ b/src/pages/me/Me.vue
@@ -31,7 +31,7 @@
>
-
微博登录
+
@@ -123,7 +123,7 @@
-
+
-
+
@@ -242,11 +242,11 @@
+
![]()
+ ![]()
{{ i.name }}
-
+
我的订单
-
我的订单
+
钱包
@@ -260,22 +260,22 @@
观看历史
-
钱包
观看历史
+
时间管理
-
时间管理
+
创作者服务中心
-
创作者服务中心
+
小程序
-
小程序
+
抖音公益
@@ -283,7 +283,7 @@
未成年保护工具
-
抖音公益
未成年保护工具
+
我的客服
@@ -295,38 +295,38 @@
我的客服
生活服务
-
+
卡券
-
卡券
+
免流量
-
免流量
+
视频彩铃
视频彩铃
拓展功能
-
+
我的动态
-
我的动态
+
我的缓存
-
我的缓存
+
上热门
-
上热门
+
小店随心推
-
小店随心推
+
投教园地
@@ -351,7 +351,7 @@
class="download"
src="@/assets/img/icon/components/video/download.png"
alt=""
- @click.stop="$no"
+ @click.stop="_no"
/>
@@ -378,7 +378,7 @@ import { mapState } from 'pinia'
import bus from '../../utils/bus'
import ConfirmDialog from '../../components/dialog/ConfirmDialog'
-import { $no, _checkImgUrl, _formatNumber, _getUserDouyinId } from '@/utils'
+import { _checkImgUrl, _formatNumber, _getUserDouyinId, _no, _stopPropagation } from '@/utils'
import { likeVideo, myVideo, privateVideo } from '@/api/videos'
import { useBaseStore } from '@/store/pinia'
import { userCollect } from '@/api/user'
@@ -488,10 +488,10 @@ export default {
bus.on('baseSlide-end', () => (this.canScroll = true))
},
methods: {
+ _no,
_getUserDouyinId,
_checkImgUrl,
_formatNumber,
- $no,
setLoadingFalse() {
this.loadings.loading0 = false
this.loadings.loading1 = false
@@ -502,7 +502,7 @@ export default {
if (this.baseActiveIndex === 0) return
if (this.baseActiveIndex === 1) {
this.baseActiveIndex = 0
- this.$stopPropagation(e)
+ _stopPropagation(e)
}
},
async getScrollAreaHeight(index = this.contentIndex) {
@@ -790,10 +790,9 @@ export default {
} else {
//transformY === 0说明，本来就在顶部，然后猛的一划,这里要判断下
if (transformY !== 0) {
- if (this.$getCss(this.refs.header, 'height') < 400) {
+ if (_css(this.refs.header, 'height') < 400) {
this.refs.header.style.transition = 'none'
- this.refs.header.style.height =
- this.$getCss(this.refs.header, 'height') + 10 + 'px'
+ this.refs.header.style.height = _css(this.refs.header, 'height') + 10 + 'px'
timer = requestAnimationFrame(fn)
} else {
this.refs.header.style.transition = 'all .6s'
diff --git a/src/pages/me/MyCard.vue b/src/pages/me/MyCard.vue
index 8a2a7e3..8adea94 100644
--- a/src/pages/me/MyCard.vue
+++ b/src/pages/me/MyCard.vue
@@ -20,13 +20,13 @@
投教园地
-
+
扫一扫
-
+
@@ -41,7 +41,7 @@