From 9d319e4ef396628848ecc7c3471e00e700c0e48d Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 6 Jun 2022 22:10:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js        |  4 ++--
 pages/index/index-home.vue  | 17 +++++++++++------
 pages/my/my-money-bag.vue   | 12 ++++++------
 pages/my/statement-desc.vue | 34 ++++++++++++++++++++--------------
 4 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index 6cc5201..ebad12a 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -9,8 +9,8 @@ export default {
 			invoke(args) {
 				let userInfo = _this.getCurUserInfo();
 				// request 触发前拼接 url 
-				args.url = 'https://www.opsoul.com' + args.url;
-				// args.url = 'http://127.0.0.1:80' + args.url;
+				// args.url = 'https://www.opsoul.com' + args.url;
+				args.url = 'http://127.0.0.1:80' + args.url;
 				// args.url = 'http://10.45.110.174:80' + args.url;
 				if (!args.data) {
 					args.data = {}
diff --git a/pages/index/index-home.vue b/pages/index/index-home.vue
index b7ee850..b601392 100644
--- a/pages/index/index-home.vue
+++ b/pages/index/index-home.vue
@@ -96,9 +96,9 @@
 				</view>
 				<view class="cu-bar bg-white">
 					<view class="action margin-0 flex-sub text-black" @tap="hideModal"
-						@click="chooseEntryType('goods')">配件商</view>
+						@click="chooseEntryType(1)">配件商</view>
 					<view class="action margin-0 flex-sub text-main-color solid-left" @tap="hideModal"
-						@click="chooseEntryType('serv')">服务商</view>
+						@click="chooseEntryType(0)">服务商</view>
 				</view>
 			</view>
 		</view>
@@ -196,10 +196,13 @@
 				if (this.isAuthWxPhoneModal) {
 					return;
 				}
-				this.curUserInfo = curUserInfo;
+				this.curUserInfo = curUserInfo;
+				
+				// 是否展示选择入驻类型的模态框
+				this.isShowSteer = this.curUserInfo.type != null &&  this.curUserInfo.type != undefined ? false : true;
 
 				this.myInfo = await this.$api.data('myInfo');
-				this.isShowSteer = !this.myInfo.entryType;
+				// this.isShowSteer = !this.myInfo.entryType;
 				let newServModules = this.servModules.concat();
 				if (this.myInfo.hasCheckedRule) {
 					newServModules[0].pageUrl = '/pages/demand-center/accept-demand-center';
@@ -213,8 +216,10 @@
 				}
 				this.servModules = newServModules;
 			},
-			chooseEntryType(typeCode) {
-
+			async chooseEntryType(typeCode) {
+				await this.$request.updateWorker({
+					type: typeCode
+				});
 			},
 			hideModal(e) {
 				this.isShowSteer = false
diff --git a/pages/my/my-money-bag.vue b/pages/my/my-money-bag.vue
index c316ac5..ba194c3 100644
--- a/pages/my/my-money-bag.vue
+++ b/pages/my/my-money-bag.vue
@@ -38,7 +38,7 @@
 				</template>
 				<view>
 					<view v-for="(item, index1) in billItem.statement"
-						class="bg-white padding flex justify-between align-center" @click="showDetail">
+						class="bg-white padding flex justify-between align-center" @click="showDetail(bill[index].statement[index1])">
 						<view>
 							<view class="margin-bottom-xs" v-if="item.financialDetailType == 1">师傅转派</view>
 							<view class="margin-bottom-xs" v-else-if="item.financialDetailType == 2">多级分销</view>
@@ -110,12 +110,12 @@
 					})
 					// #endif
 				}
+			},
+			showDetail(item) {
+				uni.navigateTo({
+					url: '/pages/my/statement-desc?statementDesc=' + encodeURIComponent(JSON.stringify(item))
+				})
 			},
-			showDetail() {
-				uni.navigateTo({
-					url: '/pages/my/statement-desc'
-				})
-			}
 		},
 	}
 </script>
diff --git a/pages/my/statement-desc.vue b/pages/my/statement-desc.vue
index 2880978..68aac6b 100644
--- a/pages/my/statement-desc.vue
+++ b/pages/my/statement-desc.vue
@@ -7,37 +7,42 @@
 		</cu-custom>
 		<view class="padding margin-top-sm bg-white">
 			<view class="padding-tb-lg text-center solid-bottom">
-				<view class="text-black text-sl">{{statementDesc.inOutMoney}}</view>
-				<view class="text-gray">{{statementDesc.name}}</view>
+				<view class="text-black text-sl">{{statementDesc.payMoney}}</view>
+				<view class="text-gray" v-if="statementDesc.remark">{{statementDesc.remark}}</view>
 			</view>
 			<view class="padding-tb-lg">
 				<view class="margin-bottom-sm">
 					<text class="text-gray">当前状态：</text>
-					<text>{{statementDesc.status === '0' ? '交易成功' : '交易失败'}}</text>
+					<text>{{statementDesc.payStatus == 0 ? '未付款' : '已付款'}}</text>
 				</view>
 				<view class="margin-bottom-sm">
 					<text class="text-gray">详情说明：</text>
-					<text>{{statementDesc.desc}}</text>
+					<text v-if="statementDesc.remark">{{statementDesc.remark}}</text>
 				</view>
 				<view class="margin-bottom-sm">
 					<text class="text-gray">到帐备注：</text>
-					<text>{{statementDesc.payRemark}}</text>
+					<text v-if="statementDesc.payType != null && statementDesc.payType != undefined">
+						<text v-if="statementDesc.payType == 0">微信</text>
+						<text v-else-if="statementDesc.payType == 1">支付宝</text>
+						<text v-else-if="statementDesc.payType == 2">线下</text>
+						<text>支付到帐</text>
+					</text>
 				</view>
 				<view class="margin-bottom-sm">
 					<text class="text-gray">提现单号：</text>
-					<text>{{statementDesc.extractCode}}</text>
+					<text v-if="statementDesc.extractCode">{{statementDesc.extractCode}}</text>
 				</view>
 				<view class="margin-bottom-sm">
 					<text class="text-gray">发起时间：</text>
-					<text>{{statementDesc.createTime}}</text>
+					<text v-if="statementDesc.payTime">{{statementDesc.payTime}}</text>
 				</view>
 				<view class="margin-bottom-sm">
 					<text class="text-gray">订单编号：</text>
-					<text>{{statementDesc.orderCode}}</text>
+					<text v-if="statementDesc.orderDetailCode">{{statementDesc.orderDetailCode}}</text>
 				</view>
 				<view class="margin-bottom-sm">
 					<text class="text-gray">订单时间：</text>
-					<text>{{statementDesc.orderCreateTime}}</text>
+					<text v-if="statementDesc.orderCreateTime">{{statementDesc.orderCreateTime}}</text>
 				</view>
 			</view>
 		</view>
@@ -51,13 +56,14 @@
 				statementDesc: {}
 			}
 		},
-		onLoad() {
-			this.loadData();
+		onLoad(options) {
+			this.statementDesc = JSON.parse(decodeURIComponent(options.statementDesc));
+			// this.loadData();
 		},
 		methods: {
-			async loadData() {
-				this.statementDesc = await this.$api.data('statementDesc');
-			}
+			// async loadData() {
+			// 	this.statementDesc = await this.$api.data('statementDesc');
+			// }
 		},
 	}
 </script>