From 24924d35a90e9750999ad624b2a0dfadd4c0b7c7 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 20 Dec 2023 09:15:02 +0800
Subject: [PATCH] 自定义模板的优化

---
 components/diy_user_info/style1.wxml  | 4 ++--
 components/diy_user_info/style2.wxml  | 4 ++--
 components/diy_user_info/style3.wxml  | 4 ++--
 packageG/pages/user_template/index.js | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/components/diy_user_info/style1.wxml b/components/diy_user_info/style1.wxml
index 935fc43..88bb7a9 100644
--- a/components/diy_user_info/style1.wxml
+++ b/components/diy_user_info/style1.wxml
@@ -5,7 +5,7 @@
 
 
         <view style="position:relative;">
-            <image class="xc-user-img  circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
+            <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">
                     <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
@@ -49,7 +49,7 @@
 
 
 <view wx:if="{{userInfo && object.is_user_card}}" class="xc-qrcode-frame abs" style="top:46rpx">
-    <image bindtap='show_tc' class=" xc-qrcode " style="border: 5rpx solid #fe9db5;background: #fe9db5;" src="{{iurl}}/miniapp/images/qrcode1.png"></image>
+    <image bindtap='show_tc' class=" xc-qrcode " style="border: 5rpx solid {{object.user_bg_color}};background: {{object.user_bg_color}};" src="{{iurl}}/miniapp/images/qrcode1.png"></image>
     <view style="font-size:12px;color:{{object.word_color}}">会员卡</view>
 </view>
 
diff --git a/components/diy_user_info/style2.wxml b/components/diy_user_info/style2.wxml
index d9ed040..e8c4ac6 100644
--- a/components/diy_user_info/style2.wxml
+++ b/components/diy_user_info/style2.wxml
@@ -3,7 +3,7 @@
 
     <view class="flex jc-center">
         <view style="position:relative;">
-            <image class="xc-user-img  circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
+            <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>
@@ -47,7 +47,7 @@
 
 
 <view wx:if="{{userInfo && object.is_user_card}}" class="xc-qrcode-frame abs ">
-    <image bindtap='show_tc' class=" xc-qrcode " style="border: 5rpx solid #fe9db5;background: #fe9db5;" src="{{iurl}}/miniapp/images/qrcode1.png"></image>
+    <image bindtap='show_tc' class=" xc-qrcode " style="border: 5rpx solid {{object.user_bg_color}};background: {{object.user_bg_color}};" src="{{iurl}}/miniapp/images/qrcode1.png"></image>
     <view style="font-size:12px;color:{{object.word_color}}">会员卡</view>
 </view>
 
diff --git a/components/diy_user_info/style3.wxml b/components/diy_user_info/style3.wxml
index 7707d55..769e373 100644
--- a/components/diy_user_info/style3.wxml
+++ b/components/diy_user_info/style3.wxml
@@ -9,7 +9,7 @@
                 <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 #fe9db5;background: #fe9db5;width:40rpx; height:40rpx;" src="{{iurl}}/miniapp/images/qrcode1.png"></image>
+                   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>
 
         <!-- 显示成长值，综合分 -->
@@ -36,7 +36,7 @@
 
 <view  class="xc-qrcode-frame abs" style="right:50rpx;top:38rpx">
     <view style="position:relative;">
-        <image class="xc-user-img  circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
+        <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>
diff --git a/packageG/pages/user_template/index.js b/packageG/pages/user_template/index.js
index 6c2a3c1..7ca1dca 100644
--- a/packageG/pages/user_template/index.js
+++ b/packageG/pages/user_template/index.js
@@ -184,6 +184,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