优化样式

vedio/pages/loading.vue

@@ -90,8 +90,8 @@
 								app.globalData.userId = data.idcode;
 								saveToken(data.token)
 								setTimeout(() => {
-									// redirectTo('home?activiteFlag='+data.activiteFlag+"&idcode="+data.idcode);									
-									redirectTo('/pagesA/vipPay/vipPay');									
+									redirectTo('home?activiteFlag='+data.activiteFlag+"&idcode="+data.idcode);									
+									// redirectTo('/pagesA/vipPay/vipPay');									
 								}, 1000);
 								
 							}

vedio/pagesA/vipPay/vipPay.vue

@@ -6,16 +6,16 @@
 				mode="widthFix" />
 
 			<view class="section">
-				<view class="title">
-					自动续费管理
-				</view>
+				<view v-if="agreementDto != undefined" @click="handleUnsign"
+					style="margin-top: 12rpx;margin-left: 30rpx;color: black;">自动续费管理</view>
+
 				<view class="pack-box">
 					<view class="pack-item" :class="[{active: index==selectedIndex}]" v-for='(item, index) in vipList'
 						:key='index' @click="choosePack(item, index)">
-						<view class="label" v-if="index==selectedIndex">
-							{{ '限时减10元' }}
+						<view class="label">
+							{{ item.topTitle }}
 						</view>
-						<view class="name row">
+						<view class="name row" :class="[{active2: index==selectedIndex}]">
 							{{item.title}}
 						</view>
 						<view class="price row" :class="[{active1: index==selectedIndex}]">
@@ -25,12 +25,13 @@
 						<view class="origin row" v-if='item.oldPrice'>
 							￥{{item.oldPrice}}
 						</view>
-						<view class="cut-down" v-if='item.oldPrice-item.firstPayPrice>0'>
-							立省 {{item.oldPrice-item.firstPayPrice}} 元
+
+						<view class="origin row" v-if='item.oldPrice'>
+							{{item.remarks }}
 						</view>
 
 						<view class="label2" v-if="index==selectedIndex">
-							{{ '仅需0.19元/天' }}
+							{{ '仅需'+amount(item.firstPayPrice / item.days)+'元/天' }}
 						</view>
 					</view>
 				</view>
@@ -75,7 +76,8 @@
 			return {
 				vipList: [],
 				selectedIndex: 0,
-				checked: false
+				checked: false,
+				agreementDto: null,
 			}
 		},
 		methods: {
@@ -89,10 +91,29 @@
 						this.vipList = data.list
 					}
 				});
+
+				this.post({
+					url: '/vip/getOrderList',
+					showLoading: false,
+					success: ({
+						data
+					}) => {
+						this.agreementDto = data.agreement;
+					}
+				});
 			},
 			choosePack(item, index) {
 				this.selectedIndex = index;
 			},
+			handleUnsign() {
+				if (this.agreementDto) {
+					let params = JSON.stringify(this.agreementDto)
+					navigateTo(`/pagesA/unsign/unsign?params=` + params)
+				}
+			},
+			amount(value) {
+				return value.toFixed(2)
+			},
 			handlePay() {
 				if (!this.checked) {
 					message.notify("请阅读《连续订阅服务协议》与《支付协议》后勾选同意")
@@ -207,12 +228,12 @@
 					border: 4rpx solid #EAECEC;
 					border-radius: 20rpx;
 					position: relative;
-					padding-top: 60rpx;
+					padding-top: 50rpx;
 
 					.row {
 						display: flex;
 						align-items: center;
-						margin: 8rpx 15rpx;
+						margin: 4rpx 15rpx;
 						marign-bottom: 0;
 					}
 
@@ -223,7 +244,7 @@
 					.name {
 						font-size: 26rpx;
 						font-weight: 700;
-						color: #333;
+						color: #000000;
 					}
 
 
@@ -237,15 +258,21 @@
 						color: #fd5350;
 					}
 
+					.active2 {
+						color: #6D301D;
+					}
+
+
 					.origin {
 						font-size: 22rpx;
-						color: #333;
+						text-align: center;
+						color: #676666;
 						text-decoration: line-through;
 					}
 
 					.label {
 						border-radius: 20rpx 0 20rpx 0;
-						width: 70%;
+						width: 80%;
 						background: linear-gradient(90deg, #FC4F3B, #FBCB7A);
 						color: white;
 						font-size: 24rpx;
@@ -296,11 +323,11 @@
 			}
 		}
 
-		.agreementWrp {
-			display: flex;
+		.agreementWrp {
+			display: flex;
 			align-items: center;
 			color: darkgray;
-			font-size: 26rpx;
+			font-size: 26rpx;
 			padding-left: 30rpx;
 
 			.agreementText {