Signed-off-by: yukangzhe <382985154@qq.com>

app.js

@@ -68,7 +68,7 @@ App({
   },
 
   globalData: {
-    ver:'1.0.7',
+    ver:'1.0.8',
     userInfo: null,
     openId: '',
     imageUrl: 'https://app.schoolwisdoms.com/static/wx/images/',

pages/login/login.js

@@ -12,7 +12,8 @@ Page({
     imageUrl: app.globalData.imageUrl,
     isShow: true,
     testName: '',
-    testPwd: ''
+    testPwd: '',
+    isOpenId:''
   },
 
   update: function () {
@@ -103,6 +104,9 @@ Page({
         ).then(res => {
           if (res.success == 1) {
             wx.setStorageSync('openId', res.data.openId)
+            this.setData({
+              isOpenId :res.data.openId
+            })
           }
         })
       },

pages/login/login.wxml

@@ -3,10 +3,19 @@
 	<image lazy-load class="background" mode="aspectFill" src="{{imageUrl ? imageUrl+'bg0608.png': ''}}"></image>
 	<image lazy-load class="logo" mode="aspectFill" src="/images/login-logo.png"></image>
 	<!-- <text class="name">艾克斯朗学生端</text> -->
-	<button wx:if="{{isShow}}" class="button" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"
+	<button wx:if="{{isShow && isOpenId}}" class="button" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"
 		hidden="{{btnShow}}">
-		登陆
+		点击登陆
 	</button>
+	<text wx:if="{{isShow && isOpenId}}" class="login-tip">此小程序仅供艾克斯朗学员登录使用</text>
+	<view wx:if="{{isShow && isOpenId}}" class="slogan-view">
+		<view class="slogan-en">Be Excellent<text class="nbsp"></text>Better To Do</view>
+		<view class="slogan-zn">艾克斯朗<text class="nbsp"></text>培养与众不同的你</view>
+		<view class="agreement-view">
+		登录即表示同意<text class="agreement-text">《艾克斯朗平台相关协议》</text>
+	</view>
+	</view>
+	
 	<!-- <button wx:if="{{!isShow}}" class="button" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" hidden="{{btnShow}}">
 		登陆
 	</button> -->

pages/login/login.wxss

@@ -20,30 +20,31 @@
   height: 1125rpx;
 }
 .logo{
-  margin-top: 208rpx;
-  margin-bottom: 20rpx;
-  width: 390rpx;
-  height: 390rpx;
+  margin-top: 100rpx;
+  margin-bottom: 100rpx;
+  width: 290rpx;
+  height: 290rpx;
   z-index: 3;
 }
 .button {
   /* margin: 0; */
   padding: 0;
-  position: fixed;
-  left: 50%;
-  transform: translateX(-50%);
-  bottom: 120rpx;
-  width: 400rpx;
-  height: 82rpx;
-  line-height: 82rpx;
+  /* position: fixed; */
+  /* left: 50%; */
+  /* transform: translateX(-50%); */
+  /* bottom: 120rpx; */
+  width: 500rpx !important;
+  height: 100rpx;
+  line-height: 100rpx;
   text-align: center;
   background: rgba(255, 255, 255, 1);
-  border: 2rpx solid #005033;
-  box-shadow: 0rpx 4rpx 12rpx #005033;
-  border-radius: 42rpx;
-  font-size: 32rpx;
+  border: 1rpx solid #005033;
+  /* box-shadow: 0rpx 20rpx 60rpx -15px #005033; */
+  border-radius: 100rpx;
+  font-size: 30rpx;
+  letter-spacing: 10rpx;
   color: #005033;
-  font-weight: 600;
+  font-weight: 400;
 }
 
 .login-view{
@@ -76,4 +77,42 @@
     margin: 20rpx auto;
     color: red;
     text-align: center;
+}
+.login-tip{
+  font-size: 24rpx;
+  margin: 50rpx auto;
+  color: #005033;
+  text-align: center;
+  letter-spacing: 2rpx;
+}
+.nbsp{
+  margin: 0 10rpx;
+}
+.slogan-view{
+  color: #005033;
+  font-size: 24rpx;
+ 
+  text-align: center;
+  position: fixed;
+  bottom: 140rpx;
+}
+.slogan-en{
+  letter-spacing: 4rpx;
+}
+.slogan-zn{
+  letter-spacing: 2rpx;
+  font-size: 22rpx;
+}
+.slogan-view view:first-child{
+  margin-bottom: 20rpx;
+}
+.agreement-view{
+  margin-top: 100rpx;
+  font-size: 18rpx;
+  letter-spacing: 2rpx;
+  text-align: center;
+}
+.agreement-text{
+  color: #cc6031;
+  letter-spacing: 1rpx;
 }