Merge remote-tracking branch 'origin/master' into enterprise

learnOnline/pages/index/index.wxml

@@ -15,6 +15,6 @@
       <text bindtap='goOutSite' class='userinfo-nickname'>{{userInfo.nickName}}</text>
     </block> -->
   </view>
-  <template is='bindPhone' data='{{bindphone}}'></template>
+  <template is='bindPhone' data='{{bindphone, isUseAccountLogin}}'></template>
   <template is='bindAccount' data='{{bindaccount}}'></template>
 </view>
\ No newline at end of file