xhj преди 2 години
родител
ревизия
30b96722c6

+ 2 - 1
pages/cell/cell.vue

@@ -61,7 +61,8 @@
 				<view class="cell-box" v-for="item,index in groupList">
 					<view class="ddflex">
 						<view style="margin-right: 35rpx;">
-							<cell :width="99" :height="197" :soc="item.leaseStatus==1?50:100" :color="index==0?'#A8A5A5':''" :disabled="index==0?true:false" :showsoc="false"></cell>
+							<!-- <cell :width="99" :height="197" :soc="item.leaseStatus==1?50:100" :color="index==0?'#A8A5A5':''" :disabled="index==0?true:false" :showsoc="false"></cell> -->
+							<cell :width="99" :height="197" :soc="item.leaseStatus==1?50:100" :showsoc="false"></cell>
 						</view>
 						<view class="cell-info fflex">
 							<view class="ddflex">

+ 67 - 0
pages/user/user.css

@@ -161,3 +161,70 @@ page {background: #F0F0F0;}
 .border-right-solid{border-right: 1rpx solid #F1F1F1;}
 .service-icon{width: 38rpx;height: 38rpx;margin-right: 40rpx;}
 .service-more{display: block;width: 14rpx;height: 21rpx;margin:auto 0 auto auto}
+
+
+/* 弹窗 */
+.ceng {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.65);
+    z-index: 99;
+}
+.pop{
+	width:100%;
+	border-radius:16rpx 16rpx 0 0;
+	background: #F6F6F6;
+	position: fixed;
+	bottom:-100%;
+	left:0;
+	right:0;
+	padding:10rpx 0 0;
+	z-index: 100;
+	transition: all .3s ease;
+}
+.pop-item{
+	padding:30rpx;
+	font-size:30rpx;
+	text-align:center;
+}
+.pop-qx{
+	border-top:10rpx solid #f5f5f5;
+	background: #fff;
+}
+.pop-title{
+	line-height: 50rpx;
+	font-size: 36rpx;
+	font-weight: 600;
+	color: #333333;
+	margin: 40rpx 0;
+	text-align: center;
+}
+.pop-c-item{
+	width: 662rpx;
+	height: 130rpx;
+	background: #FFFFFF;
+	border-radius: 10rpx 10rpx 10rpx 10rpx;
+	opacity: 1;
+	margin: auto;
+	padding: 0 50rpx;
+	box-sizing: border-box;
+	margin-bottom: 30rpx;
+}
+.pop-c-item image{
+	width: 48rpx;
+	height: 48rpx;
+	margin-right: 17rpx;
+	line-height: 42rpx;
+	font-size: 30rpx;
+	font-weight: 400;
+	color: #333333;
+}
+.pop-c-item-r{
+	line-height: 33rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: #A8A5A5;
+}

+ 52 - 6
pages/user/user.vue

@@ -26,23 +26,23 @@
 			<view style="background-color:#f2f2f2;margin:0 30rpx 10rpx;height: 1px;"></view>
 			<view class="money-bar">
 				<view class="flex-1">
-					<view class="money-number">0.00</view>
+					<view class="money-number">{{countMoney?countMoney:0}}</view>
 					<text class="money-text" style="color: #242323;">我的余额</text>
 				</view>
-				<view class="recharge">提现</view>
+				<view class="recharge" @click="showPop = true">提现</view>
 			</view>
 			<view class="order-bar">
 				<view class="order-bar-item ">
 					<text>累计收益</text>
-					<view>¥0.00</view>
+					<view>¥{{dataInfo.totalProfit?dataInfo.totalProfit:0}}</view>
 				</view>
 				<view class="order-bar-item ">
 					<text>今日收益</text>
-					<view>¥0.00</view>
+					<view>¥{{dataInfo.todayProfit?dataInfo.todayProfit:0}}</view>
 				</view>
 				<view class="order-bar-item">
 					<text>已提现</text>
-					<view>¥0.00</view>
+					<view>¥{{dataInfo.totalWithdraw?dataInfo.totalWithdraw:0}}</view>
 				</view>
 			</view>
 		</view>
@@ -111,6 +111,26 @@
 			</view>
 		</view>
 		
+		
+		<view class="ceng" v-show="showPop" @click="showPop=false"></view>
+		<view :style="showPop?'bottom:0;':''" class="pop">
+			<view class="pop-title">选择提现方式</view>
+			<view class="pop-c-item ddflex" @click="jumpUrl('promote/withdrawal/index/index?cardType=1')">
+				<image src="../../static/pages/images/tx1.png"></image>
+				<view class="fflex">线上提现</view>
+				<view class="pop-c-item-r ddflex">
+					<view>仅限个人账户</view>
+					<image style="width: 12rpx;height:22rpx;margin-left: 12rpx;" src="../../static/images/n_rico.png"></image>
+				</view>
+			</view>
+			<view class="pop-c-item ddflex" @click="jumpUrl('promote/withdrawal/index/index?cardType=2')">
+				<image src="../../static/pages/images/tx2.png"></image>
+				<view class="fflex">线下提现</view>
+			</view>
+			<view class="pop-item pop-qx" @click="showPop=false">取消</view>
+		</view>
+		
+		
 		<!-- <footer-copyright></footer-copyright> -->
 		<foot channel="user" :isUpdate="isUpdate"></foot>
 	</view>
@@ -138,7 +158,11 @@
 				userInfos: null,
 				
 				alarmCount:0,
-				exceptionOrderCount:0
+				exceptionOrderCount:0,
+				
+				dataInfo:{},
+				countMoney:0,
+				showPop:false,
 			};
 		},
 
@@ -168,6 +192,7 @@
 				this.isLogin = true
 				this.getUserInfo()
 				this.getWarningData()
+				this.getDataInfo()
 			}else{
 				this.isLogin = false
 				this.userInfos = null
@@ -183,6 +208,7 @@
 				})
 			},
 			jumpUrl(url) {
+				this.showPop=false
 				if (!req.isLogins(true)) return false;
 				app.globalData.navigateTo(url);
 			},
@@ -211,6 +237,26 @@
 						}
 					}
 				})
+			},
+			// 获取余额数据
+			getDataInfo(){
+				let userId = null
+				let userType = null
+				if(req.getStorage('userInfo').merchantId){
+					userId = req.getStorage('userInfo').merchantId
+					userType = 2
+				}
+				// 商户
+				if(req.getStorage('userInfo').storeId){
+					userId = req.getStorage('userInfo').storeId
+					userType = 1
+				}
+				req.getRequest('/admin/v2/my/myStatistic',{},res=>{
+					this.dataInfo = res
+				})
+				req.getRequest('/admin/v2/merchant/balance', {id:userId,type:userType}, res => {
+					this.countMoney = res?res.balance:0;
+				});
 			}
 		}
 	};

BIN
promote/static/promote/images/gou_h.png


BIN
promote/static/promote/images/gou_h2.png


+ 26 - 12
promote/withdrawal/bindCard/bindCard.vue

@@ -3,12 +3,12 @@
 		<view class="step ddflex">
 			<view :class="'li' + (stepOne ? ' ing' : '') + (stepOneComplete ? ' end' : '')" @click="toStepOne">
 				<view class="num">1</view>
-				<image src="../../static/promote/images/gou_h.png" class="s-gou"></image>
+				<image src="/promote/static/promote/images/gou_h.png" class="s-gou"></image>
 				<text>验证身份信息</text>
 			</view>
 			<view :class="'li' + (stepTwo ? ' ing' : '') + (stepTwoComplete ? ' end' : '')">
 				<view class="num">2</view>
-				<image src="../../static/promote/images/gou_h.png" class="s-gou"></image>
+				<image src="/promote/static/promote/images/gou_h.png" class="s-gou"></image>
 				<text>验证银行卡信息</text>
 			</view>
 		</view>
@@ -29,20 +29,24 @@
 				</view>
 				<view class="li ddflex">
 					<label class="label">姓名</label>
-					<view class="item fflex"><input :disabled="!isEdit" v-model="rName" placeholder="上传身份证人像面自动获取" placeholder-class="placeholder" class="ipt" /></view>
+					<view class="item fflex"><input :disabled="!isEdit" v-model="rName" placeholder="请输入真实姓名" placeholder-class="placeholder" class="ipt" /></view>
 				</view>
 				<view class="li ddflex">
 					<label class="label">身份证号</label>
-					<view class="item fflex"><input :disabled="!isEdit" v-model="rCode" placeholder="上传身份证人像面自动获取" placeholder-class="placeholder" class="ipt" /></view>
+					<view class="item fflex"><input type="idcard" :disabled="!isEdit" v-model="rCode" placeholder="请输入身份证号" placeholder-class="placeholder" class="ipt" /></view>
 				</view>
 				<view class="li ddflex">
 					<label class="label">有效期限</label>
 					<view class="item ddflex fflex">
-						<input v-model="rValidDate" :disabled="!isEdit" placeholder="上传身份证国徽面自动获取" placeholder-class="placeholder" class="ipt fflex" />
-						<!-- <view class="chang ddflex">
-							<image src="../../static/promote/images/gou1.png"></image>
+						<picker class="ipt fflex" mode="date" :disabled="!isEdit" :value="rValidDate" @change="bindDateChange">
+							<view v-if="!isLong" class="ipt fflex" :style="rValidDate?'':'color: #dbd0cf;'">{{rValidDate?rValidDate:'请选择身份证有效期'}}</view>
+							<view v-else class="ipt fflex" >长期</view>
+						</picker>
+						<view class="chang ddflex" @click="isEdit?(isLong=!isLong):''">
+							<image v-if="!isLong" src="/promote/static/promote/images/gou.png"></image>
+							<image v-if="isLong" src="/promote/static/promote/images/gou_h1.png"></image>
 							长期
-						</view> -->
+						</view>
 					</view>
 				</view>
 				<view class="li dflex">
@@ -80,7 +84,7 @@
 				</view>
 				<view class="li ddflex">
 					<label class="label">银行卡号</label>
-					<view class="item fflex"><input :disabled="!isEdit" v-model="bankNo" placeholder="上传后自动获取" placeholder-class="placeholder" class="ipt" /></view>
+					<view class="item fflex"><input :disabled="!isEdit" v-model="bankNo" placeholder="请输入银行卡号" placeholder-class="placeholder" class="ipt" /></view>
 				</view>
 
 				<view class="li flexs dflex">
@@ -140,7 +144,9 @@ export default {
 			userType:null,//1 商户 2 门店
 			cardType:2,//1 线上提现卡 2 线下提现卡
 			
-			id:null
+			id:null,
+			
+			isLong:false,//身份证号是否长期
 		};
 	},
 	onLoad(opt) {
@@ -164,6 +170,8 @@ export default {
 		this.bankList = hfParams.bank();
 		if(this.id){
 			this.getDetail()
+		}else{
+			this.isEdit = true
 		}
 		if (opt.isEnd) {
 			this.isEnd = opt.isEnd;
@@ -199,6 +207,7 @@ export default {
 				this.fileInfo = JSON.parse(res.fileJson);
 				this.rCode = res.legalCertId;
 				this.rValidDate = res.legalCertIdExpires;
+				if(this.rValidDate=='2099-12-31') this.isLong=true
 				this.bankAcctPhone = res.legalMp;
 				if(res.status==0) this.isEdit = false
 				else{
@@ -237,7 +246,7 @@ export default {
 				req.msg('身份证号不能为空');
 				return;
 			}
-			if (!this.rValidDate) {
+			if (!this.rValidDate&&!this.isLong) {
 				req.msg('身份证有效期不能为空');
 				return;
 			}
@@ -404,6 +413,11 @@ export default {
 			this.bankPosition = event.detail.value;
 			this.bankName = this.bankList[this.bankPosition].name;
 		},
+		
+		bindDateChange(event){
+			this.rValidDate = event.detail.value;
+			this.isLong = false
+		},
 
 		submit() {
 			if (!this.fileInfo.bankUrl) {
@@ -436,7 +450,7 @@ export default {
 				haveLicenseNo: 2,
 				legalCertName: this.rName,
 				legalCertId: this.rCode,
-				legalCertIdExpires: this.rValidDate,
+				legalCertIdExpires: this.isLong?'2099-12-31':this.rValidDate,
 				isOpen: 0,
 				legalMp: this.bankAcctPhone,
 				bindId:this.userId,

+ 1 - 1
promote/withdrawal/cardList/cardList.css

@@ -42,7 +42,7 @@
 	opacity: 1;
 	margin: auto;
 	margin-top: 30rpx;
-	padding: 52rpx 45rpx;
+	padding: 52rpx 35rpx;
 	box-sizing: border-box;
 }
 .yhk{

+ 5 - 4
promote/withdrawal/cardList/cardList.vue

@@ -10,8 +10,8 @@
 					<view class="card-text">单日上限5万</view>
 				</view>
 				<view class="card-state ddflex">
-					<view>{{getStateText(item)}}</view>
-					<image class="rico" src="/static/images/n_rico.png"></image>
+					<view :style="(id==item.id&&item.status==1)?'color: #999;':''">{{getStateText(item)}}</view>
+					<!-- <image class="rico" src="/static/images/n_rico.png"></image> -->
 				</view>
 			</view>
 			<view class="card-add" @click="toaddCard(1)">
@@ -68,7 +68,7 @@
 				})
 			},
 			getCardList(){
-				req.getRequest('/admin/v2/bank/page',{page:1,limit:9999,type:this.cardType},res=>{
+				req.getRequest('/admin/v2/bank/page',{page:1,limit:9999,type:this.cardType,bindId:this.userId,bindType:this.userType},res=>{
 					this.cardList = res.list
 				})
 			},
@@ -127,7 +127,8 @@
 				if (item.status == 0) {
 					text = '待审核';
 				} else if (item.status == 1) {
-					text = '审核通过';
+					if(this.cardType==1) text = '已绑定';
+					if(this.cardType==2) text = '设为提现卡';
 				} else if (item.status == 2) {
 					text = '审核失败';
 				}

+ 50 - 40
promote/withdrawal/index/index.vue

@@ -26,7 +26,7 @@
 								<view class="t-bri">{{ styleHintText(settlementInfo.legalCertId) }}</view>
 							</view>
 						</view>
-						<view class="li ddflex" @click="jumpUrl('/promote/withdrawal/cardList/cardList?cardType='+cardType+'&id='+settlementInfo.id)">
+						<view class="li ddflex" @click="cardType==1?toaddCard():jumpUrl('/promote/withdrawal/cardList/cardList?cardType='+cardType+'&id='+settlementInfo.id)">
 							<view class="yhk">
 								<image src="/static/pages/images/yhk.png" mode="aspectFit" class="txico"></image>
 							</view>
@@ -48,10 +48,10 @@
 			<view class="pdlr20 pd50 bgfff cont">
 				<view class="txje ddflex">
 					<view class="fflex">提现金额</view>
-					<navigator url="/promote/withdrawal/income/income" hover-class="none" class="ddflex">
+					<!-- <navigator url="/promote/withdrawal/income/income" hover-class="none" class="ddflex">
 						收益账户明细
 						<image src="../../../static/pages/images/crico1.png" class="rico"></image>
-					</navigator>
+					</navigator> -->
 				</view>
 				<view class="dflex money pd50">
 					<text>¥</text>
@@ -103,6 +103,7 @@ export default {
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad: function(options) {
+		if(options.cardType) this.cardType = options.cardType
 		// 门店
 		if(req.getStorage('userInfo').merchantId){
 			this.userId = req.getStorage('userInfo').merchantId
@@ -113,7 +114,7 @@ export default {
 			this.userId = req.getStorage('userInfo').storeId
 			this.userType = 1
 		}
-		if(options.cardType) this.cardType = options.cardType
+		// 获取系统参数配置的最小提现金额
 		this.getminMoney();
 		this.bankList = hfParams.bank();
 	},
@@ -131,12 +132,13 @@ export default {
 				url:url
 			})
 		},
+		// 银行卡号
 		getbankNo(bankNo) {
 			if (bankNo) {
 				return bankNo.substring(bankNo.length - 4, bankNo.length);
 			}
 		},
-
+		// 银行
 		getBankName(code) {
 			if (code) {
 				for (var i = 0; i < this.bankList.length; i++) {
@@ -147,36 +149,27 @@ export default {
 				}
 			}
 		},
-
+		// 审核状态 0、待审核 1、审核通过 2、审核失败
 		getStateText() {
 			var text = '待审核';
 			//银行卡状态 - 0、待审核 1、审核通过 2、审核失败
 			if (this.settlementInfo.status == 0) {
 				text = '待审核';
 			} else if (this.settlementInfo.status == 1) {
-				text = '审核通过';
+				if(this.cardType==1) text = '已绑定';
+				if(this.cardType==2) text = '更换';
+				// text = '审核通过';
 			} else if (this.settlementInfo.status == 2) {
 				text = '审核失败';
 			}
 			return text;
 		},
-
+		
+		// 身份证
 		styleHintText(str) {
 			return util.styleHintText(str);
 		},
 
-		//是否可提现
-		isOkState() {
-			var is = false;
-			if (this.settlementInfo && this.settlementInfo.channelList && this.settlementInfo.channelList.length > 0) {
-				var obj = this.settlementInfo.channelList[0];
-				if (obj.state == 1 && obj.settlementState == 1) {
-					is = true;
-				}
-			}
-			return is;
-		},
-
 		getProfit() {
 			req.getRequest('/admin/v2/merchant/balance', {id:this.userId,type:this.userType}, res => {
 				this.countMoney = res?res.balance:0;
@@ -203,7 +196,7 @@ export default {
 			let d = {
 				bindId:this.userId,
 				bindType:this.userType,
-				type:2
+				type:this.cardType
 			}
 			req.getRequest('/admin/v2/bank/defaultBank', d, data => {
 				this.settlementInfo = data;
@@ -212,9 +205,8 @@ export default {
 
 		// 提现
 		withdrawmoney() {
-			if (!this.isOkState()) {
-				return req.msg('请先添加正确的银行卡信息');
-			}
+			if(!this.settlementInfo) return req.msg('请先添加正确的银行卡信息');
+			if(!this.settlementInfo.status) return req.msg('该银行卡审核中');
 			if (this.txmoney == 0) {
 				return req.msg('请输入提现金额');
 			} else if (this.txmoney > this.countMoney) {
@@ -222,18 +214,40 @@ export default {
 			} else if (this.txmoney < this.minMoney) {
 				return req.msg('提现金额不能低于最小提现金额');
 			} else if (this.txmoney > 0 && this.txmoney <= this.countMoney && +this.txmoney >= +this.minMoney) {
+				if(this.posting) return false
+				this.posting = true
 				req.postRequest(
-					'/api/withdraw',
+					'/admin/v2/withdraw/apply',
 					{
-						money: this.txmoney
+						money: this.txmoney,
+						settlementId:this.settlementInfo.id,
+						bindId:this.userId,
+						bindType:this.userType,
+						type:this.cardType
 					},
 					res => {
-						console.log(res);
-						req.msg('您的提现申请已受理,请等待平台打款', success => {
-							setTimeout(function() {
-								uni.navigateBack();
-							}, 1500);
-						});
+						if(this.cardType==1){
+							req.postRequest(
+								'/admin/v2/withdraw/payCashToHf',
+								res,
+								data => {
+									this.posting = false
+									req.msg('您的提现申请已受理,请等待平台打款', success => {
+										setTimeout(function() {
+											uni.navigateBack();
+										}, 1500);
+									});
+								}
+							);
+						}else{
+							this.posting = false
+							console.log(res);
+							req.msg('您的提现申请已受理,请等待平台打款', success => {
+								setTimeout(function() {
+									uni.navigateBack();
+								}, 1500);
+							});
+						}
 					}
 				);
 			}
@@ -255,14 +269,10 @@ export default {
 		},
 
 		toaddCard() {
-			var url = '/promote/withdrawal/bindCard/bindCard?cardType='+this.cardType+'&id='+this.settlementInfo.id;
-			// if (this.settlementInfo) {
-			// 	if (this.isOkState()) {
-			// 		url = '/promote/withdrawal/bindCardCheck/bindCardCheck';
-			// 	} else {
-			// 		url = url + '?isEnd=true';
-			// 	}
-			// }
+			var url = '/promote/withdrawal/bindCard/bindCard?cardType='+this.cardType
+			if (this.settlementInfo) {
+				url = url  +'&id='+this.settlementInfo.id;
+			}
 			uni.navigateTo({
 				url: url
 			});

+ 1 - 1
promote/withdrawal/myCard/myCard.css

@@ -42,7 +42,7 @@
 	opacity: 1;
 	margin: auto;
 	margin-top: 30rpx;
-	padding: 52rpx 45rpx;
+	padding: 52rpx 35rpx;
 	box-sizing: border-box;
 }
 .yhk{

+ 17 - 5
promote/withdrawal/myCard/myCard.vue

@@ -11,7 +11,7 @@
 				<image class="ts-icon" src="/static/pages/images/ts2.png"></image>
 				<view class="ts-text">仅限个人账户</view>
 			</view>
-			<view class="card ddflex" v-for="item,index in cardListOn" :key="index">
+			<view v-if="cardListOn.length>0" class="card ddflex" v-for="item,index in cardListOn" :key="index" @click="jumpUrl('/promote/withdrawal/bindCard/bindCard?cardType='+item.type+'&id='+item.id)">
 				<view class="yhk">
 					<image src="../../../static/pages/images/yhk.png" mode="aspectFit"></image>
 				</view>
@@ -24,7 +24,7 @@
 					<image class="rico" src="/static/images/n_rico.png"></image>
 				</view>
 			</view>
-			<view class="card-add" @click="toaddCard(1)">
+			<view v-else class="card-add" @click="toaddCard(1)">
 				<view class="ddflex" style="justify-content: center;height: 100%;">
 					<image class="add-icon" src="../../../static/pages/images/add.png"></image>
 					<view>添加银行卡</view>
@@ -36,7 +36,7 @@
 			<view class="ddflex">
 				<view class="ts-title">线下提现银行卡</view>
 			</view>
-			<view class="card ddflex" v-for="item,index in cardList" :key="index">
+			<view class="card ddflex" v-for="item,index in cardList" :key="index" @click="jumpUrl('/promote/withdrawal/bindCard/bindCard?cardType='+item.type+'&id='+item.id)">
 				<view class="yhk">
 					<image src="../../../static/pages/images/yhk.png" mode="aspectFit"></image>
 				</view>
@@ -72,13 +72,25 @@
 				bankList: [],
 				cardList: [],//线下银行卡
 				cardListOn:[],//线上银行卡
+				userType:null,//1 商户 2 门店
 			}
 		},
 		onLoad(options) {
+			// 门店
+			if(req.getStorage('userInfo').merchantId){
+				this.userId = req.getStorage('userInfo').merchantId
+				this.userType = 2
+			}
+			// 商户
+			if(req.getStorage('userInfo').storeId){
+				this.userId = req.getStorage('userInfo').storeId
+				this.userType = 1
+			}
 			this.bankList = hfParams.bank();
 		},
 		onShow() {
 			this.getCardList()
+			this.getCardListOn()
 		},
 		methods: {
 			jumpUrl(url) {
@@ -88,13 +100,13 @@
 			},
 			// 获取线下提现银行卡
 			getCardList(){
-				req.getRequest('/admin/v2/bank/page',{page:1,limit:999,type:2},res=>{
+				req.getRequest('/admin/v2/bank/page',{page:1,limit:999,type:2,bindId:this.userId,bindType:this.userType},res=>{
 					this.cardList = res.list
 				})
 			},
 			// 获取线上提现银行卡
 			getCardListOn(){
-				req.getRequest('/admin/v2/bank/page',{page:2,limit:999,type:2},res=>{
+				req.getRequest('/admin/v2/bank/page',{page:1,limit:999,type:1,bindId:this.userId,bindType:this.userType},res=>{
 					this.cardListOn = res.list
 				})
 			},

+ 4 - 3
promote/withdrawal/record/record.vue

@@ -5,8 +5,8 @@
 	<!-- <block wx:for="{{pageList}}" wx:key="index"> -->
 		<view v-for="(item, index) in data" :key="index" class="li dflex">
 			<view class="dizhi flex">
-				<view>{{item.remark}}<text class="shenghe" v-if="item.state==1">审核中</text><text class="success" v-if="item.state==2">提取成功</text><text class="file" v-if="item.state==3">审核失败</text></view>
-				<text class="reason" v-if="item.state==3">失败原因:<text class="colorred">{{item.reason}}</text></text>
+				<view>{{item.type==1?'线上提现':'线下提现'}}<text class="shenghe" v-if="item.state==0">审核中</text><text class="success" v-if="item.state==1">提取成功</text><text class="file" v-if="item.state==2">审核失败</text><text class="file" v-if="item.state==3">提取失败</text></view>
+				<text class="reason" v-if="item.state==2">失败原因:<text class="colorred">{{item.reason}}</text></text>
 				<view class="time"><text>{{item.time}}</text></view>
 			</view>
 			<view class="yue">
@@ -77,7 +77,8 @@ export default {
       if (!that.isLoad) return false;
       console.log("11111111111111111");
       that.isLoad = false;
-      req.getRequest('/api/withdraw/list', that.form, data => {
+      req.getRequest('/admin/v2/withdraw/page', that.form, data => {
+		  data = data?data.list:[]
         if (data && data.length >= 10) that.isLoad = true;
         if (that.form.page > 1) data = that.data.concat(data);
         this.setData({

+ 1 - 1
utils/request.js

@@ -1,6 +1,6 @@
 const app = getApp();
 const env = {
-	NODE_ENV: 'prd',
+	NODE_ENV: 'dev',
 	dev: {
 		apiUrl: 'https://pkapi.zhiqiyun.com'
 	},