From 955b50fa31c745ee15d2cad1be5ba9974c7713db Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 23 Apr 2023 22:39:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9B?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E5=8A=A8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js        | 18 +++++++++--------
 pages/my/b-account-bind.vue | 39 ++++++++++++++++++++++++++++++-------
 pages/my/my-money-bag.vue   |  2 +-
 pages/my/serv-detail.vue    |  4 ++--
 pages/my/withdraw.vue       |  2 +-
 5 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index 963a43e..f77f557 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -26,17 +26,19 @@ export default {
 				// return false;
 			},
 			success(res) {
-				if (res.data.code !== 0) {
-					uni.showToast({
-						title: '系统开小差啦T_T，请稍后重试',
-						icon: 'error'
-					})
+				uni.hideLoading();
+				if (!res || !res.data || res.data.code !== 0) {
+					uni.showToast({
+						title: '系统错误',
+						icon: 'error'
+					})
 				}
 			},
 			fail(err) {
-				uni.showToast({
-					title: '系统开小差啦T_T，请稍后重试',
-					icon: 'error'
+				uni.hideLoading();
+				uni.showToast({
+					title: '请求失败',
+					icon: 'error'
 				})
 			},
 			complete(res) {
diff --git a/pages/my/b-account-bind.vue b/pages/my/b-account-bind.vue
index 47ef42c..4b4d6b8 100644
--- a/pages/my/b-account-bind.vue
+++ b/pages/my/b-account-bind.vue
@@ -24,20 +24,20 @@
 			<!-- 银行卡 -->
 			<view v-if="curAccountType === '1'" class="bg-white padding text-lg">
 				<view>
-					<view class="margin-bottom-sm">开户人姓名</view>
+					<view class="margin-bottom-sm">开户人姓名<text class="margin-left-xs text-red">*</text></view>
 					<input type="text" placeholder="请输入开户人姓名" placeholder-style="color:#989898" v-model="formData.name">
 				</view>
 				<view class="margin-top">
-					<view class="margin-bottom-sm">身份证号</view>
+					<view class="margin-bottom-sm">身份证号<text class="margin-left-xs text-red">*</text></view>
 					<input type="idcard" placeholder="请输入身份证号" placeholder-style="color:#989898" v-model="formData.certId">
 				</view>
 				<view class="margin-top">
-					<view class="margin-bottom-sm">手机号</view>
-					<input type="text" placeholder="请输入开卡时所绑定的手机号码" placeholder-style="color:#989898" v-model="formData.phone">
+					<view class="margin-bottom-sm">手机号<text class="margin-left-xs text-red">*</text></view>
+					<input type="number" placeholder="请输入开卡时所绑定的手机号码" placeholder-style="color:#989898" v-model="formData.phone">
 				</view>
 				<view class="margin-top">
-					<view class="margin-bottom-sm">银行卡号</view>
-					<input type="text" placeholder="请输入银行卡号" placeholder-style="color:#989898" v-model="formData.bankNum">
+					<view class="margin-bottom-sm">银行卡号<text class="margin-left-xs text-red">*</text></view>
+					<input type="number" placeholder="请输入银行卡号" placeholder-style="color:#989898" v-model="formData.bankNum">
 				</view>
 				<!-- <view class="margin-top">
 					<view class="margin-bottom-sm">银行卡号开户城市</view>
@@ -96,17 +96,42 @@
 			changAccountType(e) {
 				this.curAccountType = e.currentTarget.dataset.type;
 			},
+			validData() {
+				if (!this.formData.name || !this.formData.certId || !this.formData.phone || !this.formData.bankNum) {
+					return false;
+				}
+				return true;
+			},
 			async submit() {
 				if (this.curAccountType === '1') {
+					if (!this.validData()) {
+						uni.showToast({
+							icon: 'none',
+							title: '请完成必填项的填写',
+							duration: 2000
+						})
+						return;
+					}
 					let params = {
 						...this.formData,
 						customerId: this.curUserInfo.customerId
 					}
 					let res = await this.$request.bindBankCard(params);
-					if (res.code === 0) {
+					if (res && res.code === 0) {
 						uni.navigateBack({
 							delta: -1
 						})
+					} else if (res && res.msg) {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg,
+							duration: 4000
+						})
+					} else {
+						uni.showToast({
+							title: '绑定失败',
+							icon: 'error'
+						})
 					}
 				}
 			}
diff --git a/pages/my/my-money-bag.vue b/pages/my/my-money-bag.vue
index d1e391a..e3f0dfc 100644
--- a/pages/my/my-money-bag.vue
+++ b/pages/my/my-money-bag.vue
@@ -3,7 +3,7 @@
 		<!-- 顶部操作条 -->
 		<cu-custom :bgColor="'bg-main-color'" :isBack="true">
 			<block slot="backText">返回</block>
-			<block slot="content">我的钱包</block>
+			<block slot="content">运营账单</block>
 		</cu-custom>
 		<view class="padding-tb bg-white solid-bottom">
 			<view class="flex justify-between align-center margin-top-xs padding-left">
diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index 39b53a0..6905104 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -220,7 +220,7 @@
 								<text>师傅反馈结果：</text>
 								<text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text>
 								<text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text>
-								<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">重新上门</text>
+								<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">上门重做/补做</text>
 							</view>
 							<view v-if="afterServiceRecord.workerFeedbackResult === 1">
 								<text>同意退款金额：</text>
@@ -247,7 +247,7 @@
 								<text>师傅反馈结果：</text>
 								<text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text>
 								<text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text>
-								<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">重新上门</text>
+								<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">上门重做/补做</text>
 							</view>
 							<view v-if="afterServiceRecord.workerFeedbackResult !== 2">
 								<text>师傅反馈：</text>
diff --git a/pages/my/withdraw.vue b/pages/my/withdraw.vue
index 810256e..9775be6 100644
--- a/pages/my/withdraw.vue
+++ b/pages/my/withdraw.vue
@@ -64,7 +64,7 @@
 		</view>
 		<!-- 操作按钮 -->
 		<view class="margin-lr">
-			<button class="cu-btn lg line-main-color long-btn shadow-blur" @click="showFinanalDetails">分销明细</button>
+			<button class="cu-btn lg line-main-color long-btn shadow-blur" @click="showFinanalDetails">运营账单</button>
 		</view>
 	</view>
 </template>