From 39613118a5bae23c45498c4f5a939e83595f99f5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 16:05:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_jiaxuan/pages/auth/auth.wxml |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/wechat_jiaxuan/pages/auth/auth.wxml b/wechat_jiaxuan/pages/auth/auth.wxml
index 824c3df..dc6a84a 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxml
+++ b/wechat_jiaxuan/pages/auth/auth.wxml
@@ -1,26 +1,28 @@
 <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" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">鎵嬫満鍙峰揩鎹风櫥褰�</button>
     </view>
   </view>
+  <!--  -->
+  <van-popup show="{{ showModal }}" round bind:close="onClose">
+    <view class="modal">
+      <rich-text nodes="{{activeHtml}}"></rich-text>
+    </view>
+  </van-popup>
 </view>
\ No newline at end of file

--
Gitblit v1.9.3