From 899f36a45f5f0b7e6a1676354247a9ec37780341 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 25 Dec 2023 18:14:03 +0800
Subject: [PATCH] bug优化

---
 components/diy_user_info/diy_user_info.js             |  4 ++++
 components/diy_user_info/diy_user_info.wxss           |  3 +++
 components/diy_user_info/style3.wxml                  | 67 +++++++++++++++++++++++++++++++++++++------------------------------
 components/diy_user_my_rights/diy_user_my_rights.wxml |  2 +-
 pages/user/index/index.js                             |  8 +++++---
 5 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/components/diy_user_info/diy_user_info.js b/components/diy_user_info/diy_user_info.js
index 431ea7c..d85bdec 100644
--- a/components/diy_user_info/diy_user_info.js
+++ b/components/diy_user_info/diy_user_info.js
@@ -188,6 +188,10 @@ Component({
 
       },
 
+      go_info:function (){
+          getApp().goto("/packageG/pages/user/userinfo/userinfo");
+      }
+
 
   }
 })
\ No newline at end of file
diff --git a/components/diy_user_info/diy_user_info.wxss b/components/diy_user_info/diy_user_info.wxss
index df7caed..d12f368 100644
--- a/components/diy_user_info/diy_user_info.wxss
+++ b/components/diy_user_info/diy_user_info.wxss
@@ -237,3 +237,6 @@
   justify-content: center;
   /* margin-top: 20rpx; */
 }
+.numfont {
+  font-size: 28rpx;
+}
\ No newline at end of file
diff --git a/components/diy_user_info/style3.wxml b/components/diy_user_info/style3.wxml
index 769e373..6ed3f7b 100644
--- a/components/diy_user_info/style3.wxml
+++ b/components/diy_user_info/style3.wxml
@@ -1,28 +1,46 @@
 <!-- 会员有登陆登陆的情况 -->
-<view class="xc-user-frame abs" wx:if="{{userInfo}}" style="width:700rpx;left:25rpx;top:32rpx">
-    <view class="xc-uesr-name" style="color:{{object.word_color}}" >
-        <view class="flex ai-center">
-            <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text>
-        </view>
-        <view class="flex fs24 xc-grow-ups ai-center" style="margin-top:4rpx">
-            <view class="hvip" wx:if='{{qy_data && qy_data.GradeName && qy_data.is_init && object.is_qy}}' style="margin-right:6rpx">
-                <image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{qy_data.GradeName}}
+<block wx:if="{{userInfo}}">
+    <view class="xc-user-frame abs"  style="width:700rpx;left:25rpx;top:32rpx">
+        <view class="xc-uesr-name" style="color:{{object.word_color}}" >
+            <view class="flex ai-center">
+                <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text>
             </view>
-            <image bindtap='show_tc' class="xc-qrcode"  wx:if="{{userInfo && object.is_user_card}}"
-                   style="border: 5rpx solid {{object.user_bg_color}};background: {{object.user_bg_color}};width:40rpx; height:40rpx;" src="{{iurl}}/miniapp/images/qrcode1.png"></image>
-        </view>
-
-        <!-- 显示成长值，综合分 -->
-        <block wx:if="{{qy_data &&  qy_data.is_init && qy_data.gradeId && object.is_cz}}">
-            <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" style="width:{{(qy_data.cz_val*100)/qy_data.need_money}}%;background:{{userqy_color.secord_bgcolor?userqy_color.secord_bgcolor:'#fe9db5'}}"></view>
+            <view class="flex fs24 xc-grow-ups ai-center" style="margin-top:4rpx">
+                <view class="hvip" wx:if='{{qy_data && qy_data.GradeName && qy_data.is_init && object.is_qy}}' style="margin-right:6rpx">
+                    <image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{qy_data.GradeName}}
+                </view>
+                <image bindtap='show_tc' class="xc-qrcode"  wx:if="{{userInfo && object.is_user_card}}"
+                       style="border: 5rpx solid {{object.user_bg_color}};background: {{object.user_bg_color}};width:40rpx; height:40rpx;" src="{{iurl}}/miniapp/images/qrcode1.png"></image>
             </view>
-        </block>
 
+            <!-- 显示成长值，综合分 -->
+            <block wx:if="{{qy_data &&  qy_data.is_init && qy_data.gradeId && object.is_cz}}">
+                <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" style="width:{{(qy_data.cz_val*100)/qy_data.need_money}}%;background:{{userqy_color.secord_bgcolor?userqy_color.secord_bgcolor:'#fe9db5'}}"></view>
+                </view>
+            </block>
+
+        </view>
     </view>
 
-</view>
+    <view  class="xc-qrcode-frame abs" style="right:50rpx;top:38rpx">
+        <view style="position:relative;">
+            <image class="xc-user-img  {{object.head_pic_type?'circle':''}}" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
+            <block wx:if="{{pulscardname && sys_switch.rank_switch > 0 && object.is_plus }}">
+                <view data-url="/pages/user/plus/plus" catchtap="goto"  class="flex-center plusMax" style="bottom:-12rpx">
+                    <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
+                    <view>{{pulscardname}}</view>
+                </view>
+            </block>
+        </view>
+    </view>
+
+
+
+</block>
+
+
 
 <!-- 显示头像 -->
 <view  wx:else class="flex-space-between  abs xc-user-frame" >
@@ -34,17 +52,6 @@
 </view>
 
 
-<view  class="xc-qrcode-frame abs" style="right:50rpx;top:38rpx">
-    <view style="position:relative;">
-        <image class="xc-user-img  {{object.head_pic_type?'circle':''}}" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
-        <block wx:if="{{pulscardname && sys_switch.rank_switch > 0 && object.is_plus }}">
-            <view data-url="/pages/user/plus/plus" catchtap="goto"  class="flex-center plusMax" style="bottom:-12rpx">
-                <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
-                <view>{{pulscardname}}</view>
-            </view>
-        </block>
-    </view>
-</view>
 
 <view class="flex-vertical abs xc-grow-frame rel" style="display: none">
     <view class="xc-grow-up">{{rfmName}}</view>
diff --git a/components/diy_user_my_rights/diy_user_my_rights.wxml b/components/diy_user_my_rights/diy_user_my_rights.wxml
index 650a414..e3a0629 100644
--- a/components/diy_user_my_rights/diy_user_my_rights.wxml
+++ b/components/diy_user_my_rights/diy_user_my_rights.wxml
@@ -32,7 +32,7 @@
                                   data-ind="{{index}}" data-find="{{pidx}}" bindtap="go_qy_url">
                                 <!-- <text>qy_list.privilegeICOUrl</text> -->
                                 <image wx:if="{{object.is_icon}}"  class="xc-center-img  {{item.ishas==1?'':'img_gray'}}" src="{{item.PrivilegeICOUrl}}"></image>
-                                <view class="four-level-word">{{item.PrivilegeName}}</view>
+                                <view class="four-level-word ellipsis-1">{{item.PrivilegeName}}</view>
                             </view>
                         </view>
                     </swiper-item>
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index c2388ad..14eca51 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -537,7 +537,7 @@ Page({
 			//自定义组件一定要等到页面加载完了，才来调用selectComponnent
 			setTimeout(function () {
 
-				th.setData({ is_show_recommend:true,pshow:1 })
+				th.setData({ is_show_recommend:true })
 				if (getApp().globalData.user_id) getApp().requestCardNum(th);
 				var goods_list = th.selectComponent("#goods_recommend"); //组件的id
 
@@ -548,10 +548,12 @@ Page({
 
 			}, 1200)
 
-
-
 		}
 
+		setTimeout(()=>{
+		  th.setData({ pshow:1 })
+		},500)
+
   },
 
   //获取会员权益等级是否升级
--
libgit2 0.21.4