Merge branch 'jifenquanyi_gaiban_20250813' of...

Merge branch 'jifenquanyi_gaiban_20250813' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into jifenquanyi_gaiban_20250813

components/quanyi/aibenxinrenli.vue

@@ -3,6 +3,11 @@
     background: `url(${$baseUrl}integral/1015/aibenxinrenliBg${props.index}.png) no-repeat center/contain`,
     height: `${props.isshowLock ? '569rpx' : '495rpx'}`
   }">
+
+
+<view class="tipLock-section" v-if="props.isshowLock">
+      <image class="tipLock" :src="$baseUrl +  `integral/1015/tipsLock1.png`" mode="aspectFit" />
+    </view>
     <!-- 标题区域 -->
     <view class="title-section">
       <text class="main-title" :style="{ color: getColor()[props.index].titleColor }">爱本新人礼</text>
@@ -41,7 +46,12 @@ const props = defineProps({
   index: {
     type: Number,
     default: 0
-  }
+  },
+
+isshowLock:{
+  type: Boolean,
+  default: false
+}
 })
 
 // 定义组件事件
@@ -101,6 +111,18 @@ const getColor = () => {
   flex-direction: column;
   // align-items: center;
 
+  .tipLock-section{
+    position: relative;
+    width: 100%;
+
+    .tipLock{
+      position: absolute;
+      right: 0;
+      top: 0;
+      width: 320rpx;
+      height: 41rpx;
+    }
+  }
   .title-section {
     // text-align: center;
     margin-top: 50rpx;

components/quanyi/jinjili.vue

@@ -45,7 +45,12 @@ const props = defineProps({
   index: {
     type: Number,
     default: 0
-  }
+  },
+
+isshowLock:{
+  type: Boolean,
+  default: false
+}
 })
 
 // 定义组件事件

components/quanyi/shengrili.vue

@@ -123,7 +123,9 @@ const handleUpgrade = async () => {
 
 // 待开启按钮点击
 const handleUpgrade_daikaiqi = () => {
-  showToast('奖励还未开启哦');
+  uni.showToast({
+    title: '奖励还未开启哦'
+  });
 }
 
 // 颜色配置
@@ -154,6 +156,7 @@ onMounted(async () => {
   const data = await fetchBirthdayGiftJSON();
   if(data.success){
     status.value = data.data.status;
+    // status.value = 3000;
   }
   console.log('data', data);
   hideLoading();

components/quanyi/suyuanyou.vue

@@ -58,7 +58,12 @@ const props = defineProps({
   startDate: {
     type: String,
     default: ''
-  }
+  },
+
+isshowLock:{
+  type: Boolean,
+  default: false
+}
 })
 
 const isStart = () => {

views/Integral.vue

@@ -359,33 +359,33 @@
 
 			<aibenxinrenli
 				:index="itemIndex"
-				:isshowLock="memberInfo?.grade < 2 && Number(itemIndex) === 0"
+				:isshowLock="memberInfo?.grade < 1 && Number(itemIndex) === 0"
 				v-if="Number(selectIdx) === 3"
 				@upgrade="handleGoToShop_aibenxinrenli"
 			/>
 
 			<zhuanduanli
 				:index="itemIndex"
-				:isshowLock="memberInfo?.grade < 2 && Number(itemIndex) === 0"
+				:isshowLock="memberInfo?.grade < 1 && Number(itemIndex) === 0"
 				v-if="Number(selectIdx) === 4"
 				@upgrade="handleGoToShop_zhuanduanli"
 			/>
 
 			<jinjili
 				:index="itemIndex"
-				:isshowLock="memberInfo?.grade < 3 && Number(itemIndex) < 2"
+				:isshowLock="memberInfo?.grade < 2 && Number(itemIndex) < 2"
 				v-if="Number(selectIdx) === 7"
 				@upgrade="handleGoToShop_jinjili"
 			/>
 			<shengrili
 				:index="itemIndex"
-				:isshowLock="memberInfo?.grade < 3 && Number(itemIndex) < 2"
+				:isshowLock="memberInfo?.grade < 2 && Number(itemIndex) < 2"
 				v-if="Number(selectIdx) === 6"
 				@upgrade="handleGoToShop_shengrili"
 			/>
 			<suyuanyou
 				:index="itemIndex"
-				:isshowLock="memberInfo?.grade < 4"
+				:isshowLock="memberInfo?.grade < 3"
 				startDate="2025-08-17"
 				v-if="Number(selectIdx) === 8"
 				@upgrade="handleGoToShop_suyuanyou"
@@ -468,7 +468,7 @@
 						:key="i"
 
 						:style="{
-							background:`url(${$baseUrl}integral/1016/listItemImgBg.png) no-repeat center/contain`
+							background:`url(${$baseUrl}integral/1017/listItemImgBg${itemIndex}.png) no-repeat center/contain`
 						}"
 					>
 						<!-- <image
@@ -501,7 +501,7 @@
 						v-for="i in goodsData[1]?.titles?.length" 
 						:key="i"
 						:style="{
-							background:`url(${$baseUrl}${listCommon?.listItemImgBg}) no-repeat center/contain`
+							background:`url(${$baseUrl}integral/1017/listItemImgBg${itemIndex}.png) no-repeat center/contain`
 						}"
 					>
 						<view class="goods-item-container" @click="handleGoodsItemClick('lingyuan',i)">
@@ -529,7 +529,7 @@
 						v-for="i in goodsData[2]?.titles?.length" 
 						:key="i"
 						:style="{
-							background:`url(${$baseUrl}${listCommon?.listItemImgBg}) no-repeat center/contain`
+							background:`url(${$baseUrl}integral/1017/listItemImgBg${itemIndex}.png) no-repeat center/contain`
 						}"
 					>
 						<view class="goods-item-container" @click="handleGoodsItemClick('beiwei',i)">
@@ -598,7 +598,7 @@
 	import { ref, onMounted, onBeforeMount, computed, watch } from 'vue';
 	import { jump, JumpType } from '@/utils/index.js'
 	import { useUserStore } from "@/stores/user";
-	import { fetchIntegralJSON } from '../api/integral';
+	import { fetchIntegralJSON,fetchBatchReceiveJSON } from '../api/integral';
 	import RegisterLayer from "../components/RegisterLayer.vue";
 
 	import { showLoading, hideLoading } from '../utils'
@@ -626,7 +626,7 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
 	}
 
 	const integralData = ref({
-	"tupianBanben": "1015",
+	"tupianBanben": "1017",
 	"swiper": [
 	],
 	"vipLvInfo":[
@@ -1746,6 +1746,7 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
 		console.log('initNetData');
 		
 		memberInfo.value = userStore.memberInfo;
+		// memberInfo.value = {"grade":"3","gradeList":[{"grade":"0","gradeName":"V1黄金会员","gradeScoreRuleMax":1,"gradeScoreRuleMin":-2147483648},{"grade":"1","gradeName":"V2铂金会员","gradeScoreRuleMax":1000,"gradeScoreRuleMin":1},{"grade":"2","gradeName":"V3钻石会员","gradeScoreRuleMax":5000,"gradeScoreRuleMin":1000},{"grade":"3","gradeName":"V4星光会员","gradeScoreRuleMax":10000,"gradeScoreRuleMin":5000},{"grade":"4","gradeName":"V5星耀会员","gradeScoreRuleMax":2147483647,"gradeScoreRuleMin":10000}],"gradeName":"V4星光会员","maxGrade":false,"memberId":"CRM000000000948094264","memberName":"文慧17637145052","mobile":"17637145052","nextGradeScoreRuleMin":10000,"orderUpgrade":true,"points":5001,"recentAnnualPointsTotal":5500,"willExpiredPoints":100000}
 
 		recentAnnualPointsTotal.value = memberInfo.value.recentAnnualPointsTotal;
 		willExpiredPoints.value = memberInfo.value.willExpiredPoints;
@@ -2200,6 +2201,7 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
 
 	const handleGoToShop_shengrili = async (data) => {
 		console.log('生日礼', data.index);
+
 		switch(data.index){
 			case 4000:
 				
@@ -2207,6 +2209,8 @@ import YearGift from '../components/pointRightsCom/yearGift.vue';
 			case 3000:
 				//去领取
 				const data = await fetchBatchReceiveJSON();
+				console.log('data22222==', data);
+				// const data = {"code":"000000","data":{"babyInfo":[{"babyBirthday":"2025-08-01","babyName":"男宝","babyNum":1}],"clientOpenId":"string","equityCode":"string","grade":"2","memberId":"CRM000000000948094264","status":3000,"statusName":"string","subStatus":0,"subStatusName":"string","traceId":"string"},"message":"success","ok":true,"success":true}
 				if(data.success){
 					showPopupShengri.value = true;
 				}