Merge remote-tracking branch 'origin/master'

k94314517

2024-08-15 89e7ed902461f28d6a7dd3e6c927eaf40b154f5e

 wechat_jiaxuan/pages/auth/auth.wxml

@@ -1,9 +1,4 @@
<view>
  <van-nav-bar title="授权登录">
    <view slot="left">
      <van-icon name="arrow-left" size="22px" color="#000000" />
    </view>
  </van-nav-bar>
  <view class="container">
    <view class="logo_wrap">
      <image src="../../static/icon/logo.png"></image>
@@ -15,12 +10,26 @@
        <van-checkbox value="{{ agreementFalg }}" checked-color="{{primary}}" shape="round" bind:change="agreementChange"></van-checkbox>
        <view class="content">
          <text>我已阅读并同意</text>
          <text class="primary">《ZBOM用户服务协议》</text>
          <text data-index="0" bindtap="onOpen" class="primary">《ZBOM用户服务协议》</text>
          <text>及</text>
          <text class="primary">《ZBOM用户隐私政策》</text>
          <text data-index="1" bindtap="onOpen" class="primary">《ZBOM用户隐私政策》</text>
        </view>
      </view>
      <view class="btn">手机号快捷登录</view>
      <button hover-class="none" class="btn" wx:if="{{ !agreementFalg }}" bindtap="loginIn">手机号快捷登录</button>
      <button hover-class="none" wx:else class="btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号快捷登录</button>
    </view>
  </view>
  <!--  -->
  <van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
    <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>
        <view data-flag="{{false}}" bindtap="handleJudge" class="btn">不同意并退出</view>
      </view>
    </view>
  </van-popup>
</view>