Merge branch 'release'

pages/heartNew/heartNew.wxml

@@ -77,16 +77,16 @@
 <!-- 志友朵朵 -->
 <block wx:if="{{ selectedTab == 'tab1' }}">
   <view class="details-top">
-  <view class="search">
+    <view class="search">
       <view class="item-all">
-          <view class="item-left">
+        <view class="item-left">
-              <image src="../../images/search.png"></image>
+          <image src="../../images/search.png"></image>
-              <input placeholder-class="placeholder-style" placeholder="输入昵称关键字" bindinput="bindInputValue" value="{{searchName}}"></input>
+          <input placeholder-class="placeholder-style" placeholder="输入昵称关键字" bindinput="bindInputValue" value="{{searchName}}"></input>
-          </view>
+        </view>
-          <button class="item-right" bindtap="searchName" hover-class="none">搜索</button>
+        <button class="item-right" bindtap="searchName" hover-class="none">搜索</button>
       </view>
-  </view>
+    </view>
-  <view class="reg-count">志愿者注册数：{{volunteerCount}}</view>
+    <view class="reg-count">志愿者注册数：{{volunteerCount}}</view>
     <view class="volunteer-box">
       <volunteer-list bind:clickImage="clickImage" wx:for="{{volunteerlist}}" volunteerItemObj="{{item}}" wx:for-index="index" wx:for-item="item" wx:key="index"></volunteer-list>
     </view>
@@ -97,15 +97,12 @@
 <view class="details-top" hidden="{{jingcai}}">
   <activity bind:toActDetail="toActDetailDown" id="state-2" state="2"></activity>
 </view>
-
 <movable-area class="movable-area">
   <movable-view class="movable-view" direction="all" inertia="true" friction="10">
     <view class="my-apply" bindtap="myApply">
-      <image src="../../images/heart/apply.png" />
+      <image src="../../images/heart/apply-new.png" />
     </view>
   </movable-view>
 </movable-area>
-
 <load-more loadMoreVisible="{{loadMoreVisible}}" loadMoreType="{{loadMoreType}}"></load-more>
-
 <completeInfo-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></completeInfo-dialog>

pages/toRegister/toRegister.js

@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.5.4"
+    const versionNum = "1.5.5"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag