同步20240621

pages/user/wallet/maxScoreLog.vue

@@ -11,15 +11,17 @@
 						<view class="ss-flex ss-col-center" style="width: 100%;">
 							<view class="ss-flex ss-m-t-10"
 								style="flex-direction: column;align-items: flex-start;width: 100%;">
-								<view class="name" style="width: 100%;"> {{ item.profitStatusName || '空' }} {{item.username? "("+item.username+")" : ''}}
+								<view class="name" style="width: 100%;"> {{ title(item) }}
 									<text style="float: right;" class="color-red"
-										:class="{'color-green':item.maxAvailablePointsAmount < 0}"
-										>{{item.maxAvailablePointsAmount > 0 ? '+'+points2point(item.maxAvailablePointsAmount):+points2point(item.maxAvailablePointsAmount)}}
+										
+										:class="{'color-green':item.maxAvailablePointsAmount < 0 || freezeHighQuota < 0 }"> 
+										{{changeValue(item)}}
 									</text>
 								</view>
 								<view class="time " style="width: 100%;">
 									{{sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM')}}
-									<text style="float: right;" >余额:{{ points2point(item.afterMaxAvailablePointsAmount)}}</text>
+									<text
+										style="float: right;">{{ balance(item)}}</text>
 								</view>
 							</view>
 						</view>
@@ -77,7 +79,51 @@
 		showModel: false,
 		showQueModel: false
 	});
-
+	// 列表标题
+	const title = (item) => {
+		let title = item.profitStatusName + ' (';
+		// 如果有返回username就显示
+		if(item.username){
+			title += item.username+ ' '
+		}
+		// 如果profitStatus === 7 就不显示订单号
+		if(item.profitStatus !== 7){
+			title += item.orderNo + ' '
+		}
+		// 如果profitStatus === 23 || 24 就会显示待确权 否则都是确权
+		if(item.profitStatus === 23 || item.profitStatus === 24){
+			title += "待确权"
+		}else{
+			title += "确权"
+		}
+		title += ")"
+		return title;
+	}
+	// 计算变化值
+	const changeValue = (item) => {
+		let value = '';
+		if(item.freezeHighQuota > 0 || item.maxAvailablePointsAmount > 0){
+			value = '+'
+		}
+		if(item.profitStatus === 23 || item.profitStatus === 24){
+			value += points2point(item.freezeHighQuota)
+		}else{
+			value += points2point(item.maxAvailablePointsAmount)
+		}
+		return value;
+	}
+	// 计算余额
+	const balance = (item) => {
+		let value = '';
+		if(item.profitStatus === 23 || item.profitStatus === 24){
+			value += '待确权余额:'
+			value += points2point(item.afterFreezeHighQuota)
+		}else{
+			value += '余额:'
+			value += points2point(item.afterMaxAvailablePointsAmount)
+		}
+		return value;
+	}
 	async function getLogList(isFreeze) {
 		state.loadStatus = 'loading';
 		// isFreeze为true是冻结积分 isFreeze为false是已拿到的积分

pages/user/wallet/score.vue

@@ -3,16 +3,17 @@
 	<s-layout class="wallet-wrap" :bgStyle="{'backgroundColor':'#ffffff'}" title="我的积分" navbar="normal">
 		<view class="score-box bg-white ss-flex-col ss-row-center ss-col-center">
 			<view class="ss-m-b-10  circle value-box ss-flex ss-row-center" :style="circleStyle">
-				<view >积分</view>
+				<view>积分</view>
 			</view>
 
-			<view class="ss-m-b-30 ss-font-40"  :style="{color:percentageColor}">
+			<view class="ss-m-b-30 ss-font-40" :style="{color:percentageColor}">
 				<text class="all-title ss-m-r-8">{{ points2point(userWallet.integralDO.currentQuota) }}</text>
 			</view>
 			<view class="ss-m-b-40">
 				<view class="all-title ss-m-r-8">
 					<!--  -->
-					<button class="btn ss-reset-button" @tap="sheep.$router.go('/pages/goods/list', { categoryId: 98 })">
+					<button class="btn ss-reset-button"
+						@tap="sheep.$router.go('/pages/goods/list', { categoryId: 98 })">
 						兑换
 					</button>
 				</view>
@@ -20,8 +21,8 @@
 			<!-- 分割线 -->
 			<view style="width: 100%;height: 20rpx;background-color: #ececec;"></view>
 			<uni-list :border="false" class="ss-p-t-10 ss-w-100">
-				<uni-list-item clickable @tap="sheep.$router.go('/pages/user/wallet/maxScoreLog')"
-					title="当前可获得峰值" showArrow :border="false">
+				<uni-list-item clickable @tap="sheep.$router.go('/pages/user/wallet/maxScoreLog')" title="当前可获得峰值"
+					showArrow :border="false">
 					<template v-slot:body>
 						<p style="width: 100%">
 							当前可获得峰值：{{ points2point(userWallet.integralDO.currentQuota) }}/{{ points2point(userWallet.integralDO.highQuota) }}
@@ -85,10 +86,10 @@
 		resetPagination
 	} from '@/sheep/util';
 	import ScoreApi from '@/sheep/api/distri/score';
-	
+
 	import ScoreLog from './ScoreLog'
 	import richtext from '@/pages/public/richtext'
-	
+
 	const userWallet = computed(() => sheep.$store('user').userWallet);
 	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
 	const userInfo = computed(() => sheep.$store('user').userInfo);
@@ -112,61 +113,29 @@
 	}
 	const pointsPercentage = computed(() => {
 		const currentQuota = parseFloat(points2point(userWallet.value.integralDO.currentQuota))
-		const highQuota =parseFloat(points2point(userWallet.value.integralDO.highQuota))
+		const highQuota = parseFloat(points2point(userWallet.value.integralDO.highQuota))
 		if (currentQuota > highQuota) {
 			return 100;
 		} else {
 			const percentage = (currentQuota / highQuota) * 100;
-			
+
 			return Math.min(percentage, 100); // 确保百分比不会超过100
 		}
 	});
 	const percentageColor = computed(() => {
-		if (pointsPercentage.value>=90) {
+		if (pointsPercentage.value >= 90) {
 			return '#fe0000';
-		} else if(pointsPercentage.value>=75){
+		} else if (pointsPercentage.value >= 75) {
 			return '#d8b800';
 		} else {
 			return '#0c912f';
 		}
 	});
 	const circleStyle = computed(() => {
-	      return {
-	        // background: `conic-gradient(${percentageColor.value} ${pointsPercentage.value}%, #ddd ${pointsPercentage.value}%)`
-	        background: percentageColor.value
-	      };
-	    });
-	async function getLogList(isFreeze) {
-		state.loadStatus = 'loading';
-		// isFreeze为true是冻结积分 isFreeze为false是已拿到的积分
-		let {
-			code,
-			data
-		} = await ScoreApi.getScoreApi({
-			pageNo: state.pagination.pageNo,
-			pageSize: state.pagination.pageSize,
-			isFreeze: isFreeze
-		});
-		if (code !== 0) {
-			return;
-		}
-		let list = _.concat(state.pagination.list, data.list);
-		state.pagination.list = list;
-		state.pagination.total = data.total;
-		state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
-	}
-	function onLoadMore(isFreeze) {
-
-		if (state.loadStatus === 'noMore') {
-			return;
-		}
-		state.pagination.pageNo++;
-		getLogList(isFreeze);
-	}
-
-	onReachBottom(() => {
-
-		onLoadMore();
+		return {
+			// background: `conic-gradient(${percentageColor.value} ${pointsPercentage.value}%, #ddd ${pointsPercentage.value}%)`
+			background: percentageColor.value
+		};
 	});
 </script>
 
@@ -176,7 +145,7 @@
 		width: 100px;
 		height: 100px;
 		border-radius: 50%;
-		
+
 	}
 
 	.circle::before {
@@ -212,13 +181,13 @@
 		display: flex;
 		align-items: center;
 		box-sizing: border-box;
-		color:  var(--ui-BG-Main);
+		color: var(--ui-BG-Main);
 
 	}
 
 	.head-nav>view {
 		padding-bottom: 10rpx;
-		border-bottom: 4rpx solid  var(--ui-BG-Main);
+		border-bottom: 4rpx solid var(--ui-BG-Main);
 	}
 
 	.uni-list-item {
@@ -245,6 +214,7 @@
 		height: 100rpx;
 		border-radius: 50%;
 		overflow: hidden;
+
 		.avatar-img {
 			width: 100%;
 			height: 100%;

sheep/components/s-select-sku/s-select-sku.vue

@@ -194,14 +194,13 @@
 
 		if (points > userCanUsePoints) {
 			sheep.$helper.toast('可用积分不足');
-			console.log('输入的积分大于可用积分了', points, userCanUsePoints);
+			// console.log('输入的积分大于可用积分了', points, userCanUsePoints);
 			nextTick(() => {
 				state.selectedSku.use_points = parseInt(userCanUsePoints);
 				// 重新计算 对应的商品数量
 				calcNums()
 			});
 		}
-
 	}
 	watch(
 		() => state.selectedSku,