From 5525ed0398c496b43a09377d0c59d143e7ff3e98 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 19:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

---
 pages/home/supplier-home.vue |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index 3faafc4..e741eb0 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -7,17 +7,35 @@
 			我的
 		</view> -->
 		<!-- 背景图 -->
+		
 		<view class="top-bg" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
 			<view class="title" style="position: relative;">
 				首页
 
 			</view>
 			<view class="flex user-info" v-if="currentInfo&&(currentInfo.id)">
+				
+				<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="scaleToFill"></image>
+					
+				<image class="user-icon" v-else
+					src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
+					mode="scaleToFill"></image>
+					
 				<!-- 头像 -->
-				<image class="user-icon" v-if="!currentInfo.picture"
+			<!-- 	<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>
+				<image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image> -->
 
 				<view class="name">
 					<view class="t1">
@@ -29,6 +47,10 @@
 						<span v-if="!currentInfo.partnerDTO&&currentInfo.type==='partner'">(信息待完善)</span>
 					</view>
 					<view class="t2">{{currentInfo.tel || '暂无电话'}}</view>
+					<view class="t2" v-if="currentInfo.partnerDTO && currentInfo.partnerDTO.id">
+					  ID: {{ currentInfo.partnerDTO.id }}
+					</view>
+
 				</view>
 			</view>
 
@@ -53,7 +75,7 @@
 			<view class="flex tj-container" v-if="selftype==='supplier'">
 				<view class="tj-each">
 					<view class="num">
-						{{tj.dealCountLastMonth||0}}单
+						{{tj.dealCountLastMonth||0}}扎
 					</view>
 					<view class="name">
 						上月成交
@@ -61,7 +83,7 @@
 				</view>
 				<view class="tj-each">
 					<view class="num">
-						{{tj.dealCountToday||0}}单
+						{{tj.dealCountToday||0}}扎
 					</view>
 					<view class="name">
 						今日成交
@@ -69,7 +91,7 @@
 				</view>
 				<view class="tj-each">
 					<view class="num">
-						{{tj.dealCountDay30||0}}单
+						{{tj.dealCountDay30||0}}扎
 					</view>
 					<view class="name">
 						近30天成交
@@ -111,12 +133,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">
@@ -135,14 +157,14 @@
 					</view>
 					<view class="order-desc tg">订单管理</view>
 				</view>
-			<!-- 	<view class="nav row margin-tb" v-if="selftype==='supplier'"
+				<view class="nav row margin-tb" v-if="selftype==='supplier'"
 					@click="goto('/sub_pages/supplier/order-manage/order-manage',true)">
 					<view class="img-c">
 						<image class="icon margin-bottom order-icon ddgl"
 							src="/static/images/partner/user/user-icon-ddgl.png" mode="scaleToFill" />
 					</view>
 					<view class="order-desc tg">订单统计</view>
-				</view> -->
+				</view>
 
 				<view class="nav row margin-tb"
 					@click="goto('/sub_pages/supplier/order-settlement/order-settlement',true)">
@@ -167,7 +189,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 +260,7 @@
 		},
 		async onPullDownRefresh() {
 			await this.$store.dispatch('getCurrentInfo')
+			await getTj(true)
 			uni.stopPullDownRefresh()
 		},
 		onLoad(options) {
@@ -245,7 +268,7 @@
 			const urlcode = options.url && decodeURIComponent(options.url) || ''
 		},
 		onShow() {
-			this.getTj()
+			this.getTj(true)
 		},
 		created() {
 			//公告
@@ -267,7 +290,7 @@
 				}
 			}).then(res => {
 				if (res.code == 0) {
-					this.noticeList = (res.data && res.data.records || [])
+					this.noticeList = (res.data && res.data || [])
 					console.log('this.noticeList', this.noticeList)
 					if (this.noticeList.length > 0) {
 						this.currentNotice = this.noticeList[0]
@@ -430,10 +453,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