From 728a7604328e961b42c619df2d19daac90e7979f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 01 八月 2025 11:00:45 +0800
Subject: [PATCH] 页面调整，二维调整
---
pages/tabbar/user/utils/tool.vue | 2
pages/kitchen/KitchenVideo.vue | 44 +++++++++++++-
pages/product/goods.vue | 7 +
pages.json | 7 +-
pages/mine/activity/reportActivity.vue | 50 +++-------------
pages/health/healthVideo.vue | 13 +++-
pages/mine/activity/applyActivityList.vue | 2
7 files changed, 72 insertions(+), 53 deletions(-)
diff --git a/pages.json b/pages.json
index bc3dc0d..f3532d4 100644
--- a/pages.json
+++ b/pages.json
@@ -865,7 +865,8 @@
"u-navbar": "view",
"u-button": "view",
"u-image": "view",
- "u-loadmore": "view"
+ "u-loadmore": "view",
+ "u-empty":"view"
}
}
},
@@ -1914,7 +1915,7 @@
{
"path": "news",
"style": {
- "navigationBarTitleText": "鏂伴椈",
+ "navigationBarTitleText": "蹇",
"componentPlaceholder": {
"u-icon": "view",
"u-button": "view",
@@ -1933,7 +1934,7 @@
{
"path": "detail",
"style": {
- "navigationBarTitleText": "鏂伴椈璇︽儏",
+ "navigationBarTitleText": "蹇璇︽儏",
"componentPlaceholder": {
"u-icon": "view",
"u-button": "view",
diff --git a/pages/health/healthVideo.vue b/pages/health/healthVideo.vue
index add3102..4b17775 100644
--- a/pages/health/healthVideo.vue
+++ b/pages/health/healthVideo.vue
@@ -386,10 +386,11 @@
const params = this.parseUrlParams(decodedUrl);
const shareType = params.shareType;
const videoId = params.videoId;
- const source = params.source
+ const source = params.source
+
queryParam.videoId = videoId
- queryParam.shareType = shareType
- queryParam.source = source
+ queryParam.shareType = shareType
+ queryParam.source = source
console.log('瑙ｆ瀽鍙傛暟:', { shareType, videoId,source });
}
const token = storage.getAccessToken();
@@ -784,7 +785,10 @@
this.loading = true;
if(param){
+ console.log("浜岀淮鐮佹壂鐮佹暟鎹墽琛屽湪姝ゅ1")
+ console.log(this.videoQuery)
getHealthRecommendVideos(this.videoQuery).then(res => {
+ console.log(res)
// 鏂板涓�涓瓧娈电敤浜庡惊鐜椂鐨刱ey
const data = res.data.data.map(item => {
return {
@@ -811,7 +815,10 @@
})
}else{
+ console.log("浜岀淮鐮佹壂鐮佹暟鎹墽琛屽湪姝ゅ2")
+ console.log(this.videoQuery)
getHealthRecommendVideos(this.videoQuery).then(res => {
+ console.log(res)
// 鏂板涓�涓瓧娈电敤浜庡惊鐜椂鐨刱ey
const data = res.data.data.map(item => {
return {
diff --git a/pages/kitchen/KitchenVideo.vue b/pages/kitchen/KitchenVideo.vue
index 79305e9..f69b41b 100644
--- a/pages/kitchen/KitchenVideo.vue
+++ b/pages/kitchen/KitchenVideo.vue
@@ -284,6 +284,8 @@
changeCollect
} from "@/api/collect.js";
import { saveShare, saveShareClickRecord } from "@/api/share.js";
+import storage from "@/utils/storage.js";
+
export default {
computed: {
hasPlayTime() {
@@ -439,6 +441,7 @@
}
this.getKitchenTypeList();
this.loadVideos(queryParam);
+
})
}else{
if (option.userId && option.videoId) {
@@ -447,7 +450,7 @@
saveShareClickRecord({refId: option.videoId, shareUserId: option.userId})
}
this.getKitchenTypeList();
- this.loadVideos();
+ this.loadVideos(queryParam);
}
},
@@ -799,14 +802,48 @@
})
},
// 鍔犺浇瑙嗛鏁版嵁
- async loadVideos() {
+ async loadVideos(param) {
console.log(this.loading, this.videoNoMore,this.videoQuery)
if (this.videoQuery.pageNumber == 1) {
} else if (this.loading || this.videoNoMore) return;
this.loading = true;
-
+ if(param){
+ console.log("浜岀淮鐮佹壂鐮佹暟鎹墽琛屽湪姝ゅ1")
+ console.log(this.videoQuery)
+ getkitchenVideoList(this.videoQuery).then(res => {
+ console.log(res)
+ // 鏂板涓�涓瓧娈电敤浜庡惊鐜椂鐨刱ey
+ const data = res.data.data.map(item => {
+ return {
+ ...item,
+ updateKey: item.id
+ }
+ })
+ if (this.videoQuery.pageNumber === 1) {
+ this.videoList = data;
+ } else {
+ this.videoList = [
+ ...this.videoList,
+ ...data.filter(
+ (newItem) => !this.videoList.some((oldItem) => oldItem.id === newItem.id)
+ ),
+ ];
+ }
+ this.loading = false;
+ if (data.length < this.videoQuery.pageSize) {
+ this.videoNoMore = true;
+ return;
+ }
+ this.videoQuery.pageNumber++;
+
+ })
+ }else{
+
+ console.log("浜岀淮鐮佹壂鐮佹暟鎹墽琛屽湪姝ゅ2")
+ console.log(this.videoQuery)
getkitchenVideoList(this.videoQuery).then(res => {
+ console.log(res)
// 鏂板涓�涓瓧娈电敤浜庡惊鐜椂鐨刱ey
const data = res.data.data.map(item => {
return {
@@ -832,6 +869,7 @@
this.videoQuery.pageNumber++;
})
+ }
},
// 婊戝姩鍒囨崲瑙嗛
diff --git a/pages/mine/activity/applyActivityList.vue b/pages/mine/activity/applyActivityList.vue
index ad493fc..cd59efe 100644
--- a/pages/mine/activity/applyActivityList.vue
+++ b/pages/mine/activity/applyActivityList.vue
@@ -41,7 +41,7 @@
</view>
<!-- 鏀硅繘鐨勫姞杞芥洿澶氭彁绀� -->
<view class="load-more">
- <u-loadmore :status="loading ? 'loading' : noMore ? 'nomore' : 'loadmore'" :load-text="{
+ <u-loadmore v-if="mockData.length > 0" :status="loading ? 'loading' : noMore ? 'nomore' : 'loadmore'" :load-text="{
loadmore: '涓婃媺鍔犺浇鏇村',
loading: '姝ｅ湪鍔犺浇',
nomore: '娌℃湁鏇村浜�'
diff --git a/pages/mine/activity/reportActivity.vue b/pages/mine/activity/reportActivity.vue
index 86b0a86..5741ab1 100644
--- a/pages/mine/activity/reportActivity.vue
+++ b/pages/mine/activity/reportActivity.vue
@@ -1,8 +1,12 @@
<template>
<view class="wrapper">
<top-bar selectedTitleIndex="activity" textColor="black" @changeTab="topBarChange" class="topBar"></top-bar>
-
- <view style="height: 50rpx;margin-top: 50px"></view>
+
+ <view style="height: 50rpx;margin-top: 150rpx"></view>
+ <u-empty v-if="mockData.length === 0 && !loading" style="margin-top: 130rpx;"
+ mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png">
+ </u-empty>
<!-- 鍐呭鍖哄煙 -->
<scroll-view scroll-y class="scroll-view-container" style="height: 40vh;" @scrolltolower="loadMore" :lower-threshold="100">
<view class="waterfall">
@@ -26,10 +30,8 @@
</view>
</view>
</view>
- <view class="empty-state" v-if="mockData.length === 0 && !loading">
- <text>鏆傛棤鍐呭锛屼笅鎷夊埛鏂拌瘯璇�</text>
- </view>
- <!-- <view style="height: 150rpx;"></view> -->
+
+
<!-- 鏀硅繘鐨勫姞杞芥洿澶氭彁绀� -->
<view class="load-more">
<u-loadmore v-if="mockData.length > 0" :status="loading ? 'loading' : noMore ? 'nomore' : 'loadmore'"
@@ -218,20 +220,8 @@
</script>
<style lang="scss">
- /* 绌虹姸鎬佹牱寮� */
- .empty-state {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- height: 50vh;
- text-align: center;
- color: #999;
- text {
- font-size: 28rpx;
- }
- }
- /* 鏂板鍔犺浇鏇村鏍峰紡 */
+
+ /*鏂板鍔犺浇鏇村鏍峰紡 */
.load-more {
padding: 20rpx 0;
text-align: center;
@@ -367,26 +357,6 @@
}
}
- /* 绌虹姸鎬佹牱寮� */
- .empty-state {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- height: 60vh;
- text-align: center;
-
- image {
- width: 240rpx;
- opacity: 0.6;
- margin-bottom: 30rpx;
- }
-
- text {
- color: #c0c4cc;
- font-size: 28rpx;
- }
- }
.topBar {
position: fixed;
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index c133d01..ea7f328 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -499,8 +499,11 @@
async onLoad (options) {
if(options.q){
- let queryParam = null;
- const decodedUrl = decodeURIComponent(decodeURIComponent(option.q));
+ const queryParam = {
+ id:'',
+ goodsId:''
+ };
+ const decodedUrl = decodeURIComponent(decodeURIComponent(options.q));
console.log('鍘熷URL:', decodedUrl);
const params = this.parseUrlParams(decodedUrl);
const id = params.id;
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 3703d08..eb815e3 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -69,7 +69,7 @@
</view>
<view class="interact-item" @click="navigateTo('/pages/news/news')">
<image src="/static/mine/shensu.png" mode=""></image>
- <view>鏂伴椈</view>
+ <view>蹇</view>
</view>
<!-- <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/customerManager/customerManager')">
--
Gitblit v1.8.0