Merge branch 'master' of http://git.liuniu946.com/xuhaolan/boying

pages.json

@@ -154,11 +154,19 @@
 				"navigationBarBackgroundColor":"#000",
 				"navigationBarTextStyle":"white"
 			}
-		},
-		{
-			"path": "pages/profit/profit",
-			"style": {
-				"navigationBarTitleText": "收益中心"
+		},
+		{
+			"path": "pages/profit/profit",
+			"style": {
+				// "navigationBarTitleText": "收益中心",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#15130f",
+						"type": "float",
+						"titleText": "收益中心" 
+					}
+				}
 			}
 		}
 	],

pages/profit/profit.vue

@@ -1,9 +1,10 @@
 <template>
 	<view class="content">
-		<view class="content-money">
+		<view class="content-money">
+			<image src="../../static/img/centerbg.png" mode="" class="bg"></image>
 			<view class="money-box">
-				<view class="text">可提现佣金（元）</view>
-				<view class="money">{{ money | getMoneyStyle }}</view>		
+				<view class="text">当前余额</view>
+				<view class="money"><text>￥</text>{{ money | getMoneyStyle }}</view>		
 			</view>
 			<!-- <view class="moneyTx" @click="navto('./withdrawal')">提现</view>
 			<view class="flex buttom-box">
@@ -177,12 +178,17 @@ export default {
 
 <style lang="scss">
 page {
-	background: #ffffff;
+	background: #000;
 	height: 100%;
 }
 .content-money {
 	padding-bottom: 30rpx;
-	background: $page-color-base;
+	background: $page-color-base;
+	position: relative;
+	.bg{ 
+		position: absolute;
+		width: 100%;
+	}
 	.moneyTx{
 		position: absolute;
 		top: 150rpx;
@@ -224,17 +230,23 @@ page {
 	}
 }
 .money-box {
-	background-color: $base-color;
+	// background-color: $base-color;
 	padding-top: var(--status-bar-height);
 	height: 368rpx;
-	color: #ffffff;
-	text-align: center;
+	color: #FAD6B0;
+	text-align: center;
+	position: relative;
 	.text {
 		padding-top: 147rpx;
 		font-size: $font-sm;
 	}
-	.money {
-		font-size: 56rpx;
+	.money {
+		font-size: 47px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		text {
+			font-size: 24px;
+		}
 	}
 }
 
@@ -242,7 +254,7 @@ page {
 	display: flex;
 	height: 40px;
 	padding: 0 5px;
-	background: #fff;
+	background: #000;
 	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
 	position: relative;
 	z-index: 10;
@@ -253,7 +265,7 @@ page {
 		align-items: center;
 		height: 100%;
 		font-size: 15px;
-		color: $font-color-dark;
+		color: #999999;
 		position: relative;
 		&.current {
 			color: $base-color;

pages/public/login.vue

@@ -3,7 +3,7 @@
 		<view class="container_text">
 			<image class="banner-img" src="/static/img/img01.png" mode="scaleToFill"></image>
 		</view>
-		<view class="loginTitle"><text>登录</text></view>
+		<view class="loginTitle"><text>博·赢</text></view>
 		<view class="login_text">
 			<view class="login_input flex">
 				<view class="login_img"><image src="/static/icon/img03.png"></image></view>

uni.scss

@@ -1,10 +1,10 @@
 /* 页面左右间距 */
 $page-row-spacing: 30rpx;
 //页面基础颜色
-$page-color-base: #f8f8f8;//页面背景颜色
+$page-color-base: #000;//页面背景颜色
 $page-color-light: #f8f6fc;
 // 主题颜色
-$base-color: #5dbc7c;//项目颜色
+$base-color: #FAD6B0;//项目颜色
 $box-shadow-color:#5dbc7c;//阴影颜色
 $font-color:#5dbc7c;//字体颜色
 $font-color-spec: #5dbc7c;//可操作文字颜色