From 9e2845ab8c3de1969d1955d4545cce5a95fb6046 Mon Sep 17 00:00:00 2001
From: ycy <2861518472@qq.com>
Date: Sat, 20 Apr 2024 10:14:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/compontents/billingPage.vue   | 19 ++++++++++++++++---
 pages/index/compontents/integralGuess.vue | 10 +++++-----
 pages/user/index.vue                      | 10 ++++++----
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/pages/index/compontents/billingPage.vue b/pages/index/compontents/billingPage.vue
index dcd33de..a80853d 100644
--- a/pages/index/compontents/billingPage.vue
+++ b/pages/index/compontents/billingPage.vue
@@ -6,7 +6,7 @@
 	<view class="attentionList">
 		<view class="schemeInfo">
 			<span style="margin-left: 5%; color: #fff; font-weight: 600; font-size: 15px;">方案信息</span>
-			<u-cell-group style="background-color: #fff;flex: 0;">
+			<u-cell-group style="background-color: #fff;flex: 0; border-radius: 5px;">
 				<u-cell title="赛事" value="斯洛文尼亚甲级联赛"
 				:titleStyle="{'font-size': '14px','font-weight': '600','color' : '#c6c6c6'}"  />
 				<u-cell title="职业方案" value="放心,连红不会断在这场!"
@@ -20,7 +20,7 @@
 		<view class="">
 			<view class="schemeInfo" style="height: 26vh;">
 				<span style="margin-left: 5%; color: #fff; font-weight: 600; font-size: 15px;">我的账户</span>
-				<u-cell-group style="background-color: #fff;flex: 0;">
+				<u-cell-group style="background-color: #fff;flex: 0; border-radius: 5px;">
 					<u-cell title="选择支付方式" value="元宝支付" :isLink="true"
 					:titleStyle="{'font-size': '14px','font-weight': '600','color' : '#c6c6c6'}"  />
 					<u-cell title="账户金额:668.00元宝" value="直接充值" :isLink="true"
@@ -30,9 +30,11 @@
 				</u-cell-group>
 			</view>
 		</view>
-		<u-button size="large" shape="shape" color="#fff" style="width: 90%; margin-top: 4%;">
+		<u-button size="large" shape="shape" color="#fff" style="width: 90%; margin-top: 4%;" @click="accountBtn">
 			<span style="color: #e4b698; font-weight: 600;">立即结算</span>
 		</u-button>
+		<u-modal :show="show" title="温馨提示" :content='content' style="text-align: center;" confirmColor="red" @confirm="confirm" ref="uModal"
+		 :asyncClose="true" showCancelButton @cancel="()=>show=false"/>     
 	</view>
 </template>
 
@@ -43,12 +45,20 @@
 	const {
 		safeAreaInsets
 	} = uni.getSystemInfoSync();
+	const show = ref(false)
+	const content = ref('赛事已经开场,确认要选购么!!!!')
 	const src = ref('https://cdn.uviewui.com/uview/album/1.jpg');
 	const gotoBack = () => {
 		uni.navigateBack({
 			delta: 1
 		})
 	}
+	const accountBtn = ()=>{
+		show.value = true
+	}
+	const confirm = ()=>{
+		show.value = false
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -72,4 +82,7 @@
 		    font-weight: 700;
 				color: #000;
 	}
+	:deep(.u-modal__title){
+		display: block;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/compontents/integralGuess.vue b/pages/index/compontents/integralGuess.vue
index 1d94250..93f55bf 100644
--- a/pages/index/compontents/integralGuess.vue
+++ b/pages/index/compontents/integralGuess.vue
@@ -1,7 +1,7 @@
 <template>
 	<view style="background-color: #e13977; height: 30vh; padding: 0 3%;">
-		<view style="margin-bottom: 5%;">
-			<u-icon name="arrow-left" color="#646668" size="28" style="float: left;margin-top:2%;" @click="gotoBack" />
+		<view style="margin-bottom: 5%; position: relative;">
+			<u-icon name="arrow-left" color="#646668" size="24" style="position: absolute; top: 11px;" @click="gotoBack" />
 			<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbarOne">积分竞猜</view>
 		</view>
 		<view>
@@ -31,14 +31,14 @@
 						<view class="userTag">
 							<view v-for="(item, index) in item.tagList" :key="index">
 								<view class="grid-item">
-									<u-tag :text="item.name" type="warning" size="large" plain></u-tag>
+									<u-tag :text="item.name" type="warning" size="large" plain plainFill></u-tag>
 								</view>
 							</view>
 						</view>
 					</view>
 					<view style="width: 95%;">
 						<u-input placeholder="请输入积分" border="surround" v-model="value" />
-						<u-button text="提交" size="large" shape="circle" color="#1989f9" style="margin: 3% 0 ;"/>
+						<u-button text="提交" size="main" shape="circle" color="#1989f9" style="margin: 3% 0 ;"/>
 					</view>
 				</view>
 			</view>
@@ -69,7 +69,7 @@
 					<view class="userTag">
 						<view v-for="(item, index) in item.tagList" :key="index">
 							<view class="grid-item">
-								<u-tag :text="item.name" type="warning" size="large" plain></u-tag>
+								<u-tag :text="item.name" type="warning" size="large" plain plainFill></u-tag>
 							</view>
 						</view>
 					</view>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index bddcdd9..4f24e30 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -55,7 +55,6 @@
 				<u-cell title="退出登录" :titleStyle="{'font-size': '16px','font-weight': '600'}" :isLink="true"></u-cell>
 			</u-cell-group>
 		</view>
-		<!-- <u-modal :show="popupShow" :title="签到" content='签到成功'></u-modal> -->
 		<u-overlay :show="popupShow" @click="popupShow = false">
 			<view class="warp">
 				<view class="rect" @tap.stop>
@@ -79,6 +78,9 @@
 		safeAreaInsets
 	} = uni.getSystemInfoSync();
 
+	const show = ref(false)
+	const content = ref('赛事已经开场,确认要选购么')
+
 	// 我的关注
 	const URLto = () => {
 		uni.navigateTo({
@@ -132,7 +134,7 @@
 
 	.userInfo {
 		width: 89vw;
-		padding: 10% 5%;
+		padding: 8% 5%;
 		display: flex;
 		justify-content: space-between;
 
@@ -157,7 +159,7 @@
 
 		.gridBox {
 			width: 89.4vw;
-			height: 25vh;
+			height: 24vh;
 			padding: 5% 5%;
 			display: flex;
 			flex-direction: column;
@@ -185,7 +187,7 @@
 				justify-content: space-between;
 
 				.gridBox-rectangle {
-					width: 45%;
+					width: 47%;
 					height: 8vh;
 					border: 1px solid #f0f0f0;
 					font-size: 14px;