Merge remote-tracking branch 'origin/master'

k94314517

2024-08-15 89e7ed902461f28d6a7dd3e6c927eaf40b154f5e

 wechat_staff/pages/login/index.wxml

@@ -5,20 +5,20 @@
  <!--  -->
  <view class="btns">
    <block wx:if="{{ status == '0' }}">
      <button class="btn speedy" wx:if="{{ !agreementFalg }}" bindtap="loginIn">手机号快捷登录</button>
      <button hover-class="none" class="btn speedy" wx:if="{{ !agreementFalg }}" bindtap="loginIn">手机号快捷登录</button>
      <button wx:else class="btn speedy" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号快捷登录</button>
      <view bindtap="changeStatus" class="btn">手机验证码登录</view>
    </block>
    <block wx:if="{{ status == '1' }}">
      <view class="line">
        <image class="icon" src="../../static/login_ic_phone@2x.png" mode="widthFix"></image>
        <van-field class="input"  maxlength="{{ 11 }}" border="{{false}}" model:value="{{ phone }}" placeholder="请输入手机号" />
        <van-field class="input" type="number" maxlength="{{ 11 }}" border="{{false}}" model:value="{{ phone }}" placeholder="请输入手机号" />
        <view bindtap="getCode" wx:if="{{ countDown === 0 }}" class="get_code primary">获取验证码</view>
        <view wx:else class="placeholder9">{{ countDown }}s</view>
      </view>
      <view class="line">
        <image class="icon" src="../../static/login_ic_password@2x.png" mode="widthFix"></image>
        <van-field class="input" maxlength="{{ 6 }}" border="{{false}}" model:value="{{ code }}" placeholder="请输入验证码" />
        <van-field type="number" class="input" maxlength="{{ 6 }}" border="{{false}}" model:value="{{ code }}" placeholder="请输入验证码" />
      </view>
      <view bindtap="loginPhone" class="btn speedy sub_btn">立即登录</view>
    </block>
@@ -37,6 +37,7 @@
    <view class="modal">
      <view class="content">
        <mp-html content="{{activeHtml}}"></mp-html>
        <!-- <rich-text nodes="{{activeHtml}}"></rich-text> -->
      </view>
      <view style="bottom: {{ bottomLift }}px" class="btns">
        <view data-flag="{{true}}" bindtap="handleJudge" class="agree">同意</view>