From 767ca1416d96ff1d2f8d346c0a1bdd36bc6557f5 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 12 十一月 2024 13:18:32 +0800
Subject: [PATCH] 1.增加类别和花名搜索

---
 pages/home/supplier-home.vue |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index 0b3a9e3..6204421 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -39,8 +39,25 @@
 
 				<view class="name">
 					<view class="t1">
-						{{ (!!currentInfo.supplierDTO?(currentInfo.supplierDTO.name):"") || currentInfo.nickName || currentInfo.loginName || '-'}}<span
-							v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
+						<!-- {{ (!!currentInfo.supplierDTO?(currentInfo.supplierDTO.name):"") || currentInfo.nickName || currentInfo.loginName || '-'}} -->
+						<span v-if="currentInfo.partnerDTO && currentInfo.partnerDTO.name">
+							{{ currentInfo.partnerDTO.name }}
+						</span>
+						<span v-else-if="currentInfo.supplierDTO && currentInfo.supplierDTO.name">
+							{{ currentInfo.supplierDTO.name }}
+						</span>
+						<span v-else-if="currentInfo.customerDTO && currentInfo.customerDTO.name">
+							{{ currentInfo.customerDTO.name }}
+						</span>
+						<span v-else-if="currentInfo.nickName">
+							{{ currentInfo.nickName }}
+						</span>
+						<span v-else-if="currentInfo.loginName">
+							{{ currentInfo.loginName }}
+						</span>
+						<span v-else>-</span>
+
+						<span v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
 							({{currentInfo.supplierDTO?currentInfo.supplierDTO.statusStr:''}})</span>
 						<span v-if="currentInfo.partnerDTO&&currentInfo.partnerDTO.status!=='P'">
 							({{currentInfo.partnerDTO?currentInfo.partnerDTO.statusStr:''}})</span>
@@ -196,6 +213,7 @@
 					</view>
 					<view class="order-desc syst">售后理赔</view>
 				</view>
+	
 				<!-- <view class="nav row margin-tb" @click="printDeliveryOrder">
 					<view class="img-c">
 						<image class="icon margin-bottom order-icon kkjl"
@@ -203,6 +221,24 @@
 					</view>
 					<view class="order-desc wbsp">测试蓝牙</view>
 				</view> -->
+			</view>
+			<view class="flex order-icons m-t-12">
+				<view class="nav row margin-tb" v-if="selftype==='supplier'" @click="goto('/sub_pages/supplier/wallet/my-wallet',true)">
+					<view class="img-c">
+						<image class="icon margin-bottom order-icon shlp"
+							src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/8d/8d72f2df8a4348ac90bfbfb553a9cc71qianbao.png" mode="scaleToFill" />
+					</view>
+					<view class="order-desc syst">我的钱包</view>
+				</view>
+				<view class="nav row margin-tb">
+					
+				</view>
+				<view class="nav row margin-tb">
+					
+				</view>
+				<view class="nav row margin-tb">
+					
+				</view>
 			</view>
 		</view>
 
@@ -260,7 +296,7 @@
 		},
 		async onPullDownRefresh() {
 			await this.$store.dispatch('getCurrentInfo')
-			await getTj(true)
+			await this.getTj(true)
 			uni.stopPullDownRefresh()
 		},
 		onLoad(options) {

--
Gitblit v1.9.3