From a82b34f3dad88a826b459660aecc0af77e353080 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 27 九月 2024 16:48:21 +0800
Subject: [PATCH] update

---
 pages/user/supplier-user.vue |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index 5befef5..889aac1 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -16,16 +16,20 @@
 			<!-- v-if="currentInfo&&(currentInfo.id)" -->
 			<view class="flex user-info">
 				<!-- 头像 -->
-
 				<image class="user-icon" v-if="
-					currentInfo.customerDTO&&currentInfo.customerDTO.cover
-					||currentInfo.supplierDTO&&currentInfo.supplierDTO.cover
+					(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.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>
@@ -189,10 +193,11 @@
 					<view>我的服务</view>
 				</view>
 				<view class="flex service-icons-container">
-					<view class="service-icons" @click="goto('/sub_pages/customer/self/follow',true)">
-						<image src="../../static/images/customer/service/service-icon-1.png" class="service-icon ">
+					<view class="service-icons" @click="goto('/sub_pages/customer/self/sign',true)">
+						<image src="../../static/images/customer/coupon/icon-sign-home.png" class="service-icon ">
 						</image>
-						<view>关注店铺</view>
+						<view>签到</view>
+						<view v-if="!signToday" class="dot"></view>
 					</view>
 					<view class="service-icons" @click="goto('/sub_pages/customer/self/collect',true)">
 						<image src="../../static/images/customer/service/service-icon-2.png" class="service-icon ">
@@ -244,6 +249,25 @@
 					</view>
 					<!-- #endif -->
 				</view>
+
+				<!-- #ifdef PUB_CUSTOMER -->
+				<view class="flex service-icons-container">
+					<view class="service-icons" @click="goto('/sub_pages/customer/self/follow',true)">
+						<image src="../../static/images/customer/service/service-icon-1.png" class="service-icon ">
+						</image>
+						<view>关注店铺</view>
+					</view>
+					<view class="service-icons">
+
+					</view>
+					<view class="service-icons">
+
+					</view>
+					<view class="service-icons">
+
+					</view>
+				</view>
+				<!-- #endif -->
 			</view>
 		</view>
 		<!-- #endif -->
@@ -251,6 +275,13 @@
 			<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 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>
 				<view class="right-icon">
 					<uni-icons type="right"></uni-icons>
 				</view>
@@ -458,6 +489,7 @@
 				tj: {},
 				tj_order: {},
 				cacheUserId: '',
+				signToday: false
 				// order_pendding_num: 0,
 
 			};
@@ -513,6 +545,8 @@
 		onShow() {
 			this.cacheUserId = ''
 			this.getTj()
+
+
 		},
 		onLoad(options) {
 			// const url = options.q ? decodeURIComponent(options.q) : '';
@@ -631,6 +665,9 @@
 					this.cacheUserId = this.currentInfo.id
 					let that = this
 					setTimeout(() => {
+
+
+
 						// #ifdef PUB_CUSTOMER
 						this.$http.request('get', '/api/customer/center/tj', {}).then(res => {
 							if (res.code === 0) {
@@ -649,7 +686,13 @@
 								console.log('tj_order', that.tj_order)
 							}
 						})
-
+						//判断有没有签到
+						let that = this
+						this.$http.request('get', '/api/customer/point/sign/sign/today', {}).then(res => {
+							if (res.data) {
+								that.signToday = true
+							}
+						})
 
 						// #endif
 					}, 200)

--
Gitblit v1.9.3