Merge remote-tracking branch 'origin/user_action' into user_action

peng

2025-10-27 287d63930c74a63146b1c1a44009f5ed81965105

 pages/tabbar/user/my.vue

@@ -18,28 +18,38 @@
      <u-icon style="display: flex;align-items: flex-start;" name="arrow-right"></u-icon>
    </view>
   <!-- <button  type="default" @click="goTOSuccess">立即查看</button> -->
   <view class="member-gradient-bg">	
    <view class="member-content">
         <view class="vip-icon">
           <image src="/static/tabbar/vip.png" mode="widthFix"></image>
         </view>
         <view class="vip-info">
           <p class="vip-level">绿满筐会员</p>
           <p class="vip-validity">长期有效</p>
         </view>
	      
         <!-- 会员标识装饰 -->
         <view class="vip-badge">
           <text class="badge-text">尊享特权</text>
         </view>
       </view>
   <view class="member-gradient-bg" v-if="prizeActivity.enableStatus === 'ON'">
    <view class="member-gradient-bg" @click="gotoPrizeActivity" >
      <view class="activity-content">
        <!-- 活动图标（使用接口返回的 activityCoverUrl） -->
        <view class="activity-icon">
          <view class="floating-btn-content">
            <text class="floating-btn-icon">🎁</text>
            <text class="floating-btn-text">抽奖活动</text>
          </view>

<!--          <image :src="prizeActivity.activityCoverUrl" mode="aspectFit"></image>-->
        </view>
        <!-- 活动信息（名称、描述、倒计时） -->
        <view class="activity-info">
          <p class="activity-name">{{ prizeActivity.activityName }}</p>
          <p class="activity-desc">{{ prizeActivity.activityDes }}</p>
          <p class="activity-desc">{{ formatDate(prizeActivity.beginTime) }} - {{ formatDate(prizeActivity.endTime)}}</p>
        </view>
        <!-- 立即参与入口 -->
        <view class="activity-enter">
          <text class="enter-text">立即参与</text>
          <u-icon name="arrow-right"></u-icon>
        </view>
      </view>
    </view>
      
   </view>
    <!-- 积分，优惠券，关注， -->
    <div class="pointBox box">
      <u-row text-align="center" gutter="16" class="point">
        <u-col text-align="center" span="4" @click="navigateTo('/pages/mine/deposit/operation')">
          <view>预存款</view>
          <view>余额</view>
          <view class="money">{{ walletNum | unitPrice }}</view>
        </u-col>

@@ -145,12 +155,17 @@
import configs from '@/config/config'
import storage from '@/utils/storage.js'
import { getSessionId, userAction } from "@/api/userAction.js";
import {getONPrizeActivity} from "@/api/prize-activity";
import UIcon from "../../subComponents/uview-components/uview-ui/components/u-icon/u-icon.vue";

export default {
  components: {
    UIcon,
    tool
  },
  data() {
    return {
      prizeActivity: {},
     endpoint: '',
      configs,
      userImage:configs.defaultUserPhoto,
@@ -174,6 +189,7 @@
    };
  },
  onLoad(option) {
    this.actionParam.pageParams = JSON.stringify(option)
    console.log('-----------分享出的数据---------->', option)
    let shareStoreId = null;
    let shareTime = null;
@@ -205,45 +221,38 @@
      } catch (e) {
        console.error('存储失败：', e);
      }
    }else{
      shareStoreId = uni.getStorageSync('shareStoreId');
      shareStoreId = uni.getStorageSync('shareTime');
      console.log('从缓存读取参数:', { shareStoreId, shareTime });
      // this.bindMemberAndStore(shareStoreId, shareTime)
      if (shareStoreId && shareTime) {
        console.log('检测到有效参数，调用后端接口');
        this.bindMemberAndStore(shareStoreId, shareTime);
      } else {
        console.log('无有效参数，执行正常逻辑');
      }
    }
    this.initCOS()
   },
  onUnload() {
    let   param = this.actionParam;
    let   param = Object.assign({}, this.actionParam);
    if (this.sendOnShow)return
    param.pageStatus = "LEAVE"
    userAction(param)
  },
  onHide() {
    this.startHidenTime = Date.now()
    let   param = this.actionParam;
    let   param =Object.assign({}, this.actionParam);
    this.sendOnShow = true;
    param.pageStatus = "LEAVE"
    userAction(param)
  },
  onLoad(options) {
     this.actionParam.pageParams = JSON.stringify(options)
     this.initCOS()
  },
  // onLoad(options) {
   //
   //   this.initCOS()
  // },
  onShow() {
    this.getONPrizeActivity();
     getSessionId().then(res=>{
      this.pageSessionNo = res.data.data
      this.actionParam.sessionId = res.data.data
      if(this.pageSessionNo){
      let   param = this.actionParam;
      let   param = Object.assign({}, this.actionParam);
         param.sessionId = this.pageSessionNo
         userAction(param)
      }
     })

    this.userInfo = this.$options.filters.isLogin() || {};
    if (this.$options.filters.isLogin("auth")) {
      this.getUserOrderNum();
@@ -252,10 +261,21 @@
      this.couponNum = 0;
      this.footNum = 0;
    }

   let shareStoreId = uni.getStorageSync('shareStoreId');
   let shareTime = uni.getStorageSync('shareTime');
   console.log('从缓存读取参数:', { shareStoreId, shareTime });
   if (shareStoreId && shareTime) {
     console.log('检测到有效参数，调用后端接口');
     this.bindMemberAndStore(shareStoreId, shareTime);
   } else {
     console.log('无有效参数，执行正常逻辑');
   }
  },
  onPullDownRefresh() {
    this.getUserOrderNum();
    this.userInfo = this.$options.filters.isLogin();
    this.getONPrizeActivity(); // 下拉刷新同步最新活动状态
  },
  // #ifndef MP
  onNavigationBarButtonTap(e) {
@@ -268,6 +288,48 @@

  mounted() { },
  methods: {
    formatDate(isoTime) {
      if (!isoTime) return '';
      const date = new Date(isoTime);
      const year = date.getFullYear();
      const month = String(date.getMonth() + 1).padStart(2, '0');
      const day = String(date.getDate()).padStart(2, '0');
      return `${year}年${month}月${day}日`; // 转换为中文格式
    },
    getONPrizeActivity(){
      getONPrizeActivity().then(res =>{
        if(res.statusCode=== 200){
          //后端没查到开启的抽奖活动 res.data.data.id值为null
          this.prizeActivity = res.data.data; // 存储完整活动数据
          if (this.prizeActivity.endTime) {
          }else {
            this.prizeActivity = {}; // 无活动时清空
          }
        }
      })
    },
    gotoPrizeActivity(){
      uni.navigateTo({
        url:'/pages/prize/PrizeDetail/PrizeDetail?id=' + this.prizeActivity.id,
      });
    },
     // 解析URL参数
     parseUrlParams(url) {
        const params = {};
        // 处理可能存在的hash（如果有的话）
        const cleanUrl = url.split('#')[0];
        const queryStr = cleanUrl.split('?')[1] || '';

        queryStr.split('&').forEach(pair => {
           const [key, value] = pair.split('=');
           if (key) {
              // 如果值存在，则解码，否则设为空字符串
              params[key] = value ? decodeURIComponent(value) : '';
           }
        });

        return params;
     },
    async bindMemberAndStore(shareStoreId, shareTime){
      let form ={
        shareStoreId: shareStoreId,
@@ -346,7 +408,28 @@
body {
  overflow: auto;
}
  
  .floating-btn-content {
    display: flex;
    flex-direction: column;
    align-items: center;
    justify-content: center;
    z-index: 1;
    position: relative;
  }
  .floating-btn-icon {
    font-size: 70rpx;
    color: white;
    filter: drop-shadow(0 2rpx 4rpx rgba(0, 0, 0, 0.2));
    margin-bottom: 5rpx;
  }
  .floating-btn-text {
    font-size: 20rpx;
    color: white;
    z-index: 1;
    position: relative;
    text-shadow: 0 1rpx 3rpx rgba(0, 0, 0, 0.2);
    white-space: nowrap;
  }
.member-gradient-bg {
   width: 98%;
   height: 250rpx;
@@ -359,7 +442,95 @@
     &:active {
       transform: scale(0.98);
     }
  cursor: pointer; // 增加点击指针样式
  overflow: hidden; // 防止内容溢出
  .activity-content {
    width: 100%;
    height: 100%;
    display: flex;
    align-items: center;
    padding: 0 40rpx;
    box-sizing: border-box;
  }

  // 活动图标
  .activity-icon {
    width: 130rpx;
    height: 130rpx;
    margin-right: 24rpx;
    border-radius: 16rpx;
    overflow: hidden;
    background: rgba(255,255,255,0.2);
    image {
      width: 100%;
      height: 100%;
      object-fit: cover;
    }
  }

  // 活动信息区域
  .activity-info {
    flex: 1;
    .activity-name {
      font-size: 32rpx;
      font-weight: bold;
      color: #fff;
      margin: 0 0 8rpx 0;
      text-shadow: 0 2rpx 4rpx rgba(0,0,0,0.1);
    }
    .activity-desc {
      font-size: 22rpx;
      color: rgba(255,255,255,0.9);
      margin: 0;
    }
  }

  // 倒计时样式
  .activity-countdown {
    display: flex;
    align-items: center;
    margin-top: 12rpx;
    .countdown-label {
      font-size: 20rpx;
      color: rgba(255,255,255,0.8);
      margin-right: 8rpx;
    }
    .countdown-box {
      display: flex;
      align-items: center;
    }
    .countdown-item {
      display: inline-block;
      width: 36rpx;
      height: 36rpx;
      line-height: 36rpx;
      background: rgba(255,255,255,0.3);
      border-radius: 8rpx;
      color: #fff;
      font-size: 20rpx;
      text-align: center;
      margin: 0 4rpx;
    }
    .countdown-sep {
      color: #fff;
      font-size: 22rpx;
      margin: 0 4rpx;
    }
  }

  // 立即参与入口
  .activity-enter {
    display: flex;
    align-items: center;
    .enter-text {
      font-size: 24rpx;
      color: #fff;
      margin-right: 8rpx;
      font-weight: 500;
    }
  }
}

/* 内容区域 */
.member-content {
  width: 100%;