From 74f4653e9ac83202a8f4ffea209c9a0663e5a148 Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Mon, 17 Aug 2020 10:26:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96check=5Fpage()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/mix_page.py | 16 ++++++++++++----
 README.en.md             |  8 ++++++--
 README.zh-cn.md          |  8 ++++++--
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/DrissionPage/mix_page.py b/DrissionPage/mix_page.py
index 3967003..9d27e43 100644
--- a/DrissionPage/mix_page.py
+++ b/DrissionPage/mix_page.py
@@ -154,10 +154,18 @@ class MixPage(Null, SessionPage, DriverPage):
         u = url or self.session_url
         self._drission.cookies_to_driver(u)
 
-    def check_page(self) -> Union[bool, None]:
-        return
-        # if self.session_url == self.url:
-        #     return True if self._response and self._response.ok else False
+    def check_page(self, by_requests: bool = False) -> Union[bool, None]:
+        """d模式时检查网页是否符合预期                \n
+        默认由response状态检查，可重载实现针对性检查   \n
+        :param by_requests: 是否用内置response检查
+        :return: bool或None，None代表不知道结果
+        """
+        if self.session_url and self.session_url == self.url:
+            return self._response.ok
+        if by_requests:
+            self.cookies_to_session()
+            r = self._make_response(self.url, **{'timeout': 3})[0]
+            return r.ok if r else False
 
     # ----------------重写SessionPage的函数-----------------------
 
diff --git a/README.en.md b/README.en.md
index 95e922e..afd0ea8 100644
--- a/README.en.md
+++ b/README.en.md
@@ -907,9 +907,13 @@ The following methods and attributes only take effect in driver mode, and will a
 
 ### check_page()
 
-​	check_page() -> bool
+​	check_page(by_requests: bool = False) -> Union[bool, None]
 
-​	After the subclass is derived, it is used to check whether the domain name meets expectations, and the function is implemented by the subclass.
+​	In d mode, check whether the web page meets expectations. The response status is checked by default, and can be overloaded to achieve targeted checks.
+
+​	Parameter Description:
+
+- by_requests  - 强制使用内置response进行检查
 
 ### run_script()
 
diff --git a/README.zh-cn.md b/README.zh-cn.md
index a7200d7..c2a6066 100644
--- a/README.zh-cn.md
+++ b/README.zh-cn.md
@@ -906,9 +906,13 @@ MixPage封装了页面操作的常用功能，可在driver和session模式间无
 
 ### check_page()
 
-​	check_page() -> bool
+​	check_page(by_requests: bool = False) -> Union[bool, None]
 
-​	派生子类后用于检查域名是否符合预期，功能由子类实现。
+​	d模式时检查网页是否符合预期。默认由response状态检查，可重载实现针对性检查。
+
+​	参数说明：
+
+- by_requests  - 强制使用内置response进行检查
 
 ### run_script()