diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java
index b393a5a6c..21ce19902 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java
@@ -164,29 +164,31 @@ public class ActiveRecommendServiceImpl extends ServiceImpl<ActiveRecommendMappe
         queryWrapper1.eq(ActiveApplet::getActiveId,activeRecommendDTO.getId());
         ActiveApplet activeApplet = activeAppletService.getOne(queryWrapper1);
 
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd");
-        String formatSt = dateFormat.format(activeRecommendDTO.getActiveStartTime());
-        String formatEd = dateFormat.format(activeRecommendDTO.getActiveEndTime());
-        activeApplet.setTime(formatSt+"-" + formatEd+"");
+        if (ObjectUtil.isNotEmpty(activeApplet)) {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd");
+            String formatSt = dateFormat.format(activeRecommendDTO.getActiveStartTime());
+            String formatEd = dateFormat.format(activeRecommendDTO.getActiveEndTime());
+            activeApplet.setTime(formatSt + "-" + formatEd + "");
 
-        if (ObjectUtils.isNotEmpty(activeRecommendDTO.getPoints())){
-            activeApplet.setPoints(activeRecommendDTO.getPoints());
-        }
-        if (ObjectUtils.isNotEmpty(activeRecommendDTO.getGrowthValue())){
-            activeApplet.setGrowaValue(activeRecommendDTO.getGrowthValue());
-        }
-        activeApplet.setType("7");
-        activeApplet.setName("推荐有礼活动");
-
-        //赠送优惠券兑换券实物
-        String card = "";
-        if (CollectionUtils.isNotEmpty(activeRecommendDTO.getActiveRecommendChildList())) {
-            for (ActiveRecommendChild activeRecommendChild : activeRecommendDTO.getActiveRecommendChildList()) {
-                card += activeRecommendChild.getGiftCardDetail() + "的券，";
+            if (ObjectUtils.isNotEmpty(activeRecommendDTO.getPoints())){
+                activeApplet.setPoints(activeRecommendDTO.getPoints());
             }
+            if (ObjectUtils.isNotEmpty(activeRecommendDTO.getGrowthValue())){
+                activeApplet.setGrowaValue(activeRecommendDTO.getGrowthValue());
+            }
+            activeApplet.setType("7");
+            activeApplet.setName("推荐有礼活动");
+
+            //赠送优惠券兑换券实物
+            String card = "";
+            if (CollectionUtils.isNotEmpty(activeRecommendDTO.getActiveRecommendChildList())) {
+                for (ActiveRecommendChild activeRecommendChild : activeRecommendDTO.getActiveRecommendChildList()) {
+                    card += activeRecommendChild.getGiftCardDetail() + "的券，";
+                }
+            }
+            activeApplet.setDiscountActiveDescribe("此项推荐有礼活动，推荐即可获得积分："+activeApplet.getPoints()+"积分，成长值："+activeApplet.getGrowaValue()+"成长值，赠送券为："+card+"。");
+            activeAppletService.updateById(activeApplet);
         }
-        activeApplet.setDiscountActiveDescribe("此项推荐有礼活动，推荐即可获得积分："+activeApplet.getPoints()+"积分，成长值："+activeApplet.getGrowaValue()+"成长值，赠送券为："+card+"。");
-        activeAppletService.updateById(activeApplet);
 
 
 
diff --git a/gasStation-uni/pagesHome/Activity/index.vue b/gasStation-uni/pagesHome/Activity/index.vue
index 5ab0ed82e..16f32fccb 100644
--- a/gasStation-uni/pagesHome/Activity/index.vue
+++ b/gasStation-uni/pagesHome/Activity/index.vue
@@ -14,7 +14,7 @@
 					<view class="right-box" v-if="index == 0">
 						最新活动
 					</view>
-					<view class="box-img" @click="intoOtherPage(item.name)">
+					<view class="box-img" @click="intoOtherPage(item.name,item.type)">
 						<image src="../../static/imgs/xfyl.png" v-if="item.name == '消费有礼活动'"></image>
 						<image src="../../static/imgs/zkyx.png" v-if="item.name == '折扣营销活动'"></image>
 						<image src="../../static/imgs/mjyh.png" v-if="item.name == '满减营销活动'"></image>
@@ -24,7 +24,7 @@
 					</view>
 					<view class="box-size">
 						<view class="box-s-title">{{item.name || "活动标题"}}</view>
-						<view class="box-s-size">{{item.des || "内容"}}</view>
+						<view class="box-s-size">{{item.discountActiveDescribe || "内容"}}</view>
 						<!--						<view class="dis-box">
 							<view class="dian"></view>
 							<view class="h_size">适用用户：普通会员、银牌会员、V2</view>
@@ -67,9 +67,9 @@
 			this.getData();
 		},
 		methods: {
-			intoOtherPage(name) {
+			intoOtherPage(name,type) {
 				uni.navigateTo({
-					url: '/pagesHome/activeIn/index?name=' + name
+					url: '/pagesHome/activeIn/index?name=' + name + '&type=' + type
 				})
 			},
 			getData() {
@@ -77,12 +77,12 @@
 					title: '加载中'
 				});
 				request({
-					url: 'business/marketingActivity/activeExchange/applet',
-					// url: 'business/marketingActivity/activeApplet/appletActive',
+					// url: 'business/marketingActivity/activeExchange/applet',
+					url: 'business/marketingActivity/activeApplet/appletActive',
 					method: 'get',
 					params: this.query
 				}).then(res => {
-					console.log(res);
+					console.log(res,111);
 					if (res.code == 200) {
 						this.activityList = res.data
 						uni.hideLoading();
diff --git a/gasStation-uni/pagesHome/activeIn/index.vue b/gasStation-uni/pagesHome/activeIn/index.vue
index e6c69fd64..83fc12e69 100644
--- a/gasStation-uni/pagesHome/activeIn/index.vue
+++ b/gasStation-uni/pagesHome/activeIn/index.vue
@@ -17,7 +17,7 @@
 			</view>
 			<view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '消费有礼活动'">
 				<view class=" title-box">活动介绍</view>
-				<view class="h_size">{{item.activeDescribe || ""}}</view>
+				<view class="h_size">{{item.discountActiveDescribe || ""}}</view>
 				<view class="box-bottom">
 					<view class="">活动时间</view>
 					<view>{{item.time}}</view>
@@ -61,7 +61,7 @@
 			</view>
 			<view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '满减营销活动'">
 				<view class=" title-box">活动介绍</view>
-				<view class="h_size">{{item.fullminusActiveDescribe || ""}}</view>
+				<view class="h_size">{{item.discountActiveDescribe || ""}}</view>
 				<view class="box-bottom">
 					<view class="">活动时间</view>
 					<view>{{item.time}}</view>
@@ -106,12 +106,12 @@
 					</view>
 				</view>
 			</view>
-			<view class="center-box" v-if="title == '新人有礼活动'">
+			<view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '新人有礼活动'">
 				<view class=" title-box">活动介绍</view>
-				<view class="h_size">{{datas.newlywedsActiveDescribe || ""}}</view>
+				<view class="h_size">{{item.discountActiveDescribe || ""}}</view>
 				<view class="box-bottom">
 					<view class="">活动时间</view>
-					<view>{{datas.time || ''}}</view>
+					<view>{{item.time || ''}}</view>
 				</view>
 				<!-- <view class="title-box">参与油品</view> -->
 				<!-- <view class="w_box">
@@ -124,20 +124,19 @@
 					</view> -->
 					<view class="dis-box">
 						<view class="dian" style="background: #FA5E03;"></view>
-						<view class="h_size">赠送{{datas.point || ''}}积分</view>
+						<view class="h_size">赠送{{item.points || ''}}积分</view>
 					</view>
 					<view class="dis-box">
 						<view class="dian" style="background: #FA5E03;"></view>
-						<view class="h_size">赠送{{datas.growValue || ''}}成长值</view>
+						<view class="h_size">赠送{{item.growaValue || ''}}成长值</view>
 					</view>
 				</view>
 			</view>
-			<view class="center-box" v-if="title == '推荐有礼活动'">
+			<view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '推荐有礼活动'">
 				<view class=" title-box">活动介绍</view>
-				<view class="h_size">{{datas.recommendActiveDescribeIn || ""}}</view>
-				<view class="h_size">{{datas.recommendActiveDescribeOut || ""}}</view>
+				<view class="h_size">{{item.discountActiveDescribe || ""}}</view>
 				<view class="box-bottom">
-					<view class="">活动时间：{{datas.time}}</view>
+					<view class="">活动时间：{{item.time}}</view>
 				</view>
 				<!-- <view class="title-box">参与油品</view>
 				<view class="w_box">
@@ -150,11 +149,11 @@
 					</view> -->
 					<view class="dis-box">
 						<view class="dian" style="background: #FA5E03;"></view>
-						<view class="h_size">赠送{{datas.point || ''}}积分</view>
+						<view class="h_size">赠送{{item.points || ''}}积分</view>
 					</view>
 					<view class="dis-box">
 						<view class="dian" style="background: #FA5E03;"></view>
-						<view class="h_size">赠送{{datas.growValue || ''}}成长值</view>
+						<view class="h_size">赠送{{item.growaValue || ''}}成长值</view>
 					</view>
 				</view>
 			</view>
@@ -196,7 +195,6 @@
 				oilName: [],
 				title: '',
 				datas: [],
-
 			}
 		},
 		components: {
@@ -206,7 +204,8 @@
 			this.query.storeId = uni.getStorageSync("storeId");
 			this.title = option.name
 			console.log(option.name);
-			this.getData(option.name);
+			this.getInfo(option.type)
+			// this.getData(option.name);
 		},
 		methods: {
 			goTopup() {
@@ -245,6 +244,23 @@
 					url: '/pagesHome/oilRecharge/oilRecharge'
 				}) */
 			},
+			getInfo(type){
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.query.type = type
+				request({
+					url: 'business/marketingActivity/activeApplet/appletActiveByType',
+					method: 'get',
+					params: this.query
+				}).then(res => {
+					if (res.code == 200) {
+						this.datas = res.data,
+						uni.hideLoading();
+					}
+				
+				})
+			},
 			getData(name) {
 				uni.showLoading({
 					//title: '加载中'