提现

config/baseUrl.js

@@ -3,12 +3,12 @@ let h5BaseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	// baseUrl = "http://192.168.0.103:8080"; //屈晨
+	baseUrl = "http://192.168.0.103:8080"; //屈晨
 	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
 	// h5BaseUrl = "https://test.baoxianzhanggui.com/h5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// h5BaseUrl = "https://pre.baoxianzhanggui.com/h5";
-	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
+	// baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
 	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
 	socketUrl = "";
 } else if (process.env.NODE_ENV === 'production') {

manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率，192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "2.1.7",
-	"versionCode": 217,
+	"versionName": "2.1.8",
+	"versionCode": 218,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"

node_modules/uview-ui/components/u-steps/u-steps.vue

@@ -5,7 +5,7 @@
 			}">
 			<view class="u-steps__item" :class="['u-steps__item--' + direction]" v-for="(item, index) in list"
 				:key="index">
-				<view class="u-steps__item__num" v-if="mode == 'number'" :style="{
+				<view class="u-steps__item__num" v-if="mode == 'number' && item.processingStatus!=3" :style="{
 						backgroundColor: current < index ? 'transparent' : activeColor,
 						borderColor: current < index ? unActiveColor : activeColor
 					}">
@@ -14,20 +14,37 @@
 					}">
 						{{ index+1 }}
 					</text>
-					<u-icon v-else size="22" color="#ffffff" :name="icon"></u-icon>
+					<u-icon v-else size="22" color="#ffffff" :name="item.processingStatus==3?icon1:icon"></u-icon>
 
 				</view>
+				<view class="u-steps__item__num" v-if="mode == 'number' && item.processingStatus==3" :style="{
+						backgroundColor: current < index ? 'transparent' : 'red',
+						borderColor: current < index ? unActiveColor : 'red'
+					}">
+					<text v-if="current < index" :style="{
+						color: current < index ? unActiveColor : activeColor,
+					}">
+						{{ index+1 }}
+					</text>
+					<u-icon v-else size="22" color="#ffffff" :name="icon1"></u-icon>
 
+				</view>
 				<view class="u-steps__item__dot" v-if="mode == 'dot'" :style="{ 
 					backgroundColor: index <= current ? activeColor : unActiveColor 
 				}"></view>
-				<text class="u-line-1" :style="{
-						color: index <= current ? activeColor : unActiveColor,
-					}" :class="['u-steps__item__text--' + direction]">
-					<text class="dis f-c a-start pathTraceColor" v-for="(value, key, index) in item"
-						:class="{' active':key=='time'}" :key="index">{{ value }}</text>
+				<view class="dis f-c ">
+					<text class="u-line-1" :style="{
+							color: index <= current ? activeColor : unActiveColor,
+						}" :class="['u-steps__item__text--' + direction]">
+						<text class="dis f-c a-start pathTraceColor" :key="index">{{item.processingStatusName}}</text>
+					</text>
+					<text class="u-line-1" :style="{
+							color: index <= current ? activeColor : unActiveColor,
+						}" :class="['u-steps__item__text--' + direction]">
+						<text class="dis f-c a-start pathTraceColor" :key="index">{{item.processingDate}}</text>
+					</text>
+				</view>
 
-				</text>
 				<view class="u-steps__item__line" :class="['u-steps__item__line--' + mode]"
 					v-if="index < list.length - 1">
 					<u-line :direction="direction" length="100%" :hair-line="false" :color="unActiveColor"
@@ -92,6 +109,10 @@
 				type: String,
 				default: 'checkmark'
 			},
+			icon1: {
+				type: String,
+				default: 'close'
+			},
 			// step的排列方向，row-横向，column-竖向
 			direction: {
 				type: String,

pages.json

@@ -45,8 +45,9 @@
 		}, {
 			"path": "pages/register/register", //注册
 			"style": {
-				"navigationBarTitleText": "发送验证码",
+				"navigationBarTitleText": "用户注册",
 				"app-plus": {
+					"titleNView": false,
 					"scrollIndicator": "none", //隐藏滚动条
 					"bounce": "none" //关闭反弹效果
 				}
@@ -72,6 +73,26 @@
 				}
 			}
 		},
+		{
+			"path": "pages/wallet/preReceivedDetails",
+			"style": {
+				"navigationBarTitleText": "预收明细",
+				"app-plus": {
+					"scrollIndicator": "none",
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/wallet/transactionDetails",
+			"style": {
+				"navigationBarTitleText": "收支明细",
+				"app-plus": {
+					"scrollIndicator": "none",
+					"bounce": "none"
+				}
+			}
+		},
 		{
 			"path": "pages/my/my",
 			"style": {
@@ -591,8 +612,8 @@
 				}
 			}
 		},
-	
-		 {
+
+		{
 			"path": "pages/wallet/wallet",
 			"style": {
 				"navigationBarTitleText": "我的钱包",
@@ -1030,8 +1051,8 @@
 			"path": "pages/orders1/quotation",
 			"style": {
 				"navigationBarTitleText": "报价单",
-				"navigationBarBackgroundColor": "#0052FF",
-				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#C6D8FE",
+				"navigationBarTextStyle": "black",
 				"enablePullDownRefresh": false
 
 			}

pages/login/login.vue

@@ -1,91 +1,112 @@
 <template>
 	<view>
 		<!-- 状态栏 -->
-		<uni-status-bar></uni-status-bar>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<app-update ref="app_update"></app-update>
 		<!-- 欢迎语 -->
-		<view class="w-100 flex-column box-sizing font-weight" style="height: 450rpx;padding:135rpx 60rpx;">
-			<view class="font-lgr">您好，</view>
-			<view class="font-lgr">欢迎来到掌柜科技</view>
+		<view class="dis j-end a-c">
+			<image src="../../static/image/login/2.png" mode=""
+				style="height: 280px;width: calc(100% - 16px);margin-top: 120px;">
+			</image>
 		</view>
-		<!-- 登录区域Start -->
-		<view class="mx-3">
-			<!-- 账号密码登录 false代表账号密码登录 -->
-			<template v-if="!status">
-				<view class="mt-1 border-bottom">
-					<input type="text" v-model="username" class="uni-input common-input" maxlength="17"
-						placeholder="请输入会员号" />
-				</view>
-				<view class="mt-2 position-relative border-bottom">
-					<input type="text" :password="isHidePassword" v-model="password" class="uni-input common-input"
-						placeholder="请输入密码" style="padding-right: 200rpx;" maxlength="15" />
-					<view class=" position-absolute top-0 right-0 d-flex a-center j-center"
-						style="width: 200rpx;height: 100%;">
-						<view style="font-size: 40rpx;" class="icon iconfont"
-							:class="isHidePassword?'icon-buxianshimima1':'icon-xianshimima1'"
-							@tap="isHidePassword = !isHidePassword"></view>
+		<view class="" style="margin-top: -120px;">
+			<u-tabs :list="list" :is-scroll="true" :current="current" @change="change"
+				style="background: transparent;margin-bottom: 30px;"></u-tabs>
+			<!-- 登录区域Start -->
+			<view class="mx-3">
+				<!-- 账号密码登录 false代表账号密码登录 -->
+				<template v-if="current==0">
+					<view class="mt-2 position-relative border-bottom">
+						<view class="position-absolute d-flex a-center j-center left-0 top-0 font-weight"
+							style="height: 100%;">
+							<image src="../../static/image/login/zhanghao.png" mode=""
+								style="width: 18px;height: 18px;">
+							</image>
+						</view>
+						<input type="text" v-model="username" class="uni-input common-input" maxlength="17"
+							placeholder="请输入会员号" style="padding-left: 56rpx;background: transparent;" />
 					</view>
-				</view>
-				<view class="mt-2 position-relative border-bottom">
-					<input type="text" v-model="imgcode" class="uni-input common-input" maxlength="5"
-						placeholder="请输入验证码" style="padding-right: 200rpx;" />
-					<image style="height: 80%;padding-top: 4rpx;width: 200rpx;" mode="aspectFill"
-						class="position-absolute top-0 right-0 d-flex a-center j-center text-light-muted"
-						:src="imgcodesrc" @tap="refreshCaptcha"></image>
-				</view>
-			</template>
-			<!-- 手机验证码登录 true代表手机验证码登录 -->
-			<template v-else>
-				<view class="mt-1 position-relative border-bottom">
-					<view class="position-absolute d-flex a-center j-center left-0 top-0 font-weight"
-						style="width: 100rpx;height: 100%;">+86</view>
-					<input type="text" v-model="phone" class="uni-input common-input" style="padding-left: 100rpx;"
-						placeholder="手机号" />
-				</view>
-				<view class="mt-2 position-relative border-bottom">
-					<input type="text" v-model="checknum" class="uni-input common-input" maxlength="4"
-						style="padding-right: 240rpx;" placeholder="请输入验证码" />
-					<view class="position-absolute top-0 right-0 d-flex a-center j-center text-light-muted"
-						style="width: 240rpx;height: 100%;" @tap="getCheckNum">
-						<view class="d-flex a-center j-center "
-							:class="!codetime?'yanzhengmaView1 main-text-color':'yanzhengmaView2'">
-							{{!codetime?'获取验证码':codetime+' S'+'后重新获取'}}
+					<view class="mt-2 position-relative border-bottom">
+						<view class="position-absolute d-flex a-center j-center left-0 top-0 font-weight"
+							style="height: 100%;">
+							<image src="../../static/image/login/mima.png" mode="" style="width: 18px;height: 18px;">
+							</image>
+						</view>
+						<input type="text" :password="isHidePassword" v-model="password" class="uni-input common-input"
+							placeholder="请输入密码" style="padding-right: 200rpx;padding-left: 56rpx;" maxlength="15" />
+						<view class=" position-absolute top-0 right-0 d-flex a-center j-center"
+							style="width: 200rpx;height: 100%;">
+							<image
+								:src="isHidePassword?'../../static/image/login/biyan.png':'../../static/image/login/zhengyan.png'"
+								@tap="isHidePassword = !isHidePassword" mode="" style="width: 18px;height: 18px;">
 						</view>
 					</view>
+					<view class="mt-2 position-relative border-bottom">
+						<view class="position-absolute d-flex a-center j-center left-0 top-0 font-weight"
+							style="height: 100%;">
+							<image src="../../static/image/login/yanzhengma.png" mode=""
+								style="width: 18px;height: 18px;">
+							</image>
+						</view>
+						<input type="text" v-model="imgcode" class="uni-input common-input" maxlength="5"
+							placeholder="请输入验证码" style="padding-right: 200rpx;padding-left: 56rpx;" />
+						<image style="height: 80%;padding-top: 4rpx;width: 200rpx;" mode="aspectFill"
+							class="position-absolute top-0 right-0 d-flex a-center j-center text-light-muted"
+							:src="imgcodesrc" @tap="refreshCaptcha"></image>
+					</view>
+				</template>
+				<!-- 手机验证码登录 true代表手机验证码登录 -->
+				<template v-else>
+					<view class="mt-2 position-relative border-bottom">
+						<view class="position-absolute d-flex a-center j-center left-0 top-0 font-weight"
+							style="height: 100%;">
+							<image src="../../static/image/login/shoujihao.png" mode=""
+								style="width: 18px;height: 18px;">
+							</image>
+						</view>
+						<input type="text" v-model="phone" class="uni-input common-input" style="padding-left: 56rpx;"
+							placeholder="手机号" />
+					</view>
+					<view class="mt-2 position-relative border-bottom">
+						<view class="position-absolute d-flex a-center j-center left-0 top-0 font-weight"
+							style="height: 100%;">
+							<image src="../../static/image/login/yanzhengma.png" mode=""
+								style="width: 18px;height: 18px;">
+							</image>
+						</view>
+						<input type="text" v-model="checknum" class="uni-input common-input" maxlength="4"
+							style="padding-right:120px;padding-left: 56rpx;" placeholder="请输入验证码" />
+						<view class="position-absolute top-0 right-0 d-flex a-center j-center text-light-muted"
+							style="width: 240rpx;height: 100%;" @tap="getCheckNum">
+							<view class="d-flex a-center j-center "
+								:class="!codetime?'yanzhengmaView1 text-color':'yanzhengmaView2'">
+								{{!codetime?'获取验证码':codetime+' S'+'后重新获取'}}
+							</view>
+						</view>
+					</view>
+				</template>
+				<button class="my-3 mt-4 d-flex a-center j-center font-weight bg-color" :loading="loading"
+					:class="{'bg-hover-color':disabled}" type="primary" @tap="submit" :disabled="disabled"
+					style="letter-spacing: 20rpx;">登录</button>
+				<view class=" left-0 right-0 dis a-c j-start  text-light-muted" style="bottom:30rpx">
+					<u-checkbox v-model="checked"></u-checkbox>
+					我已确认并同意<view> <text @tap="nav('/pages/login/xieyi')" class="text-color">平台协议</text>及<text
+							class="text-color" @tap="nav('/pages/login/mimi')">隐私协议</text>政策</view>
 				</view>
-			</template>
-			<button class="my-3 mt-4 d-flex a-center j-center font-weight main-bg-color" :loading="loading"
-				:class="{'main-bf-hover-color':disabled}" type="primary" @tap="submit" :disabled="disabled"
-				style="letter-spacing: 20rpx;">登录</button>
-			<!-- 登录状态切换 -->
-			<view class="pt-1 px-3 pb-0 text-light-muted d-flex j-sb">
-				<view @tap="changeStatus">
-					{{status?'密码登录':'验证码登录'}}
-				</view>
-				<!-- #ifdef H5 -->
-				<view>
-					<view @tap="navigate({url:'/pages/register/register'})">用户注册</view>
+				<!-- #ifdef APP -->
+				<view class="third_party_login_box">
+					<view class="third_party_title"><text>第三方登录</text></view>
+					<view class="third_party_content flex-wrap">
+						<image src="../../static/image/login/wx.png" @click="onWxAppLogin" mode="aspectFit"></image>
+						<image src="../../static/image/login/zf.png" @click="onzfbAppLogin" mode="aspectFit"></image>
+					</view>
 				</view>
 				<!-- #endif -->
 			</view>
-			<!-- #ifdef APP -->
-			<view class="third_party_login_box">
-				<view class="third_party_title"><text>第三方登录</text></view>
-				<view class="third_party_content flex-wrap">
-					<image src="/static/icon/weixin.png" @click="onWxAppLogin" mode="aspectFit"></image>
-					<image src="/static/icon/zhifubao.png" @click="onzfbAppLogin" mode="aspectFit"></image>
-				</view>
-			</view>
-			<!-- #endif -->
-			<view class="position-fixed left-0 right-0 d-flex a-center j-center pt-2 text-light-muted"
-				style="bottom:30rpx">
-				登录/<span>注册</span>表示您已同意<view> <text @tap="nav('/pages/login/xieyi')"
-						class="main-text-color">平台协议</text>及<text class="main-text-color"
-						@tap="nav('/pages/login/mimi')">隐私协议</text>政策</view>
-			</view>
 		</view>
+
+		<u-toast ref="uToast" />
 		<u-popup v-model="show" border-radius="14" mode="center" width="70%">
 			<view class="shu1 shili">
 				<text>温馨提示</text>
@@ -114,6 +135,13 @@
 		},
 		data() {
 			return {
+				checked: false,
+				list: [{
+					name: '账号登录'
+				}, {
+					name: '短信登录'
+				}],
+				current: 0,
 				isLoading: false,
 				show: false,
 				contentSlot: true,
@@ -247,7 +275,11 @@
 		//方法
 		methods: {
 			...mapMutations(['setUserInfo']),
+
 			// 跳转页面
+			change(index) {
+				this.current = index;
+			},
 			nav(url) {
 				uni.navigateTo({
 					url: url
@@ -380,9 +412,15 @@
 			//#endif
 			// 提交登录
 			submit() {
+				if (!this.checked) {
+					return this.$refs.uToast.show({
+						title: '请阅读后勾选并同意《平台协议》及《隐私协议》政策',
+						type: 'default',
+					})
+				}
 				// // 账号密码登录
 				uni.hideKeyboard();
-				if (!this.status) {
+				if (this.current == 0) {
 					//#ifdef H5
 					this.$login({
 						url: "/login2",
@@ -692,7 +730,14 @@
 		onReachBottom() {},
 	};
 </script>
-<style scoped>
+<style lang="scss" scoped>
+	/deep/ {
+		.u-tab-bar {
+			background: linear-gradient(90deg, #0052FF 0%, rgba(0, 82, 255, 0) 100%) !important;
+			border-radius: 4px 4px 4px 4px;
+		}
+	}
+
 	.shu1 {
 		display: flex;
 		flex-direction: column;
@@ -797,4 +842,19 @@
 		width: 220rpx;
 		padding: 5rpx 0;
 	}
+
+	.bg-color {
+		background-color: #0052FF;
+		border-radius: 20px;
+	}
+
+	.bg-hover-color {
+		background-color: #0052FF;
+		opacity: 0.65;
+		border-radius: 20px;
+	}
+
+	.text-color {
+		color: #0052FF;
+	}
 </style>

pages/register/register.vue

@@ -2,63 +2,78 @@
 	<view class="page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<view class="mx-3 mt-3">
-			<!-- 账号密码登录 false代表账号密码登录 -->
-			<view class="phone d-flex">
-				<view class="title">电话号码</view>
-				<input placeholder="请输入手机号" v-model="phone" maxlength="11" />
-			</view>
-			<view class="phone d-flex">
-				<view class="title">真实姓名</view>
-				<input placeholder="请输入姓名" v-model="name" />
-			</view>
-			<view class="password d-flex">
-				<view class="title">密码</view>
-				<input placeholder="请输入密码" v-model="password" :password='isHidePassword' maxlength="15"
-					style="padding-right: 200rpx;" />
-				<view class="d-flex a-center j-center yanzhengma">
-					<view style="font-size: 40rpx;" class="icon iconfont"
-						:class="isHidePassword?'icon-buxianshimima':'icon-xianshimima'"
-						@tap="isHidePassword = !isHidePassword"></view>
+		<view class="dis j-end a-c">
+			<image src="../../static/image/login/3.png" mode=""
+				style="height:260px;width: calc(100% - 16px);margin-top: 120px;">
+			</image>
+		</view>
+		<view class="input-data1">
+			<u-tabs :list="list" :is-scroll="true" :current="current" @change="change"
+				style="background: transparent;margin-bottom: 10px;"></u-tabs>
+			<view class="input-data">
+				<view class="phone d-flex">
+					<image src="../../static/image/login/shoujihao.png" mode="" style="width: 18px;height: 18px;">
+					</image>
+					<input placeholder="请输入手机号" v-model="phone" maxlength="11" />
 				</view>
-			</view>
-
-			<view class="code d-flex">
-				<view class="title">验证码</view>
-				<input placeholder="请输入验证码" v-model="code" maxlength="5" style="padding-right: 200rpx;" />
-				<view class="d-flex a-center j-center login-font-color yanzhengma" @tap="getCheckNum">
-					<view class="d-flex a-center j-center"
-						:class="!codetime?'yanzhengma1 main-text-color':'yanzhengma2'">
-						{{!codetime?'获取验证码':codetime+' s'}}
+				<view class="phone d-flex">
+					<image src="../../static/image/login/name.png" mode="" style="width: 18px;height: 18px;">
+					</image>
+					<input placeholder="请输入真实姓名" v-model="name" />
+				</view>
+				<view class="password d-flex">
+					<image src="../../static/image/login/mima.png" mode="" style="width: 18px;height: 18px;">
+					</image>
+					<input placeholder="请输入密码" v-model="password" :password='isHidePassword' maxlength="15"
+						style="padding-right: 200rpx;" />
+					<view class=" position-absolute top-0 right-0 d-flex a-center j-center"
+						style="width: 200rpx;height: 100%;">
+						<image
+							:src="isHidePassword?'../../static/image/login/biyan.png':'../../static/image/login/zhengyan.png'"
+							@tap="isHidePassword = !isHidePassword" mode="" style="width: 18px;height: 18px;">
+					</view>
+				</view>
+				<view class="code d-flex">
+					<image src="../../static/image/login/yanzhengma.png" mode="" style="width: 18px;height: 18px;">
+					</image>
+					<input placeholder="请输入验证码" v-model="code" maxlength="4" style="padding-right: 200rpx;" />
+					<view class="d-flex a-center j-center login-font-color yanzhengma" @tap="getCheckNum">
+						<view class="d-flex a-center j-center"
+							:class="!codetime?'yanzhengma1 text-color':'yanzhengma2'">
+							{{!codetime?'获取验证码':codetime+' s'}}
+						</view>
 					</view>
 				</view>
 			</view>
-
-			<!-- 推荐信息 -->
-			<template v-if="showRecommend">
+			<view class="mx-3 mt-3" v-if="showRecommend">
+				<view class=" mas-title dis j-start a-c">
+					<image src="../../static/image/login/1.png" mode=""
+						style="width: 18px;height: 18px;margin-right: 10px;">
+					</image>
+					<text>请确认推荐人信息，注册后，推荐人将不可修改</text>
+				</view>
 				<view class="recommendInfo">
-					<view class="d-flex">
-						<view>
-							<image src="/static/bigLogo.png"></image>
-						</view>
-						<view>
-							<view><span class="text-muted mr-2">推荐人姓名</span> {{recommendername}}</view>
-							<view><span class="text-muted mr-2">推荐人会员号</span> {{recommenderid}}</view>
-						</view>
+					<view class="dis a-c j-start">
+						<image src="/static/bigLogo.png" style="width: 21px;height: 20px;"></image>
+						<text style="color: rgba(35,40,50,0.8);">推荐人姓名：</text>
+						<text style="color: #232832;">{{recommendername}}</text>
+					</view>
+					<view class="dis a-c">
+						<text style="color: rgba(35,40,50,0.8);">推荐人会员号：</text>
+						<text style="color: #232832;">{{recommenderid}}</text>
 					</view>
-					<view class="px-3 py-1 d-flex a-center j-center">请确认推荐人信息，注册后，推荐人将不可修改</view>
 				</view>
-			</template>
+				<button class="my-3 mt-4 d-flex a-center j-center font-weight bg-color" :loading="loading"
+					:class="{'bg-hover-color':disabled}" type="primary" @tap="submit" :disabled="disabled"
+					style="letter-spacing: 20rpx;">注册</button>
 
-			<button class="my-3 mt-4 d-flex a-center j-center font-weight main-bg-color" :loading="loading"
-				:class="{'main-bf-hover-color':disabled}" type="primary" @tap="submit" :disabled="disabled"
-				style="letter-spacing: 20rpx;">注册</button>
-
-			<view class="d-flex a-center j-center my-3">
-				已有帐号？<view class="main-text-color" @tap="navigate({url:'/pages/login/login'},'reLaunch')">去登录</view>
+				<view class="d-flex a-center j-center my-3">
+					已有帐号？<view class="text-color" @tap="navigate({url:'/pages/login/login'},'reLaunch')">去登录</view>
+				</view>
 			</view>
 		</view>
 
+
 	</view>
 </template>
 <script>
@@ -72,6 +87,10 @@
 	export default {
 		data() {
 			return {
+				list: [{
+					name: '出单员注册'
+				}],
+				current: 0,
 				name: "",
 				phone: "",
 				password: "",
@@ -144,6 +163,9 @@
 		},
 		methods: {
 			...mapMutations(['setUserModules']),
+			change(index) {
+				this.current = index;
+			},
 			// 改变按钮状态
 			OnBtnChange() {
 				if (this.phone && this.password && this.code && this.name) {
@@ -285,6 +307,55 @@
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
 
+	/deep/ {
+		.u-tab-bar {
+			background: linear-gradient(90deg, #0052FF 0%, rgba(0, 82, 255, 0) 100%) !important;
+			border-radius: 4px 4px 4px 4px;
+		}
+	}
+
+	.text-color {
+		color: #0052FF;
+	}
+
+	.bg-color {
+		background-color: #0052FF;
+		border-radius: 20px;
+	}
+
+	.bg-hover-color {
+		background-color: #0052FF;
+		opacity: 0.65;
+		border-radius: 20px;
+	}
+
+	.mas-title {
+		width: 100%;
+		height: 34px;
+		background: rgba(0, 82, 255, 0.1);
+		border-radius: 6px;
+		padding: 6px;
+		margin-bottom: 15px;
+	}
+
+	.input-data1 {
+		position: relative;
+		margin-top: -140px;
+	}
+
+	.input-data {
+		width: calc(100% - 32px);
+		height: auto;
+		background: #FFFFFF;
+		box-shadow: 0px 4px 10px 0px #DAE3F4;
+		border-radius: 6px;
+		margin: auto;
+		padding: 0 10px;
+		z-index: 999;
+	}
+
+
+
 	.idCardBefore {
 		background: rgba($themeColor, 0.1) url('/static/image/user/identy2.png') center center no-repeat;
 		background-size: auto 70%;
@@ -292,7 +363,7 @@
 	}
 
 	.page {
-		background: #F5F5F5;
+		background: #F8FAFE;
 		height: 100vh;
 		width: 100%;
 		position: absolute;
@@ -302,12 +373,10 @@
 	.password,
 	.code {
 		position: relative;
-		height: 90upx;
+		height: 95rpx;
 		display: flex;
 		align-items: center;
-		background-color: #FFFFFF;
-		padding: 0 30upx;
-		margin-bottom: 26upx;
+		border-bottom: 1px solid #f2f2f2;
 	}
 
 	.phone .title,
@@ -323,6 +392,7 @@
 	.code input {
 		width: 350upx;
 		font-size: 28upx;
+		margin-left: 13px;
 	}
 
 	.yanzhengma {
@@ -350,10 +420,21 @@
 
 	.recommendInfo {
 		background: #FFFFFF;
-	}
+		width: 100%;
+		height: 72;
+		background: #FFFFFF;
+		border-radius: 6px;
+		border: 1px solid #0052FF;
+		padding: 0 10px;
 
-	.recommendInfo>view:nth-of-type(1) {
-		border-bottom: 1px solid #ddd;
+		>view {
+			padding: 6px;
+			font-size: 13px;
+		}
+
+		>view:nth-child(1) {
+			border-bottom: 1px solid #f2f2f2;
+		}
 	}
 
 	.recommendInfo>view:nth-of-type(1)>view:nth-of-type(1) {

pages/register/registerSuccess.vue

@@ -13,8 +13,8 @@
 					<p class="entry-con">感谢您加入掌柜</p>
 					<h2 class="entry-hd">恭喜注册成功</h2>
 					<view class="info-list">
-						<view>您的掌柜会员号：{{id}}</view>
-						<view>您的关联手机：{{phone}}</view>
+						<view @longpress="copyAction(id)">您的掌柜会员号：{{id}}</view>
+						<view @longpress="copyAction(phone)">您的关联手机：{{phone}}</view>
 					</view>
 				</view>
 			</view>
@@ -66,6 +66,17 @@
 			}
 		},
 		methods: {
+			copyAction(text) {
+				uni.setClipboardData({
+					data: text,
+					success: function() {
+						uni.showToast({
+							title: '复制成功',
+							duration: 2000
+						});
+					}
+				});
+			},
 			// 判断是不是微信
 			async weixinTip(ele) {
 				var ua = navigator.userAgent;

pages/wallet/billDetails1.vue

@@ -1,700 +0,0 @@
-<template>
-	<view>
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<view class="fixed">
-			<view class="white-box">
-				<view class="tx">
-					<view class="tx-grid">
-						<view class="tx-grid-text">
-							<view class="title">可提现（元）</view>
-							<view class="money">
-								<text v-if="handlingFee">{{ handlingFee }}</text>
-								<text v-else>0.00</text>
-							</view>
-						</view>
-					</view>
-					<view class="tx-grid-comm-sign dis j-c a-c" @click="toWithdraw">
-						<image src="/static/image/bindBank/Frame1.png" mode="" style="width: 18px;height: 18px;">
-						</image>
-						<text>立即提现</text>
-					</view>
-				</view>
-				<view class="palace  dis a-c j-s">
-					<view class="palace-grid dis f-c">
-						<text class="">预收金额</text>
-						<text v-if="willHalding">{{ willHalding}}</text>
-						<text v-else>0.00</text>
-					</view>
-					<view class="palace-grid dis f-c">
-						<text class="">提现中</text>
-						<text v-if="withdrawalHalding">{{ withdrawalHalding}}</text>
-						<text v-else>0.00</text>
-					</view>
-					<view class="palace-grid dis f-c">
-						<text class="">已提现</text>
-						<text v-if="approvedHalding">{{ approvedHalding}}</text>
-						<text v-else>0.00</text>
-					</view>
-				</view>
-			</view>
-			<view class="queryCriteria dis j-s a-c ">
-				<view class="dis a-c j-c" style="width: 49%;" @click="statusShow=true">
-					<image src="/static/image/bindBank/time.png" mode="" style="width: 18px;height: 18px;"></image>
-					<text>{{statusLabel}}</text>
-				</view>
-				<view class="" style="width: 1px;height: 90%;background-color: #D4D0D0;"></view>
-				<view class="dis a-c j-c" style="width: 49%;" @click="timeShow=true">
-					<image src="/static/image/bindBank/date.png" mode="" style="width: 18px;height:18px;"></image>
-					<text>{{pageRequest.Date}}</text>
-				</view>
-			</view>
-		</view>
-
-		<view class="list-view">
-			<view v-for="(item,index) in list" :key="index" v-if="active==2 || active==3">
-				<view class="list-item dis a-c j-s" @tap="toBillInfo(index)">
-					<view class="content-box">
-						<view class="des-box" v-if="active==2">
-							<view class="tit">订单号：{{item.id }}</view>
-							<view class="time">提现时间：{{ item.createTime }}</view>
-						</view>
-						<view class="des-box" v-if="active==3">
-							<view class="tit">订单号：{{item.id }}</view>
-							<view class="time">提现时间：{{ item.createTime }}</view>
-							<view class="time" v-if="item.paytime">到账时间：{{ item.paytime }}</view>
-						</view>
-					</view>
-					<!-- <view class="money dis f-c a-c j-s" v-if="active==1">
-						<view
-							style="padding: 0 10px;border: 1px solid #229805;border-radius: 30px;font-size: 12px;color: #229805;">
-							预收</view>
-						<view v-if="item.amount">{{item.amount }}</view>
-						<view v-else>0.00</view>
-					</view> -->
-					<view class="money dis f-c a-c j-s " v-if="active==2">
-						<view
-							style="padding: 0 10px;border: 1px solid #FF5600;border-radius: 30px;font-size: 12px;color: #FF5600;">
-							提现中</view>
-						<view v-if="item.amount">{{item.amount }}</view>
-						<view v-else>0.00</view>
-					</view>
-					<view class="money dis f-c a-c j-s" v-if="active==3">
-						<view
-							style="padding: 0 10px;border: 1px solid #0052FF;border-radius: 30px;font-size: 12px;color: #0052FF;">
-							已提现
-						</view>
-						<view v-if="item.amount">{{item.amount }}</view>
-						<view v-else>0.00</view>
-					</view>
-				</view>
-			</view>
-			<view v-for="(item,index) in yushouList" :key="index" v-if="active==0 || active==1">
-				<view class="list-item dis a-c j-s" @tap="yushouInfo(index)">
-					<view class="">
-						<view class="des-box">
-							<view class="tit">订单号：{{item.id }}</view>
-							<view class="time">签单时间：{{ item.signingTime }}</view>
-							<view class="time">车牌号：{{ item.licenseno }}</view>
-						</view>
-					</view>
-					<view class="money dis f-c a-c j-s" v-if="active==0">
-						<view
-							style="padding: 0 10px;border: 1px solid #229805;border-radius: 30px;font-size: 12px;color: #229805;">
-							预收</view>
-						<view v-if="item.willAmount">{{item.willAmount }}</view>
-						<view v-else>0.00</view>
-					</view>
-					<view class="money dis f-c a-c j-s" v-if="active==1">
-						<view
-							style="padding: 0 10px;border: 1px solid #229805;border-radius: 30px;font-size: 12px;color: #229805;">
-							实收</view>
-						<view v-if="item.willAmount">{{item.willAmount }}</view>
-						<view v-else>0.00</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<u-popup v-model="statusShow" mode="bottom" height="500">
-			<view class="term dis f-c j-s">
-				<view style="padding: 0 16px;">
-					<view class="title dis j-c a-c">
-						<text>状态筛选</text>
-					</view>
-					<text>订单状态</text>
-					<view class="dis  a-c  " style="margin-top: 10px;">
-						<view class="status-data" :class="item.value==active? 'active':''"
-							v-for="(item,index) in statusList" @tap.stop.prevent="statusclick(item)" :key="index">
-							{{item.label}}
-						</view>
-					</view>
-				</view>
-				<view class="operateBtn dis ">
-					<view class="cancel dis a-c j-c" @click="statusShow=false">
-						取消
-					</view>
-					<view class="confirm dis a-c j-c" @click="stausSearch">
-						确定
-					</view>
-				</view>
-			</view>
-		</u-popup>
-
-		<u-picker v-model="timeShow" mode="time" :params="params" @confirm="startconfirm"></u-picker>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState
-	} from "vuex"
-	import ZPagingMixin from '@/uni_modules/z-paging/components/z-paging/js/z-paging-mixin';
-	export default {
-		components: {
-			ZPagingMixin
-		},
-		data() {
-			return {
-				statusShow: false, //状态筛选
-				timeShow: false, //日期筛选
-				params: {
-					year: true, //年
-					month: true, //月
-					day: true, //日
-				},
-				//状态筛选list
-				statusLabel: "提现中",
-				statusList: [{
-						label: '预收',
-						value: 0,
-						searchType: 1,
-						src: "/static/image/car-insure/state2.png"
-					},
-					{
-						label: '实收',
-						value: 1,
-						searchType: 2,
-						src: "/static/image/car-insure/state2.png"
-					},
-					{
-						label: '提现中',
-						value: 2,
-						src: "/static/image/car-insure/state3.png"
-					},
-					{
-						label: '已提现',
-						value: 3,
-						src: "/static/image/car-insure/state4.png"
-					},
-				],
-
-				/* 时间筛选相关 */
-				pageRequest: { //查询的默认条件
-					Date: "",
-					pageNum: 1,
-					pageSize: 20,
-				},
-				/* 查询区域Start */
-				/* 查询区域End */
-				currentPage: 1, //当前页码
-				pageSize: 5, //每页展示条数
-				totalPages: 0, //总页数
-				totalSize: 0, //总条数
-				list: [],
-				loadStatus: 0,
-				"handlingFee": 0, //可提现手续费金额
-				willHalding: 0,
-				withdrawalHalding: 0,
-				approvedHalding: 0,
-				yushouIds: '',
-				yushouList: [],
-				active: 2,
-				searchType: "",
-			};
-		},
-		onLoad(params) {
-			this.pageRequest.Date = this.transformTime();
-		},
-		computed: {
-			...mapState(['userInfo']),
-			getHeight() {
-				let height = uni.getSystemInfoSync().windowHeight - uni.upx2px(400);
-				return `height: ${height}px`;
-			}
-		},
-		onShow() {
-			this.getCarAdvanceMoney();
-			this.getOrdersList(1, 20);
-		},
-		methods: {
-			async stausSearch() {
-				switch (this.active) {
-					case 0:
-					case 1:
-						let res = await this.$http.post('/sysUserAccount/getInsOrders', {
-							ids: this.yushouIds,
-							timeFiltering: this.pageRequest.Date,
-							amountType: "1",
-							searchType: this.searchType,
-						});
-						if (res.code == 200) {
-							this.yushouList = res.data.insFeeOrderNewList;
-							this.statusShow = false;
-						}
-						break;
-					case 2:
-					case 3:
-						await this.getOrdersList(1, 20);
-						this.statusShow = false;
-						break;
-					default:
-						break;
-				}
-			},
-			async startconfirm(e) {
-				this.pageRequest.Date = e.year + '-' + e.month + '-' + e.day;
-				switch (this.active) {
-					case 0:
-					case 1:
-						let res = await this.$http.post('/sysUserAccount/getInsOrders', {
-							ids: this.yushouIds,
-							timeFiltering: this.pageRequest.Date,
-							amountType: "1",
-							searchType: this.searchType,
-						});
-						if (res.code == 200) {
-							this.yushouList = res.data.insFeeOrderNewList;
-						}
-						break;
-					case 2:
-					case 3:
-						await this.getOrdersList(1, 20);
-						break;
-				}
-			},
-			//状态筛选
-			statusclick(e) {
-				this.active = e.value;
-				this.statusLabel = e.label;
-				this.searchType = e.searchType;
-			},
-			async changeTab(tabIndex) {
-				this.active = tabIndex;
-				this.list = [];
-				await this.getOrdersList(1, 20);
-			},
-			// 去提现
-			async toWithdraw() {
-				let res = await this.$http.post('/userBank/getUserBankList', {
-					auditStatus: '1',
-				});
-				if (res.data.length) {
-					this.navigate({
-						url: `/pages/wallet/withdraw?amountStatus=1&amount=${this.handlingFee}`,
-					}, "navigateTo", true)
-				} else {
-					uni.showToast({
-						title: '暂无审核通过的银行卡，不可提现',
-						duration: 3000,
-						icon: "none"
-					});
-					// this.navigate({
-					// 	url: '/pages/wallet/bindBank',
-					// 	complete: () => {
-					// 		setTimeout(() => {
-					// 			uni.showToast({
-					// 				title: '请先绑定银行卡',
-					// 				duration: 3000,
-					// 				icon: "none"
-					// 			});
-					// 		}, 500);
-
-					// 	}
-					// }, "navigateTo", true)
-				}
-			},
-			// 预收账户金额查询 
-			async getCarAdvanceMoney() {
-				let res = await this.$http.get('/sysUserAccount/getSysAllAmount');
-				// 请求失败处理
-				if (res.code == 200 && res.data) {
-					this.handlingFee = res.data.handlingFee; //可提现
-					this.willHalding = res.data.willHalding; //预收
-					this.withdrawalHalding = res.data.withdrawalHalding; //提现中
-					this.approvedHalding = res.data.approvedHalding; //已提现
-					this.yushouIds = res.data.ids;
-				} else {
-					this.handlingFee = 0; //手续费
-					this.documentary = 0; //非跟单
-					this.promotion = 0; //佣金
-				}
-			},
-			toBillInfo(index) {
-				this.navigate({
-					url: '/pages/wallet/billInfo',
-					success: (res) => {
-						res.eventChannel.emit("acceptData", {
-							item: this.list[index],
-							active: this.active,
-						})
-					}
-				}, "navigateTo", true)
-			},
-			yushouInfo(index) {
-				this.navigate({
-						url: "/pages/wallet/billInfo1?companyId=" + this.yushouList[index].id,
-					},
-					"navigateTo", true);
-			},
-			//获取订单数据Start
-			async getOrdersList(pageNo, pageSize) {
-				var data = {
-					"pageNum": pageNo,
-					"pageSize": pageSize,
-					"amountStatus": '1',
-					[this.active == 2 ? "withdrawalTime" : "timeFiltering"]: this.pageRequest.Date,
-					"auditingStatus": this.active,
-				};
-				let res = await this.$http.post('/sysAmountAuditing/queryAppPage', data);
-				if (res.code == 200) {
-					this.list = res.data.content;
-				}
-			},
-			//获取订单数据End
-			//当前时间
-			transformTime(day) {
-				var date = new Date();
-				date.setFullYear(date.getFullYear());
-				date.setTime(date.getTime());
-				var strYear = date.getFullYear();
-				var strDay = day ? date.getDate() - day : date.getDate();
-				var strMonth = date.getMonth() + 1;
-				if (strMonth < 10) {
-					strMonth = "0" + strMonth;
-				}
-				if (strDay < 10) {
-					strDay = "0" + strDay;
-				}
-				var datastr = strYear + "-" + strMonth + "-" + strDay;
-				return datastr;
-			},
-			transformTime1(month) {
-				var date = new Date();
-				date.setFullYear(date.getFullYear());
-				date.setTime(date.getTime());
-				var strYear = date.getFullYear();
-				var strDay = date.getDate();
-				var strMonth = month ? (date.getMonth() + 1) - month : date.getMonth() + 1;
-				if (strMonth < 10) {
-					strMonth = "0" + strMonth;
-				}
-
-				var datastr = strYear + "-" + strMonth;
-				return datastr;
-			},
-		},
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import '@/style/mixin.scss';
-
-	page {
-		padding: 12px 16px;
-		background-color: #fff;
-	}
-
-	.term {
-
-		height: 100%;
-
-		.title {
-			font-size: 14px;
-			font-weight: bold;
-			color: #232832;
-			padding: 10px 0;
-			border-bottom: 1px solid #f2f2f2;
-		}
-
-		>text {
-			font-size: 13px;
-			font-weight: bold;
-			color: #232832;
-			margin-bottom: 10px;
-		}
-
-		.status-data {
-			padding: 4px 10px;
-			box-sizing: border-box;
-			margin-right: 10px;
-			font-size: 12px;
-			border: 1px solid #eee;
-			cursor: pointer;
-		}
-
-		.operateBtn {
-			font-weight: bold;
-			font-size: 16px;
-
-			.cancel {
-				width: 50%;
-				height: 46px;
-				color: #0052FF;
-				background-color: #EAEAEA;
-			}
-
-			.confirm {
-				width: 50%;
-				height: 46px;
-				color: #fff;
-				background-color: #0052FF;
-			}
-		}
-	}
-
-
-	.active {
-		position: relative;
-		background: rgba(0, 82, 255, 0.1);
-		color: #0052FF;
-		border: 1px solid #0052FF;
-		font-weight: 700;
-	}
-
-	.queryCriteria {
-		width: 100%;
-		height: 32px;
-		background: #FFFBF2;
-		border-radius: 6px;
-		margin-top: 26px;
-		font-size: 14px;
-		color: rgba(51, 51, 51, 0.8);
-
-		text {
-			margin-left: 5px;
-		}
-	}
-
-	.white-box {
-		width: 100%;
-		height: 155px;
-		background: linear-gradient(270deg, #F9D27B 0%, #E5B25F 100%);
-		box-shadow: 0px 10px 20px 0px rgba(224, 179, 106, 0.4);
-		border-radius: 6px;
-		padding: 34rpx 40rpx;
-		position: relative;
-	}
-
-	.palace {
-		color: #fff;
-		margin-top: 8px;
-
-		.palace-grid {
-			font-size: 12px;
-
-			text:last-child {
-				font-size: 14px;
-				font-family: DIN, DIN;
-				font-weight: bold;
-			}
-
-		}
-
-	}
-
-	.white-box .tx {
-		overflow: hidden;
-		display: flex;
-		justify-content: space-between;
-		align-content: center;
-		border-bottom: 1px solid #f2f2f2;
-	}
-
-	.white-box .tx .tx-grid {
-		box-sizing: border-box;
-	}
-
-
-
-	.tx-grid-comm-sign {
-		width: 90px;
-		height: 30px;
-		background: rgba(255, 255, 255, 0.6);
-		box-shadow: -1px 4px 4px 0px rgba(204, 149, 57, 0.2);
-		border-radius: 14px 0px 0px 14px;
-		font-weight: bold;
-		position: absolute;
-		right: 0;
-		top: 44px;
-
-		text {
-			font-size: 14px;
-			color: #CC9539;
-			margin-left: 2px;
-		}
-
-	}
-
-	.white-box .tx .tx-grid .tx-grid-text {
-		display: block;
-		color: #333;
-		font-size: 26rpx;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		overflow: hidden;
-	}
-
-	.white-box .tx .tx-grid .tx-grid-text .title {
-		font-size: 26rpx;
-		font-weight: normal;
-		color: #fff;
-	}
-
-	.white-box .tx .tx-grid .tx-grid-text .money {
-		font-size: 24px;
-		color: #fff;
-	}
-
-	.white-box .tx .tx-grid .tx-grid-text .money-b {
-		font-size: 28rpx;
-	}
-
-
-	.list-view {
-		height: 100vh;
-		overflow-y: auto;
-		padding-top: 225px;
-	}
-
-	.list-item {
-		width: 100%;
-		padding: 30rpx 28rpx;
-		box-sizing: border-box;
-		background: #fff;
-		border-bottom: 1rpx solid #eaeef1;
-	}
-
-	.item-last::after {
-		left: 0 !important;
-	}
-
-
-	.des-box {
-		min-height: 80rpx;
-		box-sizing: border-box;
-		vertical-align: top;
-		color: #333;
-		font-size: 24rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-	}
-
-	.tit {
-		font-size: 30rpx;
-		max-width: 500rpx;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.source {
-		margin: 12rpx 0;
-	}
-
-	.time {
-		color: #888;
-	}
-
-	.money {
-		font-size: 38rpx;
-		font-weight: 500;
-		color: #333;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.less {
-		color: #4caf50 !important;
-	}
-
-	.tip {
-		margin-top: 50rpx;
-		display: flex;
-		justify-content: center;
-		align-content: center;
-		font-size: 24rpx;
-		color: #888;
-	}
-
-	.nothing {
-		position: absolute;
-		top: 320upx;
-		left: 0;
-		right: 0;
-		bottom: 0;
-	}
-
-	.nothing>view {
-		line-height: 1;
-	}
-
-	.nothing>view.icon {
-		/* color: #66A3FF; */
-		color: #989898;
-		font-size: 260upx;
-	}
-
-	.nothing>view.text {
-		font-size: 28upx;
-		color: #989898;
-	}
-
-
-	/* 查询区域Start */
-	.queryView {
-		justify-content: space-around;
-		height: 82upx;
-		line-height: 80upx;
-	}
-
-	.queryView>view {
-		border-top: 1px solid #FFC38F;
-		border-bottom: 1px solid #FFC38F;
-		border-left: 1px solid #FFC38F;
-		box-sizing: border-box;
-		color: #FFC38F;
-	}
-
-	.queryView>view:nth-child(1) {
-		flex: 3;
-	}
-
-	.queryView>view:nth-child(2) {
-		flex: 4;
-	}
-
-	.queryView>view:nth-child(3) {
-		flex: 3;
-	}
-
-	.queryView>view:nth-child(4) {
-		border-right: 1px solid #FFC38F;
-		flex: 3;
-	}
-
-	.fixed {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		margin: auto;
-		z-index: 999;
-		padding: 12px 16px 0 16px;
-		background-color: #ffffff;
-
-	}
-
-	/* 查询区域End */
-</style>

pages/wallet/billInfo.vue

@@ -1,228 +1,312 @@
 <template>
-	<view class="pay-success" v-if="!loading">
+	<view>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<view class="pay-section bg-1 dis f-c" :style="{background:style.back}">
-			<image class="bg" src="/static/image/wallet/money-bg.png"></image>
-			<text v-if="[2,3].includes(auditingStatus)"
-				style="font-size: 32px;font-weight: 500;font-family: DIN, DIN;">{{orderDetail.amount.toFixed(2)}}</text>
-			<text v-else
-				style="font-size: 32px;font-weight: 500;font-family: DIN, DIN;">{{orderDetail.willAmount.toFixed(2)}}</text>
-			<view class="tips-wrapper">
-				<image :src="style.icon" mode="" style="width: 20px;height: 20px;margin-right: 5px;"></image>
-				<view class="content">
-					<text class="title" v-if="auditingStatus=='0'">预收金额！</text>
-					<text class="title" v-if="auditingStatus=='1'">实收金额！</text>
-					<text class="title" v-if="auditingStatus=='2'">后台审核中</text>
-					<text class="title" v-if="auditingStatus=='3'">提现成功</text>
-				</view>
-			</view>
-		</view>
-		<view class="pay-card" v-if="[2,3].includes(auditingStatus)">
-			<view class="item dis j-s a-c" v-if='orderDetail.id'><text>交易编号：</text> <text>{{ orderDetail.id }}</text>
-			</view>
-			<view class="item dis j-s a-c" v-if='orderDetail.createTime'><text>申请时间：</text>
-				<text>{{ orderDetail.createTime}}</text>
-			</view>
-			<view class="item dis j-s a-c" v-if="orderDetail.auditingStatus=='3' && orderDetail.paytime">
-				<text>到账时间：</text>{{ orderDetail.paytime }}
-			</view>
-			<view class="item dis j-s a-c" v-if="orderDetail.bankNumber"><text>提现账户：</text>{{ orderDetail.bankNumber }}
-			</view>
-			<view class="item dis j-s a-c" v-if="orderDetail.bankAccount">
-				<text>提现银行：</text>{{ orderDetail.bankAccount }}
+		<view style="z-index: 99;" class="flexd">
+			<view class="search dis  a-c j-s">
+				<u-icon name="arrow-left" size="40" @tap="back"></u-icon>
+				<text class="center">账单详情</text>
 			</view>
-			<view class="item dis j-s a-c" v-if="orderDetail.applytype=='A'"><text>提现类型：</text>账户余额提现</view>
-			<view class="item dis j-s a-c" v-if="orderDetail.applytype=='B'"><text>提现类型：</text>推广佣金提现</view>
 		</view>
-		<view class="pay-card" v-else>
-			<view class="item dis j-s a-c" v-if="Details.subOrderId"><text>订单编号：</text>
-				<text>{{ Details.subOrderId }}</text>
-			</view>
-			<view class="item dis j-s a-c" v-if="Details.signingTime"><text>承保时间：</text>
-				<text>{{ Details.signingTime}}</text>
-			</view>
-			<view class="item dis j-s a-c" v-if="Details.licenseNo"><text>车牌号：</text>{{ Details.licenseNo }}
-			</view>
-			<view class="item dis j-s a-c" v-if="Details.jypremium"><text>驾意险：</text>{{ Details.jypremium }}
-			</view>
-			<view class="item dis j-s a-c" v-if="Details.jqpremium"><text>交强险：</text>{{ Details.jqpremium }}
-			</view>
-			<view class="item dis j-s a-c" v-if="Details.sypremium"><text>商业险：</text>{{ Details.sypremium }}
+		<view class="" style="padding:100px 16px 16px;">
+			<view class="assets dis f-c j-s" v-if="detailsType==2">
+				<view class="dis f-c j-s a-c" style="border: none;">
+					<text>推广金额</text>
+					<text>{{promotionData.amount}}</text>
+				</view>
 			</view>
-			<view class="item dis j-s a-c" v-if="Details.agentName"><text>代理人姓名：</text>{{ Details.agentName }}
+			<view class="assets dis f-c j-s" v-if="detailsType==3">
+				<view class="dis f-c j-s a-c">
+					<text>业务收入提现到银行卡</text>
+					<text>{{MoneyData.withdrawalAmount}}</text>
+					<text>{{MoneyData.withdrawalStatusName}}</text>
+				</view>
+				<view class="yushou dis f-c">
+					<u-steps :list="numList" :current="trajectoryLength" direction="column" mode="number"
+						active-color="#13C15A">
+					</u-steps>
+				</view>
 			</view>
-			<view class="item dis j-s a-c" v-if="Details.agentLevel"><text>代理人级别：</text>{{ Details.agentLevel }}
+			<view class="assets1 dis f-c j-s">
+				<template v-if="detailsType==2">
+					<view class="dis j-s a-c" v-if="promotionData.subOrderId">
+						<text>订单编号：</text>
+						<text>{{promotionData.subOrderId}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="promotionData.signingTime">
+						<text>承保时间：</text>
+						<text>{{promotionData.signingTime}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="promotionData.licenseNo">
+						<text>车牌号：</text>
+						<text>{{promotionData.licenseNo}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="promotionData.jqpremium">
+						<text>交强险：</text>
+						<text>{{promotionData.jqpremium}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="promotionData.jypremium">
+						<text>驾意险：</text>
+						<text>{{promotionData.jypremium}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="promotionData.sypremium">
+						<text>商业险：</text>
+						<text>{{promotionData.sypremium}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="promotionData.agentName">
+						<text>代理人姓名：</text>
+						<text>{{promotionData.agentName}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="promotionData.agentLevel">
+						<text>代理人级别：</text>
+						<text>{{promotionData.agentLevel}}</text>
+					</view>
+				</template>
+				<template v-if="detailsType==3">
+					<view class="dis j-s a-c" v-if="MoneyData.transactionNumber">
+						<text>交易编号：</text>
+						<text>{{MoneyData.transactionNumber}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="MoneyData.rejectReason">
+						<text>失败原因：</text>
+						<text>{{MoneyData.rejectReason}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="MoneyData.applicationDate">
+						<text>申请时间：</text>
+						<text>{{MoneyData.applicationDate}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="MoneyData.paymentDate && MoneyData.withdrawalStatus=='4'">
+						<text>到账时间：</text>
+						<text>{{MoneyData.paymentDate}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="MoneyData.bankNumber">
+						<text>到账账户：</text>
+						<text>{{MoneyData.bankNumber}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="MoneyData.bankAccount">
+						<text>到账银行：</text>
+						<text>{{MoneyData.bankAccount}}</text>
+					</view>
+				</template>
 			</view>
 		</view>
-		<view class="btn-group dis j-c a-c" v-if="style.btncolor">
-			<u-button type="primary" :style="{width:'100%',background:style.btncolor,color:'#fff'}"
-				@click="toHome">返回首页</u-button>
-		</view>
 	</view>
 </template>
+
 <script>
+	import {
+		mapState
+	} from "vuex"
 	export default {
 		data() {
 			return {
-				loading: false,
-				auditingStatus: "",
-				orderId: '',
-				orderDetail: {},
-				style: {},
-				StyleSheet: [{
-						id: 0,
-						title: "预收金额",
-						back: 'linear-gradient( 270deg, #46CE24 0%, #229805 100%)',
-						icon: "/static/image/bindBank/yushou.png",
-						btncolor: '#229805',
-					}, {
-						id: 1,
-						title: "实收金额",
-						back: 'linear-gradient( 270deg, #46CE24 0%, #229805 100%)',
-						icon: "/static/image/bindBank/yushou.png",
-						btncolor: '#229805',
-					}, {
-						id: 2,
-						title: "后台审核中",
-						back: 'linear-gradient( 270deg, #FFBA53 0%, #FF9900 100%)',
-						icon: "/static/image/bindBank/shenhezhong.png",
-						btncolor: '#FF9900',
-					},
-					{
-						id: 3,
-						title: "提现成功",
-						back: 'linear-gradient( 270deg, #5187FA 0%, #0052FF 100%)',
-						btncolor: '#0052FF',
-						icon: "/static/image/bindBank/tixian.png"
-					},
-
-				],
-				Details: {},
-			};
+				numList: [],
+				MoneyData: {},
+				promotionData: {},
+				trajectoryLength: 0,
+				detailsType: "",
+			}
+		},
+		computed: {
+			...mapState(['userInfo'])
 		},
-		onLoad() {
-			const eventChannel = this.getOpenerEventChannel()
-			// 监听acceptData事件，获取上一页面通过eventChannel传送到当前页面的数据
-			eventChannel.on('acceptData', async (data) => {
-				if (!!data) {
-					this.orderDetail = data.item; //车辆信息
-					this.auditingStatus = data.active;
-					let obj = this.StyleSheet.find(val => val.id == data.active);
-					this.style = obj;
-					if (data.active == 0 || data.active == 1) {
-						let res = await this.$http.get('/sysUserAccount/getSubOrderDetails?subOrderId=' +
-							data
-							.item
-							.id)
-						if (res.code == '200') {
-							this.Details = res.data;
+		onShow() {
+
+		},
+		async onLoad(params) {
+			if (params.id) {
+				this.detailsType = params.type;
+				switch (params.type) {
+					case '2':
+						let data = await this.$http.get('/sysUserAccount/getSubOrderDetails?subOrderId=' + params
+							.subOrderNo);
+						if (data.code == '200') {
+							this.promotionData = data.data;
+							this.promotionData.amount = params.amount;
+						} else {
+							uni.showToast({
+								title: data.msg,
+								icon: 'none',
+							});
 						}
-					}
+						break;
+					case '3':
+						let res = await this.$http.get('/sysUserAccount/findDetailById?id=' + params.id);
+						this.MoneyData = res.data;
+						this.numList = res.data.record;
+						const filteredArray = this.numList.filter(item => item.processingStatusFlag === true).length -
+							1;;
+						this.trajectoryLength = filteredArray;
+						break;
+					default:
 				}
-			})
+
+			}
 		},
+		onShow() {},
 		methods: {
-			// 返回主页
-			toHome() {
+			// 绑定银行卡界面
+			async changeBank() {
+				let res = await this.$http.post('/userBank/getUserBankList', {
+					auditStatus: "",
+				});
+				if (res.data.length) {
+					this.navigate({
+						url: "/pages/wallet/bankCard"
+					}, "navigateTo", true);
+				} else {
+					this.navigate({
+						url: '/pages/wallet/bindBank',
+						complete: () => {
+							setTimeout(() => {
+								uni.showToast({
+									title: '请先绑定银行卡',
+									duration: 3000,
+									icon: "none"
+								});
+							}, 500);
+
+						}
+					}, "navigateTo", true)
+				}
+
+			},
+			back() {
+				uni.navigateBack({
+					delta: 1, // 返回的页面数，如果是1表示返回上一页
+					success: function() {}
+				});
+			},
+			details(url) {
 				this.navigate({
-					url: '/pages/index/index'
-				}, 'reLaunch', true)
-			}
+					url: url
+				}, "navigateTo", true);
+			},
+			// 去提现
+			async toWithdraw() {
+				let res = await this.$http.post('/userBank/getUserBankList', {
+					auditStatus: '1',
+				});
+				if (res.data.length) {
+					this.navigate({
+						url: `/pages/wallet/withdraw?amountStatus=1&amount=${this.handlingFee}`,
+					}, "navigateTo", true)
+				} else {
+					uni.showToast({
+						title: '暂无审核通过的银行卡，不可提现',
+						duration: 3000,
+						icon: "none"
+					});
+
+				}
+			},
+
+
 		}
-	};
+	}
 </script>
+
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
 
 	page {
-		background-color: #f5f5f5;
+		background: #F8FAFE;
 	}
 
-	.bg-1 {
-		color: #FFFFFF;
+	.flexd {
+		position: fixed;
+		left: 0;
+		right: 0;
 	}
 
-	.pay-success {
-		.pay-section {
-			height: 400upx;
-			overflow: hidden;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			.bg {
-				position: absolute;
-				left: 0;
-				top: 0;
-				width: 100vw;
-				height: 60vw;
-			}
+	.assets1 {
+		width: 100%;
+		height: auto;
+		background: linear-gradient(180deg, #FFFFFF 0%, #F8FAFE 100%);
+		box-shadow: 0px 4px 10px 0px #DAE3F4;
+		border-radius: 6px;
 
-			.tips-wrapper {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				color: #fff;
+		>view {
+			border-bottom: 1px solid #f2f2f2;
+			font-size: 14px;
+			color: #232832;
+			padding: 10px;
+		}
+	}
 
-				.iconfont {
-					font-size: 110upx;
-					margin-right: 20upx;
-				}
+	.assets {
+		width: 100%;
+		height: auto;
+		background: linear-gradient(180deg, #FFFFFF 0%, #F8FAFE 100%);
+		box-shadow: 0px 4px 10px 0px #DAE3F4;
+		border-radius: 10px;
+		border: 1px solid #FFFFFF;
+		padding: 0 12px;
+		margin-bottom: 12px;
 
-				.content {
-					.title {
-						font-size: 36upx;
-					}
+		>view:nth-child(1) {
+			border-bottom: 1px solid #CFCFCF;
+			padding: 16px 0;
+			color: #333;
 
-					.tip {
-						font-size: 26upx;
-					}
-				}
+			text:nth-child(1) {
+				font-size: 14px;
 			}
-		}
 
-		.pay-card {
-			width: 90%;
-			height: auto;
-			background-color: #fff;
-			border-radius: 12upx;
-			margin: -80upx 5% 0;
-			background: #FFFFFF;
-			box-shadow: 0px 4px 10px 0px #DAE3F4;
-			border-radius: 6px;
-			padding: 0 10px;
-
-			.pay-card-money {
-				text-align: center;
-				font-size: 44upx;
-				padding: 20upx 0;
-				color: #000;
-				font-weight: 500;
-				border-bottom: 1upx solid rgba(0, 0, 0, 0.05);
+			text:nth-child(2) {
+				font-size: 30px;
+				font-weight: bold;
+				margin: 6px 0;
 			}
+		}
+
+		.yushou {
+			padding: 8px;
 
-			.item {
-				padding: 10px 0;
-				color: #232832;
-				border-bottom: 1px solid #f2f2f2;
+
+			image {
+				width: 20px;
+				height: 20px;
+				margin-top: 5px;
 			}
 		}
+	}
 
-		.btn-group {
-			position: fixed;
-			bottom: 0;
-			width: 100%;
-			height: 62px;
-			background: #FFFFFF;
-			box-shadow: 0px -4px 10px 0px rgba(0, 0, 0, 0.05);
-			padding: 16px;
+	/* 银行卡信息Start */
 
-			.confirm-btn {
-				width: 100%;
-				height: 100%;
+	.search {
+		height: auto;
+		width: 100%;
+		z-index: 999999;
+		padding: 50px 16px 30px;
+		height: auto;
+		background: #F8FAFE;
+		background-image: url("/static/image/wallet/qianbao.png");
+		background-size: 100% 100%;
+		position: relative;
 
-			}
+		text {
+			font-size: 18px;
+			font-weight: bold;
+			color: #000;
+		}
+
+		.bank {
+			font-weight: 600;
+			font-size: 28rpx;
+			color: #000000;
+		}
+
+		.center {
+			position: absolute;
+			left: 50%;
+			transform: translateX(-50%);
+		}
+
+		image {
+			width: 22px;
+			height: 22px;
+			margin-left: 20px;
 		}
 	}
 </style>

pages/wallet/preReceivedDetails.vue

@@ -0,0 +1,418 @@
+<template>
+	<view class="page">
+		<public-module></public-module>
+		<view class="flexd">
+			<view class="headerFilter dis a-c j-s">
+				<view class="drop dis a-c j-s" @tap="searchPopup">
+					<image src="/static/image/addStaff/screen.png" mode="" style="width: 18px;height: 18px;"></image>
+					<text>全部筛选</text>
+					<u-icon name="arrow-down-fill" color="#9A9A9A" size="16"></u-icon>
+				</view>
+				<text>预收￥{{sumAmountYS}}</text>
+			</view>
+			<view :class="['dropdown-content', { 'show': showDropdown }]" @tap="searchPopup">
+				<view :class="['dropdown-content1','dis','f-c','j-s', { 'show1': showDropdown }]" @tap.stop.prevent>
+					<view style="padding: 0 16px; box-sizing: border-box;">
+						<view class="term">
+							<text>业务板块</text>
+							<view class="dis  a-c f-wrap j-start" style="margin-top: 5px;">
+								<view class="status-data"
+									:class="item.dictValue==pageRequest.businessSegmentsType? 'active':''"
+									v-for="(item,index) in businessSegmentsTypeList"
+									@tap.stop.prevent="statusclick('businessSegmentsType',item.dictValue)" :key="index">
+									{{item.dictTag}}
+								</view>
+							</view>
+						</view>
+						<view class="term">
+							<text>收入类型</text>
+							<view class="dis  a-c f-wrap j-start" style="margin-top: 5px;">
+								<view class="status-data"
+									:class="item.dictValue==pageRequest.transactionType? 'active':''"
+									v-for="(item,index) in transactionTypeList"
+									@tap.stop.prevent="statusclick('transactionType',item.dictValue)" :key="index">
+									{{item.dictTag}}
+								</view>
+							</view>
+						</view>
+						<view class="term">
+							<text>筛选日期</text>
+							<view class="dis  a-c f-wrap j-start" style="margin-top: 5px;">
+								<view class="status-data" :class="item.value==pageRequest.dateQueryType? 'active':''"
+									v-for="(item,index) in dateList" @tap="dateclick(index)" :key="index">
+									{{item.label}}
+								</view>
+								<view class="dis a-c">
+									<view class="status-data" :class="startShow? 'active' :''" @tap="startShowmethod()">
+										<text v-if="pageRequest.startDate!=''">{{pageRequest.startDate}}</text>
+										<text v-else>{{transformTime()}}</text>
+									</view>
+									<text style="margin: 0 8px;font-size: 12px;">至</text>
+									<view class="status-data" :class="endShow? 'active' :''" @tap="endShowmethod()">
+										<text v-if="pageRequest.endDate!=''">{{pageRequest.endDate}}</text>
+										<text v-else>{{transformTime()}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="operateBtn dis ">
+						<view class="cancel dis a-c j-c" @click="showDropdown=false">
+							取消
+						</view>
+						<view class="confirm dis a-c j-c" @click="querysearch">
+							确定
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="" style="padding-top: 52px;">
+			<view class="yshoudata" v-for="(item,index) in dataList" :key="index" @click="details(item.subOrderNo)">
+				<view class=" dis f-c content">
+					<view class="dis a-c j-s">
+						<view class="dis a-c" v-if="item.transactionType==1">
+							<image src="/static/image/wallet/shouxu.png" mode="">
+							</image>
+							<text style="margin-left: 5px;font-size: 14px;color: #333;">车险</text>
+						</view>
+						<view class="dis a-c" v-if="item.transactionType==2">
+							<image src="/static/image/wallet/tuiguang.png" mode="">
+							</image>
+							<text style="margin-left: 5px;font-size: 14px;color: #333;">推广</text>
+						</view>
+						<text style="font-size: 14px;color: #333;font-weight: bold;">{{item.amount}}</text>
+					</view>
+					<text>订单号：{{item.subOrderNo}}</text>
+					<view class="dis a-c j-s">
+						<text>{{item.signingTime}}</text>
+						<text>车牌号：{{item.licenseNo}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 回到顶部 -->
+		<u-picker v-model="startShow" mode="time" :params="params" @confirm="startconfirm"></u-picker>
+		<u-picker v-model="endShow" mode="time" :params="params" @confirm="endconfirm"></u-picker>
+
+
+	</view>
+</template>
+<script>
+	import {
+		mapState
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				params: {
+					year: true, //年
+					month: true, //月
+					day: true, //日
+					hour: false,
+					minute: false,
+					second: false,
+				},
+				sumAmountYS: 0,
+				startShow: false,
+				endShow: false,
+				pageRequest: {
+					businessSegmentsType: 1, //业务板块
+					dateQueryType: 0, //日期类型
+					transactionType: 1, //收入类型
+					userId: "",
+					endDate: "",
+					startDate: "",
+					pageNum: 1,
+					pageSize: 20,
+				},
+				showDropdown: false,
+				businessSegmentsTypeList: [],
+				transactionTypeList: [],
+				yushouList: [{
+						label: '车险',
+						value: 1,
+						src: "/static/image/wallet/shouxu.png"
+					},
+					{
+						label: '推广费',
+						value: 2,
+						src: "/static/image/wallet/tuiguang.png"
+					},
+				],
+				//日期筛选list
+				dateList: [{
+						label: '全部',
+						value: 0,
+					},
+					{
+						label: '一周内',
+						value: 1,
+					},
+					{
+						label: '一个月内',
+						value: 2,
+					},
+					{
+						label: '三个月内',
+						value: 3,
+					},
+					{
+						label: '六个月内',
+						value: 4,
+					},
+
+				],
+				dataList: [],
+			}
+		},
+		computed: {
+			...mapState(['userInfo'])
+		},
+		onShow() {
+
+		},
+		onLoad() {
+			this.pageRequest.userId = this.userInfo.sysUser.id;
+			this.getDictionary('businessSegmentsType'); //业务板块
+			this.getDictionary('transactionType'); //收入类型
+			this.queryList();
+		},
+		methods: {
+			startShowmethod() {
+				this.startShow = true;
+			},
+			startconfirm(e) {
+				this.pageRequest.startDate = e.year + '-' + e.month + '-' + e.day;
+			},
+			endShowmethod() {
+				this.endShow = true;
+			},
+			endconfirm(e) {
+				this.pageRequest.endDate = e.year + '-' + e.month + '-' + e.day;
+			},
+			//状态筛选
+			statusclick(filed, e) {
+				this.pageRequest[filed] = e;
+			},
+			//查询事件
+			querysearch() {
+				this.queryList();
+				this.showDropdown = false;
+			},
+			async getDictionary(type) {
+				let res = await this.$http.get('/sysDict/dictDetails/' + type);
+				if (res.code == '200') {
+					this[type + 'List'] = res.data.ddList;
+				}
+			},
+			details(id) {
+				this.navigate({
+						url: "/pages/wallet/billInfo1?companyId=" + id,
+					},
+					"navigateTo", true);
+			},
+			async queryList() {
+				let res = await this.$http.post('/sysUserAccount/findMyCollectInAdvanceByUserId', this.pageRequest);
+				if (res.code == '200') {
+					this.dataList = res.data.data.content;
+					this.sumAmountYS = res.data.sumAmountYS;
+				}
+			},
+			searchPopup() {
+				this.showDropdown = !this.showDropdown;
+			},
+			//日期筛选
+			dateclick(e) {
+				this.pageRequest.dateQueryType = e;
+			},
+			//当前时间
+			transformTime(day) {
+				var date = new Date();
+				date.setFullYear(date.getFullYear());
+				date.setTime(date.getTime());
+				var strYear = date.getFullYear();
+				var strDay = day ? date.getDate() - day : date.getDate();
+				var strMonth = date.getMonth() + 1;
+				if (strMonth < 10) {
+					strMonth = "0" + strMonth;
+				}
+				if (strDay < 10) {
+					strDay = "0" + strDay;
+				}
+				var datastr = strYear + "-" + strMonth + "-" + strDay;
+				return datastr;
+			},
+			transformTime1(month) {
+				var date = new Date();
+				date.setFullYear(date.getFullYear());
+				date.setTime(date.getTime());
+				var strYear = date.getFullYear();
+				var strDay = date.getDate();
+				var strMonth = month ? (date.getMonth() + 1) - month : date.getMonth() + 1;
+				if (strMonth < 10) {
+					strMonth = "0" + strMonth;
+				}
+				if (strDay < 10) {
+					strDay = "0" + strDay;
+				}
+				var datastr = strYear + "-" + strMonth + "-" + strDay;
+				return datastr;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.dropdown-content {
+		background-color: rgba(0, 0, 0, 0.6);
+		height: 0px;
+		opacity: 0;
+		transition: opacity 0.3s ease;
+
+		.title {
+			font-size: 14px;
+			color: #232832;
+			font-weight: bold;
+			border-bottom: 1px solid #E1E1E1;
+		}
+
+		.term {
+			padding-top: 10px;
+
+			>text {
+				color: #232832;
+				font-weight: bold;
+				font-size: 13px;
+			}
+		}
+
+		.operateBtn {
+			font-weight: bold;
+			font-size: 16px;
+
+			.cancel {
+				width: 50%;
+				height: 46px;
+				color: #0052FF;
+				background-color: #EAEAEA;
+			}
+
+			.confirm {
+				width: 50%;
+				height: 46px;
+				color: #fff;
+				background-color: #0052FF;
+			}
+		}
+	}
+
+	.dropdown-content1 {
+		background-color: #fff;
+		height: 0px;
+		overflow: hidden;
+		transition: height 0.4s ease;
+	}
+
+	.show {
+		height: 100vh;
+		opacity: 1;
+		/* 下拉菜单内容的最大高度 */
+	}
+
+	.show1 {
+		height: 350px;
+		/* 下拉菜单遮罩最大高度 */
+	}
+
+	.status-data {
+		padding: 4px 10px;
+		box-sizing: border-box;
+		margin: 0 4px 4px 0;
+		font-size: 12px;
+		border: 1px solid #eee;
+		cursor: pointer;
+	}
+
+	.active {
+		position: relative;
+		background: rgba(0, 82, 255, 0.1);
+		color: #0052FF;
+		border: 1px solid #0052FF;
+		font-weight: 700;
+	}
+
+	.active::before {
+		content: "";
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 10px;
+		height: 10px;
+		background-image: url("/static/image/car-insure/before.png");
+		background-size: cover;
+	}
+
+	.page {
+		background: #F8FAFE;
+	}
+
+	.flexd {
+		position: fixed;
+		left: 0;
+		right: 0;
+		z-index: 9999;
+	}
+
+	.yshoudata {
+		padding: 8px 16px;
+
+		background-color: #fff;
+
+		.content {
+			border-bottom: 1px solid #CFCFCF;
+			padding: 8px 0;
+
+			>text:nth-child(2) {
+				font-size: 13px;
+				color: #333;
+				margin: 4px 0;
+			}
+
+			>view:nth-child(3) {
+				color: rgba(51, 51, 51, 0.8);
+				font-size: 12px;
+			}
+		}
+
+		image {
+			width: 20px;
+			height: 20px;
+		}
+	}
+
+	.headerFilter {
+		padding: 8px 16px;
+		background: #F8FAFE;
+		z-index: 99;
+
+		.drop {
+			width: 106px;
+			height: 100%;
+			background: #EAEEF5;
+			border-radius: 6px;
+			padding: 5px;
+
+			text {
+				color: rgba(51, 51, 51, 0.8);
+				font-size: 14px;
+			}
+		}
+
+		>text {
+			color: rgba(51, 51, 51, 0.8);
+			font-size: 14px;
+		}
+	}
+</style>

pages/wallet/transactionDetails.vue

@@ -0,0 +1,515 @@
+<template>
+	<view class="page">
+		<public-module></public-module>
+		<view class="flexd">
+			<view class="headerFilter dis a-c j-s">
+				<view class="drop dis a-c j-s" @tap="searchPopup">
+					<image src="/static/image/addStaff/screen.png" mode="" style="width: 18px;height: 18px;"></image>
+					<text>全部筛选</text>
+					<u-icon name="arrow-down-fill" color="#9A9A9A" size="16"></u-icon>
+				</view>
+				<text>收入￥{{sumAmountSR?sumAmountSR:0}}</text>
+				<text>支出￥{{sumAmountZC?sumAmountZC:0}}</text>
+			</view>
+			<view :class="['dropdown-content', { 'show': showDropdown }]" @tap="searchPopup">
+				<view :class="['dropdown-content1','dis','f-c','j-s', { 'show1': showDropdown }]" @tap.stop.prevent>
+					<view style="padding: 0 16px; box-sizing: border-box;">
+						<view class="term">
+							<text>业务板块</text>
+							<view class="dis  a-c f-wrap j-start" style="margin-top: 5px;">
+								<view class="status-data"
+									:class="{'active':item.dictValue==pageRequest.businessSegmentsType}"
+									v-for="(item,index) in businessSegmentsSZTypeList"
+									@tap.stop.prevent="statusclick('businessSegmentsType',item.dictValue)" :key="index">
+									{{item.dictTag}}
+								</view>
+							</view>
+						</view>
+						<view class="term">
+							<text>收支类型</text>
+							<view class="dis  a-c f-wrap j-start" style="margin-top: 5px;">
+								<view class="status-data "
+									:class="{'active':item.dictValue==pageRequest.incomeAndExpensesType,'disableSelection':!incomeAndExpensesDisabled.includes(item.dictValue)}"
+									v-for="(item,index) in incomeAndExpensesTypeList"
+									@tap.stop.prevent="statusclick('incomeAndExpensesType',item.dictValue)"
+									:key="index">
+									{{item.dictTag}}
+								</view>
+							</view>
+						</view>
+						<view class="term">
+							<text>交易类型</text>
+							<view class="dis  a-c f-wrap j-start" style="margin-top: 5px;">
+								<view class="status-data"
+									:class="{'active':item.dictValue==pageRequest.transactionType,'disableSelection':!transactionDisabled.includes(item.dictValue)}"
+									v-for="(item,index) in moneyAttrTypeList"
+									@tap.stop.prevent="statusclick('transactionType',item.dictValue)" :key="index">
+									{{item.dictTag}}
+								</view>
+							</view>
+						</view>
+						<view class="term">
+							<text>筛选日期</text>
+							<view class="dis  a-c f-wrap j-start" style="margin-top: 5px;">
+								<view class="status-data" :class="item.value==pageRequest.dateQueryType? 'active':''"
+									v-for="(item,index) in dateList" @tap="dateclick(index)" :key="index">
+									{{item.label}}
+								</view>
+								<view class="dis a-c">
+									<view class="status-data" :class="startShow? 'active' :''" @tap="startShowmethod()">
+										<text v-if="pageRequest.startDate!=''">{{pageRequest.startDate}}</text>
+										<text v-else>{{transformTime()}}</text>
+									</view>
+									<text style="margin: 0 8px;font-size: 12px;">至</text>
+									<view class="status-data" :class="endShow? 'active' :''" @tap="endShowmethod()">
+										<text v-if="pageRequest.endDate!=''">{{pageRequest.endDate}}</text>
+										<text v-else>{{transformTime()}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="operateBtn dis ">
+						<view class="cancel dis a-c j-c" @click="showDropdown=false">
+							取消
+						</view>
+						<view class="confirm dis a-c j-c" @click="querysearch">
+							确定
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="" style="padding-top: 52px;">
+			<view class="yshoudata" v-for="(item,index) in dataList" :key="index" @click="details(item)">
+				<view class=" dis f-c content">
+					<view class="dis a-c j-s">
+						<view class="dis a-c" v-if="item.transactionType==1">
+							<image src="/static/image/wallet/shouxu.png" mode="">
+							</image>
+							<text style="margin-left: 5px;font-size: 14px;color: #333;">车险</text>
+						</view>
+						<view class="dis a-c" v-if="item.transactionType==2">
+							<image src="/static/image/wallet/tuiguang.png" mode="">
+							</image>
+							<text style="margin-left: 5px;font-size: 14px;color: #333;">推广</text>
+						</view>
+						<view class="dis a-c" v-if="item.transactionType==3">
+							<image src="/static/image/wallet/tixian.png" mode="">
+							</image>
+							<text style="margin-left: 5px;font-size: 14px;color: #333;">提现</text>
+						</view>
+						<text style="font-size: 14px;font-weight: bold;"
+							:style="{ color: item.transactionType == 3 ? '#333' : '#FF5600' }">{{item.transactionType==3?'-':'+'}}{{item.amount}}</text>
+					</view>
+					<text v-if="item.transactionType !== 3">订单号：{{item.subOrderNo}}</text>
+					<text>交易号：{{item.id}}</text>
+					<view class="dis a-c j-s">
+						<text>{{item.signingTime}}</text>
+						<text v-if="item.transactionType!=3">车牌号：{{item.licenseNo}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 回到顶部 -->
+		<u-picker v-model="startShow" mode="time" :params="params" @confirm="startconfirm"></u-picker>
+		<u-picker v-model="endShow" mode="time" :params="params" @confirm="endconfirm"></u-picker>
+
+	</view>
+</template>
+<script>
+	import {
+		mapState
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				params: {
+					year: true, //年
+					month: true, //月
+					day: true, //日
+					hour: false,
+					minute: false,
+					second: false,
+				},
+				sumAmountSR: 0, //总收入
+				sumAmountZC: 0, //总支出
+				dataList: [],
+				startShow: false,
+				endShow: false,
+				timespecifications: null,
+				pageRequest: {
+					businessSegmentsType: 0, //业务板块
+					dateQueryType: 0, //日期类型
+					incomeAndExpensesType: 0, //收支类型
+					transactionType: 0, //交易类型
+					userId: "",
+					endDate: "",
+					startDate: "",
+					pageNum: 1,
+					pageSize: 20,
+				},
+				showDropdown: false,
+				businessSegmentsSZTypeList: [],
+				incomeAndExpensesTypeList: [],
+				//交易类型字典
+				moneyAttrTypeList: [],
+				jiaoyiList: [{
+						label: '车险',
+						value: 1,
+						src: "/static/image/wallet/shouxu.png"
+					},
+					{
+						label: '推广费',
+						value: 2,
+						src: "/static/image/wallet/tuiguang.png"
+					},
+					{
+						label: '提现',
+						value: 3,
+						src: "/static/image/wallet/tixian.png"
+					}
+				],
+				//日期筛选list
+				dateList: [{
+						label: '全部',
+						value: 0,
+					},
+					{
+						label: '一周内',
+						value: 1,
+					},
+					{
+						label: '一个月内',
+						value: 2,
+					},
+					{
+						label: '三个月内',
+						value: 3,
+					},
+					{
+						label: '六个月内',
+						value: 4,
+					},
+
+				],
+				incomeAndExpensesDisabled: ['0', '1', '2'],
+				transactionDisabled: ['0', '1', '2', '3', '4'],
+			}
+		},
+		computed: {
+			...mapState(['userInfo'])
+		},
+		onShow() {},
+		onLoad() {
+			this.pageRequest.userId = this.userInfo.sysUser.id;
+			this.getDictionary('businessSegmentsSZType'); //业务板块
+			this.getDictionary('incomeAndExpensesType'); //收支类型
+			this.getDictionary('moneyAttrType'); //交易类型
+			this.queryList();
+		},
+
+		methods: {
+
+			details(item) {
+				switch (item.transactionType) {
+					case '1':
+						this.navigate({
+								url: "/pages/wallet/billInfo1?companyId=" + item.subOrderNo,
+							},
+							"navigateTo", true);
+						break;
+					case '2':
+					case '3':
+						this.navigate({
+								url: "/pages/wallet/billInfo?type=" + item.transactionType + '&id=' + item.id +
+									'&subOrderNo=' + item.subOrderNo + '&amount=' + item.amount,
+							},
+							"navigateTo", true);
+						break;
+					default:
+				}
+
+			},
+			//状态筛选
+			statusclick(filed, e) {
+				this.pageRequest[filed] = e;
+				if (filed == 'businessSegmentsType') { //业务板块
+					switch (e) {
+						case '0':
+							this.pageRequest.incomeAndExpensesType = '0';
+							this.pageRequest.transactionType = "0";
+							this.incomeAndExpensesDisabled = ['0', '1', '2'];
+							this.transactionDisabled = ['0', '1', '2', '3', '4'];
+							break;
+						case '1':
+							this.pageRequest.incomeAndExpensesType = '0';
+							this.pageRequest.transactionType = "0";
+							this.incomeAndExpensesDisabled = ['0', '1', '2'];
+							this.transactionDisabled = ['0', '1', '2', '3'];
+							break;
+						case '2':
+							this.pageRequest.incomeAndExpensesType = '1';
+							this.pageRequest.transactionType = "4";
+							this.incomeAndExpensesDisabled = ['1'];
+							this.transactionDisabled = ['4'];
+							break;
+					}
+				}
+				if (filed == 'incomeAndExpensesType') { //收支类型
+					switch (e) {
+						case '0':
+							this.pageRequest.transactionType = "0";
+							this.transactionDisabled = ['0', '1', '2', '3', '4'];
+							break;
+						case '1':
+							if (this.pageRequest.businessSegmentsType == '2') {
+								this.pageRequest.transactionType = "4";
+								this.transactionDisabled = ['4'];
+							} else {
+								this.pageRequest.transactionType = "0";
+								this.transactionDisabled = ['0', '1', '2', '4'];
+							}
+							break;
+						case '2':
+							this.pageRequest.transactionType = "3";
+							this.transactionDisabled = ['3'];
+							break;
+					}
+				}
+
+			},
+			//查询事件
+			querysearch() {
+				this.queryList();
+				this.showDropdown = false;
+			},
+			async getDictionary(type) {
+				let res = await this.$http.get('/sysDict/dictDetails/' + type);
+				if (res.code == '200') {
+					this[type + 'List'] = res.data.ddList;
+				}
+			},
+			async queryList() {
+				let res = await this.$http.post('/sysUserAccount/findMyIncomeAndExpensesByUserId', this.pageRequest);
+				if (res.code == '200') {
+					this.dataList = res.data.data.content;
+					this.sumAmountSR = res.data.sumAmountSR;
+					this.sumAmountZC = res.data.sumAmountZC;
+				}
+			},
+			searchPopup() {
+				this.showDropdown = !this.showDropdown;
+			},
+			//日期筛选
+			dateclick(e) {
+				this.pageRequest.dateQueryType = e;
+			},
+			startShowmethod() {
+				this.startShow = true;
+			},
+			startconfirm(e) {
+				this.pageRequest.startDate = e.year + '-' + e.month + '-' + e.day;
+			},
+			endShowmethod() {
+				this.endShow = true;
+			},
+			endconfirm(e) {
+				this.pageRequest.endDate = e.year + '-' + e.month + '-' + e.day;
+			},
+			//当前时间
+			transformTime(day) {
+				var date = new Date();
+				date.setFullYear(date.getFullYear());
+				date.setTime(date.getTime());
+				var strYear = date.getFullYear();
+				var strDay = day ? date.getDate() - day : date.getDate();
+				var strMonth = date.getMonth() + 1;
+				if (strMonth < 10) {
+					strMonth = "0" + strMonth;
+				}
+				if (strDay < 10) {
+					strDay = "0" + strDay;
+				}
+				var datastr = strYear + "-" + strMonth + "-" + strDay;
+				return datastr;
+			},
+			transformTime1(month) {
+				var date = new Date();
+				date.setFullYear(date.getFullYear());
+				date.setTime(date.getTime());
+				var strYear = date.getFullYear();
+				var strDay = date.getDate();
+				var strMonth = month ? (date.getMonth() + 1) - month : date.getMonth() + 1;
+				if (strMonth < 10) {
+					strMonth = "0" + strMonth;
+				}
+				if (strDay < 10) {
+					strDay = "0" + strDay;
+				}
+				var datastr = strYear + "-" + strMonth + "-" + strDay;
+				return datastr;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.disableSelection {
+		color: rgba(51, 51, 51, 0.2);
+		pointer-events: none;
+		/* 禁用点击事件 */
+	}
+
+	.dropdown-content {
+		background-color: rgba(0, 0, 0, 0.6);
+		height: 0px;
+		opacity: 0;
+		transition: opacity 0.3s ease;
+
+		.title {
+			font-size: 14px;
+			color: #232832;
+			font-weight: bold;
+			border-bottom: 1px solid #E1E1E1;
+		}
+
+		.term {
+			padding-top: 10px;
+
+			>text {
+				color: #232832;
+				font-weight: bold;
+				font-size: 13px;
+			}
+		}
+
+		.operateBtn {
+			font-weight: bold;
+			font-size: 16px;
+
+			.cancel {
+				width: 50%;
+				height: 46px;
+				color: #0052FF;
+				background-color: #EAEAEA;
+			}
+
+			.confirm {
+				width: 50%;
+				height: 46px;
+				color: #fff;
+				background-color: #0052FF;
+			}
+		}
+	}
+
+	.dropdown-content1 {
+		background-color: #fff;
+		height: 0px;
+		overflow: hidden;
+		transition: height 0.4s ease;
+	}
+
+	.show {
+		height: 100vh;
+		opacity: 1;
+		/* 下拉菜单内容的最大高度 */
+	}
+
+	.show1 {
+		height: 400px;
+		/* 下拉菜单遮罩最大高度 */
+	}
+
+	.status-data {
+		padding: 4px 10px;
+		box-sizing: border-box;
+		margin: 0 8px 5px 0;
+		font-size: 12px;
+		border: 1px solid #eee;
+		cursor: pointer;
+	}
+
+	.active {
+		position: relative;
+		background: rgba(0, 82, 255, 0.1);
+		color: #0052FF;
+		border: 1px solid #0052FF;
+		font-weight: 700;
+	}
+
+	.active::before {
+		content: "";
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 10px;
+		height: 10px;
+		background-image: url("/static/image/car-insure/before.png");
+		background-size: cover;
+	}
+
+	.page {
+		background: #F8FAFE;
+	}
+
+	.flexd {
+		position: fixed;
+		left: 0;
+		right: 0;
+		z-index: 9999;
+	}
+
+	.yshoudata {
+		padding: 8px 16px;
+
+		background-color: #fff;
+
+		.content {
+			border-bottom: 1px solid #CFCFCF;
+			padding: 8px 0;
+
+			>text:nth-child(2) {
+				font-size: 13px;
+				color: #333;
+				margin: 4px 0;
+			}
+
+			>view:nth-child(3) {
+				color: rgba(51, 51, 51, 0.8);
+				font-size: 12px;
+			}
+		}
+
+		image {
+			width: 20px;
+			height: 20px;
+		}
+	}
+
+	.headerFilter {
+		padding: 8px 16px;
+		background: #F8FAFE;
+		z-index: 99;
+
+		.drop {
+			width: 106px;
+			height: 100%;
+			background: #EAEEF5;
+			border-radius: 6px;
+			padding: 5px;
+
+			text {
+				color: rgba(51, 51, 51, 0.8);
+				font-size: 14px;
+			}
+		}
+
+		>text {
+			color: rgba(51, 51, 51, 0.8);
+			font-size: 14px;
+		}
+	}
+</style>

pages/wallet/wallet.vue

@@ -2,97 +2,48 @@
 	<view>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<!-- 银行卡信息Start -->
-		<view class="wallet-head dis f-c j-end">
-			<view class="dis a-start" style="position: absolute;top:13%;left: 9.5%;">
-				<image src="/static/image/my/avatar1.png" mode=""></image>
-				<!-- <text style="font-size: 14px;">admin</text> -->
+		<view style="z-index: 99;">
+			<view class="search dis  a-c j-s">
+				<u-icon name="arrow-left" size="40" @tap="back"></u-icon>
+				<text class="center">钱包</text>
+				<text class="bank" @click="changeBank">卡包</text>
 			</view>
-			<view class="dis a-c j-s mt-2">
-				<text style="font-size: 15px;color: #333333;font-weight: bold;">我的资产</text>
-				<u-tag @click="changeBank" text="卡包" mode="dark"
-					style="background: linear-gradient( 270deg, #0052FF 0%, #6899FF 100%);" />
-			</view>
-			<view class="dis a-c j-s mt-2 amount">
-				<view class="dis f-c a-c" @click="toBillDetails(1)">
-					<text>手续金额</text>
-					<text v-if="MoneyData.handlingFee" class="sum" style="color: #0052FF;">￥ <text
-							style="font-size: 14px;">{{MoneyData.handlingFee.toFixed(2)}}</text> </text>
-					<text v-else class="sum" style="color: #0052FF;">￥ <text style="font-size: 14px;">0.00</text>
-					</text>
-				</view>
-				<view class="dis f-c a-c" @click="toBillDetails(2)">
-					<text>跟单金额</text>
-					<text v-if="MoneyData.documentary" class="sum" style="color: #FF5600;">￥ <text
-							style="font-size: 14px;">{{MoneyData.documentary.toFixed(2)}}</text> </text>
-					<text v-else class="sum" style="color: #FF5600;">￥ <text style="font-size: 14px;">0.00</text>
-					</text>
+		</view>
+		<view class="" style="padding:0 16px 16px;">
+			<view class="assets dis f-c j-s">
+				<view class="dis f-c j-s a-c">
+					<text>我的资产(元)</text>
+					<text> <text style="font-size: 16px;">￥</text> {{totalAssetAmount}}</text>
+					<u-button size="medium" type="primary"
+						style="background: linear-gradient( 270deg, #0052FF 0%, #6899FF 100%);"
+						@click="toWithdraw">提现</u-button>
 				</view>
-				<view class="dis f-c a-c" @click="toBillDetails(3)">
-					<text>推广金额</text>
-					<text v-if="MoneyData.promotion" class="sum" style="color: #229805;">￥ <text
-							style="font-size: 14px;">{{MoneyData.promotion.toFixed(2)}}</text> </text>
-					<text v-else class="sum" style="color: #229805;">￥ <text style="font-size: 14px;">0.00</text>
-					</text>
+				<view class="yushou dis f-c">
+					<view class="dis j-s a-start" @click="details('/pages/wallet/preReceivedDetails')">
+						<image src="/static/image/wallet/yushou.png" mode=""></image>
+						<view class="dis f-c " style="width: 90%;">
+							<view class="dis a-c j-s">
+								<text style="font-size: 15px;color: #333;font-weight: bold;">预收明细</text>
+								<u-icon name="arrow-right" size="30" color="#C7C6CA"></u-icon>
+							</view>
+							<text style="font-size: 12px;color: rgba(51,51,51,0.8);">车牌订单明细内容</text>
+						</view>
+					</view>
+					<view class="dis j-s a-start" style="margin-top: 16px;"
+						@click="details('/pages/wallet/transactionDetails')">
+						<image src="/static/image/wallet/yushou.png" mode=""></image>
+						<view class="dis f-c " style="width: 90%;">
+							<view class="dis a-c j-s">
+								<text style="font-size: 15px;color: #333;font-weight: bold;">收支明细</text>
+								<u-icon name="arrow-right" size="30" color="#C7C6CA"></u-icon>
+							</view>
+							<text style="font-size: 12px;color: rgba(51,51,51,0.8);">收入/提现中/已提现明细内容</text>
+						</view>
+					</view>
 				</view>
 			</view>
 		</view>
-		<view class="walletData dis a-c j-s f-wrap">
-			<view class="fee-sector ">
-				<text>手续金额预收</text>
-				<text v-if="MoneyData.willHalding">￥ <text style="font-size: 13px;">{{MoneyData.willHalding}}</text>
-				</text>
-				<text v-else>￥ <text style="font-size: 13px;">0.00</text> </text>
-			</view>
-			<view class="copyTrade-sector ">
-				<text>跟单金额预收</text>
-				<text v-if="MoneyData.willDocumentary">￥<text
-						style="font-size: 13px;">{{MoneyData.willDocumentary}}</text></text>
-				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
-			</view>
-			<view class="promotion-sector ">
-				<text>推广金额预收</text>
-				<text v-if="MoneyData.willPromotion">￥<text
-						style="font-size: 13px;">{{MoneyData.willPromotion}}</text></text>
-				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
-			</view>
-			<view class="fee-sector ">
-				<text>手续金额提现中</text>
-				<text v-if="MoneyData.withdrawalHalding">￥<text
-						style="font-size: 13px;">{{MoneyData.withdrawalHalding}}</text></text>
-				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
-			</view>
-			<view class="copyTrade-sector ">
-				<text>跟单金额提现中</text>
-				<text v-if="MoneyData.withdrawalDocumentary">￥<text
-						style="font-size: 13px;">{{MoneyData.withdrawalDocumentary}}</text></text>
-				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
-			</view>
-			<view class="promotion-sector ">
-				<text>推广金额提现中</text>
-				<text v-if="MoneyData.withdrawalPromotion">￥<text
-						style="font-size: 13px;">{{MoneyData.withdrawalPromotion}}</text></text>
-				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
-			</view>
-			<view class="fee-sector">
-				<text>手续金额已提现</text>
-				<text v-if="MoneyData.approvedHalding">￥<text
-						style="font-size: 13px;">{{MoneyData.approvedHalding}}</text></text>
-				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
-			</view>
-			<view class="copyTrade-sector">
-				<text>跟单金额已提现</text>
-				<text v-if="MoneyData.approvedDocumentary">￥<text
-						style="font-size: 13px;">{{MoneyData.approvedDocumentary}}</text></text>
-				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
-			</view>
-			<view class="promotion-sector">
-				<text>推广金额已提现</text>
-				<text v-if="MoneyData.approvedPromotion">￥<text
-						style="font-size: 13px;">{{MoneyData.approvedPromotion}}</text></text>
-				<text v-else>￥<text style="font-size: 13px;">0.00</text></text>
-			</view>
-		</view>
+
 	</view>
 </template>
 
@@ -103,8 +54,7 @@
 	export default {
 		data() {
 			return {
-				MoneyData: {},
-
+				totalAssetAmount: null,
 			}
 		},
 		computed: {
@@ -120,16 +70,10 @@
 		methods: {
 			// 预收账户金额查询
 			async getAdvanceMoney() {
-				let res = await this.$http.get('/sysUserAccount/getSysAllAmount');
-				this.MoneyData = res.data;
-			},
-			// 去账单明细
-			toBillDetails(type) {
-				this.navigate({
-					url: "/pages/wallet/billDetails" + type
-				}, "navigateTo", true)
+				let res = await this.$http.get('/sysUserAccount/getUserSumAmountByUserId?userId=' + this.userInfo
+					.sysUser.id);
+				this.totalAssetAmount = res.data;
 			},
-
 			// 绑定银行卡界面
 			async changeBank() {
 				let res = await this.$http.post('/userBank/getUserBankList', {
@@ -156,53 +100,37 @@
 				}
 
 			},
-			// 推广界面
-			toSpread() {
-				this.navigate({
-					url: "/pages/tools/poster/poster"
-				}, "navigateTo", true);
+			back() {
+				uni.navigateBack({
+					delta: 1, // 返回的页面数，如果是1表示返回上一页
+					success: function() {}
+				});
 			},
-			//提现界面
-			toWithdraw() {
+			details(url) {
 				this.navigate({
-					url: "/pages/wallet/withdraw"
+					url: url
 				}, "navigateTo", true);
 			},
-
-			//格式化银行卡号
-			formatBankNo(BankNo) {
-				if (BankNo.value == "") return;
-				var account = new String(BankNo.value);
-				account = account.substring(0, 22); /*帐号的总数, 包括空格在内 */
-				if (account.match(".[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{7}") == null) {
-					/* 对照格式 */
-					if (account.match(".[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{7}|" + ".[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{7}|" +
-							".[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{7}|" + ".[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{7}") == null) {
-						var accountNumeric = "";
-						var accountChar = "";
-						var i;
-						for (i = 0; i < account.length; i++) {
-							accountChar = account.substr(i, 1);
-							if (!isNaN(accountChar) && (accountChar != " ")) accountNumeric = accountNumeric + accountChar;
-						}
-						account = "";
-						for (i = 0; i < accountNumeric.length; i++) {
-							/* 可将以下空格改为-,效果也不错 */
-							if (i == 4) account = account + " "; /* 帐号第四位数后加空格 */
-							if (i == 8) account = account + " "; /* 帐号第八位数后加空格 */
-							if (i == 12) account = account + " "; /* 帐号第十二位后数后加空格 */
-							if (i == 16) account = account + " "; /* 帐号第十二位后数后加空格 */
-							account = account + accountNumeric.substr(i, 1)
-						}
-					}
+			// 去提现
+			async toWithdraw() {
+				let res = await this.$http.post('/userBank/getUserBankList', {
+					auditStatus: '1',
+				});
+				if (res.data.length) {
+					this.navigate({
+						url: `/pages/wallet/withdraw?amount=${this.totalAssetAmount}`,
+					}, "navigateTo", true)
 				} else {
-					account = " " + account.substring(1, 5) + " " + account.substring(6, 10) + " " + account.substring(14,
-						18) + "-" + account.substring(18, 25);
+					uni.showToast({
+						title: '暂无审核通过的银行卡，不可提现',
+						duration: 3000,
+						icon: "none"
+					});
+
 				}
-				if (account != BankNo.value) BankNo.value = account;
+			},
+
 
-				return account;
-			}
 		}
 	}
 </script>
@@ -211,104 +139,82 @@
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
 
-	/* 银行卡信息Start */
-	.wallet-head {
-		width: 100%;
-		height: 165px;
-		// background-color: #0052FF;
-		background-image: url("/static/image/my/1.png");
-		background-size: 100% 100%;
-		padding: 22px 34px;
-		position: relative;
-
-		image {
-			width: 31px;
-			height: 31px;
-		}
+	page {
+		background: #F8FAFE;
+	}
 
-		.amount {
-			>view {
-				font-size: 12px;
-				color: #333333;
+	.assets {
+		width: 100%;
+		height: auto;
+		background: linear-gradient(180deg, #FFFFFF 0%, #F8FAFE 100%);
+		box-shadow: 0px 4px 10px 0px #DAE3F4;
+		border-radius: 10px;
+		border: 1px solid #FFFFFF;
+		padding: 0 10px;
+
+		>view:nth-child(1) {
+			border-bottom: 1px solid #CFCFCF;
+			padding: 24px 0;
+			color: #333;
+
+			text:nth-child(1) {
+				font-size: 14px;
 			}
 
-			.sum {
-				font-size: 20rpx;
+			text:nth-child(2) {
+				font-size: 30px;
 				font-weight: bold;
-				font-family: DIN, DIN;
+				margin: 6px 0;
 			}
 		}
-	}
 
-	.walletData {
-		width: 100%;
-		height: auto;
-		padding: 0 16px;
+		.yushou {
+			padding: 16px 0;
 
-		.fee-sector,
-		.copyTrade-sector,
-		.promotion-sector {
-			position: relative;
-			width: 32%;
-			height: 56px;
-			background: #FFFFFF;
-			box-shadow: 0px 4px 10px 0px #DAE3F4;
-			border-radius: 4px;
-			margin-bottom: 12px;
-			padding-left: 12px;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-
-			text:first-child {
-				font-size: 12px;
-				color: rgba(51, 51, 51, 0.8);
-			}
 
-			text:last-child {
-				font-family: DIN, DIN;
-				font-size: 20rpx;
-				font-weight: bold;
-				color: #333333;
+			image {
+				width: 20px;
+				height: 20px;
+				margin-top: 5px;
 			}
 		}
 	}
 
-	.fee-sector::before {
+	/* 银行卡信息Start */
 
-		content: "";
-		display: block;
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 6%;
-		height: 100%;
-		background-color: #0052FF;
-		border-radius: 4px 0 0 4px;
-		/* 按需设置颜色 */
-	}
+	.search {
+		height: auto;
+		width: 100%;
+		z-index: 999999;
+		padding: 50px 16px 30px;
+		height: auto;
+		background: #F8FAFE;
+		background-image: url("/static/image/wallet/qianbao.png");
+		background-size: 100% 100%;
+		position: relative;
 
-	.copyTrade-sector::before {
-		content: "";
-		display: block;
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 6%;
-		height: 100%;
-		background-color: #FF5600;
-		border-radius: 4px 0 0 4px;
-	}
+		text {
+			font-size: 18px;
+			font-weight: bold;
+			color: #000;
+		}
+
+		.bank {
+			font-weight: 600;
+			font-size: 28rpx;
+			color: #000000;
+		}
 
-	.promotion-sector::before {
-		content: "";
-		display: block;
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 6%;
-		height: 100%;
-		background-color: #229805;
-		border-radius: 4px 0 0 4px;
+		.center {
+			position: absolute;
+			left: 50%;
+			transform: translateX(-50%);
+		}
+
+		image {
+			width: 22px;
+			height: 22px;
+			margin-left: 20px;
+		}
 	}
 </style>

pages/wallet/withdraw.vue

@@ -20,7 +20,7 @@
 			<text style="font-size: 15px;color: #333;">提现金额</text>
 			<view class="input-money">
 				<text class="rmb">￥</text>
-				<input disabled v-model.number="extract" type="text" @focus.prevent="stopKeyborad" class="t-input" />
+				<input v-model.number="extract" type="text" @input="arrinput" class="t-input" />
 			</view>
 			<view class="info-money">
 				<view v-if="is_out">
@@ -171,7 +171,6 @@
 				lowest: 0, //最低提现金额
 				amount: 500, //可提现余额
 				extract: '', //选择的提现金额
-				amountStatus: "", //提现类型
 				is_out: false,
 				is_lowest: false,
 				is_post: false,
@@ -192,12 +191,14 @@
 		async onLoad(params) {
 			if (!!params.amount) {
 				this.amount = params.amount
-				this.amountStatus = params.amountStatus
 			}
 			this.loadData();
 			this.getbankCard();
 		},
 		methods: {
+			arrinput(val) {
+				console.log(val);
+			},
 			bank() {
 				this.navigate({
 					url: "/pages/wallet/bindBank"
@@ -262,8 +263,7 @@
 			async handleShowModel() {
 				let params = {
 					amount: this.extract,
-					amountStatus: this.amountStatus,
-					fromBankCardId: this.bankCardInfo.id,
+					fromBankCardId: this.bankCardInfo.bankNumber,
 				}
 				let res = await this.$http.post('/sysUserAccount/insert', params);
 				if (res.code == '200') {