From 3c5b40c426b08d7152d1b8aa7213d4a037d69e63 Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Sat, 22 Apr 2023 00:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env.js                                        |   2 +-
 pages.json                                    |   4 +-
 pages/app/commission/commission-log.vue       |  10 +-
 pages/app/commission/goods.vue                |   3 +-
 pages/app/commission/index.vue                |   4 +-
 pages/app/commission/order.vue                |  10 +-
 pages/app/commission/share-log.vue            |   6 +-
 pages/app/commission/team.vue                 |   2 +-
 pages/app/components/sh-collapse-item.vue     |  16 +-
 pages/index/homeActivities/homeActivities.vue |  19 +-
 pages/order/detail.vue                        |   6 +-
 pages/order/list.vue                          |  26 +-
 pages/order/payment/method.vue                |  36 ++-
 pages/user/address/edit.vue                   |   3 +-
 pages/user/favorite.vue                       |   3 +-
 pages/user/wallet/index.vue                   |  14 +-
 pages/user/wallet/score-balance.vue           |   1 +
 pages/user/wallet/top-up.vue                  | 294 +++++++++++++++++-
 pages/user/wallet/withdraw.vue                |   5 +-
 static/images/empty.png                       | Bin 0 -> 4989 bytes
 20 files changed, 406 insertions(+), 58 deletions(-)
 create mode 100644 static/images/empty.png

diff --git a/env.js b/env.js
index 5b7fdb4..225bfc6 100644
--- a/env.js
+++ b/env.js
@@ -12,7 +12,7 @@ export const API_URL = `${BASE_URL}/addons/shopro/`
 export const IMG_URL = 'https://fx.njrenzhou.cn'
 
 //高德地图开发者Web服务key,逆坐标解析必须
-export const MAP_KEY = '265849207*********39753dc'
+export const MAP_KEY = '213ff5240e12efbd4c2ec6b7e2f02c6c'
 
 //后台是否开通直播权限,根据情况在manifest.json中引入直播插件，并在pages.json中打开直播页面
 export const HAS_LIVE = false 
diff --git a/pages.json b/pages.json
index d3e9c80..fb11a04 100644
--- a/pages.json
+++ b/pages.json
@@ -522,7 +522,9 @@
 				{
 					"path": "payment/method",
 					"style": {
-						"navigationBarTitleText": "收银台"
+						"navigationBarTitleText": "收银台",
+						"navigationBarBackgroundColor": "#21222B",
+						"navigationBarTextStyle": "white"
 					},
 					"meta": {
 						"auth": true,
diff --git a/pages/app/commission/commission-log.vue b/pages/app/commission/commission-log.vue
index 7aa57a4..c01f1ae 100644
--- a/pages/app/commission/commission-log.vue
+++ b/pages/app/commission/commission-log.vue
@@ -7,7 +7,7 @@
 				<view class="head-box u-flex">
 					<view class="head-title">总收益（元）</view>
 					<button class="u-reset-button look-btn" @tap="showMoney = !showMoney">
-						<view class="u-iconfont" :class="showMoney ? 'uicon-eye-fill' : 'uicon-eye-off'" style="color: #fff;font-size: 50rpx;"></view>
+						<view class="u-iconfont" :class="showMoney ? 'uicon-eye-fill' : 'uicon-eye-off'" style="color: #09090B;font-size: 50rpx;"></view>
 					</button>
 				</view>
 				<view class="card-num">{{ showMoney ? agentInfo.total_income || '0.00' : '***' }}</view>
@@ -50,7 +50,7 @@
 			<!-- 佣金明细列表 -->
 			<view class="log-item u-flex u-row-between" v-for="item in rewardLog" :key="item.id">
 				<view class="item-left u-flex">
-					<image class="log-img" :src="item.buyer.avatar" mode=""></image>
+					<!-- <image class="log-img" :src="item.buyer.avatar" mode=""></image> -->
 					<view class="">
 						<view class="log-name">{{ item.buyer.nickname }}</view>
 						<view class="log-notice">{{ $u.timeFormat(item.createtime, 'yyyy.mm.dd') }}</view>
@@ -74,7 +74,7 @@
 			mode="range"
 			start-text="开始"
 			end-text="结束"
-			active-bg-color="#7063d2"
+			active-bg-color="#7063D2"
 			active-color="#fff"
 			range-bg-color="#e5e2ff"
 			range-color="#7063d2"
@@ -99,9 +99,9 @@ export default {
 				cancel: '已取消'
 			},
 			classType: {
-				'-1': '#EB2B3D',
+				'-1': '#FFFFFF',
 				'0': '#05C3A1',
-				'1': '#7063D2',
+				'1': '#DD5C3D',
 				'-2': '#EEEEEE'
 			},
 			statusList: [
diff --git a/pages/app/commission/goods.vue b/pages/app/commission/goods.vue
index 34be836..a78b459 100644
--- a/pages/app/commission/goods.vue
+++ b/pages/app/commission/goods.vue
@@ -113,11 +113,12 @@ page {
 	border-radius:20rpx;
 	border-bottom: 1rpx solid rgba(#dfdfdf, 0.5);
 	position: relative;
+	margin-bottom:20rpx;
 	.share-btn {
 		position: absolute;
 		bottom: 30rpx;
 		right: 30rpx;
-		width: 160rpx;
+		width: 130rpx;
 		line-height: 60rpx;
 		background: #F0D2A0;
 		box-shadow: 0px 7rpx 11rpx 2rpx rgba(124, 103, 214, 0.34);
diff --git a/pages/app/commission/index.vue b/pages/app/commission/index.vue
index 7ed9ed3..d2ac417 100644
--- a/pages/app/commission/index.vue
+++ b/pages/app/commission/index.vue
@@ -703,7 +703,7 @@ export default {
 	.card-top {
 		padding: 40rpx 40rpx 30rpx;
 		margin-bottom: 30rpx;
-		border-bottom: 1px solid rgba(#fff, 0.12);
+		// border-bottom: 1px solid rgba(#fff, 0.12);
 		.user-name {
 			line-height: 30rpx;
 			margin-bottom: 20rpx;
@@ -808,7 +808,7 @@ export default {
 	.log-scroll {
 		height: 380rpx;
 		.log-item-box {
-			height: 78rpx;
+			height: 100rpx;
 			.log-time {
 				font-size: 26rpx;
 				font-family: Alibaba PuHuiTi;
diff --git a/pages/app/commission/order.vue b/pages/app/commission/order.vue
index 5c0932a..815d239 100644
--- a/pages/app/commission/order.vue
+++ b/pages/app/commission/order.vue
@@ -75,7 +75,7 @@
 			</view>
 		</view>
 
-		<view class="content_box">
+		<view class="content_box" style="padding:0 24rpx;">
 			<scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
 				<!-- 订单列表 -->
 				<view class="order-list" v-for="item in orderList" :key="item.id">
@@ -273,7 +273,7 @@ export default {
 	
 	.direct-item {
 		width: 341rpx;
-		height: 117rpx;
+		// height: 117rpx;
 		background: linear-gradient(0deg, #E1BC7D, #F0D2A0);
 		
 		border-radius: 20rpx;
@@ -287,7 +287,8 @@ export default {
 		.item-value {
 			font-size: 36rpx;
 			font-weight: 600;
-			color:#030300
+			color:#030300;
+			margin-top: 23rpx;
 		}
 	}
 }
@@ -297,7 +298,7 @@ export default {
 	.data-card {
 		width: 340rpx;
 		border-radius: 20rpx;
-		padding: 20rpx;
+		padding: 30rpx;
 		
 		background: linear-gradient(0deg, #E1BC7D, #F0D2A0);
 
@@ -388,6 +389,7 @@ export default {
 // 订单列表
 .order-list {
 	background-color: #fff;
+	border-radius: 20rpx;
 	margin-top: 20rpx;
 	.order-head {
 		padding: 20rpx;
diff --git a/pages/app/commission/share-log.vue b/pages/app/commission/share-log.vue
index afce233..879c264 100644
--- a/pages/app/commission/share-log.vue
+++ b/pages/app/commission/share-log.vue
@@ -16,7 +16,7 @@
 			</view>
 		</view>
 
-		<view class="content_box">
+		<view class="content_box" style="padding: 0 24rpx;">
 			<scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
 				<!-- 分享记录列表 -->
 				<view class="log-list u-flex" v-for="item in shareLogList" :key="item.id">
@@ -135,7 +135,7 @@ export default {
 <style lang="scss">
 // nav
 .head_box {
-	height: 280rpx;
+	height: 240rpx;
 	// background: url($IMG_URL+'/imgs/commission/share_head_bg.png') no-repeat;
 	background-size: 100% auto;
 	position: relative;
@@ -190,7 +190,7 @@ export default {
 .log-list {
 	background-color: #333440;
 	padding: 30rpx;
-	margin: 10rpx 0;
+	margin: 20rpx 0;
 	align-items: flex-start;
 	border-radius: 15rpx;
 
diff --git a/pages/app/commission/team.vue b/pages/app/commission/team.vue
index 03c2af3..ebd5c9f 100644
--- a/pages/app/commission/team.vue
+++ b/pages/app/commission/team.vue
@@ -48,7 +48,7 @@
 			</view>
 		</view>
 
-		<view class="content_box">
+		<view class="content_box" style="padding:0 24rpx">
 			<scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
 				<!-- 团队列表 -->
 				<view class="team-box">
diff --git a/pages/app/components/sh-collapse-item.vue b/pages/app/components/sh-collapse-item.vue
index 64eb503..1d24d15 100644
--- a/pages/app/components/sh-collapse-item.vue
+++ b/pages/app/components/sh-collapse-item.vue
@@ -86,16 +86,18 @@ export default {
 
 <style lang="scss">
 .sh-collapse-box {
-	background-color: #fff;
+	// background-color: #fff;
 	.collapse-head {
 		padding: 0rpx 28rpx;
 		height: 132rpx;
-		border-bottom: 1rpx solid #eee;
+		background: #333440;
+		border-radius: 15rpx;
+		// border-bottom: 1rpx solid #eee;
 		.head-img {
-			width: 66rpx;
-			height: 66rpx;
+			width: 80rpx;
+			height: 80rpx;
 			border-radius: 50%;
-			margin-right: 45rpx;
+			margin-right: 21rpx;
 		}
 		.arrow-btn {
 			background: none;
@@ -118,9 +120,9 @@ export default {
 			.name-box {
 				margin-bottom: 12rpx;
 				.name-text {
-					font-size: 26rpx;
+					font-size: 24rpx;
 					font-weight: 500;
-					color: #111111;
+					color: #FFFFFF;
 				}
 				.tag-box {
 					background: rgba(0, 0, 0, 0.2);
diff --git a/pages/index/homeActivities/homeActivities.vue b/pages/index/homeActivities/homeActivities.vue
index 61ae7a2..34e56e8 100644
--- a/pages/index/homeActivities/homeActivities.vue
+++ b/pages/index/homeActivities/homeActivities.vue
@@ -1,5 +1,5 @@
 <template>
-	<view style="padding-bottom:30rpx;">
+	<view style="padding:30rpx 0;">
 		<view class="list">
 			<view class="listItem" @tap="goDetail(item)" v-for="(item,index) in list" :key="index">
 				<view class="img">
@@ -15,7 +15,10 @@
 				</view>
 			</view>
 		</view>
-		
+		<view class="empty" v-if="list.length==0">
+			<image src="/static/images/empty.png" mode="widthFix"></image>
+			<view class="emptyText">暂无内容</view>
+		</view>
 	</view>
 </template>
 
@@ -46,6 +49,18 @@
 </script>
 
 <style lang="scss">
+.empty{
+	margin:20% auto 0 auto;
+	text-align: center;
+	image{
+		width:30%;
+		height:auto;
+	}
+	.emptyText{
+		color:#ffffff;
+		margin:30upx;
+	}
+}
 .listItem{
 	margin:0 24upx;
 	background: #aaaaaa;
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 68f7c33..d913c2f 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -723,8 +723,10 @@ export default {
 		justify-content: flex-end;
 		// margin-bottom: 20rpx;
 		.delete-btn {
-			background: #ffeeee;
-			color: #e50808;
+			// background: #ffeeee;
+			// color: #e50808;
+			color:#09090B;
+			border: 1px solid #222222;
 			width: 160rpx;
 			line-height: 60rpx;
 			border-radius: 30rpx;
diff --git a/pages/order/list.vue b/pages/order/list.vue
index c0e29b6..dfc42c7 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -71,8 +71,12 @@
 				</view>
 
 				<!-- 空白页 -->
-				<shopro-empty v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_groupon.png'"
-					tipText="暂无商品，还有更多好货等着你噢~"></shopro-empty>
+				<view class="empty" v-if="isEmpty">
+					<image src="../../static/images/empty.png" mode="widthFix"></image>
+					<view class="emptyText">暂无商品，还有更多好货等着你噢~</view>
+				</view>
+		<!-- 		<shopro-empty v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_groupon.png'">
+					tipText="暂无商品，还有更多好货等着你噢~"></shopro-empty> -->
 				<!-- 更多 -->
 				<u-loadmore v-show="orderList.length" height="80rpx" :status="loadStatus" icon-type="flower"
 					color="#ccc" />
@@ -243,6 +247,18 @@
 </script>
 
 <style lang="scss">
+	.empty{
+		margin:20% auto 0 auto;
+		text-align: center;
+		image{
+			width:30%;
+			height:auto;
+		}
+		.emptyText{
+			color:#ffffff;
+			margin:30upx;
+		}
+	}
 	.order-nav {
 		// background: #fff;
 		height: 80rpx;
@@ -344,8 +360,10 @@
 			}
 
 			.obtn3 {
-				background: #ffeeee;
-				color: #e50808;
+				// background: #ffeeee;
+				border: 1px solid #09090B;
+				// color: #e50808;
+				color:#09090B;
 				width: 180rpx;
 				line-height: 70rpx;
 				border-radius: 35rpx;
diff --git a/pages/order/payment/method.vue b/pages/order/payment/method.vue
index e8f5fe2..45b089b 100644
--- a/pages/order/payment/method.vue
+++ b/pages/order/payment/method.vue
@@ -1,6 +1,6 @@
 <!-- 收银台 -->
 <template>
-	<view class="pay-method-wrap">
+	<view class="pay-method-wrap" style="padding:34rpx 24rpx 0 24rpx;">
 		<view class="u-flex-col u-col-center money-box" v-if="orderDetail.total_fee">
 			<text class="time" v-show="isCountDown">{{ timeText }}</text>
 			<view class="money">{{ orderDetail.total_fee }}</view>
@@ -201,20 +201,25 @@
 
 <style lang="scss">
 	.money-box {
-		background: #fff;
-		height: 250rpx;
+		height: 260rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 6rpx 16rpx 0rpx rgba(25,25,25,0.05);
+		border-radius: 20rpx;
 		margin-bottom: 20rpx;
-		padding-top: 30rpx;
-
+		// padding-top: 30rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 		.time {
 			font-size: 28rpx;
-			color: #c4c4c4;
+			// color: #c4c4c4;
+			color:#09090B;
 		}
 
 		.money {
-			color: #e1212b;
+			color: #09090B;
 			font-size: 60rpx;
-			margin-top: 60rpx;
+			margin-top: 39rpx;
 
 			&::before {
 				content: '￥';
@@ -224,14 +229,19 @@
 	}
 
 	.pay-box {
+		/deep/.u-radio-group{
+			box-shadow: 0px 6rpx 16rpx 0px rgba(25,25,25,0.05);
+			border-radius: 20rpx;
+			overflow: hidden;
+		}
 		.pay-item {
-			height: 90rpx;
+			height: 130rpx;
 			padding: 0 30rpx;
 			font-size: 26rpx;
 			background: #fff;
-			width: 750rpx;
+			// width: 750rpx;
 			border-bottom: 1rpx solid #eeeeee;
-
+			
 			&:last-child {
 				border-bottom: none;
 			}
@@ -246,10 +256,10 @@
 
 	.pay-btn {
 		width: 690rpx;
-		line-height: 80rpx;
+		line-height: 100rpx;
 		background: linear-gradient(90deg, rgba(240, 199, 133, 1), rgba(246, 214, 157, 1));
 		border-radius: 40rpx;
-		color: rgba(#fff, 0.9);
+		color: #111111;
 		margin: 100rpx auto 0;
 	}
 </style>
diff --git a/pages/user/address/edit.vue b/pages/user/address/edit.vue
index b615a6c..57e756d 100644
--- a/pages/user/address/edit.vue
+++ b/pages/user/address/edit.vue
@@ -3,7 +3,7 @@
 	<view class="address-wrap" style="padding:0 24rpx;padding-top:46rpx;">
 		<u-form :model="model" :rules="rules" ref="uForm" :errorType="errorType">
 			<!-- 地址定位 -->
-			<view class="location-item u-flex u-row-between u-p-20 u-m-b-20" @tap="getLocation">
+			<view class="location-item u-flex u-row-between  u-m-b-20" @tap="getLocation">
 				<view class="u-flex">
 					<text class="u-iconfont uicon-map-fill" style="#a76f0d;"></text>
 					<text>{{ chooseAddress }}</text>
@@ -262,6 +262,7 @@ export default {
 // 点击定位
 .location-item {
 	font-size: 28rpx;
+	padding:29rpx 20rpx;
 	font-weight: 500;
 	background-color: #fff;
 	// color: rgba(167, 111, 13, 1);
diff --git a/pages/user/favorite.vue b/pages/user/favorite.vue
index 9cbd8cb..2c57ff9 100644
--- a/pages/user/favorite.vue
+++ b/pages/user/favorite.vue
@@ -153,8 +153,9 @@ export default {
 		color: #999;
 
 		.all-num {
-			color: #21222B;
+			color: #F0D2A0;
 			font-size: 36rpx;
+			margin:0 8rpx;
 		}
 	}
 
diff --git a/pages/user/wallet/index.vue b/pages/user/wallet/index.vue
index 1173862..8af8c90 100644
--- a/pages/user/wallet/index.vue
+++ b/pages/user/wallet/index.vue
@@ -42,7 +42,7 @@
 
 		<!-- 钱包记录 -->
 		<view class="wallet-list u-flex" v-for="item in walletLog" :key="item.id">
-			<image class="head-img u-m-r-20" :src="item.avatar" mode=""></image>
+			<!-- <image class="head-img u-m-r-20" :src="item.avatar" mode=""></image> -->
 			<view class="list-content">
 				<view class="title-box u-flex u-row-between">
 					<text class="title u-ellipsis-1">{{ item.type_name }}{{ item.title ? '-' + item.title : '' }}</text>
@@ -177,10 +177,11 @@
 <style lang="scss">
 	// 钱包记录
 	.wallet-list {
-		width: 750rpx;
-		padding: 30rpx;
-		background-color: #ffff;
-		border-bottom: 1rpx solid #eeeeee;
+		// width: 750rpx;
+		padding: 30rpx 0;
+		margin:0 30rpx;
+		// background-color: #ffff;
+		border-bottom: 1rpx solid #333440;
 
 		.head-img {
 			width: 70rpx;
@@ -203,6 +204,9 @@
 			.time {
 				color: #808292;
 				font-size: 26rpx;
+				display: block;
+				margin-top:30rpx;
+				
 			}
 		}
 
diff --git a/pages/user/wallet/score-balance.vue b/pages/user/wallet/score-balance.vue
index 1956bbd..03d02a4 100644
--- a/pages/user/wallet/score-balance.vue
+++ b/pages/user/wallet/score-balance.vue
@@ -150,6 +150,7 @@ export default {
 			// bottom: 0;
 			transform: translateX(-50%);
 			width: 710rpx;
+			z-index:9999;
 			// height: 90rpx;
 			// background: rgba(255, 255, 255, 1);
 			// border-radius: 30rpx 30rpx 0px 0px;
diff --git a/pages/user/wallet/top-up.vue b/pages/user/wallet/top-up.vue
index 7dfe19a..55a4e1f 100644
--- a/pages/user/wallet/top-up.vue
+++ b/pages/user/wallet/top-up.vue
@@ -1,4 +1,290 @@
 <!-- 充值 -->
+<template>
+	<view class="draw-money-wrap u-p-b-30">
+		<view class="head-box">
+			<shopro-navbar :background="{ background: navBackground }" :backTextStyle="{ color: '#fff' }" backText="充值"
+				backIconColor="#fff"></shopro-navbar>
+			<!-- 账户 -->
+			<view class="wallet-num-box u-flex u-row-between">
+				<view class="">
+					<view class="num-title">账户余额（元）</view>
+					<view class="wallet-num">{{ userInfo.money || '0.00' }}</view>
+				</view>
+				<button class="u-reset-button log-btn"
+					@tap="$Router.push({ path: '/pages/user/wallet/top-up-log' })">充值记录</button>
+			</view>
+		</view>
+		<!-- 充值输入卡片-->
+		<view class="draw-card">
+			<view class="card-title">充值金额</view>
+			<view class="input-box u-flex u-col-center">
+				<view calss="unit">￥</view>
+				<input class="u-flex-1 u-p-l-10" type="digit" @focus="onTopupFous" @input="onTopupInput" v-model="money"
+					placeholder-style="font-size: 30rpx; font-weight: 500;color:#C2C7CF;" placeholder="请输入充值金额" />
+			</view>
+			<!-- 快捷充值 -->
+			<view class="top-up-content u-p-b-30" v-if="initRecharge.moneys.length">
+				<view class="card-title">快捷充值</view>
+				<view class="u-flex u-flex-wrap">
+					<view class="top-up-card u-flex u-row-center u-col-center u-m-b-30 u-m-r-30"
+						:class="{'top-up-active':curMoneyCard === index}" v-for="(item,index) in initRecharge.moneys"
+						:key="index" @tap="selectCard(index)">
+						<view class="top-up-value">
+							{{item.money}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<button class="u-reset-button save-btn" :style="{opacity:!money ? 0.7 : 1 }" :disabled="!money"
+				@tap="confirmTopup">确认充值</button>
+		</view>
+
+
+		<!-- 充值说明 -->
+		<view class="draw-notice">
+			<view class="title">充值说明</view>
+			<view class="draw-list">1.充值为在线支付，即时到账，不支持退款；</view>
+			<view class="draw-list">
+				2.充值后金额会自动进入您的余额账户，请注意查收。
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapState, mapActions, mapGetters } from 'vuex';
+	import FormValidate from '@/shopro/validate/form';
+	import wechat from '@/shopro/wechat/wechat';
+	export default {
+		components: {},
+		data() {
+			return {
+				money: '', //提现金额
+				showModal: false,
+				curMoneyCard: '',
+				navBackground: 'none'
+			};
+		},
+		computed: {
+			...mapGetters(['userInfo', 'initRecharge'])
+		},
+		async onLoad() {},
+		onPageScroll(e) {
+			this.navBackground = e.scrollTop > 50 ?
+				`url(${this.$IMG_URL}/imgs/user/draw_money_head_bg.png) no-repeat top / 100% auto` : 'none';
+		},
+		methods: {
+			// 充值输入框
+			onTopupInput(e) {
+				this.$nextTick(() => {
+					this.money = this.clearNoNum(e.detail.value)
+				})
+			},
+			// 获取焦点
+			onTopupFous() {
+				this.curMoneyCard = ''
+			},
+
+			// 选择充值卡片
+			selectCard(index) {
+				this.curMoneyCard = index
+				this.money = this.initRecharge.moneys[index].money
+			},
+
+			confirmTopup() {
+				const that = this;
+				if (this.money <= 0) {
+					this.$u.toast('请选择或输入充值金额');
+					return;
+				}
+				that.$http(
+					'money.recharge', {
+						recharge_money: that.money
+					},
+					'确认中...'
+				).then(res => {
+					if (res.code === 1) {
+						that.money = '';
+						that.$Router.push({
+							path: `/pages/order/payment/method`,
+							query: {
+								orderId: res.data.id,
+								orderType: 'recharge'
+							}
+						});
+					} else {
+						that.$u.toast(res.msg);
+					}
+				});
+			},
+
+			// 校验金额
+			clearNoNum(val) {
+				if (val == ".") {
+					val = "0.";
+				}
+				val = val.replace(/[^\d.]/g, "");
+				//必须保证第一个为数字而不是.
+				val = val.replace(/^\./g, "");
+				//保证只有出现一个.而没有多个.
+				val = val.replace(/\.{2,}/g, ".");
+				//保证.只出现一次，而不能出现两次以上
+				val = val
+					.replace(".", "$#$")
+					.replace(/\./g, "")
+					.replace("$#$", ".");
+				//只能输入两位小数
+				val = val.replace(/^(-)*(\d+)\.(\d\d).*$/, "$1$2.$3");
+				if (val.indexOf(".") < 0 && val != "") {
+					//以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
+					val = parseFloat(val);
+				}
+				return val
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.head-box {
+		// background: url($IMG_URL+'/imgs/user/draw_money_head_bg.png') no-repeat;
+		// background-size: 100% auto;
+		min-height: 400rpx;
+		padding-bottom: var(--status-bar-height);
+
+		// 可提现
+		.wallet-num-box {
+			padding: 46rpx 40rpx 0;
+			align-items: baseline;
+			.num-title {
+				font-size: 30rpx;
+				font-weight: 500;
+				color: #ffffff;
+				margin-bottom: 20rpx;
+			}
+
+			.wallet-num {
+				font-size: 60rpx;
+				font-weight: 500;
+				color: #F0D2A0;
+			}
+
+			.log-btn {
+				width: 170rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				border:1px solid #F0D2A0;
+				// background: rgba(255, 255, 255, 0.1);
+				
+				border-radius: 30rpx;
+				padding: 0;
+				font-size: 24rpx;
+				font-weight: 500;
+				color: #F0D2A0;
+			}
+		}
+	}
+
+	// 提现输入卡片
+	.draw-card {
+		background-color: #fff;
+		border-radius: 20rpx;
+		width: 690rpx;
+		min-height: 400rpx;
+		margin: -70rpx auto 30rpx;
+		padding: 30rpx;
+
+		.card-title {
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #333333;
+			margin-bottom: 30rpx;
+		}
+
+		.input-box {
+			width: 624rpx;
+			border-bottom: 1rpx solid #eee;
+			height: 100rpx;
+			margin-bottom: 40rpx;
+
+			.unit {
+				font-size: 48rpx;
+				color: #333;
+			}
+		}
+
+		.save-btn {
+			width: 616rpx;
+			height: 86rpx;
+			line-height: 86rpx;
+			// background: linear-gradient(-90deg, #a36fff, #5336ff);
+			background: #F0D2A0;
+			box-shadow: 0px 7rpx 11rpx 2rpx rgba(124, 103, 214, 0.34);
+			border-radius: 43rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #ffffff;
+		}
+
+		// 充值卡片
+		.top-up-card {
+			width: 190rpx;
+			height: 124rpx;
+			background: #F7F6FB;
+			border-radius: 12rpx;
+			transition: all linear 0.2s;
+
+			&:nth-of-type(3n) {
+				margin-right: 0 !important;
+			}
+
+			.top-up-value {
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #999999;
+
+				&::after {
+					content: '元';
+					font-size: 24rpx;
+				}
+			}
+		}
+
+		.top-up-active {
+			background: #564BBD;
+			transition: all linear 0.2s;
+
+			.top-up-value {
+				color: #fff
+			}
+		}
+	}
+
+	// 提现说明
+	.draw-notice {
+		width: 684rpx;
+		min-height: 180rpx;
+		background: #ffffff;
+		border-radius: 20rpx;
+		padding: 30rpx 35rpx;
+		margin: 20rpx auto;
+
+		.title {
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #333333;
+			margin-bottom: 30rpx;
+		}
+
+		.draw-list {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+			margin-bottom: 10rpx;
+		}
+	}
+</style>
+<!-- 充值 -->
 <template>
 	<view class="draw-money-wrap u-p-b-30">
 		<view class="head-box">
@@ -154,7 +440,8 @@
 
 		// 可提现
 		.wallet-num-box {
-			padding: 20rpx 40rpx 0;
+			padding: 46rpx 40rpx 0;
+			align-items: baseline;
 
 			.num-title {
 				font-size: 30rpx;
@@ -217,12 +504,13 @@
 			width: 616rpx;
 			height: 86rpx;
 			line-height: 86rpx;
-			background: linear-gradient(-90deg, #a36fff, #5336ff);
+			// background: linear-gradient(-90deg, #a36fff, #5336ff);
+			background: #F0D2A0;
 			box-shadow: 0px 7rpx 11rpx 2rpx rgba(124, 103, 214, 0.34);
 			border-radius: 43rpx;
 			font-size: 30rpx;
 			font-weight: 500;
-			color: #ffffff;
+			color: #09090B;
 		}
 
 		// 充值卡片
diff --git a/pages/user/wallet/withdraw.vue b/pages/user/wallet/withdraw.vue
index 028a0bb..b78edcd 100644
--- a/pages/user/wallet/withdraw.vue
+++ b/pages/user/wallet/withdraw.vue
@@ -339,7 +339,7 @@ export default {
 .head-box {
 	// background: url($IMG_URL+'/imgs/user/draw_money_head_bg.png') no-repeat;
 	background-size: 100% auto;
-	min-height: 400rpx;
+	min-height: 300rpx;
 	padding-bottom: var(--status-bar-height);
 	// 可提现
 	.wallet-num-box {
@@ -378,7 +378,8 @@ export default {
 	border-radius: 20rpx;
 	width: 690rpx;
 	min-height: 530rpx;
-	margin: -70rpx auto 0;
+	// margin: -70rpx auto 0;
+	margin: 0rpx auto 0;
 	padding: 30rpx;
 	.card-title {
 		font-size: 30rpx;
diff --git a/static/images/empty.png b/static/images/empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..67bd49d9d8450339b525a1d43b24223dff85a2d1
GIT binary patch
literal 4989
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

literal 0
HcmV?d00001