Merge branch 'release' of http://121.42.41.42:7070/r/epdc-resident-mp-js into release

pages/heart/heart.wxml

@@ -14,7 +14,7 @@
         <block wx:else>
           <swiper-item>
             <view>
-              <image class="banner" src="https://epdc-shibei.elinkservice.cn/epdcFile/M00/02/B2/rBAAM16W7SqAY1XjAAMWUuGo2D4654.jpg" mode="aspectFill" />
+              <image class="banner" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/09/rBAB717MxROAWjyBAAJZd_4ygpQ188.jpg" mode="aspectFill" />
             </view>
           </swiper-item>
         </block>

pages/toRegister/toRegister.js

@@ -12,14 +12,14 @@ Page({
     height: app.globalData.height * 2 + 20,
   },
   onLoad: function (options) {
-    wx.setNavigationBarColor({
+    // wx.setNavigationBarColor({
-      frontColor: '#ffffff',
+    //   frontColor: '#ffffff',
-      backgroundColor: '#FC383B',
+    //   backgroundColor: '#FC383B',
-      animation: {
+    //   animation: {
-        duration: 400,
+    //     duration: 400,
-        timingFunc: 'easeIn'
+    //     timingFunc: 'easeIn'
-      }
+    //   }
-    })
+    // })
     let that = this
     const versionNum = '1.2.0'
     api.getScanSwitch(versionNum).then(function (res) {

pages/toRegister/toRegister.wxml

@@ -1,6 +1,6 @@
 <view class="container">
   <view class="pagelayout">
-    <image class="bgimg" src="../../images/agreement.png"  mode="widthFix"/>
+    <image class="bgimg" src="../../images/agreementv2.png"  mode="widthFix"/>
   </view>
   <view class="footer">
     <view class="buttons" wx:if="{{experience=='1'}}">

pages/toRegister/toRegister.wxss

@@ -11,6 +11,7 @@
   flex-direction: column;
 }
 .bgimg{
+  margin-top: 217rpx;
   width: 100%;
   height: auto;
   position: absolute;