From a4b7fa306f23cc0eeb92f7caaab15281751346f9 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sat, 15 Oct 2022 01:43:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js        |  6 +++---
 pages/my/b-account-bind.vue |  5 +----
 pages/my/my-order.vue       |  5 +++--
 pages/my/serv-detail.vue    | 25 ++++++++++++++-----------
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index 561726c..96ed3f4 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -11,9 +11,9 @@ export default {
 					title: '加载中'
 				})
 				// request 触发前拼接 url 
-				args.url = 'https://www.opsoul.com' + args.url;
-				// args.url = 'http://192.168.2.20:80' + args.url;
-				// args.url = 'http://127.0.0.1:80' + args.url;
+				// args.url = 'https://www.opsoul.com' + args.url;
+				// args.url = 'http://192.168.2.27:80' + args.url;
+				args.url = 'http://127.0.0.1:80' + args.url;
 				if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') {
 					args.data.deptId = globalData.deptId;
 					args.data.from = globalData.from;
diff --git a/pages/my/b-account-bind.vue b/pages/my/b-account-bind.vue
index 01ee4f4..b3ada9a 100644
--- a/pages/my/b-account-bind.vue
+++ b/pages/my/b-account-bind.vue
@@ -33,7 +33,7 @@
 				</view>
 				<view class="margin-top">
 					<view class="margin-bottom-sm">手机号</view>
-					<input type="text" placeholder="请输入手机号" placeholder-style="color:#989898" v-model="formData.phone">
+					<input type="text" placeholder="请输入开卡时所绑定的手机号码" placeholder-style="color:#989898" v-model="formData.phone">
 				</view>
 				<view class="margin-top">
 					<view class="margin-bottom-sm">银行卡号</view>
@@ -55,9 +55,6 @@
 		<view class="margin-lr">
 			<button class="cu-btn lg bg-main-color long-btn shadow-blur" @click="submit">提交</button>
 		</view>
-		<view class="text-red padding">
-			工圈子小程序承诺此账户只用于接收推广收益
-		</view>
 	</view>
 </template>
 
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index 2931470..0c70cb7 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -27,7 +27,8 @@
 							<view class="cuIcon-right"></view>
 						</view>
 					</view>
-					<!-- <view class='cu-tag bg-yellow radius margin-right-sm' v-if="tabCur === 3" @click="showServDetail(shopOrder)">查看订单详情</view> -->
+					<view class='cu-tag line-main-color radius margin-right-sm' v-if="shopOrder.payType == 0">在线支付单</view>
+					<view class='cu-tag line-main-color radius margin-right-sm' v-else-if="shopOrder.payType == 1">上门到付单</view>
 				</view>
 				<view class="padding-lr">
 					<view class="margin-top-sm" @click="showServDetail(shopOrder)">
@@ -45,7 +46,7 @@
 					</view>
 					<view v-if="orderType === 0" class="padding-tb-sm">
 						<view class="flex justify-end">
-							<button v-if="[0,1,2].indexOf(shopOrder.orderStatus) > 0" class="cu-btn bg-gray margin-right-sm shadow-blur" @click="showModalByRef('confirmModal', shopOrder)">取消订单</button>
+							<button v-if="[0,1].indexOf(shopOrder.orderStatus) >= 0" class="cu-btn bg-gray margin-right-sm shadow-blur" @click="showModalByRef('confirmModal', shopOrder)">取消订单</button>
 							<button v-if="shopOrder.payStatus === 0" class="cu-btn bg-main-color shadow-blur margin-right-sm" @click="wxpay(shopOrder)">付款</button>
 							<button class="cu-btn bg-main-color shadow-blur" @click="showServDetail(shopOrder)">查看</button>
 						</view>
diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index ed70457..2d8b384 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -420,26 +420,29 @@
 					id: id,
 					customerFinalCheck: agreeStatus
 				});
-				if (res && res.code === 0) {
+				if (res && res.code === 0) {
 					this.loadData(this.servDetail.orderMasterId);
 					if (agreeStatus == 1) {
 						uni.showToast({
 							icon: 'none',
-							duration: 2500,
+							duration: 3000,
 							title: '涉及退款部分将按付款原路退回，请留意'
 						})
-					} else {
-						uni.showToast({
-							icon: 'success',
-							duration: 1000
-						})
 					}
 					return;
+				}
+				if (res && res.msg){
+					uni.showToast({
+						icon: 'none',
+						duration: 3000,
+						title: res.msg
+					})
+				} else {
+					uni.showToast({
+						icon: 'error',
+						duration: 1000
+					})
 				}
-				uni.showToast({
-					icon: 'error',
-					duration: 1000
-				})
 			},
 			applyAfterService() {
 				this.showModalByRef('applyAfterService', this.servDetail, {