细节优化

pages/my/myInfo.vue

@@ -900,9 +900,12 @@ import moment from "../../common/moment";
 								url:"/setting/recharge/record"
 							})
 						}else{
-							uni.showToast({
-								icon:"none",
-								title:"您还未充值哟！"
+							// uni.showToast({
+							// 	icon:"none",
+							// 	title:"您还未充值哟！"
+							// })
+							uni.switchTab({
+								url:"/pages/vipCreate/vipCreate"
 							})
 						}
 						

pages/order/order.vue

@@ -363,7 +363,18 @@
 			</view>
 		</uni-popup>
 		
-		<uni-popup ref="confirmPop" type="bottom">
+		<uni-popup ref="popupActivite" type="center" isMaskClick="false">
+			<view class="flex-col">
+				<view class="activite-box">
+					<image :src="assetsPath+'/activite_1.jpg'" mode="widthFix"></image>
+				</view>
+				<view class="close-btn" @tap="onActiviteClose">
+					<text class="cuIcon-roundclose text-pink"></text>
+				</view>
+			</view>
+		</uni-popup>
+
+		<uni-popup ref="confirmPop" type="bottom" :isMaskClick="false">
 			<view class="confirm-pop">
 				<view class="pop-content-box">
 					<view class="title">
@@ -396,12 +407,24 @@
 							<text class=" margin-left text-lg ">{{roomInfo.name}} （{{roomTypeEnum[roomInfo.roomType]}}）</text>
 						</view>
 						
+						
+						<view v-if="Number(computePriceInfo.balance) > 0" class="info flex-row-center">
+							<text class="text-black text-bold text-lg">余额抵扣:</text>
+							<text class="margin-left text-lg">￥</text>
+							<text class=" text-xl">{{Number(computePriceInfo.balance).toFixed(2)}}</text>
+							
+							<text class="text-lg margin-left-sm"> (余额账户: ￥{{Number(userInfo.consumerWallet.balance).toFixed(2)}})</text>
+						</view>
+						
 						<view class="info flex-row-center">
-							<text class="text-black text-bold text-lg">金额:</text>
+							<text class="text-black text-bold text-lg">待支付:</text>
 							<text class="margin-left text-lg">￥</text>
 							<text class=" text-xl ">{{Number(computePriceInfo.payFee).toFixed(2)}}</text>
-							
 						</view>
+						
+						
+
+						
 					</view>
 					<view class="footer-btn-box">
 						
@@ -620,6 +643,9 @@
 			}
 		},
 		onLoad(option) {
+			if(!uni.getStorageSync('activite')){
+				this.$refs.popupActivite.open()
+			}
 			uni.showLoading({
 				title: "加载中"
 			})
@@ -644,6 +670,10 @@
 			}
 		},
 		methods: {
+			onActiviteClose(){
+				this.$refs.popupActivite.close();
+				uni.setStorageSync('activite',true)
+			},
 			onRadioChange(e){
 				if(this.radioChecked === e){
 					this.radioChecked = ''
@@ -1321,6 +1351,7 @@
 						roomLabelId : this.modeIndex >= 0 ? this.roomLabelList[this.modeIndex].id : '',
 					}	
 					queryCardUse(params).then(res => {
+						console.log(res,"12321321")
 
 						if(res.data.code == 200){
 							
@@ -1332,14 +1363,17 @@
 								this.radioChecked = ""
 							}
 							
-							if(this.userInfo.monthlyCardList && res.data.data && res.data.data.consumerMonthlyCard && res.data.data.consumerMonthlyCard.length){
-								this.monthlyCardList = this.userInfo.monthlyCardList.filter(item => res.data.data.consumerMonthlyCard.includes( item.id))
+							if(res.data.data && res.data.data.consumerMonthlyCard && res.data.data.consumerMonthlyCard.length){
+								
+								console.log(res.data.data.consumerMonthlyCard,'res.data.data.consumerMonthlyCard')
+								
+								this.monthlyCardList = res.data.data.consumerMonthlyCard[0]
 							}else{
 								this.monthlyCardList = [];
 							}
 							 
 							if(this.userInfo.secondaryCardList && res.data.data && res.data.data.consumerSecondaryCard && res.data.data.consumerSecondaryCard.length){
-								this.secondaryCardList = this.userInfo.secondaryCardList.filter(item => res.data.data.consumerSecondaryCard.includes( item.id));
+								this.secondaryCardList = res.data.data.consumerSecondaryCard[0]
 								
 								let list = this.userInfo.secondaryCardList.filter(item=>{
 									return moment().valueOf() < moment(item.expirationDate).valueOf() && item.number>0
@@ -2653,7 +2687,7 @@
 			display: flex;
 			flex-direction: column;
 			width: 100%;
-			height: 660upx;
+			// height: 700upx;
 			background: #FFFFFF;
 			box-shadow: 0 2upx 38upx 0 rgba(0,0,0,0.27);
 			border-radius: 16upx 16upx 0rpx 0rpx;
@@ -2877,4 +2911,22 @@
 			}
 		}
 	}
+	.activite-box{
+		width: 92vw;
+		border-radius: 20upx;
+		overflow: hidden;
+		image{
+			display: block;
+			width: 100%;
+			min-height: 960upx;
+		}
+	}
+	.close-btn{
+		display: flex;
+		justify-content: center;
+		margin-top: 24upx;
+		.text-pink{
+			font-size: 80upx;
+		}
+	}
 </style>
\ No newline at end of file

setting/cardPackageRecord/index.vue

@@ -19,7 +19,7 @@
 						</view>
 						<view class="flex-col">
 							<text class="text-bold text-lg text-2 text-pink">{{item.confName}}</text>
-							<text class="text-2">可使用{{item.number}}次</text>
+							<text class="text-2">可使用{{item.number}}次 <text class="text-sm" style="color: #999999;">（单次{{item.singleDuration}}小时,价值￥{{item.singleAmount}}）</text></text>
 							<view class="flex-row-center">
 								<text class="text-gray">过期时间:</text>
 								<text class="text-gray">{{item.expirationDate}}</text>
@@ -35,8 +35,8 @@
 							<image :src="cardIcon" mode="widthFix"></image>
 						</view>
 						<view class="flex-col">
-							<text class="text-bold text-lg text-2 text-pink">{{item.confName}}</text>
-							<text v-if="item.freeDuration" class="text-2">今日可使用{{item.freeDuration}}小时</text>
+							<text class="text-bold text-lg text-2 text-pink">{{item.confName}}-4小时/每日</text>
+							<text v-if="item.freeDuration" class="text-2"> 今日待使用{{item.freeDuration}}小时</text>
 							<text v-else class="text-2">今日已使用</text>
 							<view class="flex-row-center">
 								<text class="text-gray">过期时间:</text>
@@ -200,10 +200,10 @@
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							width: 160upx;
+							width: 110upx;
 							margin: 0 12upx;
 							image{
-								width: 64%;
+								width: 82%;
 								max-height: 104upx;
 							}
 						}