From 1cee3a660c5f8e5f4290ae894c2898c4966a834d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 02 八月 2024 18:33:33 +0800
Subject: [PATCH] ''

---
 wechat_jiaxuan/pages/auth/auth.js |   72 ++++++++++++++++++++++++------------
 1 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/wechat_jiaxuan/pages/auth/auth.js b/wechat_jiaxuan/pages/auth/auth.js
index e15e1e1..cbc6b96 100644
--- a/wechat_jiaxuan/pages/auth/auth.js
+++ b/wechat_jiaxuan/pages/auth/auth.js
@@ -18,7 +18,7 @@
     privacyHtml: '',
     activeHtml: ''
   },
-  initData(){
+  initData() {
     var app = getApp().globalData
     this.setData({
       bottomLift: app.bottomLift
@@ -43,48 +43,72 @@
   handleJudge(e) {
     const flag = e.currentTarget.dataset.flag
     console.log(e);
-    this.setData({ agreementFalg: flag, showModal: false })
+    this.setData({
+      agreementFalg: flag,
+      showModal: false
+    })
   },
   loginIn() {
-    const { agreementFalg } = this.data
-    if(!agreementFalg) return wx.showToast({
+    const {
+      agreementFalg
+    } = this.data
+    if (!agreementFalg) return wx.showToast({
       title: '璇峰厛闃呰骞跺悓鎰忕浉鍏冲崗璁�',
       icon: 'none',
       duration: 2000
     })
   },
-  getPhoneNumber (e) {
+  getPhoneNumber(e) {
     console.log(e.detail)
     console.log(e.detail.iv)
     console.log(e.detail.encryptedData)
-    const data = { ...e.detail }
-    getWxMiniPhone({
-      encryptedData: data.encryptedData,
-      iv: data.iv,
-      sessionKey: wx.getStorageSync('sessionKey') || data.iv,
-    }).then(res => {
-      binDingPhone({
-        phone: res.data
-      }).then((res) => {
-        if(res.code == 200){
-          wx.setStorageSync('member', res.data)
-          wx.navigateBack()
-        }
+    const data = {
+      ...e.detail
+    }
+    if (e.detail && e.detail.iv) {
+      getWxMiniPhone({
+        encryptedData: data.encryptedData,
+        iv: data.iv,
+        sessionKey: wx.getStorageSync('sessionKey') || data.iv,
+      }).then(res => {
+        binDingPhone({
+          phone: res.data
+        }).then((res) => {
+          if (res.code == 200) {
+            const tempPath = wx.getStorageSync('tempPath') || ''
+            wx.setStorageSync('member', res.data)
+            if (tempPath) {
+              wx.redirectTo({
+                url: tempPath,
+              })
+            } else {
+              wx.navigateBack()
+            }
+          }
+        })
       })
-    })
+    }
+
   },
-  onOpen(e){
+  onOpen(e) {
     console.log('e', e);
-    const { serviceHtml, privacyHtml } = this.data
-    const { index } = e.target.dataset
+    const {
+      serviceHtml,
+      privacyHtml
+    } = this.data
+    const {
+      index
+    } = e.target.dataset
     let activeHtml = index == '0' ? serviceHtml : privacyHtml
     this.setData({
       activeHtml,
       showModal: true
     })
   },
-  onClose(){
-    this.setData({showModal: false})
+  onClose() {
+    this.setData({
+      showModal: false
+    })
   },
   agreementChange(e) {
     this.setData({

--
Gitblit v1.9.3