From 05bd41aab8c9dba2cf7afcd78493415761f11d9d Mon Sep 17 00:00:00 2001 From: xuxueyang <xuxy@fengyuntec.com> Date: 星期四, 26 九月 2024 08:54:08 +0800 Subject: [PATCH] update 供应商刷新问题 --- pages/user/supplier-user.vue | 86 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 73 insertions(+), 13 deletions(-) diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue index ab64e5b..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&¤tInfo.customerDTO.cover - ||currentInfo.supplierDTO&¤tInfo.supplierDTO.cover + (currentInfo.customerDTO&¤tInfo.customerDTO.cover) + ||(currentInfo.supplierDTO&¤tInfo.supplierDTO.cover) + ||(currentInfo.partnerDTO&¤tInfo.partnerDTO.cover) || currentInfo.picture " :src=" - currentInfo.customerDTO&¤tInfo.customerDTO.cover - ||currentInfo.supplierDTO&¤tInfo.supplierDTO.cover + (currentInfo.customerDTO&¤tInfo.customerDTO.cover) + ||(currentInfo.supplierDTO&¤tInfo.supplierDTO.cover) + ||(currentInfo.partnerDTO&¤tInfo.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> @@ -50,20 +54,22 @@ <uni-icons color="#7CC662" type="right" size="18"></uni-icons> </view> - <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='银卡会员'" class="v2"> + <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='银卡会员'" + class="v2"> <image class="member-icon v2" src="../../static/images/customer/coupon/member/icon-member-2.png"></image> {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}} <uni-icons color="#7498E0" type="right" size="18"></uni-icons> </view> - <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='金卡会员'" class="v3"> + <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='金卡会员'" + class="v3"> <image class="member-icon v3" src="../../static/images/customer/coupon/member/icon-member-3.png"></image> {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}} <uni-icons color="#C47810" type="right" size="18"></uni-icons> </view> - <view v-else class="v4"> + <view v-else class="v4"> <image class="member-icon v4" src="../../static/images/customer/coupon/member/icon-member-4.png"></image> {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}} @@ -113,7 +119,7 @@ v-if="selftype==='customer'||!selftype"> <view> <view class="title">积分商城</view> - <view class="score m-t-8">拥有积分:{{currentInfo.currentPoint || 0}}</view> + <view class="score m-t-8">拥有积分:{{self_point}}</view> </view> <view class="button m-l-a m-r-0 m-t-12"> 去兑换 <uni-icons color="#ffffff" type="right" size="16"></uni-icons> @@ -187,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 "> @@ -242,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 --> @@ -249,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> @@ -431,6 +464,20 @@ <script> export default { + computed: { + + self_point() { + if (this.currentInfo.currentPoint) { + if (this.currentInfo.currentPoint >= 10000) { + return (this.currentInfo.currentPoint / 10000 + '万') + } else { + return this.currentInfo.currentPoint + } + } + + return 0 + } + }, data() { return { CustomBar: uni.getStorageSync('CustomBar'), @@ -442,6 +489,7 @@ tj: {}, tj_order: {}, cacheUserId: '', + signToday: false // order_pendding_num: 0, }; @@ -497,6 +545,8 @@ onShow() { this.cacheUserId = '' this.getTj() + + }, onLoad(options) { // const url = options.q ? decodeURIComponent(options.q) : ''; @@ -512,6 +562,7 @@ created() { }, + async onPullDownRefresh() { await this.$store.dispatch('getCurrentInfo') uni.stopPullDownRefresh() @@ -614,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) { @@ -632,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