From c6f83537de95f3c5e591cd2eff90f1163f38f118 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 01 十一月 2024 10:55:33 +0800
Subject: [PATCH] 1.钱包

---
 pages/user/supplier-user.vue |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index 9f57d57..a49fa3b 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -36,9 +36,25 @@
 
 				<view class="name" v-if="currentInfo.id">
 					<view class="t1">
-						{{
+						<!-- {{
               (!!currentInfo.partnerDTO ? (currentInfo.partnerDTO.name) : "") ||  (!!currentInfo.supplierDTO ? (currentInfo.supplierDTO.name) : "") || (!!currentInfo.customerDTO ? (currentInfo.customerDTO.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'">
@@ -300,13 +316,13 @@
 		</view>
 		<!-- #endif -->
 		<view class="user-utils m-20">
-			<view class="user-util m-t-12 flex" v-if="selftype==='customer'||!selftype"
+			<!-- <view class="user-util m-t-12 flex" v-if="selftype==='customer'||!selftype"
 				@click="goto('/sub_pages/customer/customer-info/customer-info',true)">
 				<view class="title">个人信息</view>
 				<view class="right-icon">
 					<uni-icons type="right"></uni-icons>
 				</view>
-			</view>
+			</view> -->
 			<view class="user-util m-t-12 flex" v-if="selftype==='partner'||!selftype"
 				@click="goto('/sub_pages/partner/partner-info/partner-info-personal',true)">
 				<view class="title">个人资料</view>
@@ -363,8 +379,17 @@
 					<uni-icons type="right"></uni-icons>
 				</view>
 			</view>
+			<!-- <view class="user-util m-t-12 flex" v-if="selftype==='supplier'||selftype==='partner'"
+				@click="goto('/sub_pages/customer/setup/account-self',true)">
+				<view class="title">账户安全</view>
+				<view class="right-icon">
+					<uni-icons type="right"></uni-icons>
+				</view>
+			</view> -->
 
-			<view class="user-util m-t-12 flex" @click="goto('/pages/user/user-pwd/user-pwd',true)">
+			<view class="user-util m-t-12 flex"
+			 v-if="selftype==='supplier'||selftype==='partner'"
+			 @click="goto('/pages/user/user-pwd/user-pwd',true)">
 				<view class="title">修改密码</view>
 				<view class="right-icon">
 					<uni-icons type="right"></uni-icons>
@@ -377,7 +402,7 @@
 					<uni-icons type="right"></uni-icons>
 				</view>
 			</view> -->
-			<view class="user-util m-t-12 flex" v-if="currentInfo&&currentInfo.id"
+			<view class="user-util m-t-12 flex" v-if="currentInfo&&currentInfo.id &&(selftype==='supplier'||selftype==='partner') "
 				@click="goto('/pages/user/user-bind-wx/user-bind-wx',true)">
 				<view class="title">绑定当前微信</view>
 				<view class="right-icon">
@@ -392,7 +417,9 @@
 			</view> -->
 
 			<!-- v-if="selftype==='customer'" -->
-			<view class="user-util m-t-12 flex" @click="clearlogout">
+			<view class="user-util m-t-12 flex"
+			  v-if="selftype==='supplier'||selftype==='partner'"
+			 @click="clearlogout">
 				<view class="title">退出登录</view>
 				<view class="right-icon">
 					<uni-icons type="right"></uni-icons>

--
Gitblit v1.9.3