Merge remote-tracking branch 'origin/bin' into media-css
This commit is contained in:
@@ -42,7 +42,7 @@ const { $api, navTo, debounce, customSystem } = inject('globalFunction');
|
||||
import { storeToRefs } from 'pinia';
|
||||
import useLocationStore from '@/stores/useLocationStore';
|
||||
import useUserStore from '@/stores/useUserStore';
|
||||
const { userInfo } = storeToRefs(useUserStore());
|
||||
const { userInfo, isMiniProgram } = storeToRefs(useUserStore());
|
||||
const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
|
||||
|
||||
const pageState = reactive({
|
||||
@@ -58,6 +58,15 @@ const state = reactive({
|
||||
tabIndex: 'all',
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
// #ifdef H5
|
||||
if (!isMiniProgram.value) {
|
||||
const a = document.getElementsByClassName('uni-page-head-hd')[0];
|
||||
a.style.display = 'none';
|
||||
}
|
||||
// #endif
|
||||
});
|
||||
|
||||
onLoad(() => {
|
||||
getList('refresh');
|
||||
});
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="video-container">
|
||||
<view class="back-box">
|
||||
<view class="back-box" v-if="isMiniProgram">
|
||||
<view class="btn">
|
||||
<uni-icons type="left" size="26" color="#FFFFFF" @click="navBack"></uni-icons>
|
||||
</view>
|
||||
@@ -31,6 +31,8 @@ import mTikTok from '@/components/TikTok/TikTok.vue';
|
||||
import useUserStore from '@/stores/useUserStore';
|
||||
import { useRecommedIndexedDBStore } from '@/stores/useRecommedIndexedDBStore.js';
|
||||
const recommedIndexDb = useRecommedIndexedDBStore();
|
||||
import { storeToRefs } from 'pinia';
|
||||
const { isMiniProgram } = storeToRefs(useUserStore());
|
||||
const state = reactive({
|
||||
videoList: [],
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user