整合学生端和教师端

dorm-manager-wx/pages/student/pass/tool.wxs

@@ -0,0 +1,30 @@
+//日期格式化-------------------------------------------------------------
+var formatTime = function (strDate) {
+  return 1
+  // 解决ios出现NaN问题
+  var realDate = strDate ? getDate(strDate.replace(getRegExp('-', 'g'), '/')) : getDate();
+  var regYear = getRegExp("(y+)", "i");
+  var date = [
+    ["M+", realDate.getMonth() + 1],
+    ["d+", realDate.getDate()],
+    ["h+", realDate.getHours()],
+    ["m+", realDate.getMinutes()],
+    ["s+", realDate.getSeconds()],
+    ["q+", Math.floor((realDate.getMonth() + 3) / 3)],
+    ["S+", realDate.getMilliseconds()],
+  ];
+  var reg1 = regYear.exec(format);
+  if (reg1) {
+    format = format.replace(reg1[1], (realDate.getFullYear() + '').substring(4 - reg1[1].length));
+  }
+  for (var i = 0; i < date.length; i++) {
+    var reg2 = getRegExp("(" + date[i][0] + ")").exec(format);
+    if (reg2) {
+      format = format.replace(reg2[1], reg2[1].length == 1 ? v : ("00" + date[i][1]).substring(("" + date[i][1]).length));
+    }
+  }
+  return format;
+}
+module.exports = {
+  formatTime: formatTime//日期格式化
+}

dorm-manager-wx/pages/user/index.js

@@ -18,19 +18,20 @@ Page({
         {
           title: '个人信息',
           icon: 'user-icon',
-          url: '/pages/student/user/user',
-
+          studenturl: '/pages/student/user/user',
+          teacherurl:'/pages/student/user/user'
         },
         {
           title: '我的投诉建议',
           icon: 'tousu',
-          url: '/pages/student/proposalList/proposalList',
-
+          studenturl: '/pages/student/proposalList/proposalList',
+          teacherurl:''
         },
         {
           title: '我的设置',
           icon: 'shezhi',
-          url: 'setting/index',
+          studenturl: 'setting/index',
+          teacherurl:'setting/index'
         }
       ]
 
@@ -40,7 +41,8 @@ Page({
     let userInfo = wx.getStorageSync('user')
     this.setData({
       photo: userInfo.headImage ? api.total.split('.if')[0]+userInfo.headImage :'/images/default-urser.png',
-      viewName: userInfo.userName
+      viewName: userInfo.userName,
+      roleType:wx.getStorageSync('user').roleType
     })
     // if (!userInfo){
     //   let { viewName = '', photo = '' } = await getUserInfo()
@@ -56,9 +58,16 @@ Page({
     // }
   },
   navigate_auth:function(e){
-    wx.navigateTo({
-      url: e.currentTarget.dataset.url,
-    })
+    if (e.currentTarget.dataset.url){
+      wx.navigateTo({
+        url: e.currentTarget.dataset.url,
+      })
+    }else{
+      wx.showToast({
+        title: '功能开发中',
+        icon:'none'
+      })
+    }
   },
   updateimage:function(){
     let that=this

dorm-manager-wx/pages/user/index.wxml

@@ -17,7 +17,7 @@
 </view>
 <!-- <list template="nav" templateList="{{list}}"></list> -->
 <block wx:for='{{list}}' wx:for-key='{{index}}'>
-  <view class='nav' catchtap='navigate_auth' data-url='{{item.url}}'>
+  <view class='nav' catchtap='navigate_auth' data-url='{{roleType==10001?item.teacherurl:item.studenturl}}'>
     <image class='nav-icon' src='/images/{{item.icon}}.png' mode="widthFix" />
     <view class='nav-content'>
       <text>{{item.title}}</text>