From a03b724abfdad275ee0e83aabd359ce07ef9e91c Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 18 Dec 2023 17:26:21 +0800
Subject: [PATCH] 自定义样式的优化

---
 components/diy_user_info/diy_user_info.wxml           | 16 ++++++++++++++--
 components/diy_user_info/diy_user_info.wxss           |  6 +++---
 components/diy_user_info/style1.wxml                  |  2 +-
 components/diy_user_info/style2.wxml                  | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 components/diy_user_info/style3.wxml                  | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 components/diy_user_my_rights/diy_user_my_rights.wxss |  2 +-
 packageG/pages/user_template/index.js                 |  5 ++---
 7 files changed, 197 insertions(+), 10 deletions(-)
 create mode 100644 components/diy_user_info/style2.wxml
 create mode 100644 components/diy_user_info/style3.wxml

diff --git a/components/diy_user_info/diy_user_info.wxml b/components/diy_user_info/diy_user_info.wxml
index 2745e22..ea93ec3 100644
--- a/components/diy_user_info/diy_user_info.wxml
+++ b/components/diy_user_info/diy_user_info.wxml
@@ -2,17 +2,29 @@
     <view class="xc-head rel">
         <block wx:if="{{object.bg_type==1}}">
             <image class="xc-background" src="{{iurl}}{{ad_img?ad_img:'/miniapp/images/user_index_powder.jpg'}}">
-                <block vw:if="{{object.style==0}}">
+                <block wx:if="{{object.style==0}}">
                     <include src="style1.wxml"></include>s
                 </block>
+                <block wx:if="{{object.style==1}}">
+                    <include src="style2.wxml"></include>s
+                </block>
+                <block wx:if="{{object.style==2}}">
+                    <include src="style3.wxml"></include>s
+                </block>
 
             </image>
         </block>
         <block wx:else>
              <view class="xc-background" style="background-color:{{object.bg_color}}">
-                 <block vw:if="{{object.style==0}}">
+                 <block wx:if="{{object.style==0}}">
                      <include src="style1.wxml"></include>
                  </block>
+                 <block wx:if="{{object.style==1}}">
+                     <include src="style2.wxml"></include>
+                 </block>
+                 <block wx:if="{{object.style==2}}">
+                     <include src="style3.wxml"></include>
+                 </block>
              </view>
         </block>
     </view>
diff --git a/components/diy_user_info/diy_user_info.wxss b/components/diy_user_info/diy_user_info.wxss
index e208501..8c81ba1 100644
--- a/components/diy_user_info/diy_user_info.wxss
+++ b/components/diy_user_info/diy_user_info.wxss
@@ -117,7 +117,7 @@
 }
 .xc-assets {
   width: 94%;
-  bottom: 32rpx;
+  bottom: 26rpx;
   color: #fff;
   line-height: 46rpx;
   margin-left: 10rpx;
@@ -130,8 +130,8 @@
   background: #fe9db5;
   width: 70rpx;
   height: 70rpx; */
-  top: 70rpx;
-  right: 64rpx;
+  top: 40rpx;
+  right: 40rpx;
 }
 
 .xc-qrcode {
diff --git a/components/diy_user_info/style1.wxml b/components/diy_user_info/style1.wxml
index 70b7f19..1e78e87 100644
--- a/components/diy_user_info/style1.wxml
+++ b/components/diy_user_info/style1.wxml
@@ -45,7 +45,7 @@
 </view>
 
 
-<view wx:if="{{userInfo && object.is_user_card}}" class="xc-qrcode-frame abs ">
+<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>
     <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
new file mode 100644
index 0000000..e46205b
--- /dev/null
+++ b/components/diy_user_info/style2.wxml
@@ -0,0 +1,94 @@
+<!-- 会员有登陆登陆的情况 -->
+<view class="xc-user-frame abs" wx:if="{{userInfo}}" style="top:20rpx">
+
+    <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>
+            <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="xc-uesr-name" style="color:{{object.word_color}}">
+        <view class="flex ai-center jc-center">
+            <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text>
+
+            <view class="hvip" wx:if='{{qy_data && qy_data.GradeName && qy_data.is_init && object.is_qy}}'>
+                <image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{qy_data.GradeName}}
+            </view>
+        </view>
+        <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>
+            </block>
+            <block wx:else>
+                {{" "}}
+                <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text> {{cz_val}}
+            </block>
+        </view>
+    </view>
+
+</view>
+
+
+<view  wx:else class="flex-space-between  abs xc-user-frame">
+    <!-- 会员没有登陆的情况 -->
+    <view class="xc-user-left  flex" bindtap="login_user">
+        <image class="xc-user-img  circle" src="{{defaultAvatar}}"></image>
+        <view class="xc-uesr-name" style="color:{{object.word_color}}">请点击注册</view>
+    </view>
+</view>
+
+
+<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>
+    <view style="font-size:12px;color:{{object.word_color}}">会员卡</view>
+</view>
+
+<view class="flex-vertical abs xc-grow-frame rel" style="display: none">
+    <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>
+        <image class="xc-zs-img abs" src="{{iurl}}/miniapp/images/zhuangshi.png"></image>
+        <view class="xc-line-Yes abs" style="width:{{length}}rpx;"></view>
+    </view>
+    <view class="xc-grow-val">0/0</view>
+</view>
+
+
+<!-- 底部显示余额，储值卡，积分，优惠券等 -->
+<view class="flex-equality  abs xc-assets" style="color:{{object.word_color}}">
+
+    <block wx:for="{{object.show_arr}}">
+        <block wx:if="{{item.show}}">
+            <block wx:if="{{item.type=='user_money'}}">
+                <view class="t-c typefont" bindtap='balance'>{{yuer?yuer:0}}
+                    <view class='numfont'>余额</view>
+                </view>
+            </block>
+            <block wx:if="{{item.type=='yc' && !is_close_chuzhi}}">
+                <view class="t-c typefont" bindtap='deposit'>{{udata.Balance?udata.Balance:0}}
+                    <view class='numfont'>储值款</view>
+                </view>
+            </block>
+            <block wx:if="{{item.type=='jf'}}">
+                <view class="t-c typefont" bindtap='integral'>{{udata.Integral?udata.Integral:0}}
+                    <view class='numfont'>积分</view>
+                </view>
+            </block>
+            <block wx:if="{{item.type=='quan'}}">
+                <view class="t-c typefont" bindtap='coupon'>{{udata.CashCount+byquan?udata.CashCount+byquan:0}}
+                    <view class='numfont'>优惠券</view>
+                </view>
+            </block>
+        </block>
+
+
+    </block>
+</view>
\ No newline at end of file
diff --git a/components/diy_user_info/style3.wxml b/components/diy_user_info/style3.wxml
new file mode 100644
index 0000000..90e23b0
--- /dev/null
+++ b/components/diy_user_info/style3.wxml
@@ -0,0 +1,82 @@
+<!-- 会员有登陆登陆的情况 -->
+<view class="xc-user-frame abs" wx:if="{{userInfo}}" style="top:20rpx">
+
+
+
+    <view class="xc-uesr-name" style="color:{{object.word_color}}">
+        <view class="flex ai-center jc-center">
+            <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text>
+
+
+        </view>
+        <view class="flex fs24 xc-grow-ups" 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>
+            </block>
+            <block wx:else>
+                {{" "}}
+                <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text> {{cz_val}}
+            </block>
+        </view>
+    </view>
+
+</view>
+
+
+<view  wx:else class="flex-space-between  abs xc-user-frame">
+    <!-- 会员没有登陆的情况 -->
+    <view class="xc-user-left  flex" bindtap="login_user">
+        <image class="xc-user-img  circle" src="{{defaultAvatar}}"></image>
+        <view class="xc-uesr-name" style="color:{{object.word_color}}">请点击注册</view>
+    </view>
+</view>
+
+
+<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>
+    <view style="font-size:12px;color:{{object.word_color}}">会员卡</view>
+</view>
+
+<view class="flex-vertical abs xc-grow-frame rel" style="display: none">
+    <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>
+        <image class="xc-zs-img abs" src="{{iurl}}/miniapp/images/zhuangshi.png"></image>
+        <view class="xc-line-Yes abs" style="width:{{length}}rpx;"></view>
+    </view>
+    <view class="xc-grow-val">0/0</view>
+</view>
+
+
+<!-- 底部显示余额，储值卡，积分，优惠券等 -->
+<view class="flex-equality  abs xc-assets" style="color:{{object.word_color}}">
+
+    <block wx:for="{{object.show_arr}}">
+        <block wx:if="{{item.show}}">
+            <block wx:if="{{item.type=='user_money'}}">
+                <view class="t-c typefont" bindtap='balance'>{{yuer?yuer:0}}
+                    <view class='numfont'>余额</view>
+                </view>
+            </block>
+            <block wx:if="{{item.type=='yc' && !is_close_chuzhi}}">
+                <view class="t-c typefont" bindtap='deposit'>{{udata.Balance?udata.Balance:0}}
+                    <view class='numfont'>储值款</view>
+                </view>
+            </block>
+            <block wx:if="{{item.type=='jf'}}">
+                <view class="t-c typefont" bindtap='integral'>{{udata.Integral?udata.Integral:0}}
+                    <view class='numfont'>积分</view>
+                </view>
+            </block>
+            <block wx:if="{{item.type=='quan'}}">
+                <view class="t-c typefont" bindtap='coupon'>{{udata.CashCount+byquan?udata.CashCount+byquan:0}}
+                    <view class='numfont'>优惠券</view>
+                </view>
+            </block>
+        </block>
+
+
+    </block>
+</view>
\ No newline at end of file
diff --git a/components/diy_user_my_rights/diy_user_my_rights.wxss b/components/diy_user_my_rights/diy_user_my_rights.wxss
index 74624b4..6071e1c 100644
--- a/components/diy_user_my_rights/diy_user_my_rights.wxss
+++ b/components/diy_user_my_rights/diy_user_my_rights.wxss
@@ -19,7 +19,7 @@
 .xc-title-img {
   width: 50rpx;
   height: 50rpx;
-  margin-left: 20rpx;s
+  margin-left: 20rpx;
 }
 
 .xc-title-content {
diff --git a/packageG/pages/user_template/index.js b/packageG/pages/user_template/index.js
index 15edd68..6c2a3c1 100644
--- a/packageG/pages/user_template/index.js
+++ b/packageG/pages/user_template/index.js
@@ -46,13 +46,12 @@ Page({
                 }
             })
         }
-
         //判断有没有登陆
         setTimeout(() =>{
             if (!getApp().globalData.userInfo) {
                 getApp().goto('/packageE/pages/togoin/togoin');
             }
-        },1000)
+        },1500)
 
     },
 
@@ -320,7 +319,7 @@ Page({
                 goods_list.get_list();
             }
 
-        }, 1000)
+        }, 1500)
 
     },
 
--
libgit2 0.21.4