htc 1 неделя назад
Родитель
Сommit
cafd00db66

+ 1 - 0
components/pages/nonprofitActivety/index.vue

@@ -46,6 +46,7 @@
 	import { useGlobalShare } from '@/common/composables/useGlobalShare';
 	const { isLogin } = useGlobalShare();
 	const statusCfg = ref({
+        '-1': '已取消',
 		0:'未开始',
 		1:'报名中',
 		2:'进行中',

+ 2 - 0
pagesHome/activityDetail.vue

@@ -132,6 +132,7 @@
 				<view class="right" @click="handleSignup" v-else-if="activityInfo?.activeState==2&&activityInfo?.signupState==1">我要签到</view>
 				<view class="right" @click="handleFill" v-else-if="activityInfo?.activeState==3&&activityInfo?.signupState==1">填写公益档案</view>
 				
+				<view class="right end" v-else-if="activityInfo?.activeState==-1">活动已取消</view>
 				<view class="right end" v-else-if="activityInfo?.activeState==0">活动未开始</view>
 				<view class="right end" v-else-if="activityInfo?.activeState==1&&activityInfo?.signupState==2">活动已签到</view>
 				<view class="right end" v-else-if="activityInfo?.activeState==2&&activityInfo?.signupState==2">活动已签到</view>
@@ -231,6 +232,7 @@
 	const id = ref('')
 	const activityInfo = ref(null)
 	const statusCfg = ref({
+		'-1':'已取消',
 		0:'未开始',
 		1:'报名中',
 		4:'报名中',

+ 6 - 3
pagesMy/heartNumber.vue

@@ -20,10 +20,10 @@
 								</view>
 							</view>
 							<view class="right adfac">
-								<image src="https://oss.familydaf.cn/sxsnfile/20251218/cdb8e97d40e44618ac38ad0e96f25cc0.png" v-if="item.capitalFlow==2"></image>
+								<image src="https://oss.familydaf.cn/sxsnfile/20251218/cdb8e97d40e44618ac38ad0e96f25cc0.png" v-if="item.type==2"></image>
 								<image src="https://oss.familydaf.cn/sxsnfile/20251218/b349d32d69ab4b0eb70d6731d37197f8.png" v-else></image>
-								<text :class="{'black':item.capitalFlow==2,'red':item.capitalFlow==1}">{{item.capitalFlow==2?'':'+'}}</text>
-								<text :class="{'black':item.capitalFlow==2,'red':item.capitalFlow==1}">{{item.loveQuantity??0}}</text>
+								<text :class="{'black':item.type==2,'red':item.type==1}">{{item.type==2?'':'+'}}</text>
+								<text :class="{'black':item.type==2,'red':item.type==1}">{{item.loveQuantity||0}}</text>
 							</view>
 						</view>
 					</view>
@@ -65,6 +65,9 @@
 		proxy.$api.get('/core/love/value/record/loveValueList',queryParams.value).then(({data:res})=>{
 			if(res.code!==0) return proxy.$showToast(res.msg)
 			list.value= [...list.value,...res.data.list];
+			list.value.forEach(l=>{
+				l.type = l.loveQuantity>=0?1:2 //1增加 2减少
+			})
 			queryParams.value.page++
 			if(res.data.list.length===0) isOver.value = true;
 		})