From b689a06e5d1f344a5f3135a0fa3218039e670425 Mon Sep 17 00:00:00 2001
From: Lee-1203 <342694918@qq.com>
Date: Mon, 25 Apr 2022 17:07:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=80=E6=96=B0=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                   |  3 ++-
 pages/home/home.js         | 10 +++++++++-
 pages/login/bind/bind.js   |  8 ++++++++
 pages/login/login.axml     |  2 +-
 pages/newpage/newpage.acss |  0
 pages/newpage/newpage.axml |  3 +++
 pages/newpage/newpage.js   |  9 +++++++++
 pages/newpage/newpage.json |  3 +++
 8 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 pages/newpage/newpage.acss
 create mode 100644 pages/newpage/newpage.axml
 create mode 100644 pages/newpage/newpage.js
 create mode 100644 pages/newpage/newpage.json

diff --git a/app.json b/app.json
index 2af6d8a..7666399 100644
--- a/app.json
+++ b/app.json
@@ -4,6 +4,7 @@
     "pages/login/login",
     "pages/login/bind/bind",
     "pages/login/verification/verification",
-    "pages/home/home"
+    "pages/home/home",
+    "pages/newpage/newpage"
   ]
 }
\ No newline at end of file
diff --git a/pages/home/home.js b/pages/home/home.js
index d49b27e..b6bacbe 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -29,7 +29,8 @@ Page({
       dd.$toolAll.removeCache('isInFirst');
       // 钉钉跳转
 			dd.redirectTo({url: '/pages/login/login'});
-    }else if(e.detail.name == 'downImg'){
+    }
+    if(e.detail.name == 'downImg'){
       dd.downloadFile({
         url: e.detail.url,
         success({ filePath }) {
@@ -44,5 +45,12 @@ Page({
         },
       });
     }
+    if(e.detail.name == 'newsPage'){
+      let url = e.detail.url;
+      console.log(url,'h5传过来的跳转链接')
+      dd.navigateTo({
+        url: '/pages/newpage/newpage?url='+url
+      })
+    }
   }
 });
diff --git a/pages/login/bind/bind.js b/pages/login/bind/bind.js
index f4bb1a0..cff1a62 100644
--- a/pages/login/bind/bind.js
+++ b/pages/login/bind/bind.js
@@ -167,6 +167,13 @@ Page({
     })
   },
 
+  // 手机登录
+  modePhone(){
+    // 跳转页面
+    dd.redirectTo ({
+        url: '/pages/login/login'
+    })
+  },
   // 跳过绑定
   passBind(){
     // 跳转页面
@@ -174,4 +181,5 @@ Page({
         url: '/pages/home/home'
     })
   },
+  
 });
diff --git a/pages/login/login.axml b/pages/login/login.axml
index 84c0f63..c51f012 100644
--- a/pages/login/login.axml
+++ b/pages/login/login.axml
@@ -7,7 +7,7 @@
             <image mode="widthFix" src="/static/login/logo.png" />
           </view>
 				</view>
-				<view class="company">有谱志愿</view>
+        <view class="company">有谱志愿</view>
 				<view class="phone-number" a:if="{{!isMode}}">
 					<view>手机号</view>
 					<input type="input" onInput="bindKeyInput" onBlur="myBlur" onFocus="myFocus" placeholder="请输入手机号"/>
diff --git a/pages/newpage/newpage.acss b/pages/newpage/newpage.acss
new file mode 100644
index 0000000..e69de29
diff --git a/pages/newpage/newpage.axml b/pages/newpage/newpage.axml
new file mode 100644
index 0000000..4b1add9
--- /dev/null
+++ b/pages/newpage/newpage.axml
@@ -0,0 +1,3 @@
+<view>
+  <web-view src="{{url}}" onMessage="onmessage"></web-view>
+</view>
\ No newline at end of file
diff --git a/pages/newpage/newpage.js b/pages/newpage/newpage.js
new file mode 100644
index 0000000..53d438c
--- /dev/null
+++ b/pages/newpage/newpage.js
@@ -0,0 +1,9 @@
+Page({
+  data: {},
+  onLoad(query) {
+    console.log(query.url,'接收到的跳转链接')
+    this.setData({
+      url: query.url
+    })
+  },
+});
\ No newline at end of file
diff --git a/pages/newpage/newpage.json b/pages/newpage/newpage.json
new file mode 100644
index 0000000..a97367d
--- /dev/null
+++ b/pages/newpage/newpage.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}