绿满眶商城微信小程序-uniapp
zxl
2025-08-01 728a7604328e961b42c619df2d19daac90e7979f
页面调整,二维调整
7个文件已修改
125 ■■■■■ 已修改文件
pages.json 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/health/healthVideo.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/kitchen/KitchenVideo.vue 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mine/activity/applyActivityList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mine/activity/reportActivity.vue 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/product/goods.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tabbar/user/utils/tool.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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",
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)
                  // 新增一个字段用于循环时的key
                  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)
          // 新增一个字段用于循环时的key
          const data = res.data.data.map(item => {
              return {
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)
              // 新增一个字段用于循环时的key
              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)
        // 新增一个字段用于循环时的key
        const data = res.data.data.map(item => {
            return {
@@ -832,6 +869,7 @@
        this.videoQuery.pageNumber++;
      })
      }
    },
    // 滑动切换视频
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: '没有更多了'
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;
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;
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')">