From 0509850596b9d275bc49211af4c39b37d2983c7c Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 23 九月 2024 17:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

---
 pages/home/supplier-home.vue |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index 60b4b2b..e3383f1 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -13,11 +13,28 @@
 
 			</view>
 			<view class="flex user-info" v-if="currentInfo&&(currentInfo.id)">
-				<!-- 头像 -->
-				<image class="user-icon" v-if="!currentInfo.picture"
+				
+				<image class="user-icon" v-if="
+					(currentInfo.customerDTO&&currentInfo.customerDTO.cover)
+					||(currentInfo.supplierDTO&&currentInfo.supplierDTO.cover)
+					||(currentInfo.partnerDTO&&currentInfo.partnerDTO.cover)
+					|| currentInfo.picture
+					" :src="
+					(currentInfo.customerDTO&&currentInfo.customerDTO.cover)
+					||(currentInfo.supplierDTO&&currentInfo.supplierDTO.cover)
+					||(currentInfo.partnerDTO&&currentInfo.partnerDTO.cover)
+					|| currentInfo.picture
+					" mode="aspectFit"></image>
+					
+				<image class="user-icon" v-else
 					src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
 					mode="aspectFit"></image>
-				<image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image>
+					
+				<!-- 头像 -->
+			<!-- 	<image class="user-icon" v-if="!currentInfo.picture"
+					src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
+					mode="aspectFit"></image>
+				<image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image> -->
 
 				<view class="name">
 					<view class="t1">
@@ -111,12 +128,12 @@
 			<view class="tj-panel  pink flex1"
 				@click="goto('/pages/order/order-delivery?status=PENDING&range=today',true)">
 				<view class="name">今日待配送</view>
-				<view class="title">{{tj.deliverCount||0}}单</view>
+				<view class="title">{{tj.deliverCount||0}}扎</view>
 			</view>
 			<view class="tj-panel green flex1"
 				@click="goto('/pages/order/order-delivery?range=today',true)">
 				<view class="name green">今日配送汇总</view>
-				<view class="title">{{tj.deliverTotal||0}}单</view>
+				<view class="title">{{tj.deliverTotal||0}}扎</view>
 			</view>
 		</view>
 		<view class="m-t-12" @click="getNoticeMore">
@@ -167,7 +184,7 @@
 					</view>
 					<view class="order-desc tg">加价配置</view>
 				</view>
-				<view class="nav row margin-tb" @click="goto('/sub_pages/supplier/order-sale/order-sale',true)">
+				<view class="nav row margin-tb" @click="goto('/pages/order/order-sale/order-sale',true)">
 					<view class="img-c">
 						<image class="icon margin-bottom order-icon shlp"
 							src="/static/images/supplier/user/user-icon-shlp.png" mode="scaleToFill" />
@@ -238,6 +255,7 @@
 		},
 		async onPullDownRefresh() {
 			await this.$store.dispatch('getCurrentInfo')
+			await getTj(true)
 			uni.stopPullDownRefresh()
 		},
 		onLoad(options) {
@@ -245,7 +263,7 @@
 			const urlcode = options.url && decodeURIComponent(options.url) || ''
 		},
 		onShow() {
-			this.getTj()
+			this.getTj(true)
 		},
 		created() {
 			//公告
@@ -430,10 +448,10 @@
 					},
 				})
 			},
-			getTj() {
+			getTj(refresh=false) {
 				// /api/supplier/delivery	
 
-				if (this.currentInfo.id && this.currentInfo.id !== this.cacheUserId) {
+				if (this.currentInfo.id && (this.currentInfo.id !== this.cacheUserId || refresh)) {
 					this.cacheUserId = this.currentInfo.id
 					let that = this
 					setTimeout(() => {

--
Gitblit v1.9.3