From 1e7a8e9e9f1f18d56422754ed16779d83f46541b Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 11 May 2021 14:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=201.6.37=20=E5=BF=97?=
 =?UTF-8?q?=E6=84=BF=E8=80=85=E6=B3=A8=E5=86=8C=E5=B0=8F=E7=BB=84=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E5=BF=85=E9=80=89=EF=BC=9B=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=94=B9=E4=B8=BA=E5=90=8E=E5=8F=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/heartNew/heartNew.js                    |  9 +++++++++
 pages/heartNew/heartNew.wxml                  |  4 ++--
 pages/toRegister/toRegister.js                |  2 +-
 subpages/heart/pages/volunteer/volunteer.js   | 10 +++++-----
 subpages/heart/pages/volunteer/volunteer.wxml |  2 +-
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index f3ed418..d8ed083 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -52,6 +52,7 @@ Page({
     btnTop: 0,
     btnLeft: 0,
     shouye: {}, 
+    scanBtn: {}, // 扫码签到改为可配置
   },
 
   /**
@@ -379,6 +380,14 @@ Page({
         tabRightList: res.data
       })
     })
+    api.getImgUrl("8").then(function (res) {
+      console.log(res.data)
+      if (res.data.length > 0) {
+        that.setData({
+          scanBtn: res.data[0]
+        })
+      }
+    })
   },
   /**
    * 页面上拉触底事件的处理函数
diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml
index fa88e66..3936482 100644
--- a/pages/heartNew/heartNew.wxml
+++ b/pages/heartNew/heartNew.wxml
@@ -120,14 +120,14 @@
         img-url="../../images/heart/apply-new.png" 
         bindmovebtnCallBack="myApply"></move-btn>
 <move-btn 
-        wx:if="{{btnTop!=0}}"
+        wx:if="{{scanBtn.imgUrl && btnTop!=0}}"
         area-top="120"
         area-height="90%"
         button-width="200" 
         button-height="200" 
         button-top="{{btnTop}}" 
         button-left="{{btnLeft}}" 
-        img-url="../../images/home/scan.png" 
+        img-url="{{scanBtn.imgUrl}}" 
         bindmovebtnCallBack="scanCode"></move-btn>
         
 <move-btn wx:if="{{shouye.id}}"
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 001acca..4ce1219 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.6.36"
+    const versionNum = "1.6.37"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag
diff --git a/subpages/heart/pages/volunteer/volunteer.js b/subpages/heart/pages/volunteer/volunteer.js
index bb4c183..75f629a 100644
--- a/subpages/heart/pages/volunteer/volunteer.js
+++ b/subpages/heart/pages/volunteer/volunteer.js
@@ -42,7 +42,7 @@ Page({
     volunteerTag: {},  //志愿者标签id
     tagList: [{
       tagName: '请选择',
-      id: '0'
+      id: ''
     }],
     tagIndex: 0,
   },
@@ -284,10 +284,10 @@ Page({
       this.showToast("请输入昵称")
       return false
     }
-    if (this.data.volunteerTag.id == '0') {
-      this.showToast("请选择小组")
-      return false
-    }
+    // if (this.data.volunteerTag.id == '') {
+    //   this.showToast("请选择小组")
+    //   return false
+    // }
     // if(!this.data.volunteerSignature){
     //   this.showToast("请输入格言")
     //   return false
diff --git a/subpages/heart/pages/volunteer/volunteer.wxml b/subpages/heart/pages/volunteer/volunteer.wxml
index 258dfe0..b1026fd 100644
--- a/subpages/heart/pages/volunteer/volunteer.wxml
+++ b/subpages/heart/pages/volunteer/volunteer.wxml
@@ -90,7 +90,7 @@
         </view>
       </view>
       <view class="head-portrait">
-        <view class="head-portrait-name"><text class="must">*</text>选择小组</view>
+        <view class="head-portrait-name">选择小组</view>
         <!-- <view class="time">{{volunteerTag.tag}}</view> -->
         <picker bindchange="choosePicker" value="{{tagIndex}}" range="{{tagList}}" range-key="tagName">
           <view class="picker">