Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

pages.json

@@ -147,6 +147,12 @@
 						"navigationBarTitleText": "资产详情"
 					}
 				},
+				{
+					"path": "assets/cash",
+					"style": {
+						"navigationBarTitleText": "资产提现"
+					}
+				},
 				{
 					"path": "dough/index",
 					"style": {

pagesMy/assets/cash.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pagesMy/assets/index.vue

@@ -5,8 +5,8 @@
 				<view class="one_1">
 					<text>¥</text><text>{{money}}</text>
 				</view>
-				<view class="one_2">
-					当前可用
+				<view class="one_2" @click="toCash">
+					<button type="default" size="mini">提现</button>
 				</view>
 			</view>
 			<view class="two">
@@ -162,6 +162,14 @@
 				that.$set(that, `limit`, 6)
 				that.$set(that, `page`, 0)
 			},
+			// 提现
+			toCash() {
+				const that = this;
+				that.clearPage();
+				uni.navigateTo({
+					url: `/pagesMy/assets/cash`
+				})
+			},
 			// 明细
 			toDetail(item) {
 				const that = this;
@@ -192,25 +200,30 @@
 
 		.one {
 			background-color: var(--fFB1Color);
-			text-align: center;
-			padding: 5vw 0;
+			padding: 5vw 2vw;
+			display: flex;
+			justify-content: space-between;
 
 			.one_1 {
-				font-size: 25px;
-				font-weight: bold;
 				color: #fff;
-				margin: 0 0 2vw 0;
+				font-size: 15px;
+				font-weight: bold;
 
-				text:nth-child(1) {
-					font-size: 15px;
-					padding: 0 1vw 0 0;
+				text:last-child {
+					padding: 0 0 0 2vw;
+					font-size: 25px;
 				}
 			}
 
 			.one_2 {
-				font-size: 16px;
-				color: #fff;
+				button {
+					background: #fff;
+					color: #ff0000;
+					border-radius: 25px;
+					font-size: 14px;
+				}
 			}
+
 		}
 
 		.two {
@@ -245,6 +258,7 @@
 					.other_2 {
 						display: flex;
 						align-items: center;
+
 						.money {
 							font-size: var(--font18Size);
 							font-weight: bold;