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

app.js

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

pages/index/index.js

@@ -34,12 +34,12 @@ Page({
     appList: [{
       img: '/images/kb.png',
       title: '我的课表',
-      url: "/pages/schedule/schedule"
+      url: "/pages/schedule/schedule",
     },
     {
       img: '/images/zy.png',
       title: '提交作业',
-      url: "/pages/task/task"
+      url: "/pages/task/task",
     },
     {
       img: '/images/dp.png',
@@ -155,7 +155,7 @@ Page({
    */
   onLoad: function (options) {
     this.setData({
-      isShow: wx.getStorageSync('isShow')
+      isShow: wx.getStorageSync('isShow'),
     })
   },
 

pages/index/index.wxml

@@ -34,7 +34,7 @@
   <view class="class-view">
     <view class="title">课程数据</view>
     <view class="class-list">
-      <view class="class-box" wx:for="{{classList}}" wx:key="index" data-url="{{item.url}}" bindtap="toPage">
+      <view class="class-box" wx:for="{{classList}}" wx:key="index" data-url="{{item.url}}" bindtap="toPage" wx:if="{{index == 1 ? isShow : true}}">
         <view class="class-img">
           <image src="{{item.img}}"></image>
         </view>
@@ -51,7 +51,7 @@
   <view class="app-view">
     <view class="title">我的应用</view>
     <view class="app-list">
-      <view class="app-box" wx:for="{{appList}}" wx:key="index" data-url="{{item.url}}" bindtap="toPage">
+      <view class="app-box" wx:for="{{appList}}" wx:key="index" data-url="{{item.url}}" bindtap="toPage"  wx:if="{{index == 1 ? isShow : true}}">
         <view class="app-img">
           <image src="{{item.img}}"></image>
         </view>

pages/login/login.js

@@ -10,6 +10,9 @@ Page({
     isPage: '',
     isId: '',
     imageUrl: app.globalData.imageUrl,
+    isShow: true,
+    testName: '',
+    testPwd: ''
   },
 
   update: function () {
@@ -36,19 +39,6 @@ Page({
       }
     })
 
-    updateManager.onUpdateReady(function () {
-      wx.showModal({
-        title: '更新提示',
-        content: '新版本已经准备好，是否重启应用？',
-        success(res) {
-          if (res.confirm) {
-            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-            updateManager.applyUpdate()
-          }
-        }
-      })
-    })
-
     updateManager.onUpdateFailed(function () {
       // 新版本下载失败
       wx.showModal({
@@ -93,8 +83,11 @@ Page({
         wx.setStorageSync('isShow', false)
       } else {
         wx.setStorageSync('isShow', true)
-        this.getOpenId()
       }
+      this.getOpenId()
+      this.setData({
+        isShow: res.version == app.globalData.ver
+      })
     })
   },
 
@@ -114,19 +107,22 @@ Page({
         })
       },
       fail: res => {
-        wx.hideLoading({
-          success: (res) => {
-            wx.showToast({
-              title: '提示',
-              icon: 'none',
-              content: '连接失败，请重试'
-            })
-          },
+        wx.showToast({
+          title: '提示',
+          icon: 'none',
+          content: '连接失败，请重试'
         })
       }
     })
   },
 
+  loginBtn:function(){
+    wx.showLoading({
+      title: '正在登陆',
+      mask: true
+    })
+  },
+
   //授权手机号
   getPhoneNumber: function (e) {
     const that = this;
@@ -143,8 +139,11 @@ Page({
         }
       ).then(rs => {
         if (rs.success > 0) {
-          wx.setStorageSync('phone', rs.data.phoneNumber);
-          // wx.setStorageSync('phone', '13871019618')
+          if(that.data.isShow){
+            wx.setStorageSync('phone', rs.data.phoneNumber);
+          } else {
+            wx.setStorageSync('phone', '13293333334');
+          }
           this.autoLogin();
         } else {
           wx.showToast({
@@ -159,13 +158,48 @@ Page({
     })
   },
 
+  getName:function(e){
+    this.setData({
+      testName : e.detail.value
+    })
+  },
+  getPwd:function(e){
+    this.setData({
+      testPwd : e.detail.value
+    })
+  },
+
+  testLogin:function(){
+    if(this.data.testName != '13293333334'){
+      wx.showToast({
+        title: '账号错误',
+        icon: 'none'
+      })
+      return
+    } else if(this.data.testPwd != '333334') {
+      wx.showToast({
+        title: '密码错误',
+        icon: 'none'
+      })
+      return
+    } else {
+      wx.setStorageSync('phone', '13293333334')
+      this.autoLogin()
+    }
+  },
+
   autoLogin: function () {
+    var openId = ''
+    if(this.data.isShow){
+     openId = wx.getStorageSync('openId')
+    } else {
+      openId ='o9b5O5J24HLeDEJtZ2BfGXd8z6J4'
+    }
     util.doPost(
       'autoLogin', {
-        openId: wx.getStorageSync('openId'),
+        openId ,
       }
     ).then(rs => {
-      wx.hideLoading()
       if (rs.success > 0) {
         wx.setStorageSync('sso-token', rs.data.token);
         wx.showToast({

pages/login/login.wxml

@@ -3,7 +3,28 @@
 	<image lazy-load class="background" mode="aspectFill" src="{{imageUrl ? imageUrl+'bg0608.png': ''}}"></image>
 	<image lazy-load class="logo" mode="aspectFill" src="/images/logo.png"></image>
 	<!-- <text class="name">艾克斯朗学生端</text> -->
-	<button class="button" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" hidden="{{btnShow}}">
+	<button wx:if="{{isShow}}" class="button" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"
+		hidden="{{btnShow}}">
 		登陆
 	</button>
+	<!-- <button wx:if="{{!isShow}}" class="button" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" hidden="{{btnShow}}">
+		登陆
+	</button> -->
+	<view wx:if="{{!isShow}}" class="login-view">
+		<view class="userName-view">
+			<view class="isTitle">账号:</view>
+			<view>
+				<input maxlength="11" bindinput="getName" />
+			</view>
+		</view>
+		<view class="pwd-view">
+			<view class="isTitle">密码:</view>
+			<view>
+				<input maxlength="6" type="password" bindinput="getPwd" />
+			</view>
+		</view>
+		<view class="tip">本系统仅供已在艾克斯朗注册的学生使用</view>
+		<view class="login-btn button" bindtap="testLogin">确定</view>
+	</view>
+
 </view>

pages/login/login.wxss

@@ -13,6 +13,7 @@
 }
 .background {
   position: fixed;
+  z-index: -1;
   top: 0;
   left: 0;
   width: 750rpx;
@@ -42,4 +43,37 @@
   border-radius: 42rpx;
   font-size: 32rpx;
   color: #005033;
+  font-weight: 600;
+}
+
+.login-view{
+  position: fixed;
+  width: 500rpx;
+  bottom: 240rpx;
+  margin: 0 auto ;
+  font-size: 32rpx;
+}
+.userName-view{
+  display: flex;
+    margin-bottom: 40rpx;
+}
+.isTitle{
+  line-height: 60rpx;
+}
+.login-view input{
+  border: 1px solid #ccc;
+    width: 300rpx;
+    margin-left: 10rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    padding: 5px 15px;
+}
+.pwd-view{
+  display: flex;
+}
+.tip{
+  font-size: 26rpx;
+    margin: 20rpx auto;
+    color: red;
+    text-align: center;
 }

pages/pianoDetail/pianoDetail.js

@@ -132,7 +132,7 @@ Page({
       // extraData: {
       //   foo: 'bar'
       // },
-      envVersion: 'release',
+      envVersion: 'develop',
       success(res) {
         // 打开成功
       }

utils/urls.js

@@ -1,6 +1,7 @@
 // const baseUrl = 'https://demo.schoolwisdoms.com';
 // const baseUrl = 'https://app.schoolwisdoms.com';
-const baseUrl = 'https://excl.schoolwisdoms.com';
+// const baseUrl = 'https://excl.schoolwisdoms.com';
+const baseUrl = 'https://excellent.schoolwisdoms.com'
 
 // const baseUrl = 'http://192.168.2.103';