9-7-1

api/user.js

@@ -157,7 +157,7 @@ export function yjzye(data) {
 
 export function jfzz(data) {
 	return request({
-		url: '/api/brokeragePriceTransfer',
+		url: '/api/user/transfer_nowMoney',
 		method: 'post',
 		data
 	})

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "亚欧高科",
-    "appid" : "__UNI__E0158B1",
+    "appid" : "__UNI__904BAB1",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -65,7 +65,7 @@
         }
     },
     "h5" : {
-        "title" : "比特科技",
+        "title" : "亚欧高科",
         "domain" : "",
         "router" : {
             "base" : "/index/",

pages.json

@@ -198,6 +198,12 @@
 				"navigationBarTitleText": "奖励提现"
 			}
 		},
+		{
+			"path": "pages/user/yjzye",
+			"style": {
+				"navigationBarTitleText": "佣金余额"
+			}
+		},
 		{
 			"path": "pages/user/yjzz",
 			"style": {

pages/user/award.vue

@@ -16,6 +16,7 @@
 				<view>我的佣金</view>
 			</view>
 			<view class="moneybtn-box">
+				<view class="money-btn" @click="navto('/pages/user/yjzye')">佣金转余额</view>
 				<view class="money-btn"></view>
 				<view class="money-btn" @click="navto('/pages/user/withdrawal')">佣金提现</view>
 			</view>

pages/user/user.vue

@@ -13,6 +13,9 @@
 					<view class="user-shopname" style="padding-left: 70rpx;">
 						{{userInfo.level_name}}
 					</view>
+					<!-- <view class="user-shopname" style="padding-left: 70rpx;">
+						{{userInfo.uid || ''}}
+					</view> -->
 				</view>
 			</view>
 			<image class="avatar" :src="userInfo.avatar" mode="" v-if="userInfo.avatar"
@@ -28,6 +31,8 @@
 			</view> -->
 			<view class="user-name-id">
 				<view class="user-name clamp1">{{ userInfo.nickname || '游客'}}</view>
+				<view class="user-name clamp1" v-if="userInfo && userInfo.uid" style="font-size: 24rpx;">
+					UID:{{ userInfo.uid || ''}}</view>
 				<!-- <view class="dl" v-if="userInfo && userInfo.area_admin > 0">
 					<image class="dl-icon" src="../../static/icon/dl.png" mode=""></image>
 					<view class="dl-font">

pages/user/withdrawal.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<!-- <uni-notice-bar single="true" text="实际到账98%"></uni-notice-bar> -->
+		<uni-notice-bar single="true" :text="'手续费：' + sxf + '%'"></uni-notice-bar>
 		<view class="content-money">
 			<view class="flex " style="width: 750rpx;justify-content: space-around;margin-left: 0;">
 				<view class="buttom">
@@ -18,6 +18,7 @@
 					placeholder-class="placeholder" />
 				<view class="buttom" @click="withdrawal = money">全部提现</view>
 			</view>
+			<uni-notice-bar v-if="withdrawal*1>0" single="true" :text="showDz"></uni-notice-bar>
 		</view>
 		<view class="list">
 			<radio-group @change="tabRadio">
@@ -87,6 +88,11 @@
 				<input class="input" type="text" v-model="bank_name" placeholder="请输入所属银行"
 					placeholder-class="placeholder" />
 			</view>
+			<view class="row b-b" v-if="type == 'bank'">
+				<text class="tit">所属支行</text>
+				<input class="input" type="text" v-model="subbranch" placeholder="请输入所属支行"
+					placeholder-class="placeholder" />
+			</view>
 		</template>
 
 		<!-- <view class="row b-b" v-if="type == 'bank'">
@@ -132,6 +138,7 @@
 		},
 		data() {
 			return {
+				sxf: '',
 				ali_people: '',
 				loading: false,
 				phone: '',
@@ -147,6 +154,7 @@
 				bank_code: '',
 				bank_people: '',
 				bank_name: '',
+				subbranch: '',
 				bank_belonging: '',
 				jftype: 0,
 				isSh: 1
@@ -156,6 +164,15 @@
 			//加载提现信息
 			this.loadData();
 		},
+		computed: {
+			showDz() {
+				if (this.withdrawal == 0) {
+					return '实际到账0';
+				} else {
+					return '实际到账' + (this.withdrawal * (100 - this.sxf * 1) / 100).toFixed(2) + '';
+				}
+			},
+		},
 		methods: {
 			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
 			async loadData() {
@@ -163,13 +180,16 @@
 					data
 				}) => {
 					console.log(data, 'data+++++++++');
+					this.sxf = data.service_charge
 					this.minPrice = data.minPrice;
 					this.money = data.brokerage_price;
 					if (data.extractInfo != null) {
 						this.bank_people = data.extractInfo.real_name;
 						this.bank_name = data.extractInfo.bank_address;
+						this.subbranch = data.extractInfo.subbranch;
 						this.bank_code = data.extractInfo.bank_code;
-						this.phone = this.userInfo.phone;
+						this.phone = data.extractInfo.phone || this.userInfo.phone || '';
+						// this.phone = this.userInfo.phone;
 					}
 				});
 				version({}).then(({
@@ -234,6 +254,9 @@
 					if (obj.bank_name == '') {
 						return obj.$api.msg('请输入所属银行');
 					}
+					if (obj.subbranch == '') {
+						return obj.$api.msg('请输入所属支行');
+					}
 					if (obj.bank_code == '') {
 						return obj.$api.msg('请输入银行卡号');
 					}
@@ -241,6 +264,7 @@
 					data.phone = obj.phone;
 					data.bankname = obj.bank_name;
 					data.cardnum = obj.bank_code;
+					data.subbranch = obj.subbranch;
 				}
 				// if (this.type == 'bank') {
 				// 	console.log('bank');

pages/user/yjzye.vue

@@ -0,0 +1,351 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="flex">
+				<view class="buttom">
+					<view class="icon" >{{ userInfo.brokerage_price | getMoneyStyle }}</view>
+					<text class="text">可转换余额</text>
+				</view>
+			</view>
+		</view>
+		<!-- <view class="row-box">
+			<view class="title">收款人手机号</view>
+			<view class="row"><input class="input" type="number" v-model="phone" placeholder="请输入收款人手机号"
+					placeholder-class="placeholder" /></view>
+		</view> -->
+		<view class="row-box">
+			<view class="title">转换金额</view>
+			<view class="row">
+				<!-- <text class="tit">￥</text> -->
+				<input class="input" type="number" v-model="withdrawal" placeholder="转换金额"
+					placeholder-class="placeholder" />
+				<view class="buttom" @click="withdrawal = userInfo.brokerage_price*1" >全部转换</view>
+				<!-- <view class="buttom" @click="withdrawal = userInfo.dynamic_integral" v-if="type== 2">全部转账</view> -->
+			</view>
+		</view>
+		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">转换</button>
+	</view>
+</template>
+
+<script>
+	import {
+		getMoneyStyle
+	} from '@/utils/rocessor.js';
+	import {
+		getUserInfo,
+		jfzz,
+		yjzye
+	} from '@/api/user.js';
+	import {
+		mapMutations,
+		mapState
+	} from 'vuex';
+	export default {
+		filters: {
+			getMoneyStyle
+		},
+		data() {
+			return {
+				phone: '',
+				money: '0.00', //可提现金额
+				withdrawal: '', //提现金额
+				password: '', //支付密码
+				card: '', //转账卡号
+				name: '',
+				// #ifdef H5
+				weichatBsrowser: false,
+				// #endif
+				loding: false,
+				type: 0
+			};
+		},
+		onLoad(options) {
+			// #ifdef H5
+			this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
+			// #endif
+			this.dataUp();
+			if (options.type) {
+				this.type = options.type;
+				
+			}
+		},
+		computed: {
+			...mapState('user', ['userInfo'])
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'login']),
+			// 更新数据
+			dataUp() {
+				let obj = this;
+				getUserInfo({})
+					.then(e => {
+						obj.login();
+						// 保存返回用户数据
+						obj.setUserInfo(e.data);
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			// 提交
+			confirm() {
+				let obj = this;
+				obj.loding = true;
+				if (obj.withdrawal == 0) {
+					obj.loding = false;
+					uni.showModal({
+						title: '提示',
+						content: '转换金额不要为0'
+					});
+					return;
+				}
+				
+				let data = {
+					// phone: obj.phone, //编号
+					price: obj.withdrawal ,//金额
+					// type: obj.type
+					to: obj.type == 1? 'money': 'now_money'
+				};
+				yjzye(data)
+					.then(e => {
+				
+						// 允许按钮点击
+						obj.loding = false;
+						// 初始化提现金额
+						obj.withdrawal = '';
+						uni.showToast({
+							title: '转换成功',
+							duration: 2000,
+							position: 'top'
+						});
+						obj.dataUp();
+						obj.cancel()
+					})
+					.catch(e => {
+						obj.$api.msg(e.msg);
+						obj.loding = false;
+						console.log();
+					});
+			},
+			boblack() {
+				uni.navigateBack({
+					fail() {
+						uni.switchTab({
+							url: '/pages/index/index'
+						})
+					}
+				})
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+	}
+
+	.content-money {
+		padding: 30rpx 0;
+		background: #ffffff;
+	}
+
+	.item {
+		padding: 0 $page-row-spacing;
+		background-color: #ffffff;
+	}
+
+	.flex {
+		background-color: #ffffff;
+		text-align: center;
+		margin: 0 30rpx;
+		border-radius: $border-radius-sm;
+		justify-content: center;
+
+		.buttom {
+			font-size: $font-lg;
+			width: 50%;
+		}
+
+		.interval {
+			width: 2px;
+			height: 60rpx;
+			background-color: #eeeeee;
+		}
+
+		.icon {
+			background-size: 100%;
+			font-size: 42rpx;
+			color: $font-color-dark;
+			font-weight: bold;
+			background-repeat: no-repeat;
+			background-position: center;
+		}
+
+		.text {
+			color: $font-color-light;
+		}
+	}
+
+	.row-box {
+		margin-top: 30rpx;
+		padding: 20rpx 30rpx;
+		background: #fff;
+
+		.title {
+			font-size: $font-base + 2rpx;
+			color: $font-color-dark;
+		}
+
+		.row {
+			display: flex;
+			align-items: center;
+			position: relative;
+			height: 80rpx;
+
+			.tit {
+				flex-shrink: 0;
+				width: 40rpx;
+				font-size: 30rpx;
+				color: $font-color-dark;
+			}
+
+			.input {
+				flex: 1;
+				font-size: 30rpx;
+				color: $font-color-dark;
+			}
+
+			.iconlocation {
+				font-size: 36rpx;
+				color: $font-color-light;
+			}
+
+			.buttom {
+				color: #f21f5d;
+				font-size: $font-base;
+			}
+		}
+	}
+
+	.add-btn {
+		width: 520rpx;
+		height: 80rpx;
+		border-radius: 20rpx;
+		margin: 140rpx auto 0;
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #fff;
+		background-color:#ff4c4c;
+	}
+
+	.back-btn {
+		width: 520rpx;
+		height: 80rpx;
+		border-radius: 20rpx;
+		margin: 40rpx auto;
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #303030;
+		background-color: #F8DABA;
+	}
+
+	.name {
+		background: #fff;
+		padding: 30rpx;
+	}
+
+	.list {
+		padding-left: 30rpx;
+		margin-top: 30rpx;
+		background-color: #ffffff;
+
+		.box {
+			display: flex;
+			align-items: center;
+			width: 100%;
+			height: 120rpx;
+			border-bottom: 1px solid $border-color-light;
+
+			.icon {
+				font-size: 48rpx;
+				padding-right: 20rpx;
+
+				.icon-img {
+					height: 50rpx;
+					width: 50rpx;
+				}
+			}
+
+			.iconweixin1 {
+				color: #18bf16;
+			}
+
+			.iconzhifubao {
+				color: #08aaec;
+			}
+
+			.title-box {
+				flex-grow: 1;
+				text-align: left;
+
+				.title {
+					font-size: $font-base + 2rpx;
+					color: $font-color-base;
+				}
+
+				.node {
+					font-size: $font-sm;
+					color: $font-color-light;
+				}
+			}
+		}
+	}
+
+	.tip {
+		padding: 20rpx;
+		color: #ff0000;
+	}
+
+	/deep/ .uni-radio-input {
+		width: 45rpx;
+		height: 45rpx;
+	}
+
+	.psw-wrapper {
+		width: 548rpx;
+		height: 344rpx;
+		background-color: #FFFFFF;
+		border-radius: 15rpx 15rpx;
+
+		.psw-title {
+			width: 100%;
+			font-size: 35rpx;
+			padding: 43rpx 0 49rpx;
+			text-align: center;
+			font-weight: 800;
+		}
+
+		.psw-ipt {
+			display: block;
+			background-color: #dce3ed;
+			height: 90rpx;
+			width: 464rpx;
+			padding-left: 30rpx;
+			margin: 0 auto;
+			font-size: 80rpx;
+		}
+
+		.psw-btn text {
+			display: inline-block;
+			text-align: center;
+			width: 50%;
+			padding-top: 29rpx;
+			font-size: 35rpx;
+		}
+
+		.psw-qd {
+			color: #5771DF;
+		}
+	}
+</style>

pages/user/yjzz.vue

@@ -103,9 +103,9 @@
 					return obj.$api.msg('请输入用户UID')
 				}
 				let data = {
-					other_uid: obj.phone, //编号
-					TransferMoney: obj.withdrawal, //金额
-					uid: obj.userInfo.uid
+					object_uid: obj.phone, //编号
+					price: obj.withdrawal, //金额
+					// uid: obj.userInfo.uid
 					// type: obj.type
 				};
 				jfzz(data)

pages/user/yue.vue

@@ -18,7 +18,7 @@
 				</view>
 				<view class="moneybtn-box">
 					<!-- <view class="money-btn" style="text-decoration: underline;" @click="navto('/pages/money/freeze')">冻结记录</view> -->
-					<!-- <view class="money-btn" @click="navto('/pages/user/yjzz')">转账</view> -->
+					<view class="money-btn" @click="navto('/pages/user/yjzz')">转账</view>
 					<view class="money-btn"></view>
 					<view class="money-btn" @click="navto('/pages/money/recharge')">钱包充值</view>
 				</view>