From 353969513a526fb52f721d5a992cacf7443de16c Mon Sep 17 00:00:00 2001
From: ycy <2861518472@qq.com>
Date: Fri, 19 Apr 2024 16:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2,=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                               | 16 ++++-
 pages/index/compontents/billingPage.vue  | 75 +++++++++++++++++++++
 pages/intelLigence/index.vue             |  2 +-
 pages/login/index.vue                    | 85 ++++++++++++++++++++++++
 pages/rankList/index.vue                 |  2 +-
 pages/user/compontents/VIPMember.vue     |  9 +--
 pages/user/compontents/attention.vue     |  7 +-
 pages/user/compontents/discount.vue      |  4 --
 pages/user/compontents/integralShop.vue  | 10 +--
 pages/user/compontents/purchasedPlan.vue |  8 +--
 pages/user/compontents/recharge.vue      |  7 +-
 pages/user/index.vue                     |  2 +-
 12 files changed, 190 insertions(+), 37 deletions(-)
 create mode 100644 pages/index/compontents/billingPage.vue
 create mode 100644 pages/login/index.vue

diff --git a/pages.json b/pages.json
index bec07dc..4737276 100644
--- a/pages.json
+++ b/pages.json
@@ -90,7 +90,21 @@
         "navigationBarTitleText": "高手详情",
         "navigationStyle": "custom"
       }
-    }
+    },
+		{
+		  "path": "pages/login/index",
+		  "style": {
+		    "navigationBarTitleText": "登录",
+		    "navigationStyle": "custom"
+		  }
+		},
+		{
+		  "path": "pages/index/compontents/billingPage",
+		  "style": {
+		    "navigationBarTitleText": "结算页面",
+		    "navigationStyle": "custom"
+		  }
+		}
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",
diff --git a/pages/index/compontents/billingPage.vue b/pages/index/compontents/billingPage.vue
new file mode 100644
index 0000000..dcd33de
--- /dev/null
+++ b/pages/index/compontents/billingPage.vue
@@ -0,0 +1,75 @@
+<template>
+	<view style="background-color: #e8b596;">
+		<u-icon name="arrow-left" color="#fff" size="20" style="float: left;margin-top:4%; margin-left: 4%;" @click="gotoBack" />
+		<view :style="{ paddingTop: safeAreaInsets.top + 'px', 'color': '#fff'}" class="page-navbar">结算页面</view>
+	</view>
+	<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 title="赛事" value="斯洛文尼亚甲级联赛"
+				:titleStyle="{'font-size': '14px','font-weight': '600','color' : '#c6c6c6'}"  />
+				<u-cell title="职业方案" value="放心,连红不会断在这场!"
+				:titleStyle="{'font-size': '14px','font-weight': '600','color' : '#c6c6c6'}" />
+				<u-cell title="职业打榜高手" value="提词器"
+				:titleStyle="{'font-size': '14px','font-weight': '600','color' : '#c6c6c6'}" />
+				<u-cell title="金额" value="488.00元宝"
+				:titleStyle="{'font-size': '14px','font-weight': '600','color' : '#c6c6c6'}" />
+			</u-cell-group>
+		</view>
+		<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 title="选择支付方式" value="元宝支付" :isLink="true"
+					:titleStyle="{'font-size': '14px','font-weight': '600','color' : '#c6c6c6'}"  />
+					<u-cell title="账户金额:668.00元宝" value="直接充值" :isLink="true"
+					:titleStyle="{'font-size': '14px','font-weight': '600','color' : '#c6c6c6'}" />
+					<u-cell title="可用优惠卷" value="0张可用" :isLink="true"
+					:titleStyle="{'font-size': '14px','font-weight': '600','color' : '#c6c6c6'}" />
+				</u-cell-group>
+			</view>
+		</view>
+		<u-button size="large" shape="shape" color="#fff" style="width: 90%; margin-top: 4%;">
+			<span style="color: #e4b698; font-weight: 600;">立即结算</span>
+		</u-button>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref
+	} from 'vue'
+	const {
+		safeAreaInsets
+	} = uni.getSystemInfoSync();
+	const src = ref('https://cdn.uviewui.com/uview/album/1.jpg');
+	const gotoBack = () => {
+		uni.navigateBack({
+			delta: 1
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.attentionList {
+		width: 100%;
+		min-height: 94.5vh;
+		background-color: #e8b596;
+		.schemeInfo{
+			height: 32vh;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-around;
+		}
+	}
+	:deep(.u-cell__value){
+		max-width: 60vw;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		    font-size: 15px;
+		    font-weight: 700;
+				color: #000;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/intelLigence/index.vue b/pages/intelLigence/index.vue
index 0a2d00d..15e1a85 100644
--- a/pages/intelLigence/index.vue
+++ b/pages/intelLigence/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px' }" class="index-page">
 	  <!-- 自定义导航 -->
-	  <view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">足球状元榜</view>
+	  <view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">赛事</view>
 	</view>
   <view class="box-y">
     <!-- <u-tabs :list="list1" @click="click"></u-tabs> -->
diff --git a/pages/login/index.vue b/pages/login/index.vue
new file mode 100644
index 0000000..ecf16f7
--- /dev/null
+++ b/pages/login/index.vue
@@ -0,0 +1,85 @@
+<template>
+	<view class="color">
+		<view class="text">
+			<h1>
+				<p>你好!<br />
+					欢迎来打足球奖门人
+				</p>
+			</h1>
+			<span style="font-size: 10px; color: #95918e;">致力于为体育迷创造一片欢乐</span>
+		</view>
+		<view class="loginBtn">
+			<u-button size="large" shape="circle" color="linear-gradient(to bottom, #555555, rgba(0, 0, 0))">
+				<span style="color: #e4b698; font-weight: 600;">微信登陆</span>
+			</u-button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted
+	} from 'vue';
+	// 获取安全区域的边界
+	const {
+		safeAreaInsets
+	} = uni.getSystemInfoSync();
+
+	const text = ref([{
+			txt: '学院'
+		},
+		{
+			txt: '方法'
+		},
+		{
+			txt: '高玩区'
+		}
+	]);
+	const src = ref({
+		src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg',
+		text: '无头像'
+	});
+	const ViewGuru = () => {
+		uni.navigateTo({
+			url: '/pages/index/compontents/bigMaster',
+			animationDuration: '300'
+		});
+	};
+	const masterHand = (item) => {
+		uni.navigateTo({
+			url: '/pages/index/compontents/masterHand',
+			animationDuration: '300'
+		});
+	};
+	// #ifdef H5 || APP
+	console.log('运行在 App');
+	// #endif
+
+	// #ifndef MP-WEIXIN
+	console.log('不是运行在微信小程序');
+	// #endif
+</script>
+
+<style lang="scss" scoped>
+	.color {
+		background-image: linear-gradient(to bottom, #f5e7de, #fffbfa);
+		height: 100vh;
+		width: 100%;
+		display: flex;
+		justify-content: space-evenly;
+		align-items: center;
+		flex-direction: column;
+
+		.text {
+			margin-top: -20%;
+			height: 20vh;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-evenly;
+		}
+	}
+	.loginBtn{
+		width: 80%;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/rankList/index.vue b/pages/rankList/index.vue
index a2bb561..1cbda8c 100644
--- a/pages/rankList/index.vue
+++ b/pages/rankList/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px' }" class="index-page">
 	  <!-- 自定义导航 -->
-	  <view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">足球状元榜</view>
+	  <view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">排行榜</view>
 	</view>
   <view class="box-y">
 		<view class="Upicker" v-if='handColor'>
diff --git a/pages/user/compontents/VIPMember.vue b/pages/user/compontents/VIPMember.vue
index 8e268c7..eeeb8d8 100644
--- a/pages/user/compontents/VIPMember.vue
+++ b/pages/user/compontents/VIPMember.vue
@@ -1,12 +1,9 @@
 <template>
-	<view :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px' }" class="index-page">
-		<!-- 自定义导航 -->
-		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">足球状元榜</view>
-	</view>
-	<view style="background-color: #ddd;">
+	<view style="background-color: #fff;">
 		<u-icon name="arrow-left" color="#646668" size="28" style="float: left;margin-top:2%;" @click="gotoBack" />
 		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">会员中心</view>
 	</view>
+	<u-line></u-line>
 	<view class="VIPBox">
 		<u-swiper style="width: 94%;" :list="list3" indicatorMode="line" interval="3000" circular autoplay indicator />
 		<view class="content">
@@ -71,7 +68,7 @@
 <style lang="scss" scoped>
 	.VIPBox {
 		width: 100%;
-		min-height: 85vh;
+		min-height: 91.5vh;
 		background-color: #f2f2f2;
 		display: flex;
 		flex-direction: column;
diff --git a/pages/user/compontents/attention.vue b/pages/user/compontents/attention.vue
index 427bb42..8d0ca78 100644
--- a/pages/user/compontents/attention.vue
+++ b/pages/user/compontents/attention.vue
@@ -1,12 +1,9 @@
 <template>
-	<view :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px' }" class="index-page">
-		<!-- 自定义导航 -->
-		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">足球状元榜</view>
-	</view>
-	<view style="background-color: #ddd;">
+	<view style="background-color: #fff;">
 		<u-icon name="arrow-left" color="#646668" size="28" style="float: left;margin-top:2%;" @click="gotoBack" />
 		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">关注列表</view>
 	</view>
+	<u-line></u-line>
 	<view class="attentionList">
 		<view v-for="(index,item) in 3" :key="index">
 			<view class="ListStrip">
diff --git a/pages/user/compontents/discount.vue b/pages/user/compontents/discount.vue
index e30a956..c8f107f 100644
--- a/pages/user/compontents/discount.vue
+++ b/pages/user/compontents/discount.vue
@@ -1,8 +1,4 @@
 <template>
-	<view :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px' }" class="index-page">
-		<!-- 自定义导航 -->
-		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">足球状元榜</view>
-	</view>
 	<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" />
diff --git a/pages/user/compontents/integralShop.vue b/pages/user/compontents/integralShop.vue
index bd0c771..707cce4 100644
--- a/pages/user/compontents/integralShop.vue
+++ b/pages/user/compontents/integralShop.vue
@@ -1,14 +1,10 @@
 <template>
-	<view :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px'}" class="index-page">
-		<!-- 自定义导航 -->
-		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">足球状元榜</view>
-	</view>
-	<view style="background-color: #ddd;">
+	<view style="background-color: #fff;">
 		<u-icon name="arrow-left" color="#646668" size="28" style="float: left;margin-top:2%;" @click="gotoBack" />
 		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">积分商城</view>
 		<span style="float: right;margin-top: -8%; font-size: 10px; margin-right: 2%;">{{'我的积分: 20'}}</span>
 	</view>
-	
+	<u-line></u-line>
 	<view class="scheme">
 		<view class="integralRoll">
 			<view v-for="(item,index) in List" :key="index" class="grid-item">
@@ -84,7 +80,7 @@
 	
 .scheme{
 	width: 100%;
-	min-height: 87.9vh;
+	min-height: 94.5vh;
 	background-color: #f2f2f2;
 	display: flex;
 	flex-direction: column;
diff --git a/pages/user/compontents/purchasedPlan.vue b/pages/user/compontents/purchasedPlan.vue
index 186969f..90332bf 100644
--- a/pages/user/compontents/purchasedPlan.vue
+++ b/pages/user/compontents/purchasedPlan.vue
@@ -1,13 +1,9 @@
 <template>
-	<view :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px' }" class="index-page">
-		<!-- 自定义导航 -->
-		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">足球状元榜</view>
-	</view>
-	<view style="background-color: #ddd;">
+	<view style="background-color: #fff;">
 		<u-icon name="arrow-left" color="#646668" size="28" style="float: left;margin-top:2%;" @click="gotoBack" />
 		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">已购方案</view>
 	</view>
-	
+	<u-line></u-line>
 	<view class="scheme">
 		<view class="content" v-for="(item,index) in List" :key="index">
 			<span>{{item.content}}</span>
diff --git a/pages/user/compontents/recharge.vue b/pages/user/compontents/recharge.vue
index 9e04889..46e21f4 100644
--- a/pages/user/compontents/recharge.vue
+++ b/pages/user/compontents/recharge.vue
@@ -1,12 +1,9 @@
 <template>
-	<view :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px' }" class="index-page">
-		<!-- 自定义导航 -->
-		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">足球状元榜</view>
-	</view>
-	<view style="background-color: #ddd;">
+	<view style="background-color: #fff;">
 		<u-icon name="arrow-left" color="#646668" size="28" style="float: left;margin-top:2%;" @click="gotoBack" />
 		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">充值</view>
 	</view>
+	<u-line></u-line>
 	<view class="recharge">
 		<view class="balance">
 			<span style="font-size: 14;font-weight: 600;">{{'余额'}}</span>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 1749d44..bddcdd9 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px' }" class="index-page">
 		<!-- 自定义导航 -->
-		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">足球状元榜</view>
+		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="page-navbar">我的</view>
 	</view>
 	<view class="back-color">
 		<view class="userInfo">