yanym 5 éve
szülő
commit
f362654288

+ 3 - 1
dorm-manager-wx/pages/teacher/facephoto/facephoto.js

@@ -54,7 +54,9 @@ Page({
     })
   },
 
-  
+  getRegisterInfo: function(e) {
+    
+  },
 
   /**
    * 生命周期函数--监听页面加载

+ 8 - 12
dorm-manager-wx/pages/teacher/visitorcheck/visitorcheck.js

@@ -10,17 +10,9 @@ Page({
    */
   data: {
     isregiste: true,
-    list: [{
-      img: '/images/head.png',
-      name: '刘天仙',
-      address: '一号宿舍楼 502宿舍',
-      time: '2019-10-28 15:18'
-    }, {
-      img: '/images/head.png',
-      name: '陈方明',
-      address: '一号宿舍楼 508宿舍',
-      time: '2019-10-28 15:18'
-    }]
+    approvalNum:0,
+    approvedNum:0,
+    list: []
   },
 
   checkTab: function(e) {
@@ -48,7 +40,11 @@ Page({
       rows: 20,
       page: 1
     }, 'post').then(res => {
-      
+      that.setData({
+        list: res.data.data.data,
+        approvalNum:res.data.data.approval,
+        approvedNum:res.data.data.approved
+      })
     })
   },
 

+ 6 - 6
dorm-manager-wx/pages/teacher/visitorcheck/visitorcheck.wxml

@@ -1,20 +1,20 @@
 <!-- visitorcheck.wxml -->
 <view class="mycontainer" style="padding:0rpx;">
   <view class="tab-item">
-    <view class="item {{isregiste?'item-checked':''}}" bindtap="checkTab">未审核(18)</view>
-    <view class="item {{isregiste?'':'item-checked'}}" bindtap="checkTab">已审核(69)</view>
+    <view class="item {{isregiste?'item-checked':''}}" bindtap="checkTab">未审核({{approvalNum}})</view>
+    <view class="item {{isregiste?'':'item-checked'}}" bindtap="checkTab">已审核({{approvedNum}})</view>
   </view>
   <scroll-view scroll-y='true'>
     <block wx:for='{{list}}'>
       <view class="list-item" hover-class="myhover" hover-start-time="50" hover-stay-time="50" bindtap="todetail">
-        <image src="{{item.img}}" class="head-img"></image>
+        <image src="{{item.localPhoto?item.localPhoto:'/images/default-urser.png'}}" class="head-img"></image>
         <view class="my-column my-flex-sb" style="height:150rpx;">
-          <view class="name">{{item.name}}</view>
+          <view class="name">{{item.inviteName}}</view>
           <view class="address">
             <image src="/images/dizhi.png" class="address-img"></image>
-            <view class="create-time">{{item.address}}</view>
+            <view class="create-time">{{item.inviteOrganization}}</view>
           </view>
-          <view class="create-time">提交时间:{{item.time}}</view>
+          <view class="create-time">提交时间:{{item.createDate}}</view>
         </view>
       </view>
     </block>

+ 4 - 4
dorm-manager-wx/utils/api.js

@@ -1,5 +1,5 @@
 //index 0开发环境   1测试环境   2正式环境
-const index = 1,
+const index = 0,
   api = {
     login: 'auth/login_by_weixin', //登录
     getMyPrivateMsgCount: 'message/getMyPrivateMsgCount', //加载是否有未读消息
@@ -97,9 +97,9 @@ const index = 1,
     getVisitorCheckInfo: 'visitor/visitorInfo.if' //获取审批中和已审批的访客信息
   },
   [root] = [
-    ["http://192.168.100.234:8080/oneportal/"],
-    ["http://192.168.0.27:9082/wx/"],
-    // ["http://192.168.0.27:8080/wx/"],
+    ["http://10.32.2.209:7088/oneportal/"],
+    // ["http://192.168.0.27:9082/wx/"],
+    ["http://192.168.0.27:8080/wx/"],
     ["https://zhll.dgtis.com/wx/"]
   ][index]
 Object.keys(api).forEach(x => {

+ 17 - 13
dorm-manager-wx/utils/util.js

@@ -1,4 +1,4 @@
-let weekArray = new Array("日", "一", "二", "三", "四", "五", "六").map(x=>`星期${x}`);
+let weekArray = new Array("日", "一", "二", "三", "四", "五", "六").map(x => `星期${x}`);
 
 //格式化日期
 const formatDate = (date = new Date()) => {
@@ -12,6 +12,7 @@ const formatDate = (date = new Date()) => {
   const day = date.getDate()
   return [year, month, day].map(formatNumber).join('-')
 }
+
 function formatTime(time) {
   if (typeof time !== 'number' || time < 0) {
     return time
@@ -23,11 +24,12 @@ function formatTime(time) {
   time = parseInt(time % 60, 10)
   const second = time
 
-  return ([hour, minute, second]).map(function (n) {
+  return ([hour, minute, second]).map(function(n) {
     n = n.toString()
     return n[1] ? n : '0' + n
   }).join(':')
 }
+
 function formatDateTime(date, withMs = false) {
 
   function formatLeadingZeroNumber(n, digitNum = 2) {
@@ -52,7 +54,7 @@ function formatDateTime(date, withMs = false) {
   return ret
 }
 
-function dateLaters(days, todate= new Date()) {
+function dateLaters(days, todate = new Date()) {
   var dateArry = [];
   for (var i = 0; i < days; i++) {
     var dateObj = dateLater(todate, i);
@@ -60,7 +62,8 @@ function dateLaters(days, todate= new Date()) {
   }
   return dateArry;
 }
-function dateLater(dates, later=0) {
+
+function dateLater(dates, later = 0) {
   let date = new Date(dates);
   date.setDate(date.getDate() + later);
   let day = date.getDay();
@@ -69,7 +72,7 @@ function dateLater(dates, later=0) {
   let dayFormate = (date.getDate() < 10 ? ("0" + date.getDate()) : date.getDate());
   return [yearDate + '-' + month + '-' + dayFormate, weekArray[day]];
 }
- 
+
 
 
 function formatLocation(longitude, latitude) {
@@ -86,16 +89,17 @@ function formatLocation(longitude, latitude) {
     latitude: latitude.toString().split('.')
   }
 }
-function getDateStr(today, addDayCount){
+
+function getDateStr(today, addDayCount) {
   var dd;
   if (today) {
     dd = new Date(today);
   } else {
     dd = new Date();
   }
-  dd.setDate(dd.getDate() + addDayCount);//获取AddDayCount天后的日期 
+  dd.setDate(dd.getDate() + addDayCount); //获取AddDayCount天后的日期 
   var y = dd.getFullYear();
-  var m = dd.getMonth() + 1;//获取当前月份的日期 
+  var m = dd.getMonth() + 1; //获取当前月份的日期 
   var d = dd.getDate();
   if (m < 10) {
     m = '0' + m;
@@ -113,7 +117,7 @@ function httpRequest(url, data = {}, method = "GET") {
   } else if (method == 'POST' || method == 'post') {
     contentType = 'application/x-www-form-urlencoded'
   }
-  return new Promise(function (resolve, reject) {
+  return new Promise(function(resolve, reject) {
     wx.request({
       url: url,
       data: data,
@@ -121,15 +125,15 @@ function httpRequest(url, data = {}, method = "GET") {
       header: {
         'Content-Type': contentType,
       },
-      success: function (res) {
+      success: function(res) {
         console.log(res);
-        if (res.data.errmsg == "success") {
+        if (res.data.errmsg == "success" || res.data.errmsg == '成功') {
           resolve(res);
         } else {
           console.log('请求失败');
         }
       },
-      fail: function (res) {
+      fail: function(res) {
         console.log(res);
         resolve(res);
       }
@@ -146,4 +150,4 @@ module.exports = {
   formatLocation,
   getDateStr,
   httpRequest
-}
+}