1.增加其他界面

2.增加登录type枚举
3.注册界面增加按钮

miniprogram/app.json

@@ -3,7 +3,11 @@
         "pages/index/index",
         "pages/login/login",
         "pages/logs/logs",
-        "pages/register/register"
+        "pages/register/register",
+        "pages/teacher/index/index",
+        "pages/installer/index/index",
+        "pages/repairman/index/index",
+        "pages/itadministrator/index/index"
     ],
     "window": {
         "backgroundTextStyle": "light",

miniprogram/pages/index/index.json

@@ -1,5 +1,8 @@
 {
   "usingComponents": {
 
-  }
+  },
+
+  "navigationBarTitleText": ""
+
 }

miniprogram/pages/index/index.ts

@@ -1,4 +1,7 @@
 // pages/index/index.ts
+
+import { loginType } from '../../utils/loginType'
+
 Page({
 
     /**
@@ -16,25 +19,30 @@ Page({
     },
     clickItem: function (event: any) {
         console.log(event.target.id)
+        let type = null;
         switch (Number(event.target.id)) {
             case 0:
                 console.log("click teacher")
+                type = loginType.Teacher
                 break;
             case 1:
                 console.log("click installer")
+                type = loginType.Installer
                 break;
             case 2:
                 console.log("click repairman")
+                type = loginType.Repairman
                 break;
             case 3:
                 console.log("click it")
+                type = loginType.IT
                 break;
         }
-        this.toLoginPage(Number(event.target.id))
+        this.toLoginPage(type)
     },
     toLoginPage: function (type: any) {
         wx.navigateTo({
-            url: '../login/login?id=' + type,
+            url: '../login/login?loginType=' + type,
         })
     },
 

miniprogram/pages/installer/index/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

miniprogram/pages/installer/index/index.ts

@@ -0,0 +1,66 @@
+// pages/installer/index/index.ts
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

miniprogram/pages/installer/index/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/installer/index/index.wxml-->
+<text>pages/installer/index/index.wxml</text>

miniprogram/pages/installer/index/index.wxss

@@ -0,0 +1 @@
+/* pages/installer/index/index.wxss */

miniprogram/pages/itadministrator/index/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

miniprogram/pages/itadministrator/index/index.ts

@@ -0,0 +1,66 @@
+// pages/itadministrator/index/index.ts
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

miniprogram/pages/itadministrator/index/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/itadministrator/index/index.wxml-->
+<text>pages/itadministrator/index/index.wxml</text>

miniprogram/pages/itadministrator/index/index.wxss

@@ -0,0 +1 @@
+/* pages/itadministrator/index/index.wxss */

miniprogram/pages/login/login.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
     "updatePassword": "../../component/updatePassword/updatePassword"
-  }
+  },
+  "navigationBarTitleText": "登录"
 }

miniprogram/pages/login/login.ts

@@ -1,4 +1,7 @@
 // index.ts
+
+import { loginType } from "../../utils/loginType"
+
 // 获取应用实例
 const app = getApp<IAppOption>()
 
@@ -11,10 +14,9 @@ Page({
   },
 
   onLoad(opention: any) {
-    console.log("opention:" + opention.id)
     this.setData({
       login_check_tab: 0,
-      loginType: opention.id
+      loginType: opention.loginType
     })
 
   },
@@ -81,6 +83,27 @@ Page({
     wx.navigateTo({
       url: '../register/register',
     })
+  },
+  toTabIndex: function () {
+    let toUrl = null
+    switch (this.data.loginType) {
+      case loginType.Teacher:
+        //教师(去教师的index页面)
+        toUrl = "../teacher/index/index"
+        break;
+      case loginType.Installer:
+        //安装员(去安装员的index页面)
+        toUrl = "../installer/index/index"
+        break;
+      case loginType.Repairman:
+        //维修员(去维修员的index页面)
+        toUrl = "../repairman/index/index"
+        break;
+      case loginType.IT:
+        //IT管理员(去IT管理员的index页面)
+        toUrl = "../itadministrator/index/index"
+        break;
+    }
   }
 
 })

miniprogram/pages/register/register.json

@@ -1,3 +1,4 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "注册"
 }

miniprogram/pages/register/register.ts

@@ -77,6 +77,9 @@ Page({
             })
         }
 
+    },
+    exitPage: function () {
+        wx.navigateBack()
     }
 
 })

miniprogram/pages/register/register.wxml

@@ -74,5 +74,14 @@
             </view>
             <!--设置密码 end-->
         </view>
-    </view>
+        <!-- 按钮-->
+        <view>
+            <view class="login_btn_layout" style="margin-left: 0rpx;margin-top: 267rpxrpx;">
+                <button class="login_btn" style="width: 100%; margin-left: 0rpx;">确认</button>
+                <text style="margin-top: 21rpx;" bindtap="exitPage">取消</text>
+            </view>
+        </view>
+    </view> 
+
+
 </view>

miniprogram/pages/register/register.wxss

@@ -1,5 +1,7 @@
 /* pages/register/register.wxss */
 
+@import "../login//login.wxss";
+
 .page {
     background-color: #F9F9F9;
     /* background-color: aquamarine; */

miniprogram/pages/repairman/index/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

miniprogram/pages/repairman/index/index.ts

@@ -0,0 +1,66 @@
+// pages/repairman/index/index.ts
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

miniprogram/pages/repairman/index/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/repairman/index/index.wxml-->
+<text>pages/repairman/index/index.wxml</text>

miniprogram/pages/repairman/index/index.wxss

@@ -0,0 +1 @@
+/* pages/repairman/index/index.wxss */

miniprogram/pages/teacher/index/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

miniprogram/pages/teacher/index/index.ts

@@ -0,0 +1,66 @@
+// pages/teacher/index/index.ts
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

miniprogram/pages/teacher/index/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/teacher/index/index.wxml-->
+<text>pages/teacher/index/index.wxml</text>

miniprogram/pages/teacher/index/index.wxss

@@ -0,0 +1 @@
+/* pages/teacher/index/index.wxss */

miniprogram/utils/loginType.ts

@@ -0,0 +1,7 @@
+export const  enum loginType {
+    Teacher,
+    Installer,
+    Repairman,
+    IT
+}
+