Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs

@@ -431,7 +431,7 @@ namespace Learun.Application.Web.Controllers
             var lc = LicenseChecker.CheckLicense();
             if (!lc.Result)
             {
-                return Content("<script>alert('" + lc.Message + "');location.href='/ShowRegister/Index';</script>");
+                return Content("<script>alert('" + lc.Message + "');location.href='about:blank';</script>");
             }
             //return View("AdminTop");
             string learn_UItheme = WebHelper.GetCookie("Learn_ADMS_V6.1_UItheme");

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs

@@ -189,7 +189,7 @@ namespace Learun.Application.Web.Controllers
             var lc = LicenseChecker.CheckLicense();
             if (!lc.Result)
             {
-                return Content("<script>alert('" + lc.Message + "');location.href='/ShowRegister/Index';</script>");
+                return Content("<script>alert('" + lc.Message + "');location.href='about:blank';</script>");
             }
             //获取错误次数
             ViewBag.errornum = OperatorHelper.Instance.GetCurrentErrorNum();

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue

@@ -1,6 +1,8 @@
 <template>
   <view class="page">
     <view class="content">
+	  <image src="@/static/login-banner.png" mode="widthFix" style="width:100%"></image>
+	  <view style="padding: 0 38px;">
       <view class="head-banner">
         <!-- 标题文字 -->
         <view class="main-title">
@@ -61,6 +63,8 @@
         :range="apiRootList"
         type="radio"
       />
+	  	
+	  </view>
     </view>
     <!-- 页面底部版权文字 -->
     <view class="footer">{{ copyRightDisplay }}</view>
@@ -239,7 +243,7 @@ page {
   .content {
     text-align: center;
     width: 100%;
-    padding: 0 38rpx;
+    // padding: 0 38rpx;
   }
 
   .head-banner {