From 44dbae4a6ffb73478cd7980f37f1760e9a070c07 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期日, 28 七月 2024 23:55:21 +0800
Subject: [PATCH] add 帮助富文本等页面

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

diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index cf0ae89..4393190 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -14,14 +14,18 @@
 			</view>
 			<view class="flex user-info" v-if="currentInfo&&(currentInfo.id)">
 				<!-- 头像 -->
-				<image class="user-icon" v-if="!currentInfo.picture" src="../../static/imgs/home/home-shop-top-icon.png"
+				<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">{{currentInfo.nickName || currentInfo.loginName || '-'}}<span
+					<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.statusStr:''}})</span>
+						<span v-if="currentInfo.partnerDTO&&currentInfo.partnerDTO.status!=='P'">
+							({{currentInfo.partnerDTO?currentInfo.partnerDTO.statusStr:''}})</span>
+						<span v-if="!currentInfo.partnerDTO&&currentInfo.type==='partner'">(信息待完善)</span>
 					</view>
 					<view class="t2">{{currentInfo.tel || '暂无电话'}}</view>
 				</view>
@@ -34,7 +38,7 @@
 			<view class="flex tj-container" v-if="selftype==='partner'">.
 				<view class="tj-each">
 					<view class="num total">
-						￥999.80
+						￥0.00
 					</view>
 				</view>
 				<view class="tj-each" style="flex: 1;">
@@ -44,7 +48,7 @@
 				</view>
 			</view>
 			<view class="line"></view>
-			
+
 			<view class="flex tj-container" v-if="selftype==='supplier'">
 				<view class="tj-each">
 					<view class="num">
@@ -101,20 +105,20 @@
 		<view class="item-container flex m-t-12" style="padding: 34rpx 44rpx;">
 			<view class="rate-view flex1" style="max-width: 140rpx;">
 				<view class="title">售后率</view>
-				<view class="title" style="color: red;">0.02%</view>
+				<view class="title" style="color: red;">0.00%</view>
 			</view>
 			<view class="tj-panel  pink flex1">
 				<view class="name">今日待配送</view>
-				<view class="title">12扎</view>
+				<view class="title">0扎</view>
 			</view>
 			<view class="tj-panel green flex1">
 				<view class="name green">今日配送汇总</view>
-				<view class="title">12扎</view>
+				<view class="title">0扎</view>
 			</view>
 		</view>
 		<view class="m-t-12" @click="getNoticeMore">
 			<uni-notice-bar class="notice-bar" color="#333" background-color="#fff" show-get-more show-icon
-				:scrollable="scrollable" :text="currentNotice.title" :key="currentNotice.id" />
+				:scrollable="scrollable" :text="currentNotice.title||'暂无公告'" :key="currentNotice.id" />
 			<span v-if="!currentNotice||!currentNotice.id">&nbsp;</span>
 		</view>
 		<view class="item-container">
@@ -171,7 +175,7 @@
 
 		<view style="padding-bottom:200rpx">
 		</view>
-		<supplier-footer flg="0"></supplier-footer>
+		<common-footer flg="0"></common-footer>
 
 
 	</view>
@@ -224,24 +228,24 @@
 							this.scrollable = false
 						}
 						let that = this
-						if (this.noticeList.length >= 1) {
-							setInterval(() => {
-								console.log('interval,1')
-								that.currentNoticeIndex += 1
-								that.currentNoticeIndex %= that.noticeList.length
-								that.currentNotice = that.noticeList[that.currentNoticeIndex]
-								that.scrollable = false
-								that.$nextTick(() => {
-									if (that.currentNotice.title && that.currentNotice.title
-										.length >= 30) {
-										that.scrollable = true
-									} else {
-										that.scrollable = false
-									}
-								})
+						// if (this.noticeList.length >= 1) {
+						// 	setInterval(() => {
+						// 		console.log('interval,1')
+						// 		that.currentNoticeIndex += 1
+						// 		that.currentNoticeIndex %= that.noticeList.length
+						// 		that.currentNotice = that.noticeList[that.currentNoticeIndex]
+						// 		that.scrollable = false
+						// 		that.$nextTick(() => {
+						// 			if (that.currentNotice.title && that.currentNotice.title
+						// 				.length >= 30) {
+						// 				that.scrollable = true
+						// 			} else {
+						// 				that.scrollable = false
+						// 			}
+						// 		})
 
-							}, 8000)
-						}
+						// 	}, 8000)
+						// }
 
 					}
 				}
@@ -250,12 +254,19 @@
 		},
 		methods: {
 			async toFlowManage() {
+
+
 				if (!this.currentInfo.supplierDTO) {
-					await this.$message.confirm('尚未入住店铺信息，是否前往入住？')
+					await this.$message.confirm('尚未入驻店铺信息，是否前往入驻？')
 					this.goto('/sub_pages/supplier/supplier-info/supplier-info', true)
 					return
 				}
 				if (this.currentInfo.supplierDTO) {
+					//需要刷新一下当前用户信息
+					this.$message.showLoading()
+					await this.$store.dispatch('getCurrentInfo')
+					this.$message.hideLoading()
+
 					if (this.currentInfo.supplierDTO.status == 'P') {
 
 					} else {
@@ -270,6 +281,7 @@
 
 					}
 				}
+				console.log('goto')
 				this.goto('/sub_pages/supplier/flower-manage/flower-manage', true)
 			},
 			getNoticeMore() {

--
Gitblit v1.9.3