sjx

manifest.json

@@ -3,8 +3,8 @@
     //"appid" : "__UNI__FC9419E",
     "appid" : "__UNI__1EA80F1", //这个是 web 的
     "description" : "",
-    "versionName" : "1.0.62",
-    "versionCode" : 162,
+    "versionName" : "1.0.64",
+    "versionCode" : 164,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/CardSend/CardSend.scss

@@ -320,6 +320,7 @@
 			}
 			.bj{
 				color: #007aff;
+				margin-right: 30upx;
 			}
 		}
 		

pages/CardSend/CardSend.vue

@@ -383,17 +383,19 @@
 			//已发卡券
 			async shop_couponFun(){
 				this.page++;
+				console.info(this.page,'1111')
 				let res =  await couponList({
-					page:1,
+					page:this.page,
 				});
 				
 				if(res.code==0){
 					
-					if( res.data!=null){
+					if( res.data.length!=0){
 						this.cardlist = [...this.cardlist,...res.data];
 					}else{
-						this.isallshow = true;
 						this.$api.msg("没有更多了~");
+						this.isallshow = true;
+						
 					}
 					
 				}else{

pages/login/login.vue

@@ -23,7 +23,12 @@
 				<view @click="change_sta">忘记密码？</view>
 			</view>
 			<view class="con_04" style="margin-top: 0px;">
-				<view class="con_04_1 " @tap="login()">登录</view>
+				<view style="border-radius: 50upx;width: 100%;overflow: hidden;">
+					<navigator url="#">
+					<view class="con_04_1 " @tap="login()">登录</view>
+					</navigator>
+				</view>
+				
 			</view> 
 			
 			<!-- #ifdef H5 -->

pages/user/reseller/reseller.scss

@@ -50,17 +50,24 @@ page {
 			position: absolute;
 			bottom: -60upx;
 			left: 23%;
-
-			.btn {
-				margin-top: 7%;
-				text-align: center;
+			.btnBox {
+				// margin-top: 7%;
 				width: 85%;
-				background-color: $base_color;
 				height: 80upx;
 				border: none;
 				border-radius: 100upx;
 				line-height: 80upx;
 				color: #FFFFFF;
+				overflow: hidden;
+				margin-top: 30upx;
+				.btn {
+					// margin-top: 7%;
+					text-align: center;
+					width: 100%;
+					height: 80upx;
+					color: #FFFFFF;
+					background-color: $base_color;
+				}
 			}
 
 
@@ -80,9 +87,10 @@ page {
 			.ico {
 				border-radius: 20upx;
 				border: 1px solid #c0c0c0;
+				overflow: hidden;
 				///width: 49%;
 				width: 338upx;
-				height: 200upx;
+				// height: 200upx;
 				margin-top: 20upx;
 				display: flex;
 				border: none;
@@ -119,4 +127,7 @@ page {
 	}
 	.mt-40{
 		margin-top: 30upx;
+	}
+	.tt{
+		margin-bottom: 30upx;
 	}
\ No newline at end of file

pages/user/reseller/reseller.vue

@@ -16,7 +16,12 @@
 				<view>{{counts.amount_cash?counts.amount_cash:0}}</view>
 			</view>
 			<view class="tixian" @click="jump_cash">
-				<view class="btn" style="font-size: 16px;">立即提现</view>
+				<view class="btnBox">
+					<navigator url="#">
+						<view class="btn" style="font-size: 16px;">立即提现</view>
+					</navigator>
+				</view>
+				
 			</view>
 			<view class="jilu">
 				<navigator url="/pages/user/record/record">

pages/yjWithdraw/yjWithdraw.vue

@@ -169,6 +169,31 @@
 		<!-- userinfo.mobile -->
 		<!-- 验证身份组件 -->
 		
+		
+		<eModal :visible.sync="visible" :animation='true'>
+			<view class="eModalbox">
+				<view class="names">验证码验证</view>
+				<!-- <view class="names-min">*请勿必绑定手机号，否则将无法提现</view> -->
+				<view class="inputboxitem flex">
+					<view class="inputsview flex1">
+						<!-- <input type="number" value="" v-model="mobile" class="inputs" placeholder="请输入手机号" /> -->
+						<view class="">
+							{{mobile}}
+						</view>
+					</view>
+				</view>
+				<view class="inputboxitem flex">
+					<view class="inputsview flex1">
+						<input type="number" value="" v-model="code" class="inputs" placeholder="请输入验证码" />
+						<view v-if="!isdjs" class="sendcode" @tap="sendSmsfun">获取验证码</view>
+						<view v-if="isdjs"  class="sendcode djs"  >{{times}}</view>
+					</view>
+				</view>
+				<view class="submitbtn 111"  :class="{active:issubm}" @tap="cashUserFundFun">确认修改</view>
+			</view>
+		</eModal>
+		<!-- 绑定手机号 -->
+		
 	</view>
 </template>
 
@@ -180,16 +205,25 @@
 	//userTransferMoney 佣金 资金 转余额
 	//cashUserFund 提现
 	
-	import {cashUserFund,storeIndex} from "@/utils/api/api.js";
+	import {cashUserFund,storeIndex,storeSendSms } from "@/utils/api/api.js";
 	import VerifyIdentity from "@/components/VerifyIdentity/VerifyIdentity.vue";
+	import eModal from "@/components/e-modal/e-modal.vue";
 	
 	export default {
 		components:{
 			bestPaymentPassword,
 			VerifyIdentity,
+			eModal,
 		},
 		data() {
 			return {
+				issubm:false,//忘记密码的表单提交状态 是否允许提交
+				isdjs:false,//
+				times:60,
+				visible: false,
+				code:"",//验证码
+				smstype:'sms_withdraw',//验证码类型
+				
 				txsum:"",//提现的金额
 				conts:"985.00",
 				activechind:false,
@@ -287,6 +321,46 @@
 			}
 		},
 		methods:{
+			//发送验证码 忘记支付密码
+			
+			async sendSmsfun(){
+				
+				if(!/(^1[1-9][0-9]{9}$)/.test(this.mobile)){
+					this.$api.msg('请输入正确的手机号码');
+					return;
+				}
+				let res =  await storeSendSms({
+					mobile:this.mobile,
+					smstype: this.smstype,
+				});
+				
+				if(res.code==0 || true){
+					this.$api.msg(res.msg);
+					//发送成功
+					this.isdjs = true;
+					
+					let iv  = setInterval(()=>{
+						this.times--;
+						if(this.times<=0){
+							this.isdjs = false;
+							clearInterval(iv);//结束
+						}
+					},1000)
+					
+				}else{
+					this.$api.msg(res.msg);
+				}
+			},
+			
+			//提交按钮控制
+			VerificationFun(){
+				if( this.code!="" && this.mobile!=""){
+					this.issubm = true;
+				}else{
+					this.issubm = false;
+				}
+			},
+			
 			//验证身份提交方法
 			fromSubmitfun(e){
 				console.info(e);
@@ -302,7 +376,7 @@
 			//获取余额信息
 			async getUserInfoFun(){
 				let res = await storeIndex({
-					
+				
 				})
 				
 				if (res.code== 0) {
@@ -322,7 +396,7 @@
 					this.gold = res.data.counts.gold;
 					
 					console.info(res);
-					
+					this.mobile = res.data.mobile;
 					
 				} else {
 					this.$api.msg(res.code);
@@ -343,6 +417,7 @@
 			},
 			//佣金提现事件 微信 和 银行卡
 			async cashUserFundFun(iscode=0){
+				this.visible= false
 				let totype = ""
 				
 				if(this.tabactive==1){
@@ -359,6 +434,7 @@
 				
 				
 				let can = {
+					code: this.code,
 					type:this.type,//0佣金提现，1代理提现,2商家提现
 					money:this.txsum,
 					totype:totype,//1提现微信，2提现银行卡
@@ -404,6 +480,8 @@
 					this.paymentPwd = "";
 					this.$api.msg(res.msg);
 				}
+				// this.mobile='';
+				this.code=''
 			},
 			//佣金提现 佣金提现方法 转到余额
 			
@@ -502,20 +580,23 @@
 				// 这里是写验证密码的业务逻辑,比如密码错误可以在这边清空
 				this.paymentPwd = e;
 				this.togglePayment();//关闭
-				
-				
-				if(this.tabactive==1){
-					//提现到微信
-					this.cashUserFundFun();
-				}else if(this.tabactive==2){
-					//提现到余额
-					//this.userTransferMoneyFun();
-					
-				}else if(this.tabactive==3){
-					//提现到银行卡
-					this.cashUserFundFun();
+				console.info(parseFloat(this.txsum),'121212121')
+				if(parseFloat(this.txsum)>500){
+					this.visible= true
+					}else{
+						
+						if(this.tabactive==1){
+							//提现到微信
+							this.cashUserFundFun();
+						}else if(this.tabactive==2){
+							//提现到余额
+							//this.userTransferMoneyFun();
+							
+						}else if(this.tabactive==3){
+							//提现到银行卡
+							this.cashUserFundFun();
+						}
 				}
-				
 				// uni.navigateTo({
 				//     url: '/pages/withdrawSucc/withdrawSucc'
 				// });
@@ -565,11 +646,79 @@
 			},
 			selcarddata(){
 				this.jiancefun();
-			}
-		}
+			},
+			code(){
+				this.VerificationFun()
+						},
+		},
+		
 	}
 </script>
 
 <style lang="scss">
-@import  "./yjWithdraw.scss"
+@import  "./yjWithdraw.scss";
+.eModalbox{
+		width: 100%;
+		height: 40vh;
+		padding: 40upx 40upx 0 40upx;
+		.names{
+			font-size:30upx;
+			color:rgba(0,0,0,1);
+			text-align: center;
+			margin-bottom: 20upx;
+		}
+		.names-min{
+			font-size:24upx;
+			color:#ff6900;
+			text-align: center;
+			margin-bottom: 80upx;
+		}
+		.inputboxitem{
+			height: 92upx;
+			line-height: 92upx;
+			border-bottom: 1px solid #E4E4E4;
+			position: relative;
+			.inputs{
+				height: 92upx;
+				line-height: 92upx;
+				font-size:30upx;
+				color:rgba(0,0,0,1);
+			}
+			.sendcode{
+				width:184upx;
+				height:68upx;
+				line-height: 68upx;
+				text-align: center;
+				background:rgba(255,105,0,1);
+				border-radius:4upx;
+				color:#FFFFFF;
+				
+				font-size:30upx;
+				position: absolute;
+				z-index: 3;
+				top:5px;
+				right: 0;
+			}
+			.sendcode.djs{
+				background: #b3b1af;
+			}
+		}
+		
+	
+	}
+	.submitbtn{
+		margin: 60upx 24upx;
+		height:88upx;
+		line-height: 88upx;
+		text-align: center;
+		background:rgba(254,197,156,1);
+		border-radius:6upx;
+		font-size:32upx;
+		color:rgba(255,255,255,1);
+	}
+	
+	.submitbtn.active{
+		background: #FF6900;
+	}
+	
 </style>