From e1ed755f972a9b6c1b67004840a2adbac4d2c7a7 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 19 九月 2024 16:12:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
pages/user/supplier-user.vue | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index ab64e5b..f47291c 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -50,20 +50,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 +115,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 +189,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 +245,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 -->
@@ -431,6 +453,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 +478,7 @@
tj: {},
tj_order: {},
cacheUserId: '',
+ signToday: false
// order_pendding_num: 0,
};
@@ -497,6 +534,17 @@
onShow() {
this.cacheUserId = ''
this.getTj()
+ // #ifdef PUB_CUSTOMER
+ let that = this
+ this.$http.request('get', '/api/customer/point/sign/sign/today', {}).then(res => {
+ if (res.data) {
+ that.signToday = true
+ }
+ })
+
+ // #endif
+ //判断有没有签到
+
},
onLoad(options) {
// const url = options.q ? decodeURIComponent(options.q) : '';
@@ -512,6 +560,7 @@
created() {
},
+
async onPullDownRefresh() {
await this.$store.dispatch('getCurrentInfo')
uni.stopPullDownRefresh()
--
Gitblit v1.9.3