Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-youwei-uniapp

App.vue

@@ -12,6 +12,7 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 	/*每个页面公共css */
+	@import "@/static/style/common.scss"
 </style>

pages.json

@@ -1,5 +1,5 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	"pages": [
 		{
 			"path": "pages/tabBar/home/home"
 		},
@@ -19,7 +19,7 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "飞鸟有味",
-		"navigationBarBackgroundColor": "#F8F8F8",
+		"navigationBarBackgroundColor": "white",
 		"backgroundColor": "#F8F8F8"
 	},
 	"uniIdRouter": {},

pages/tabBar/mine/mine.vue

@@ -1,9 +1,69 @@
-<template>
-	<view>mine</view>
-</template>
-
-<script>
-</script>
-
-<style>
+<template>
+	<view class="base-container">
+		<view class="user-info">
+			<view class="user-left">
+				<image class="avatar" src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"></image>
+				<view class="info">
+					<text class="name">听妈妈的话</text>
+					<view class="text">这是您使用飞鸟有味的第15天</view>
+				</view>
+			</view>
+			<view class="user-right">收货地址</view>
+		</view>
+		<view class="grid-">
+			
+		</view>
+		<view class="list-wrap">
+			<view class="list-item"></view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+
+</script>
+
+<style lang="scss" scoped>
+	.base-container {
+		width: 100%;
+		min-height: calc(100vh - 100rpx - 88rpx);
+		background: #f7f7f7;
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
+
+		.user-info {
+			background: #fff;
+			border-radius: 16rpx;
+			padding: 24rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.user-left{
+				display: flex;
+				align-items: center;
+				.avatar{
+					width: 92rpx;
+					height: 92rpx;
+					margin-right: 28rpx;
+					border-radius: 50%;
+				}
+				.info{
+					.name{
+						font-family: 'PangMenZhengDao';
+					}
+					.text{
+						font-size: 24rpx;
+					}
+				}
+			}
+			.user-right{
+				font-size: 24rpx;
+				padding: 12rpx 32rpx;
+				border-radius: 50rpx;
+				color: #000;
+				background: #FFD95E;
+				font-weight: 500;
+			}
+		}
+	}
 </style>

static/style/common.scss

@@ -0,0 +1,13 @@
+
+.base-container {
+	width: 100%;
+	min-height: calc(100vh - 100rpx - 88rpx);
+	background: #f7f7f7;
+	padding: 20rpx 24rpx;
+	box-sizing: border-box;
+}
+
+@font-face {
+  font-family: "PangMenZhengDao";
+  src: url("https://birdseye-img.sysuimars.com/youwei-uniapp/font/PangMenZhengDao.TTF");
+}