Merge remote-tracking branch 'origin/master'

k94314517

2024-08-15 89e7ed902461f28d6a7dd3e6c927eaf40b154f5e

 wechat_jiaxuan/pages/auth/auth.wxml

@@ -5,7 +5,6 @@
    </view>
    <view class="title">欢迎来到志邦家居选志邦，实现您对家的美好想象</view>
    <view class="placeholder9">您喜欢的样子，我都有～</view>
    <view>{{ test }}</view>
    <view class="main_footer">
      <view class="line">
        <van-checkbox value="{{ agreementFalg }}" checked-color="{{primary}}" shape="round" bind:change="agreementChange"></van-checkbox>
@@ -16,14 +15,21 @@
          <text data-index="1" bindtap="onOpen" class="primary">《ZBOM用户隐私政策》</text>
        </view>
      </view>
      <button class="btn" wx:if="{{ !agreementFalg }}" bindtap="loginIn">手机号快捷登录</button>
      <button wx:else class="btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号快捷登录</button>
      <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">
      <mp-html content="{{activeHtml}}"></mp-html>
      <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>