From e3c0ebbd9f9ee111f29be9f76979edd97f1d6f3a Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 11 九月 2024 10:32:33 +0800
Subject: [PATCH] Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into remote-v2
---
pages/user/supplier-user.vue | 99 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 83 insertions(+), 16 deletions(-)
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index 56b3ddb..8e66cea 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -39,6 +39,40 @@
({{ currentInfo.supplierDTO ? currentInfo.supplierDTO.statusStr : '' }})</span>
<span v-if="currentInfo.partnerDTO&¤tInfo.partnerDTO.status!=='P'">
({{ currentInfo.partnerDTO ? currentInfo.partnerDTO.statusStr : '' }})</span>
+
+ <!-- #ifdef PUB_CUSTOMER_DEV -->
+ <span class="member-level" @click="goto('/sub_pages/customer/self/member-center',true)"
+ v-if="currentInfo&¤tInfo.customerDTO&¤tInfo.customerDTO.userGrowthRecord">
+ <view v-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='普通会员'" class="v1">
+ <image class="member-icon"
+ src="../../static/images/customer/coupon/member/icon-member-1.png"></image>
+ {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
+ <uni-icons color="#7CC662" type="right" size="18"></uni-icons>
+
+ </view>
+ <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">
+ <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">
+ <image class="member-icon v4"
+ src="../../static/images/customer/coupon/member/icon-member-4.png"></image>
+ {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
+ <uni-icons color="#DD834E" type="right" size="18"></uni-icons>
+ </view>
+
+
+ </span>
+ <!-- #endif -->
</view>
<view class="t2">{{ currentInfo.tel || '暂无电话' }}</view>
</view>
@@ -73,7 +107,22 @@
</view>
+
+ <!-- #ifdef PUB_CUSTOMER_DEV -->
+ <view class="m-20 coupon-info-container" @click="goto( `/sub_pages/customer/coupon/good-all`,true)"
+ v-if="selftype==='customer'||!selftype">
+ <view>
+ <view class="title">积分商城</view>
+ <view class="score m-t-8">拥有积分：{{currentInfo.currentPoint || 0}}</view>
+ </view>
+ <view class="button m-l-a m-r-0 m-t-12">
+ 去兑换 <uni-icons color="#ffffff" type="right" size="16"></uni-icons>
+ </view>
+ </view>
+ <!-- #endif -->
<!-- #ifdef PUB_CUSTOMER -->
+
+
<view class="user-utils m-20 user-customer-order-infos" v-if="selftype==='customer'||!selftype">
<view class="user-util m-t-12">
<view class="title flex">
@@ -82,12 +131,6 @@
<uni-icons class="" type="right" size="12"></uni-icons>
</view>
</view>
-
-
-
-
-
-
<view class="flex order-icons-container">
<view class="order-icons" style="position: relative;"
@@ -171,16 +214,33 @@
</image>
<view>新手帮助</view>
</view>
- <!-- <view class="service-icons" @click.stop="$meesage.showToast('敬请期待')">
- <image src="../../static/images/customer/service/service-icon-6.png" class="t2 service-icon ">
+ <view class="service-icons" @click="goto('/sub_pages/customer/self/feedback',true)">
+ <image src="../../static/images/customer/service/service-icon-7.png" class="t2 service-icon ">
</image>
- <view>运费详查</view>
- </view> -->
+ <view>投诉反馈</view>
+ </view>
+ <!-- #ifdef PUB_CUSTOMER_DEV -->
+ <view class="service-icons" @click="goto('/sub_pages/customer/coupon/coupon-self',true)">
+ <image src="../../static/images/customer/service/service-icon-8.png" class="t2 service-icon ">
+ </image>
+ <view>优惠券</view>
+ </view>
- <view class="service-icons"></view>
+ <view class="service-icons" @click="goto('/sub_pages/customer/coupon/good-self',true)">
+ <image src="../../static/images/customer/service/service-icon-9.png" class="t2 service-icon ">
+ </image>
+ <view>兑换券</view>
+ </view>
+ <!-- #endif -->
+ <!-- #ifndef PUB_CUSTOMER_DEV -->
+ <view class="service-icons">
- <view class="service-icons"></view>
- <view class="service-icons"></view>
+ </view>
+
+ <view class="service-icons">
+
+ </view>
+ <!-- #endif -->
</view>
</view>
</view>
@@ -249,6 +309,13 @@
<uni-icons type="right"></uni-icons>
</view>
</view>
+
+ <!-- <view class="user-util m-t-12 flex" @click="goto('/sub_pages/partner/delivery/delivery-detail',true)">
+ <view class="title">debug</view>
+ <view class="right-icon">
+ <uni-icons type="right"></uni-icons>
+ </view>
+ </view> -->
<view class="user-util m-t-12 flex" v-if="currentInfo&¤tInfo.id"
@click="goto('/pages/user/user-bind-wx/user-bind-wx',true)">
<view class="title">绑定当前微信</view>
@@ -256,12 +323,12 @@
<uni-icons type="right"></uni-icons>
</view>
</view>
- <view class="user-util m-t-12 flex" @click="goto('/sub_pages/customer/self/feedback',true)">
+ <!-- <view class="user-util m-t-12 flex" @click="goto('/sub_pages/customer/self/feedback',true)">
<view class="title">投诉反馈</view>
<view class="right-icon">
<uni-icons type="right"></uni-icons>
</view>
- </view>
+ </view> -->
<!-- v-if="selftype==='customer'" -->
<view class="user-util m-t-12 flex" @click="clearlogout">
@@ -475,7 +542,7 @@
success: async function(res) {
console.log('条码内容：' + res.result);
if (!res.result) {
- that.$message.showToast('未识别出合伙人信息，如果是微信小程序二维码，请微信扫码打开')
+ that.$message.showToast('未识别出合伙人信息，请用微信扫码打开')
return
}
var dto = undefined
--
Gitblit v1.9.3