2-4-1

api/user.js

@@ -154,11 +154,19 @@ export function yjzye(data) {
 		data
 	})
 }
-
+//佣金转账
 export function jfzz(data) {
 	return request({
 		url:'/api/user/transfer_account',
 		method:'post',
 		data
 	})
+}
+//余额转账
+export function yuezz(data) {
+	return request({
+		url:'/api/user/transfer_nowMoney',
+		method:'post',
+		data
+	})
 }

pages/product/product.vue

@@ -328,7 +328,7 @@ export default {
 				obj.actionImage = obj.productValue[str].image;
 				obj.uniqueId = obj.productValue[str].unique;
 				obj.goodIntegral = obj.productValue[str].integral
-				if(obj.is_xf == 1) {
+				if(obj.isbd == 1) {
 					obj.goodsNumberMax = 1
 				}
 				console.log(obj.goodIntegral,'obj.goodIntegral')

pages/user/award.vue

@@ -13,6 +13,7 @@
 			</view>
 			<view class="moneybtn-box">
 				<view class="money-btn" @click="navto('/pages/user/yjzz')">奖金转账</view>
+				<view class="money-btn" @click="navto('/pages/user/yjzye')">奖金转余额</view>
 				<view class="money-btn" @click="navto('/pages/user/withdrawal')">奖金提现</view>
 			</view>
 		</view>
@@ -344,11 +345,12 @@ page {
 }
 .moneybtn-box {
 	display: flex;
+	
 	justify-content: space-between;
 	position: relative;
 	z-index: 2;
 	color: #ffffff;
-	padding: 0rpx 50rpx;
+	padding: 20rpx 50rpx 0;
 	font-size: 30rpx;
 	font-family: PingFang SC;
 	font-weight: bold;

pages/user/withdrawal.vue

@@ -5,7 +5,7 @@
 			<view class="flex " style="width: 750rpx;justify-content: space-around;margin-left: 0;">
 				<view class="buttom">
 					<view class="icon">{{ money | getMoneyStyle }}</view>
-					<text class="text">可提现佣金</text>
+					<text class="text">可提现奖金</text>
 				</view>
 			</view>
 		</view>
@@ -219,7 +219,7 @@
 				let obj = this
 				let data = {
 					extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
-					money: this.withdrawal, //金额
+					money: this.withdrawal*1, //金额
 					type: 0 //0佣金1余额
 				};
 				if (this.withdrawal % 100 != 0) {
@@ -231,7 +231,7 @@
 					});
 					return;
 				}
-				if (this.withdrawal < this.minPrice) {
+				if (this.withdrawal*1 < this.minPrice*1) {
 					uni.showToast({
 						title: '提现金额不可少于' + this.minPrice,
 						duration: 2000,

pages/user/yjzye.vue

@@ -238,8 +238,8 @@
 		margin: 140rpx auto 0;
 		font-size: 36rpx;
 		font-weight: bold;
-		color: #F8DABA;
-		background-color: #303030;
+		color: #fff;
+		background-color:#ff4c4c;
 	}
 
 	.back-btn {

pages/user/yjzz.vue

@@ -3,7 +3,8 @@
 		<view class="content-money">
 			<view class="flex">
 				<view class="buttom">
-					<view class="icon" >{{ userInfo.brokerage_price | getMoneyStyle }}</view>
+					<view class="icon" v-if="type == 'yj'">{{ userInfo.brokerage_price | getMoneyStyle }}</view>
+					<view class="icon" v-if="type == 'yue'">{{ userInfo.now_money | getMoneyStyle }}</view>
 					<text class="text">可转账余额</text>
 				</view>
 			</view>
@@ -19,7 +20,8 @@
 				<!-- <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" v-if="type == 'yj'" @click="withdrawal = userInfo.brokerage_price*1" >全部转账</view>
+				<view class="buttom" v-if="type == 'yue'" @click="withdrawal = userInfo.now_money*1" >全部转账</view>
 				<!-- <view class="buttom" @click="withdrawal = userInfo.dynamic_integral" v-if="type== 2">全部转账</view> -->
 			</view>
 		</view>
@@ -33,7 +35,8 @@
 	} from '@/utils/rocessor.js';
 	import {
 		getUserInfo,
-		jfzz
+		jfzz,
+		yuezz
 	} from '@/api/user.js';
 	import {
 		mapMutations,
@@ -55,7 +58,7 @@
 				weichatBsrowser: false,
 				// #endif
 				loding: false,
-				type: 0
+				type: 'yj'
 			};
 		},
 		onLoad(options) {
@@ -109,26 +112,51 @@
 					price: obj.withdrawal ,//金额
 					// type: obj.type
 				};
-				jfzz(data)
-					.then(e => {
-				
-						// 允许按钮点击
-						obj.loding = false;
-						// 初始化提现金额
-						obj.withdrawal = '';
-						uni.showToast({
-							title: '转账成功',
-							duration: 2000,
-							position: 'top'
+				if(obj.type == 'yj') {
+					jfzz(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();
 						});
-						obj.dataUp();
-						obj.cancel()
-					})
-					.catch(e => {
-						obj.$api.msg(e.msg);
-						obj.loding = false;
-						console.log();
-					});
+				}
+				if(obj.type == 'yue') {
+					yuezz(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({

pages/user/yue.vue

@@ -15,7 +15,7 @@
 				<view class="moneybtn-box">
 					<!-- <view class="money-btn" style="text-decoration: underline;" @click="navto('/pages/money/freeze')">冻结记录</view> -->
 					<view class="money-btn" style="text-decoration: underline;"></view>
-					<view class="money-btn" @click="navto('/pages/user/xfjfzz?type=3')"></view>
+					<view class="money-btn" @click="navto('/pages/user/yjzz?type=yue')">余额转账</view>
 				</view>
 			</view>
 		</view>

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>乐品优选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.5841170f.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.f747b261.js></script><script src=/index/static/js/index.a2c2276e.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.5841170f.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.f747b261.js></script><script src=/index/static/js/index.6fdab0b7.js></script></body></html>