From 6f6b378a9ca7c1bbfae440f156f3c6cf869dc443 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 26 Jul 2021 18:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=A5=B3=E6=80=A7=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/mine/30women.png                          | Bin 0 -> 2774 bytes
 .../heartNew/components/volunteer/volunteer.wxml |   6 +++++-
 pages/toRegister/toRegister.js                   |   2 +-
 subpages/heart/images/30women.png                | Bin 0 -> 2774 bytes
 .../pages/leaderboardNew/leaderboardNew.wxml     |   6 +++++-
 5 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 images/mine/30women.png
 create mode 100644 subpages/heart/images/30women.png

diff --git a/images/mine/30women.png b/images/mine/30women.png
new file mode 100644
index 0000000000000000000000000000000000000000..378ad9852908f430d8931e3d5637a941c8f6a7d6
GIT binary patch
literal 2774
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

literal 0
HcmV?d00001

diff --git a/pages/heartNew/components/volunteer/volunteer.wxml b/pages/heartNew/components/volunteer/volunteer.wxml
index c1773ff..78ad3e5 100644
--- a/pages/heartNew/components/volunteer/volunteer.wxml
+++ b/pages/heartNew/components/volunteer/volunteer.wxml
@@ -1,6 +1,10 @@
 <view class="item">
     <image class="faceImg" data-src="{{volunteerItemObj.faceImg}}" bindtap="preViewImage" src="{{volunteerItemObj.faceImg}}" />
-    <view class="name"><view>{{volunteerItemObj.nickname}}</view><image src="../../../../images/mine/ic_dangbiaoqian.png" wx:if="{{volunteerItemObj.partyFlag == '1'}}"  /></view>
+    <view class="name">
+        <view>{{volunteerItemObj.nickname}}</view>
+        <image src="../../../../images/mine/ic_dangbiaoqian.png" wx:if="{{volunteerItemObj.partyFlag == '1'}}"  />
+        <image src="../../../../images/mine/30women.png" wx:if="{{volunteerItemObj.age > 29 && volunteerItemObj.sex == '0'}}" />
+    </view>
     <view class="autograph">{{volunteerItemObj.volunteerSignature}}</view>
 </view>
 <!-- <view class="show">*按姓氏拼音排序</view> -->
\ No newline at end of file
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 4c230dd..2e198fc 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.7.8"
+    const versionNum = "1.7.9"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag
diff --git a/subpages/heart/images/30women.png b/subpages/heart/images/30women.png
new file mode 100644
index 0000000000000000000000000000000000000000..378ad9852908f430d8931e3d5637a941c8f6a7d6
GIT binary patch
literal 2774
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

literal 0
HcmV?d00001

diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
index 7526b5f..83115dc 100755
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
@@ -33,7 +33,11 @@
             {{index + 1}}</view>
           <image class="avatar" src="{{item.faceImg}}" />
           <view class="info">
-            <view class="name"><view>{{item.nickname}}</view><image src="../../images/ic_dangbiaoqian.png" wx:if="{{item.partyFlag == '1'}}"/></view>
+            <view class="name">
+              <view>{{item.nickname}}</view>
+              <image src="../../images/ic_dangbiaoqian.png" wx:if="{{item.partyFlag == '1'}}"/>
+              <image src="../../images/30women.png" wx:if="{{item.age > 29 && item.sex == '0'}}"/>
+            </view>
             <view class="info-detail">
               <block>
                 <image class="heart-time" src="../../images/aixin.png"></image>