config/balance.js

@@ -18,6 +18,12 @@ export const getDefaultBank = params =>
     params,
   })
 
+//校验是否绑定银行卡
+export const checkIsbindBank = params =>
+  http.get('/member/api/bank/is-bind', {
+    params,
+  })
+
 //提现页面展示
 export const getWidthdrawShow = params =>
   http.get('/member/api/withdraw/show/add', {

pages/mine/balance/withdrawal.vue

@@ -7,7 +7,7 @@
         :rules="rules"
         ref="uForm"
       >
-        <u-form-item
+        <!-- <u-form-item
           label-width="200rpx"
           :label="'银行卡号'"
           prop="cardNumber"
@@ -24,7 +24,7 @@
           <view v-else style="color: red" @click="goBindbank">
             {{ '请先绑定银行卡' }}
           </view>
-        </u-form-item>
+        </u-form-item> -->
         <u-form-item
           label-width="200rpx"
           :label="`${'提现金额'}(${isLocaled()})`"
@@ -134,16 +134,7 @@
       <u-button class="subbtn" @click="submit">{{ '提现' }}</u-button>
     </view>
     <u-toast ref="uToast"></u-toast>
-    <u-modal
+
-      :show="unBindDefaultModal"
-      showCancelButton
-      @cancel="unBindDefaultModal = false"
-      cancelText="取消"
-      confirmText="确定"
-      @confirm="unBindDefaultConfirm"
-    >
-      请先绑定默认银行卡
-    </u-modal>
     <!-- 提现引导弹窗 -->
     <!-- <WithdrawalGuide
       :show="showWithdrawalGuide"
@@ -202,9 +193,8 @@ export default {
       bankData: {},
       widthDrwaData: {},
       ifeye: false,
-      canbind: true,
+      canbind: false,
       showWithdrawalGuide: false,
-      unBindDefaultModal: false,
     }
   },
   watch: {
@@ -215,7 +205,7 @@ export default {
       url: '/pages/mine/balance/withdrawlDetail',
     })
   },
-  onShow() {
+  onLoad() {
     this.getList()
   },
   methods: {
@@ -243,18 +233,16 @@ export default {
           }
         })
       bal.getDefaultBank().then(res => {
-        if (res.data && Object.keys(res.data).length > 0) {
         this.bankData = res.data
         this.dataForm.pkBank = res.data.pkId
-        } else {
-          this.unBindDefaultModal = true
-        }
       })
-    },
+      //校验是否绑定银行卡
-    unBindDefaultConfirm() {
+      bal.checkIsbindBank().then(res => {
-      this.unBindDefaultModal = false
+        if (res.flag == 'Y') {
-      uni.navigateTo({
+          this.canbind = false
-        url: '/pages/mine/bindBank/index',
+        } else if (res.flag == 'N') {
+          this.canbind = true
+        }
       })
     },
     submit() {
@@ -264,17 +252,13 @@ export default {
           bal.addWithdraw(this.dataForm).then(res => {
             if (res.code == 200) {
               this.$refs.uToast.show({
-                message: res.msg || '提现成功',
+                message: res.msg,
                 type: 'success',
               })
+              // 显示提现引导弹窗
               setTimeout(() => {
                 uni.navigateBack()
-              }, 500)
+              }, 300)
-
-              // 显示提现引导弹窗
-              // setTimeout(() => {
-              //   this.showWithdrawalGuide = true
-              // }, 300)
             }
           })
         })
@@ -308,7 +292,6 @@ export default {
     // 处理提现引导弹窗确认
     onWithdrawalGuideConfirm() {
       this.showWithdrawalGuide = false
-      uni.navigateBack()
     },
   },
 }

pages/mine/bindBank/bindBank.vue

@@ -1,149 +1,43 @@
 <template>
 	<view class="content">
 		<view class="theform">
-      <u--form
+			<u--form labelPosition="left" :model="dataForm" :rules="rules" ref="uForm">
-        labelPosition="left"
+				<u-form-item label-width="200rpx" :label="'银行卡号'" borderBottom prop="cardNumber" ref="item1">
-        :model="dataForm"
+					<u--input v-model="dataForm.cardNumber" disabledColor="#F5F5F5;" border="none"></u--input>
-        :rules="rules"
+				</u-form-item>
-        ref="uForm"
+				<u-form-item borderBottom label-width="200rpx" :label="'银行名称'" prop="bankName"
-      >
+					@click="showAmount = true; " ref="item1">
-        <u-form-item
+					<u--input v-model="dataForm.bankName" disabledColor="#ffffff" :placeholder="'请选择'"
-          borderBottom
+						border="none"></u--input>
-          required
-          label-width="200rpx"
-          :label="'银行名称'"
-          prop="bankName"
-          @click="showAmount = true"
-          ref="item1"
-        >
-          <u--input
-            v-model="dataForm.bankName"
-            disabledColor="#ffffff"
-            :placeholder="'请选择'"
-            border="none"
-          ></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 
-        <u-form-item
+
-          label-width="200rpx"
+				<u-form-item label-width="200rpx" :label="'开户支行'" prop="subBankName" borderBottom ref="item1">
-          :label="'开户支行'"
+					<u--input v-model="dataForm.subBankName" disabledColor="#F5F5F5;" border="none"></u--input>
-          required
-          prop="subBankName"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="dataForm.subBankName"
-            disabledColor="#F5F5F5;"
-            border="none"
-          ></u--input>
 				</u-form-item>
-        <u-form-item
+				<u-form-item label-width="200rpx" :label="'真实姓名'" prop="accountName" borderBottom ref="item1">
-          label-width="200rpx"
+					<u--input :placeholder="'请输入'" v-model="dataForm.accountName" border="none"></u--input>
-          :label="'银行卡号'"
-          required
-          borderBottom
-          prop="cardNumber"
-          ref="item1"
-        >
-          <u--input
-            v-model="dataForm.cardNumber"
-            disabledColor="#F5F5F5;"
-            border="none"
-          ></u--input>
 				</u-form-item>
-        <u-form-item
+				<u-form-item label-width="200rpx" :label="'证件号码'" prop="idCard" borderBottom ref="item1">
-          label-width="200rpx"
+					<u--input v-model="dataForm.idCard" :placeholder="'请输入'" disabledColor="#F5F5F5;"
-          label="开户姓名"
+						border="none"></u--input>
-          required
-          prop="accountName"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            :placeholder="'请输入'"
-            v-model="dataForm.accountName"
-            border="none"
-          ></u--input>
 				</u-form-item>
-        <u-form-item
+				<u-form-item label-width="200rpx" :label="'联系方式'" prop="phone" borderBottom ref="item1">
-          label-width="200rpx"
+					<u--input  v-model="dataForm.phone" :placeholder="'请输入'" maxlength="20" border="none"></u--input>
-          :label="'证件号码'"
-          required
-          prop="idCard"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="dataForm.idCard"
-            :placeholder="'请输入'"
-            disabledColor="#F5F5F5;"
-            border="none"
-          ></u--input>
 				</u-form-item>
-        <u-form-item
+				<u-form-item v-if="userInfo.pkCountry==1&&cancode" label-width="200rpx" :label="'验证码'"
-          label-width="200rpx"
+					prop="verificationCode" borderBottom ref="item1">
-          :label="'联系方式'"
+					<u--input v-model="dataForm.verificationCode" :placeholder="'请输入'" border="none"></u--input>
-          prop="phone"
+					<u-button @tap='getCode' class="getcodes" type="primary" shape="circle" :text="tips"
-          required
+						color="#2FBC42"></u-button>
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="dataForm.phone"
-            :placeholder="'请输入'"
-            maxlength="20"
-            border="none"
-          ></u--input>
-        </u-form-item>
-        <u-form-item
-          v-if="userInfo.pkCountry == 1 && cancode"
-          label-width="200rpx"
-          :label="'验证码'"
-          required
-          prop="verificationCode"
-          borderBottom
-          ref="item1"
-        >
-          <u--input
-            v-model="dataForm.verificationCode"
-            :placeholder="'请输入'"
-            border="none"
-          ></u--input>
-          <u-button
-            @tap="getCode"
-            class="getcodes"
-            type="primary"
-            shape="circle"
-            :text="tips"
-            color="#2FBC42"
-          ></u-button>
 				</u-form-item>
 
-        <u-code
+				<u-code :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-code>
-          :seconds="seconds"
+				<u-picker @cancel='showAmount=false' :show="showAmount" ref="uPicker" :columns="bankCardChioceList"
-          @end="end"
+					@confirm="confirm" keyName='bankName'></u-picker>
-          @start="start"
-          ref="uCode"
-          @change="codeChange"
-        ></u-code>
-        <u-picker
-          @cancel="showAmount = false"
-          :show="showAmount"
-          ref="uPicker"
-          :columns="bankCardChioceList"
-          @confirm="confirm"
-          keyName="bankName"
-        ></u-picker>
 			</u--form>
-    </view>
+
-    <view class="tip-wrapper">
-      <view class="tip-content">
-        <view class="tip-text"
-          >银行卡号、真实姓名、证件号码、联系方式，请与银行预留信息保持一致</view
-        >
-      </view>
 		</view>
 		<view class="btnbox">
 			<u-button class="subbtn" @click="submit">{{'确定'}}</u-button>
@@ -153,76 +47,63 @@
 </template>
 
 <script>
-import * as ban from '@/config/balance.js'
+	import * as ban from "@/config/balance.js"
 	export default {
 		data() {
 			return {
 				showAmount: false,
 				dataForm: {
-        bankName: '',
+					bankName: "",
-        cardNumber: '',
+					cardNumber: "",
-        pkBank: '',
+					pkBank: "",
-        subBankName: '',
+					subBankName: "",
-        accountName: '',
+					accountName: "",
-        idCard: '',
+					idCard: "",
+
 				},
 				bankCardChioceList: [],
 				rules: {
-        cardNumber: [
+					cardNumber: [{
-          {
 						type: 'string',
 						required: true,
 						message: '请输入',
-            trigger: ['blur', 'change'],
+						trigger: ['blur', 'change']
-          },
+					}],
-        ],
+					subBankName: [{
-        subBankName: [
-          {
 						type: 'string',
 						required: true,
 						message: '请输入',
-            trigger: ['blur', 'change'],
+						trigger: ['blur', 'change']
-          },
+					}],
-        ],
+					accountName: [{
-        accountName: [
-          {
 						type: 'string',
 						required: true,
 						message: '请输入',
-            trigger: ['blur', 'change'],
+						trigger: ['blur', 'change']
-          },
+					}],
-        ],
+					idCard: [{
-        idCard: [
-          {
 						type: 'string',
 						required: true,
 						message: '请输入',
-            trigger: ['blur', 'change'],
+						trigger: ['blur', 'change']
-          },
+					}],
-        ],
+					phone: [{
-        phone: [
-          {
 						type: 'string',
 						required: true,
 						message: '请输入',
-            trigger: ['blur', 'change'],
+						trigger: ['blur', 'change']
-          },
+					}],
-        ],
+					verificationCode: [{
-        verificationCode: [
-          {
 						type: 'string',
 						required: true,
 						message: '请输入',
-            trigger: ['blur', 'change'],
+						trigger: ['blur', 'change']
-          },
+					}],
-        ],
+					bankName: [{
-        bankName: [
-          {
 						required: true,
 						message: '请选择',
-            trigger: ['change'],
+						trigger: ['change']
-          },
+					}],
-        ],
 				},
 				tips: '',
 				// refCode: null,
@@ -230,41 +111,49 @@ export default {
 				ifpass: false,
 				userInfo: {},
 				cancode: true, //判断是否是白名单
+
 			}
 		},
 		onLoad() {
 			this.userInfo = uni.getStorageSync('User')
 			this.getList()
+			this.checkIfWhite();
+
 		},
 		methods: {
+			checkIfWhite() {
+				ban.checkIfWhite().then((res) => {
+					if (res.code == 200 && res.flag == "N") {
+						this.cancode = true;
+					} else if (res.code == 200 && res.flag == "Y") {
+						this.cancode = false;
+					}
+				});
+			},
 			codeChange(text) {
-      this.tips = text
+				this.tips = text;
 			},
 			getCode() {
 				if (this.dataForm.phone && this.$u.test.mobile(this.dataForm.phone)) {
 					if (this.$refs.uCode.canGetCode) {
 						// 模拟向后端请求验证码
 						uni.showLoading({
-            title: '正在获取验证码',
+							title: '正在获取验证码'
 						})
-          ban
+						ban.getVerification({
-            .getVerification({
+							phone: this.dataForm.phone
-              phone: this.dataForm.phone,
+						}).then((res) => {
-            })
+							uni.hideLoading();
-            .then(res => {
-              uni.hideLoading()
 							// 这里此提示会被this.start()方法中的提示覆盖
-              uni.$u.toast('验证码已发送')
+							uni.$u.toast('验证码已发送');
 							// 通知验证码组件内部开始倒计时
-              this.$refs.uCode.start()
+							this.$refs.uCode.start();
 						})
 					} else {
-          uni.$u.toast('倒计时结束后再发送')
+						uni.$u.toast('倒计时结束后再发送');
 					}
 				} else {
-        uni.$u.toast(
+					uni.$u.toast(this.dataForm.phone ? '手机号格式不正确' : '请先输入手机号')
-          this.dataForm.phone ? '手机号格式不正确' : '请先输入手机号'
-        )
 					return
 				}
 			},
@@ -278,6 +167,7 @@ export default {
 				ban.getBankCardChoiceList().then(res => {
 					this.bankCardChioceList = [res.data]
 				})
+
 			},
 			bindBank() {
 				if (!this.ifpass &&this.cancode &&this.userInfo.pkCountry == 1) {
@@ -292,39 +182,38 @@ export default {
 						}, 1000)
 					}
 				})
+
 			},
 			submit() {
-      this.$refs.uForm
+				this.$refs.uForm.validate().then(res => {
-        .validate()
-        .then(res => {
 					// 没有三方接口 临机写死
-          this.ifpass = true
+					this.ifpass = true;
+					this.bindBank();
 
+					return
 					if (this.userInfo.pkCountry == 1) {
 						if(this.cancode){
-              ban
+							ban.verifyBankCard(this.dataForm).then((res) => {
-                .verifyBankCard(this.dataForm)
-                .then(res => {
 									if (res.code == 200) {
-                    this.ifpass = true
+										this.ifpass = true;
-                    this.bindBank()
+										this.bindBank();
 									} else {
-                    this.ifpass = false
+										this.ifpass = false;
 										uni.$u.toast(res.msg)
 									}
 								})
-                .catch(err => {
+								.catch((err) => {
-                  this.ifpass = false
+									this.ifpass = false;
-                })
+								});
 						}else{
-              this.ifpass = true
+							this.ifpass = true;
-              this.bindBank()
+							this.bindBank();
 						}
 					} else {
 						this.bindBank()
 					}
-        })
+
-        .catch(errors => {
+				}).catch(errors => {
 					uni.$u.toast('校验失败')
 					return false
 				})
@@ -334,17 +223,18 @@ export default {
 				this.dataForm.pkBank = e.value[0].pkId
 				this.showAmount = false
 			},
-  },
+
+		}
 	}
 </script>
 
 <style lang="scss" scoped>
 	.content {
-  background: #f2f2f2;
+		background: #F2F2F2;
 
 		.theform {
 			margin-top: 6rpx;
-    background: #ffffff;
+			background: #FFFFFF;
 			padding: 20rpx 23rpx 0rpx 23rpx;
 
 			.contentye {
@@ -353,6 +243,7 @@ export default {
 				font-family: Source Han Sans CN;
 				font-weight: 400;
 			}
+
 		}
 
 		.btnbox {
@@ -360,53 +251,23 @@ export default {
 			padding: 0 20rpx;
 
 			.subbtn {
-      background: #005bac;
+				background: #005BAC;
 				border-radius: 46rpx;
 				font-size: 30rpx;
 				font-family: Source Han Sans CN;
 				font-weight: 400;
-      color: #ffffff;
+				color: #FFFFFF;
 			}
 		}
 
 		.getcodes {
 			width: 197rpx;
 			height: 76rpx;
-    background: #2fbc42;
+			background: #2FBC42;
 			border-radius: 38rpx;
 			color: #fff;
 		}
 
-  .tip-wrapper {
-    margin: 20rpx 20rpx 0 20rpx;
 
-    .tip-content {
-      display: flex;
-      align-items: flex-start;
-      background: linear-gradient(135deg, #fff3e0 0%, #fff8f0 100%);
-      border: 2rpx solid #ffb74d;
-      border-radius: 16rpx;
-      padding: 20rpx 24rpx;
-      box-shadow: 0 4rpx 12rpx rgba(255, 183, 77, 0.1);
-
-      .tip-icon {
-        color: #ff9800;
-        font-size: 28rpx;
-        font-weight: bold;
-        margin-right: 16rpx;
-        margin-top: 2rpx;
-        flex-shrink: 0;
-      }
-
-      .tip-text {
-        flex: 1;
-        font-size: 24rpx;
-        line-height: 36rpx;
-        color: #e65100;
-        font-weight: 500;
-        letter-spacing: 0.5rpx;
-      }
-    }
-  }
 	}
 </style>

pages/mine/bindBank/index.vue

@@ -1,12 +1,8 @@
 <template>
 	<view class="content">
 		<view class="tablebox" v-if="tableData.length > 0">
-      <view
+			<view class="card" v-for="(item, index) in tableData"
-        class="card"
+				:style="{ backgroundImage: 'url(' + item.backgroundImg + ')'}" :key="index">
-        v-for="(item, index) in tableData"
-        :style="{ backgroundImage: 'url(' + item.backgroundImg + ')' }"
-        :key="index"
-      >
 				<view class="cardtopflex">
 					<view class="cardtopflex2">
 						<view class="imgbox"><img :src="item.logo" alt="" /></view>
@@ -18,74 +14,43 @@
 					<view class="flexs_1" v-if="item.defaultCard==1">
 						<view class="qiu"></view>
 						<view v-if="userInfo.pkCountry == 1">{{'默认'}}</view>
-            <view
+						<view v-else style="color: #000;font-weight: bold;" class="cardfooter">{{'默认'}}</view>
-              v-else
-              style="color: #000; font-weight: bold"
-              class="cardfooter"
-              >{{ '默认' }}</view
-            >
 					</view>
 					<view class="flexs_1" v-else>
-            <view
+
-              style="color: #fff; font-weight: bold; cursor: pointer"
+						<view style="color: #fff; font-weight: bold; cursor: pointer" @click="setDefault(item.pkId)"
-              @click="setDefault(item.pkId)"
+							class="cardfooter">{{'设为默认'}}</view>
-              class="cardfooter"
-              >{{ '设为默认' }}</view
-            >
 					</view>
 				</view>
 				<view class="cardNumber">{{ item.cardNumber }}</view>
-        <view
+				<view v-if="userInfo.pkCountry == 1" class="cardfooter" @click="removeBind(item)">
-          v-if="userInfo.pkCountry == 1"
+					[{{'解绑'}}]</view>
-          class="cardfooter"
+				<view v-else style="color: #000;font-weight: bold;" class="cardfooter" @click="removeBind(item)">
-          @click="removeBind(item)"
+					[{{'解绑'}}]</view>
-        >
-          [{{ '解绑' }}]</view
-        >
-        <view
-          v-else
-          style="color: #000; font-weight: bold"
-          class="cardfooter"
-          @click="removeBind(item)"
-        >
-          [{{ '解绑' }}]</view
-        >
 			</view>
 		</view>
-    <u-modal
+		<u-modal :showCancelButton="true" @cancel="modalShow=false" :content="'是否确认解绑银行卡'" :show="modalShow"
-      :showCancelButton="true"
+			@confirm="confirmRemove" ref="uModal" :asyncClose="true"></u-modal>
-      @cancel="modalShow = false"
+		<view class="footerbtn" @click="goAdd">
-      :content="'是否确认解绑银行卡'"
+			+{{'添加银行卡'}}
-      :show="modalShow"
+		</view>
-      @confirm="confirmRemove"
-      ref="uModal"
-      :asyncClose="true"
-    ></u-modal>
-    <view class="footerbtn" @click="goAdd"> +{{ '添加银行卡' }} </view>
 
-    <u-modal
+		<u-modal :showCancelButton="true" @cancel="modalShow2=false" content="当前解绑为默银行卡，请设置为另一张卡为默认银行卡"
-      :showCancelButton="true"
+			:show="modalShow2" @confirm="confirmRemove2" ref="uModal" :asyncClose="true"></u-modal>
-      @cancel="modalShow2 = false"
-      content="当前解绑为默银行卡，请设置为另一张卡为默认银行卡"
-      :show="modalShow2"
-      @confirm="confirmRemove2"
-      ref="uModal"
-      :asyncClose="true"
-    ></u-modal>
 		<!-- <el-button class="footerbtn" @click="bindBank(true)">{{'绑定银行卡'}}</el-button> -->
 	</view>
 </template>
 
 <script>
-import * as ban from '@/config/balance.js'
+	import * as ban from "@/config/balance.js"
 	export default {
 		data() {
 			return {
 				tableData: [],
 				modalShow: false,
 				modalShow2: false,
-      pkId: '',
+				pkId: "",
-      userInfo: {},
+				userInfo: {}
 			}
 		},
 		onLoad() {
@@ -96,22 +61,20 @@ export default {
 		},
 		methods: {
 			setDefault(pkId) {
-      ban
+				ban.updateDefault({
-        .updateDefault({
+					pkId: pkId
-          pkId: pkId,
+				}).then((res) => {
-        })
-        .then(res => {
 					if (res.code == 200) {
 						uni.$u.toast(res.msg)
-            this.getSearch()
+						this.getSearch();
 					} else {
 						uni.$u.toast(res.msg)
 					}
-        })
+				});
 			},
 			goAdd() {
 				uni.navigateTo({
-        url: '/pages/mine/bindBank/bindBank',
+					url: '/pages/mine/bindBank/bindBank'
 				})
 			},
 			removeBind(item) {
@@ -121,27 +84,26 @@ export default {
 				} else {
 					this.modalShow = true
 				}
+
 			},
 			confirmRemove2() {
 				this.modalShow2 =false
-      // this.modalShow = true
+				this.modalShow = true
 			},
 			//解除绑定
 			confirmRemove() {
-      ban
+				ban.removeBankBind({
-        .removeBankBind({
+					pkId: this.pkId
-          pkId: this.pkId,
+				}).then((res) => {
-        })
-        .then(res => {
 					if (res.code == 200) {
 						uni.$u.toast(res.msg)
 						this.modalShow = false
-            this.getSearch()
+						this.getSearch();
 					} else {
 						uni.$u.toast(res.msg)
 						this.modalShow = false
 					}
-        })
+				});
 			},
 			//点击绑定银行卡
 			bindBank(val) {
@@ -149,12 +111,12 @@ export default {
 				// this.jdTl = val;
 			},
 			getSearch() {
-      ban.getBankList().then(res => {
+				ban.getBankList().then((res) => {
-        this.tableData = res.data
+					this.tableData = res.data;
-      })
+				});
-    },
 			},
 		}
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -223,13 +185,12 @@ export default {
 							}
 						}
 					}
+
 				}
 
 				.cardNumber {
 					font-size: 32rpx;
-        font-family:
+					font-family: PingFang SC-Medium, PingFang SC;
-          PingFang SC-Medium,
-          PingFang SC;
 					font-weight: 600;
 					color: #ffffff;
 					margin-top: 100rpx;
@@ -239,9 +200,7 @@ export default {
 				.cardfooter {
 					text-align: right;
 					font-size: 24rpx;
-        font-family:
+					font-family: PingFang SC-Regular, PingFang SC;
-          PingFang SC-Regular,
-          PingFang SC;
 					font-weight: 400;
 					color: #ffffff;
 					margin-top: 24rpx;
@@ -251,6 +210,7 @@ export default {
 		}
 
 		.footerbtn {
+
 			display: flex;
 			align-items: center;
 			padding: 40rpx;