Merge remote-tracking branch 'origin/master'

jiangping

2024-07-26 816d84a76c1a2f16f88dba70664397961f55caa1

 wechat_jiaxuan/pages/auth/auth.wxml

@@ -16,13 +16,14 @@
          <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>
      <mp-html content="{{activeHtml}}"></mp-html>
    </view>
  </van-popup>
</view>