Merge branch 'master' of http://git.dgtis.com/qxp/dorm-manager

dorm-manager-wx/pages/student/application/application.wxml

@@ -56,12 +56,12 @@
           <view>：</view>
           <input bindinput="phone" maxlength="11" type="number" name='phone'></input>
         </view>
-        <view class="input">
+        <!-- <view class="input">
           <view class="input-name"><text>验</text><text>证</text><text>码</text></view>
           <view>：</view>
           <input maxlength="6" type="number" name='code' style="width:240rpx"></input>
           <button bindtap="{{codetext>0?'':'code'}}" class="code">{{codetext}}</button>
-        </view>
+        </view> -->
         <view class="textarea">
           <view class="input-name"><text>通</text><text>行</text><text>原</text><text>因</text></view>
           <view>：</view>

dorm-manager-wx/pages/student/menu/menu.wxml

@@ -11,7 +11,7 @@
 <view class="list">
   <block wx:for='{{userInfo.roleType==10001?listTeacher:listStudent}}' wx:key='{{index}}'>
     <navigator url="/pages/{{userInfo.roleType==10001?'teacher':'student'}}/{{item.url}}/{{item.url}}">
-      <view catchtap="check" class="line">
+      <view catchtap="{{userInfo.roleType==10002?'check':''}}" class="line">
         <view class="list-title">
           <image src='/images/{{item.nav}}.png'></image>
           <view>{{item.title}}</view>

dorm-manager-wx/pages/student/pass/pass.js

@@ -124,6 +124,7 @@ Page({
           })
           return false
         }
+        debugger
         for (let index in res.data.data){
           res.data.data[index].openTime = (new Date(parseInt(res.data.data[index].openTime)).toLocaleString().replace(/:\d{1,2}$/, ' ')).split(' ')[1]
         }

dorm-manager-wx/pages/teacher/facephoto/facephoto.js

@@ -127,7 +127,7 @@ Page({
    */
   onLoad: function(options) {
     const that = this;
-    that.data.userInfo = wx.getStorageSync('lnkjUserInfo');
+    that.data.userInfo = wx.getStorageSync('user');
     that.getCollegeInfo();
   },