Merge remote-tracking branch 'origin/master'

jiangping

2024-07-26 2faa6546a9f9ddb29f81cbc9770fc25b95703695

 wechat_jiaxuan/pages/auth/auth.wxml

@@ -16,13 +16,20 @@
          <text data-index="1" bindtap="onOpen" class="primary">《ZBOM用户隐私政策》</text>
        </view>
      </view>
      <button class="btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号快捷登录</button>
      <button class="btn" wx:if="{{ !agreementFalg }}" bindtap="loginIn">手机号快捷登录</button>
      <button wx:else class="btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号快捷登录</button>
    </view>
  </view>
  <!--  -->
  <van-popup show="{{ showModal }}" round bind:close="onClose">
  <van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
    <view class="modal">
      <rich-text nodes="{{activeHtml}}"></rich-text>
      <view class="content">
        <mp-html content="{{activeHtml}}"></mp-html>
      </view>
      <view style="bottom: {{ bottomLift }}px" class="btns">
        <view data-flag="{{true}}" bindtap="handleJudge" class="agree">同意</view>
        <view data-flag="{{false}}" bindtap="handleJudge" class="btn">不同意并退出</view>
      </view>
    </view>
  </van-popup>
</view>