diff --git a/488.async.js b/488.async.js
index ae5116e5d6..88626161b9 100644
--- a/488.async.js
+++ b/488.async.js
@@ -201,12 +201,12 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
           children: message || "申请已提交，请等待审核"
         }),
         onOk: function onOk() {
-          umi__WEBPACK_IMPORTED_MODULE_4__.history.push("/classrooms/".concat(course_id, "/students"));
+          window.location.href = "/classrooms/".concat(course_id, "/students");
         }
       });
       return;
     }
-    umi__WEBPACK_IMPORTED_MODULE_4__.history.push("/classrooms/".concat(course_id, "/students"));
+    window.location.href = "/classrooms/".concat(course_id, "/students");
   };
   var handleOk = /*#__PURE__*/function () {
     var _ref2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().mark(function _callee() {
diff --git a/56615.async.js b/56615.async.js
index 07a3caefe5..46bbadb4e1 100644
--- a/56615.async.js
+++ b/56615.async.js
@@ -128,7 +128,7 @@ var EditAttendance = function EditAttendance(_ref) {
   params['id'] = params['coursesId'];
   params['course_id'] = params['coursesId'];
   params['limit'] = 20;
-  params['page'] = 1;
+  var page = (0,react__WEBPACK_IMPORTED_MODULE_5__.useRef)(0);
   var getData = /*#__PURE__*/function () {
     var _ref2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().mark(function _callee() {
       var res;
@@ -136,17 +136,19 @@ var EditAttendance = function EditAttendance(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setIsLoading(true);
-            _context.next = 3;
-            return (0,_service_teacher__WEBPACK_IMPORTED_MODULE_6__/* .getList */ .gp)(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_objectSpread2_js__WEBPACK_IMPORTED_MODULE_2___default()({}, params));
-          case 3:
+            page.current++;
+            _context.next = 4;
+            return (0,_service_teacher__WEBPACK_IMPORTED_MODULE_6__/* .getList */ .gp)(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_objectSpread2_js__WEBPACK_IMPORTED_MODULE_2___default()(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_objectSpread2_js__WEBPACK_IMPORTED_MODULE_2___default()({}, params), {}, {
+              page: page.current
+            }));
+          case 4:
             res = _context.sent;
             if (res !== null && res !== void 0 && res.teacher_list) {
-              params['page']++;
               setData([].concat(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1___default()(data), _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1___default()(res.teacher_list)));
               if (res.teacher_list.length !== params['limit']) setHasMore(false);
             }
             setIsLoading(false);
-          case 6:
+          case 7:
           case "end":
             return _context.stop();
         }
@@ -158,7 +160,8 @@ var EditAttendance = function EditAttendance(_ref) {
   }();
   (0,react__WEBPACK_IMPORTED_MODULE_5__.useEffect)(function () {
     if (teachers.actionTabs.key === '更换管理员') {
-      params['page'] = 1;
+      page.current = 0;
+      setHasMore(true);
       setData([]);
       getData();
     }
diff --git a/layouts__LoginAndRegister__index.async.js b/layouts__LoginAndRegister__index.async.js
index 0c5140458b..4e7739a154 100644
--- a/layouts__LoginAndRegister__index.async.js
+++ b/layouts__LoginAndRegister__index.async.js
@@ -48,6 +48,7 @@ var jsx_runtime = __webpack_require__(37712);
 
 
 
+
 var HOST = window.location.host;
 var redirect_uri = env/* default */.Z.QQLoginCB;
 function onQQLogin() {
@@ -120,7 +121,25 @@ var LoginAndRegister = function LoginAndRegister(_ref) {
         })]
       }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
         justify: "center",
-        children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+        children: [(0,util/* isPc */.b9)() && /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+              title: "\u4F7F\u7528\u5FAE\u4FE1\u8D26\u53F7\u767B\u5F55",
+              children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+                className: "".concat(LoginAndRegistermodules.icon, " ").concat(LoginAndRegistermodules.wx),
+                onClick: onWechatLogin
+              })
+            })
+          }), !(0,util/* isWechatBrowser */.IS)() && /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+              title: "\u4F7F\u7528QQ\u8D26\u53F7\u767B\u5F55",
+              children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+                className: "".concat(LoginAndRegistermodules.icon, " ").concat(LoginAndRegistermodules.qq),
+                onClick: onQQLogin
+              })
+            })
+          })]
+        }), (0,util/* isMobileDevice */.s2)() && (0,util/* isWechatBrowser */.IS)() && /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
           children: /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
             title: "\u4F7F\u7528\u5FAE\u4FE1\u8D26\u53F7\u767B\u5F55",
             children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -128,7 +147,7 @@ var LoginAndRegister = function LoginAndRegister(_ref) {
               onClick: onWechatLogin
             })
           })
-        }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+        }), (0,util/* isMobileDevice */.s2)() && !(0,util/* isWechatBrowser */.IS)() && /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
           children: /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
             title: "\u4F7F\u7528QQ\u8D26\u53F7\u767B\u5F55",
             children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
diff --git a/layouts__index.async.js b/layouts__index.async.js
index 22e41a3029..ca9b62fe1b 100644
--- a/layouts__index.async.js
+++ b/layouts__index.async.js
@@ -1670,7 +1670,6 @@ var env = __webpack_require__(78130);
 
 
 
-
 var HOST = window.location.host;
 var redirect_uri = env/* default */.Z.QQLoginCB;
 /* harmony default export */ var OauthPanel = (function (_ref) {
@@ -1678,11 +1677,13 @@ var redirect_uri = env/* default */.Z.QQLoginCB;
     setType = _ref.setType,
     loginType = _ref.loginType;
   function onQQLogin() {
+    var href = "";
     if ((0,util/* isPc */.b9)()) {
-      window.location.href = "https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=".concat(redirect_uri, "%2fotherloginqq&state=null,").concat(HOST, "&response_type=code");
+      href = "https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=".concat(redirect_uri, "%2fotherloginqq&state=null,").concat(HOST, "&response_type=code");
     } else {
-      (0,util/* openNewWindow */.xg)("https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=".concat(redirect_uri, "%2fotherloginqq&state=null,").concat(HOST, "&response_type=code"));
+      href = "https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=".concat(redirect_uri, "%2fotherloginqq&state=null,").concat(HOST, "&response_type=code");
     }
+    return href;
   }
   return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [(loginType === 1 || loginType === 2) && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
@@ -1721,22 +1722,50 @@ var redirect_uri = env/* default */.Z.QQLoginCB;
       })
     }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: OauthPanelmodules['other-login'],
-      children: [/*#__PURE__*/(0,jsx_runtime.jsx)("a", {
+      children: [(0,util/* isMobileDevice */.s2)() && (0,util/* isWechatBrowser */.IS)() && /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
         title: "\u5FAE\u4FE1\u767B\u5F55",
+        style: {
+          margin: 0
+        },
         onClick: onWechatLogin,
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
           src: wechat,
           alt: "\u5FAE\u4FE1",
           width: 66
         })
-      }), /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
+      }), (0,util/* isMobileDevice */.s2)() && !(0,util/* isWechatBrowser */.IS)() && /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
         title: "qq\u767B\u5F55",
-        onClick: onQQLogin,
+        rel: "noreferrer noopener nofollow",
+        style: {
+          margin: 0
+        },
+        href: onQQLogin(),
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
           src: qq,
           alt: "QQ",
           width: 66
         })
+      }), (0,util/* isPc */.b9)() && /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+        children: [/*#__PURE__*/(0,jsx_runtime.jsx)("a", {
+          title: "\u5FAE\u4FE1\u767B\u5F55",
+          style: {
+            marginRight: (0,util/* isWechatBrowser */.IS)() ? 0 : 40
+          },
+          onClick: onWechatLogin,
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+            src: wechat,
+            alt: "\u5FAE\u4FE1",
+            width: 66
+          })
+        }), !(0,util/* isWechatBrowser */.IS)() && /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
+          title: "qq\u767B\u5F55",
+          href: onQQLogin(),
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+            src: qq,
+            alt: "QQ",
+            width: 66
+          })
+        })]
       })]
     })]
   });
@@ -2040,6 +2069,7 @@ var col = __webpack_require__(43604);
 
 
 
+
 var TabPane = tabs/* default */.Z.TabPane;
 /* harmony default export */ var LoginPanel = (function (_ref) {
   var dispatch = _ref.dispatch,
@@ -2068,6 +2098,10 @@ var TabPane = tabs/* default */.Z.TabPane;
     setWechatQrcode(false);
   }
   function onWechatLogin() {
+    if ((0,util/* isMobileDevice */.s2)()) {
+      (0,util/* toWechatLogin */.Or)();
+      return;
+    }
     setLoginType(2);
     setWechatQrcode(true);
   }
diff --git a/p__Classrooms__Index__index.async.js b/p__Classrooms__Index__index.async.js
index 3163c843a2..4364762d94 100644
--- a/p__Classrooms__Index__index.async.js
+++ b/p__Classrooms__Index__index.async.js
@@ -201,12 +201,12 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
           children: message || "申请已提交，请等待审核"
         }),
         onOk: function onOk() {
-          umi__WEBPACK_IMPORTED_MODULE_4__.history.push("/classrooms/".concat(course_id, "/students"));
+          window.location.href = "/classrooms/".concat(course_id, "/students");
         }
       });
       return;
     }
-    umi__WEBPACK_IMPORTED_MODULE_4__.history.push("/classrooms/".concat(course_id, "/students"));
+    window.location.href = "/classrooms/".concat(course_id, "/students");
   };
   var handleOk = /*#__PURE__*/function () {
     var _ref2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().mark(function _callee() {
diff --git a/p__User__Detail__Classrooms__index.async.js b/p__User__Detail__Classrooms__index.async.js
index 85a8340618..d830cfb53a 100644
--- a/p__User__Detail__Classrooms__index.async.js
+++ b/p__User__Detail__Classrooms__index.async.js
@@ -243,12 +243,12 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
           children: message || "申请已提交，请等待审核"
         }),
         onOk: function onOk() {
-          umi__WEBPACK_IMPORTED_MODULE_4__.history.push("/classrooms/".concat(course_id, "/students"));
+          window.location.href = "/classrooms/".concat(course_id, "/students");
         }
       });
       return;
     }
-    umi__WEBPACK_IMPORTED_MODULE_4__.history.push("/classrooms/".concat(course_id, "/students"));
+    window.location.href = "/classrooms/".concat(course_id, "/students");
   };
   var handleOk = /*#__PURE__*/function () {
     var _ref2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().mark(function _callee() {
diff --git a/p__User__WechatLogin__index.async.js b/p__User__WechatLogin__index.async.js
index 9a97023a12..9ca2aebfcf 100644
--- a/p__User__WechatLogin__index.async.js
+++ b/p__User__WechatLogin__index.async.js
@@ -45,15 +45,17 @@ __webpack_require__.r(__webpack_exports__);
     }
     function _init() {
       _init = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().mark(function _callee() {
-        var _yield$get, status, new_user, addinfo, href;
+        var ua, _yield$get, status, new_user, addinfo, href;
         return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_2_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
-              return (0,_utils_fetch__WEBPACK_IMPORTED_MODULE_5__/* .get */ .U2)('auth/wechat/callback.json', {
+              // /api/auth/wechat/web_callback.json
+              ua = navigator.userAgent.toLowerCase();
+              _context.next = 3;
+              return (0,_utils_fetch__WEBPACK_IMPORTED_MODULE_5__/* .get */ .U2)("auth/wechat/".concat(ua.match(/MicroMessenger/i) == "micromessenger" ? "web_callback" : "callback", ".json"), {
                 code: code
               });
-            case 2:
+            case 3:
               _yield$get = _context.sent;
               status = _yield$get.status;
               new_user = _yield$get.new_user;
@@ -86,7 +88,7 @@ __webpack_require__.r(__webpack_exports__);
                   }
                 });
               }
-            case 6:
+            case 7:
             case "end":
               return _context.stop();
           }
diff --git a/umi.css b/umi.css
index 8a261e0445..76aa4b5f9d 100644
--- a/umi.css
+++ b/umi.css
@@ -12638,5 +12638,6 @@ body[data-custom='y-hidden'] {
 .layoutMainClass___t8btz {
   min-width: 1200px;
   min-height: 80vh;
+  overflow: hidden;
 }
 
diff --git a/umi.js b/umi.js
index 506c839494..2f5b1e35c2 100644
--- a/umi.js
+++ b/umi.js
@@ -53249,6 +53249,7 @@ function del(url, params) {
 /* harmony export */   G7: function() { return /* binding */ handleValidatorNickName; },
 /* harmony export */   HJ: function() { return /* binding */ handleValidatorName; },
 /* harmony export */   I9: function() { return /* binding */ RomanNumber; },
+/* harmony export */   IS: function() { return /* binding */ isWechatBrowser; },
 /* harmony export */   JL: function() { return /* binding */ formatHomeWorkStatusToName; },
 /* harmony export */   L4: function() { return /* binding */ PollsStatus; },
 /* harmony export */   L9: function() { return /* binding */ trackEvent; },
@@ -53259,6 +53260,7 @@ function del(url, params) {
 /* harmony export */   NY: function() { return /* binding */ setUrlQuery; },
 /* harmony export */   Nd: function() { return /* binding */ downLoadLink; },
 /* harmony export */   Oo: function() { return /* binding */ getCategoryName; },
+/* harmony export */   Or: function() { return /* binding */ toWechatLogin; },
 /* harmony export */   PF: function() { return /* binding */ formatRandomPaperDatas; },
 /* harmony export */   Pq: function() { return /* binding */ cutName; },
 /* harmony export */   QB: function() { return /* binding */ timeContrast; },
@@ -53311,6 +53313,7 @@ function del(url, params) {
 /* harmony export */   rK: function() { return /* binding */ HomeWorkShixunListStatus; },
 /* harmony export */   rU: function() { return /* binding */ showTotal; },
 /* harmony export */   rz: function() { return /* binding */ moveArray; },
+/* harmony export */   s2: function() { return /* binding */ isMobileDevice; },
 /* harmony export */   tP: function() { return /* binding */ cutFileName; },
 /* harmony export */   tw: function() { return /* binding */ getTwoDecimalPlaces; },
 /* harmony export */   uD: function() { return /* binding */ dealUploadChange; },
@@ -56066,6 +56069,24 @@ var formatRandomPaperDatas = function formatRandomPaperDatas(originData) {
     exam: exam
   };
 };
+var isWechatBrowser = function isWechatBrowser() {
+  var ua = navigator.userAgent.toLowerCase();
+  if (ua.match(/MicroMessenger/i) == "micromessenger") {
+    return true;
+  } else {
+    return false;
+  }
+};
+var toWechatLogin = function toWechatLogin() {
+  if (isWechatBrowser()) {
+    window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx0955caba88bc37eb&redirect_uri=https%3A%2F%2Fwww.educoder.net%2fotherloginstart&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
+  } else {
+    window.location.href = "/wxlogin.html";
+  }
+};
+var isMobileDevice = function isMobileDevice() {
+  return typeof window.orientation !== "undefined" || navigator.userAgent.indexOf('Mobi') !== -1;
+};
 
 /***/ }),