From 69cfe63975905b8b68ba359e601f5ef9b2168e01 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 19 Dec 2023 16:48:36 +0800
Subject: [PATCH] 自定义的优化

---
 components/diy_user_info/diy_user_info.js           |  5 +++++
 components/diy_user_info/diy_user_info.wxss         |  1 -
 components/diy_user_info/style1.wxml                |  9 ++++++---
 components/diy_user_info/style2.wxml                |  6 +++---
 components/diy_user_info/style3.wxml                |  4 ++--
 components/diy_user_my_rights/diy_user_my_rights.js |  7 +++++++
 pages/user/index/index.js                           |  2 ++
 7 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/components/diy_user_info/diy_user_info.js b/components/diy_user_info/diy_user_info.js
index 0695126..5de9714 100644
--- a/components/diy_user_info/diy_user_info.js
+++ b/components/diy_user_info/diy_user_info.js
@@ -57,6 +57,11 @@ Component({
            if (t_swi) {
                th.setData({sys_switch: t_swi});
            }
+           var getuserqy_color=e.userqy_color;
+           if (getuserqy_color) getuserqy_color = JSON.parse(getuserqy_color)
+           if(getuserqy_color){
+               th.setData({userqy_color:getuserqy_color})
+           }
        })
 
   },
diff --git a/components/diy_user_info/diy_user_info.wxss b/components/diy_user_info/diy_user_info.wxss
index 74d6eb9..376e708 100644
--- a/components/diy_user_info/diy_user_info.wxss
+++ b/components/diy_user_info/diy_user_info.wxss
@@ -228,7 +228,6 @@
 }
 .gr_box_item{
   height: 16rpx;
-  width: 100px;
   background-color: #999;
 }
 
diff --git a/components/diy_user_info/style1.wxml b/components/diy_user_info/style1.wxml
index 1e78e87..935fc43 100644
--- a/components/diy_user_info/style1.wxml
+++ b/components/diy_user_info/style1.wxml
@@ -25,12 +25,15 @@
             <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{qy_data &&  qy_data.is_init && qy_data.gradeId && object.is_cz}}" bindtap='jump'>
                 <block wx:if="{{qy_data.cz_val<qy_data.full_cz_val}}">
                     {{" "}}
-                    <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text>
-                    <view style='margin-left:5rpx; '>{{qy_data.cz_val}} / {{qy_data.need_money}}</view>
+                    <text class="grow-up-val"  style="background:{{userqy_color.secord_bgcolor?userqy_color.secord_bgcolor:'#fe9db5'}};color:{{userqy_color.font_color}}">{{rfmName}}</text>
+                    <view style='margin-left:5rpx; color:{{userqy_color.font_color}} '>{{qy_data.cz_val}} / {{qy_data.need_money}}</view>
                 </block>
                 <block wx:else>
                     {{" "}}
-                    <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text> {{cz_val}}
+                    <text style="color:{{userqy_color.font_color}}">
+                        <text class="grow-up-val"  style="background:{{userqy_color.secord_bgcolor?userqy_color.secord_bgcolor:'#fe9db5'}};">{{rfmName}}</text>{{cz_val}}
+                    </text>
+
                 </block>
             </view>
         </view>
diff --git a/components/diy_user_info/style2.wxml b/components/diy_user_info/style2.wxml
index e46205b..d9ed040 100644
--- a/components/diy_user_info/style2.wxml
+++ b/components/diy_user_info/style2.wxml
@@ -24,12 +24,12 @@
         <view class="flex fs24 xc-grow-ups jc-center" style="margin-left:8rpx;margin-top:4rpx" wx:if="{{qy_data &&  qy_data.is_init && qy_data.gradeId && object.is_cz}}" bindtap='jump'>
             <block wx:if="{{qy_data.cz_val<qy_data.full_cz_val}}">
                 {{" "}}
-                <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text>
-                <view style='margin-left:5rpx; '>{{qy_data.cz_val}} / {{qy_data.need_money}}</view>
+                <text class="grow-up-val"  style="background:{{userqy_color.secord_bgcolor?userqy_color.secord_bgcolor:'#fe9db5'}}; color:{{userqy_color.font_color}}">{{rfmName}}</text>
+                <view style='margin-left:5rpx;  color:{{userqy_color.font_color}}'>{{qy_data.cz_val}} / {{qy_data.need_money}}</view>
             </block>
             <block wx:else>
                 {{" "}}
-                <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text> {{cz_val}}
+                <text class="grow-up-val"  style="background:{{userqy_color.secord_bgcolor?userqy_color.secord_bgcolor:'#fe9db5'}}; color:{{userqy_color.font_color}}">{{rfmName}}</text> {{cz_val}}
             </block>
         </view>
     </view>
diff --git a/components/diy_user_info/style3.wxml b/components/diy_user_info/style3.wxml
index d298595..7707d55 100644
--- a/components/diy_user_info/style3.wxml
+++ b/components/diy_user_info/style3.wxml
@@ -14,9 +14,9 @@
 
         <!-- 显示成长值，综合分 -->
         <block wx:if="{{qy_data &&  qy_data.is_init && qy_data.gradeId && object.is_cz}}">
-            <view class="fs22" style="margin-top:15rpx">距白金卡会员还有111</view>
+            <view class="fs22" style="margin-top:15rpx;color:{{userqy_color.font_color}} ">距{{qy_data.nextGradeName}}还有{{qy_data.need_money-qy_data.cz_val}}</view>
             <view class="gr_box" style="margin-top:10rpx">
-                <view class="gr_box_item"></view>
+                <view class="gr_box_item" style="width:{{(qy_data.cz_val*100)/qy_data.need_money}}%;background:{{userqy_color.secord_bgcolor?userqy_color.secord_bgcolor:'#fe9db5'}}"></view>
             </view>
         </block>
 
diff --git a/components/diy_user_my_rights/diy_user_my_rights.js b/components/diy_user_my_rights/diy_user_my_rights.js
index 50e902d..4867e23 100644
--- a/components/diy_user_my_rights/diy_user_my_rights.js
+++ b/components/diy_user_my_rights/diy_user_my_rights.js
@@ -32,6 +32,13 @@ Component({
               getApp().showWarning("请稍后重试");
           }
       },
+
+      //--跳转到权益页面--
+      go_qy: function () {
+          if (!getApp().globalData.userInfo) return false;
+          var url = "/pages/user/userqy/userqy";
+          getApp().goto(url);
+      },
   },
   observers: {
     // 监听 num1 和 num2 数据的变化
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 74c75a5..b596b68 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -441,6 +441,8 @@ Page({
 									if (cz_vals < im.BuyGradeSum && need_money == 0) {
 										need_money = im.BuyGradeSum;
 										obj.need_money = need_money;
+										obj.nextGradeName=im.GradeName;
+										break;
 									}
 								}
 
--
libgit2 0.21.4