Merge branch 'dev' of http://gitlab.dui88.com/fh/20250528_FHQ1 into dev

api/request.js

@@ -18,7 +18,7 @@ const {
 // const baseUrl = "http://172.16.230.108:7777/pmall";
 // const baseUrl = "https://momclub-uat.feihe.com/pmall";//测试环境
 // const baseUrl = "https://momclub-test.feihe.com/pmall";
-let baseUrl = "https://momclub.feihe.com/pmall";//生产环境   
+let baseUrl = "https://momclub.feihe.com/pmall";//生产环境 
 // const baseUrl = "https://docs.dui88.com/mock/1956/api";//mock
 // const baseUrl = "https://feihe.m.duibatest.com.cn/pmall"
 

components/integralArea/InviteGift.vue

@@ -8,10 +8,10 @@
 			<!-- 卡片内容区域 -->
 			<view class="card_content">
 				<!-- 卡片标题 -->
-				<text class="card_title" :class="`item-${itemIndex}`">邀请好友注册得好礼</text>
+				<text class="card_title" :class="`item-${itemIndex}`">{{ props.title }}</text>
 				
 				<!-- 描述文字 -->
-				<text class="card_description" :class="`item-${itemIndex}`">成功邀请一位好友注册即可获得XXX</text>
+				<text class="card_description" :class="`item-${itemIndex}`">{{ props.subTitle }}</text>
 				
 				<!-- 去邀请按钮 -->
 				<button class="invite_button" :class="`item-${itemIndex}`" @tap="handleInviteClick" :open-type="islogin ? 'share' : ''">
@@ -56,6 +56,14 @@ const props = defineProps({
 	islogin: {
 		type: Boolean,
 		default: false
+	},
+	title: {
+		type: String,
+		default: ''
+	},
+	subTitle: {
+		type: String,
+		default: ''
 	}
 });
 

views/Integral.vue

@@ -274,7 +274,11 @@
 		<!-- 积分限时购 -->
 		<SeckillSection :isdebug="isdebug" :itemIndex="itemIndex" @credits-sale-click="handleCreditsSaleClick" />
 		<!-- 邀请得好礼组件 -->
-		<InviteGift v-if="integralStore.originInviteHome?.data" class="invite_container" :itemIndex="itemIndex" :islogin="islogin" @invite="handleInviteClick"
+		<InviteGift v-if="integralStore.originInviteHome?.data" 
+			:title="integralStore.originInviteHome?.data?.title" class="invite_container"
+			:subTitle="integralStore.originInviteHome?.data?.subTitle"
+			:itemIndex="itemIndex" :islogin="islogin" 
+			@invite="handleInviteClick"
 			@record="handleRecordClick" />
 		<!-- 会员活动 -->
 		<view class="vip-active-area" v-if="vipActive?.length > 0">