From c8ac47d631190d29485ee33649bab0e5a87e859b Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Fri, 21 Jul 2023 09:13:08 +0800
Subject: [PATCH] 成长值转综合得分

---
 pages/user/index/index.js     | 39 +++++++++++++++++++++++++++++++++++----
 pages/user/index/index.wxml   |  6 +++---
 pages/user/userqy/userqy.js   | 15 +++++++++++++--
 pages/user/userqy/userqy.wxml | 12 ++++++------
 4 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 3e3573c..55db149 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -50,7 +50,8 @@ Page({
 
 		is_show_recommend:false,
 
-		has_rj:0
+    has_rj:0,
+    rfmName:'成长值'
 
 	},
 	goto_nav: function (e) {
@@ -234,7 +235,10 @@ Page({
 
 			s.setData({
 				userInfo: e
-			});
+      });
+      
+      //--查询会员权益是否成绩
+      s.getVison()
 
 			//-- 要调用接口，获取卡的钱 --
 			var url = "/api/weshop/wxuser/getWxCardInfo?storeId=" + os.stoid + "&userId=" + e.user_id;
@@ -510,7 +514,29 @@ Page({
 
 
 
-	},
+  },
+  //获取会员权益等级是否升级
+  getVison(){
+    let isRfm = wx.getStorageSync('isRfm')
+    if (isRfm) {
+      this.setData({
+        rfmName:'综合分'
+      })
+    }else{
+      rq.get(`/api/weshop/users/grade/vip/getSysPara?storeId=${os.stoid}&classInfo=IsUpRMF`, {    
+        success:  (res)=>{
+          console.log('会员权益等级升级查询-------');
+          console.log(res);
+          if (res.data.code == 0 && res.data.data && res.data.data.IsBool){
+            this.setData({
+              rfmName:'综合分'
+            })
+            wx.setStorageSync('isRfm', true)
+          }
+        }
+      })
+    }
+  },
 
 	//判断会员是后有改服务项目
 	check_is_has_qy: function (item, g_qy_list) {
@@ -865,7 +891,12 @@ Page({
 	},
 
 	jump: function () {
-		getApp().goto("/packageE/pages/user/grow_value/grow_value")
+    let isRfm = wx.getStorageSync('isRfm')
+    //升级为RFM就不跳转成长值详情
+    if (!isRfm) {
+      getApp().goto("/packageE/pages/user/grow_value/grow_value")
+    }
+
 	},
 	// 判断生日营销的页面是不是存在
 	birthday: function () {
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index e3bb265..6c47c9b 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -19,12 +19,12 @@
               <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
                 <block wx:if="{{cz_val<full_cz_val}}">
                   {{" "}}
-                  <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">成长值</text>
+                  <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text>
                   <view style='margin-left:5rpx; '>{{cz_val}} / {{need_money}}</view>
                 </block>
                 <block wx:else>
                   {{" "}}
-                  <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">成长值</text> {{cz_val}}
+                  <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text> {{cz_val}}
                 </block>
               </view>
             </view>
@@ -44,7 +44,7 @@
           <view style="font-size:12px;color: #fff;">会员卡</view>
         </view>
         <view class="flex-vertical abs xc-grow-frame rel" style="display: none">
-          <view class="xc-grow-up">成长值</view>
+          <view class="xc-grow-up">{{rfmName}}</view>
 
           <view class="xc-line-not rel">
             <image class="xc-bj-img abs" src="{{iurl}}/miniapp/images/baijing.png"></image>
diff --git a/pages/user/userqy/userqy.js b/pages/user/userqy/userqy.js
index 3317023..84d71dd 100644
--- a/pages/user/userqy/userqy.js
+++ b/pages/user/userqy/userqy.js
@@ -26,7 +26,7 @@ Page({
     this_curr_id:0,
     GradeName:'',
     is_full:0,  //是否满级
-
+    rfmName:'成长值',
     cur_g_num:0,//当前级需要多少钱
     userqy_color:null,//颜色值 
   },
@@ -79,6 +79,13 @@ Page({
              GradeName=data.GradeName;
          })
 
+         let isRfm = wx.getStorageSync('isRfm')
+         if (isRfm) {
+           this.setData({
+             rfmName:'综合分'
+           })
+         }
+
         //获取卡类列表
         await  getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page",{
             data:{ storeId:os.stoid}
@@ -219,7 +226,11 @@ Page({
   },
 
   go_cz:function(){
-    getApp().goto("/packageE/pages/user/grow_value/grow_value")
+    let isRfm = wx.getStorageSync('isRfm')
+    //升级为RFM就不跳转成长值详情
+    if (!isRfm) {
+      getApp().goto("/packageE/pages/user/grow_value/grow_value")
+    }
   },
 
   //获取卡类的gr_id
diff --git a/pages/user/userqy/userqy.wxml b/pages/user/userqy/userqy.wxml
index 2de3fee..6f582ea 100644
--- a/pages/user/userqy/userqy.wxml
+++ b/pages/user/userqy/userqy.wxml
@@ -10,7 +10,7 @@
     <!-- 当前是什么等级卡 -->
     
     <view class='flex abs xc-grow-frame' bindtap='go_cz'>
-      <view class="four-level-word new xc-grow-val" style="color:{{userqy_color.font_color}}; background:{{userqy_color.secord_bgcolor}}">成长值</view>
+      <view class="four-level-word new xc-grow-val" style="color:{{userqy_color.font_color}}; background:{{userqy_color.secord_bgcolor}}">{{rfmName}}</view>
       <view class="progress-bar-not">
           <view class="progress-bar-yes"  wx:if="{{cz_val>full_cz_val}}" style='width:100%;background:{{userqy_color.secord_bgcolor}}'></view>
           <view class="progress-bar-yes"  wx:else  style='width:{{cz_val/need_money*100}}%;background:{{userqy_color.secord_bgcolor}}'></view>
@@ -34,16 +34,16 @@
                 <!--  上部分的文字判断 -->
                 <view class=" abs white discounts four-level-word" wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id}}"  style="color:#{{item.FontColor}};">
                     <block wx:if="{{index!=backClass.length-1}}">
-                        [{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}]
+                        [{{item.GradeName}}]365天累计{{rfmName}}≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}]
                     </block>
                     <block wx:else>
-                        [{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum }}可保级
+                        [{{item.GradeName}}]365天累计{{rfmName}}≥{{item.BuyGradeSum }}可保级
                     </block>
                 </view>
-                <view class=" abs white discounts four-level-word" wx:if="{{gradeId==item.Id}}"  style="color:#{{item.FontColor}};">会员将在{{filter.replace_time2(gradeEndDate)}}到期，<text wx:if="{{need_money>0}}">365天累计成长值≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}]</text><text wx:else >[{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum}}可保级</text>
+                <view class=" abs white discounts four-level-word" wx:if="{{gradeId==item.Id}}"  style="color:#{{item.FontColor}};">会员将在{{filter.replace_time2(gradeEndDate)}}到期，<text wx:if="{{need_money>0}}">365天累计{{rfmName}}≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}]</text><text wx:else >[{{item.GradeName}}]365天累计{{rfmName}}≥{{item.BuyGradeSum}}可保级</text>
                 </view>
                 <view class=" abs white discounts four-level-word" wx:if="{{gradeId!=item.Id && cz_val>item.BuyGradeSum }}"  style="color:#{{item.FontColor}};">
-                    [{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}]
+                    [{{item.GradeName}}]365天累计{{rfmName}}≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}]
                 </view>
 
                 <!--  下部分的文字判断 -->
@@ -52,7 +52,7 @@
                   </view>
 
                 <view wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id }}" class=" abs white money four-level-word"  style="color:#{{item.FontColor}};">
-                     距离{{item.GradeName}}还需{{ filter.pInt(item.BuyGradeSum-cz_val)}}成长值
+                     距离{{item.GradeName}}还需{{ filter.pInt(item.BuyGradeSum-cz_val)}}{{rfmName}}
                 </view>
                 <view wx:if="{{gradeId==item.Id}}" class=" abs white money four-level-word new curword"  style="color:#{{item.FontColor}};">
                     <view class="rel">
--
libgit2 0.21.4