From 2faa6546a9f9ddb29f81cbc9770fc25b95703695 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 17:02:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_jiaxuan/pages/auth/auth.js |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/wechat_jiaxuan/pages/auth/auth.js b/wechat_jiaxuan/pages/auth/auth.js
index 7c47de8..e15e1e1 100644
--- a/wechat_jiaxuan/pages/auth/auth.js
+++ b/wechat_jiaxuan/pages/auth/auth.js
@@ -10,6 +10,7 @@
   data: {
     agreementFalg: false,
     primary: '',
+    bottomLift: 0,
 
     showModal: false,
     serviceHtml: '',
@@ -18,6 +19,10 @@
     activeHtml: ''
   },
   initData(){
+    var app = getApp().globalData
+    this.setData({
+      bottomLift: app.bottomLift
+    })
     getDictData({
       code: 'ZBOM_CUSTOMIZED',
       label: 'SERVER_AGREEMENT'
@@ -35,6 +40,11 @@
       })
     })
   },
+  handleJudge(e) {
+    const flag = e.currentTarget.dataset.flag
+    console.log(e);
+    this.setData({ agreementFalg: flag, showModal: false })
+  },
   loginIn() {
     const { agreementFalg } = this.data
     if(!agreementFalg) return wx.showToast({

--
Gitblit v1.9.3