解決衝突

This commit is contained in:
duan
2025-01-18 09:55:10 +08:00
8 changed files with 50 additions and 37 deletions

View File

@@ -9,14 +9,12 @@
<image class="img" src="/static/logo.png" mode="widthFix"></image>
</view>
<view class="quick-menu">
<image class="icon" src="/static/me/logo_btn1.png" mode="aspectFit" @click="linkTo('/pages/share/index')"></image>
<image class="icon" src="/static/me/logo_btn1.png" mode="aspectFit" @click="linkTo('/pages/share/index', true)"></image>
<image class="icon" src="/static/me/logo_btn2.png" mode="aspectFit" @click="linkTo('/pages/me/message', true)"></image>
<navigator hover-class="none" url="/pages/me/contact">
<image class="icon" src="/static/me/logo_btn3.png" mode="aspectFit"></image>
</navigator>
<image class="icon" src="/static/me/logo_btn3.png" mode="aspectFit" @click="linkTo('/pages/me/contact', true)"></image>
</view>
</view>
<view class="top" @click="linkTo('/pages/me/userInfo')">
<view class="top" @click="linkTo(userInfo.phone?'/pages/me/userInfo':'/pages/login/login')">
<image class="avatar" :src="userInfo.avatar || '/static/default_avatar.png'" mode="aspectFill"></image>
<view class="info-wrap">
<view class="name">{{ userInfo.phone || '请登录' }}</view>
@@ -31,7 +29,7 @@
<view class="title">我的追剧</view>
<view class="num">{{ likeData.collectCount }}</view>
</navigator>
<view class="item" v-if="$common.isIosExamine" @click="linkTo('/pages/me/withdraw/index')">
<view class="item" v-if="$common.isIosExamine" @click="linkTo('/pages/me/withdraw/index',true)">
<view class="title">我的红包</view>
<view class="num">{{ amount || 0 }}</view>
</view>
@@ -43,16 +41,18 @@
<image class="icon" src="/static/me/gold_icon.png" mode="aspectFit"></image>
<view class="num">{{ gold }}</view>
</view>
<navigator hover-class="none" url="/pages/me/gold_record">
<div @click="linkTo('/pages/me/gold_record', true)">
<view class="btn">金币明细</view>
</navigator>
</div>
</view>
<navigator class="title-wrap" hover-class="none" url="/pages/watching_history/watching_history?type=3">
<div class="title-wrap" @click="linkTo('/pages/watching_history/watching_history?type=3', true)">
<view class="a">
<view class="t">观看历史</view>
<up-icon name="arrow-right"></up-icon>
</view>
</navigator>
</div>
<view class="history-list">
<view
class="item"
@@ -111,19 +111,21 @@
<script setup>
import { ref, reactive } from 'vue';
import { onLoad, onShow, onPullDownRefresh } from '@dcloudio/uni-app';
import { onLoad,onShow, onPullDownRefresh } from '@dcloudio/uni-app';
import { selectByUserId, collectVideoSummary, selectUserMoney } from '@/api/me/me.js';
import { linkTo } from '@/utils/app.js';
import { useCommonStore } from '@/store/common.js';
const $common = useCommonStore();
import {
useCommonStore
} from '@/store/common.js'
const $common = useCommonStore()
const userInfo = ref({});
// 获取最近的三条观看历史
const recordThree = ref([]);
onShow(() => {
onShow(()=>{
// 判断ios是否审核
$common.init();
});
$common.init()
})
async function selectByUserIdAjax() {
try {
const res = await selectByUserId({ page: 1, limit: 3, classify: 3 });
@@ -177,11 +179,14 @@ onPullDownRefresh(async () => {
}, 500);
});
onShow(() => {
selectByUserIdAjax();
collectVideoSummaryAjax();
selectUserMoneyAjax();
userInfo.value = uni.getStorageSync('userInfo');
onLoad(() => {
if(uni.getStorageSync('token')){
selectByUserIdAjax();
collectVideoSummaryAjax();
selectUserMoneyAjax();
userInfo.value = uni.getStorageSync('userInfo');
}
});
</script>