From 816d84a76c1a2f16f88dba70664397961f55caa1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 10:07:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/auth/auth.wxml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/wechat_jiaxuan/pages/auth/auth.wxml b/wechat_jiaxuan/pages/auth/auth.wxml
index 824c3df..5d23db3 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxml
+++ b/wechat_jiaxuan/pages/auth/auth.wxml
@@ -1,26 +1,29 @@
<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>
</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>
<view class="content">
<text>鎴戝凡闃呰骞跺悓鎰�</text>
- <text class="primary">銆奪BOM鐢ㄦ埛鏈嶅姟鍗忚銆�</text>
+ <text data-index="0" bindtap="onOpen" class="primary">銆奪BOM鐢ㄦ埛鏈嶅姟鍗忚銆�</text>
<text>鍙�</text>
- <text class="primary">銆奪BOM鐢ㄦ埛闅愮鏀跨瓥銆�</text>
+ <text data-index="1" bindtap="onOpen" class="primary">銆奪BOM鐢ㄦ埛闅愮鏀跨瓥銆�</text>
</view>
</view>
- <view class="btn">鎵嬫満鍙峰揩鎹风櫥褰�</view>
+ <button class="btn" wx:if="{{ !agreementFalg }}" bindtap="loginIn">鎵嬫満鍙峰揩鎹风櫥褰�</button>
+ <button 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>
+ </van-popup>
</view>
\ No newline at end of file
--
Gitblit v1.9.3