yanym 5 years ago
parent
commit
20548eeab8

+ 5 - 0
dorm-manager-wx/pages/teacher/facephoto/facephoto.js

@@ -1,3 +1,6 @@
+const util = require('../../../utils/util.js');
+const api = require('../../../utils/api.js');
+
 const app = getApp()
 
 Page({
@@ -51,6 +54,8 @@ Page({
     })
   },
 
+  
+
   /**
    * 生命周期函数--监听页面加载
    */

+ 4 - 8
dorm-manager-wx/pages/teacher/menu/menu.js

@@ -1,4 +1,7 @@
-// pages/student/menu/menu.js
+const util = require('../../../utils/util.js');
+const api = require('../../../utils/api.js');
+const app = getApp();
+
 Page({
 
   /**
@@ -93,12 +96,5 @@ Page({
    */
   onReachBottom: function() {
 
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function() {
-
   }
 })

+ 3 - 0
dorm-manager-wx/pages/teacher/pass/pass.js

@@ -1,3 +1,6 @@
+const util = require('../../../utils/util.js');
+const api = require('../../../utils/api.js');
+
 const app=getApp();
 
 Page({

+ 2 - 1
dorm-manager-wx/pages/teacher/statistics/statistics.js

@@ -1,5 +1,6 @@
 const wxCharts = require('../../../utils/wxcharts.js');
-const data = require('../../../utils/util.js');
+const util = require('../../../utils/util.js');
+const api = require('../../../utils/api.js');
 const app = getApp()
 let ringChart = null;
 

+ 21 - 1
dorm-manager-wx/pages/teacher/visitorcheck/visitorcheck.js

@@ -1,3 +1,6 @@
+const util = require('../../../utils/util.js');
+const api = require('../../../utils/api.js');
+
 const app = getApp()
 
 Page({
@@ -25,6 +28,11 @@ Page({
     that.setData({
       isregiste: !that.data.isregiste
     })
+    if (that.data.isregiste) {
+      that.getVisitorCheckInfo(2);
+    } else {
+      that.getVisitorCheckInfo(3);
+    }
   },
 
   todetail: function(e) {
@@ -33,11 +41,23 @@ Page({
     })
   },
 
+  getVisitorCheckInfo: function(status) {
+    const that = this;
+    util.httpRequest(api.getVisitorCheckInfo, {
+      status: status,
+      rows: 20,
+      page: 1
+    }, 'post').then(res => {
+      
+    })
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
+    const that = this;
+    that.getVisitorCheckInfo(2);
   },
 
   /**

+ 3 - 0
dorm-manager-wx/pages/teacher/visitorcheckdetail/visitorcheckdetail.js

@@ -1,3 +1,6 @@
+const util = require('../../../utils/util.js');
+const api = require('../../../utils/api.js');
+
 const app = getApp();
 
 Page({

+ 3 - 0
dorm-manager-wx/pages/teacher/warning/warning.js

@@ -1,3 +1,6 @@
+const util = require('../../../utils/util.js');
+const api = require('../../../utils/api.js');
+
 const app = getApp();
 
 Page({

+ 36 - 30
dorm-manager-wx/utils/api.js

@@ -8,8 +8,8 @@ const index = 2,
     clubDetails: 'organize/detail', //  委办局详情
     guidanceDocList: 'items/guidanceDocList', // 服务大厅 办事指南 
     newsDetail: 'news/read', //新闻详情
-    newsList: 'news/list',   //新闻列表
-    allDept:'getAllVillagesDept.if',
+    newsList: 'news/list', //新闻列表
+    allDept: 'getAllVillagesDept.if',
 
     // level: 'getAllDeptByLevel.if', //服务大厅部门类别
     // levelDetail: 'getPreServiceByParam.if', //服务大厅事项列表
@@ -20,9 +20,9 @@ const index = 2,
 
     reservationDetail: 'reservation/getInfo.if', //预约详情	
     reservationCancel: 'reservation/cancel.if', //取消预约
-    reservationSave: 'reservation/save.if',//在线预约
+    reservationSave: 'reservation/save.if', //在线预约
     reservationServiceList: 'getReservationServiceList.if', //可预约部门列表
-    reservationDateStatus: 'reservation/getReservationCount.if',//查询事项某个日期的预约情况
+    reservationDateStatus: 'reservation/getReservationCount.if', //查询事项某个日期的预约情况
     myCase: 'getPreApasinfoListByUserId.if', //我的办件
     // param: 'getPreServiceByParam.if', //事项办理
     caseDetail: 'getPreApasinfoDetails.if', //办件详情
@@ -39,9 +39,9 @@ const index = 2,
     // LevelDetail: 'getPreServiceByParam.if', //服务大厅事项列表
     // Guide: 'getPreServiceByUnid.if',//查询办事详情
     // MyReservation: 'reservation/getPageList.if',//我的预约
-    ReservationDetail: 'reservation/getInfo.if',//预约详情
-    ReservationCancel: 'reservation/cancel.if',//取消预约
-    sendVerifCode: '/sms//sendVerifCode.if',//发送短信验证码
+    ReservationDetail: 'reservation/getInfo.if', //预约详情
+    ReservationCancel: 'reservation/cancel.if', //取消预约
+    sendVerifCode: '/sms//sendVerifCode.if', //发送短信验证码
 
     // Param: 'getPreServiceByParam.if',//事项办理
     // Code: 'getClassificationByCode.if',//证件类型
@@ -50,51 +50,57 @@ const index = 2,
     // UploadImg: 'uploadFile.if',//上传
     // SetImg: 'material/getList',//选择我的材料,材料列表
     // SaveDataName: 'material/save',//保存我的材料,设置材料名称
-    Apasinfo: 'savePreApasinfo.if',//提交在线办理表单
-    UploadAudio: 'getPreServiceByServiceName.if',//语音文件上传
-    HotService: 'getHotServiceList.if',//搜索咨询对象
+    Apasinfo: 'savePreApasinfo.if', //提交在线办理表单
+    UploadAudio: 'getPreServiceByServiceName.if', //语音文件上传
+    HotService: 'getHotServiceList.if', //搜索咨询对象
     // myData: 'material/getList',//我的材料
     // addData: 'material/save',//上传资料
     // deleteData: 'material/delete',//删除材料
-    advisoryList: 'consulting/getListPage',//我的咨询
-    advisoryDetail: 'consulting/getInfo',//咨询详情
+    advisoryList: 'consulting/getListPage', //我的咨询
+    advisoryDetail: 'consulting/getInfo', //咨询详情
 
 
     // new apis
 
-    departments: 'getAllDeptByLevel.if',//部门列表
+    departments: 'getAllDeptByLevel.if', //部门列表
     server: 'getClassificationByCode.if', //根据code得到相应类型
     handles: 'getPreServiceByParam.if', //服务大厅事项列表
     guide: 'getPreServiceByUnid.if',
     getUser: 'user/getUserInfo', //获取用户信息
     updateUser: 'user/updateUserInfo', //更新用户信息
     uploadImg: 'uploadFile.if', //上传图片
-    myMaterial: 'material/getList',//我的材料
-    addMaterial: 'material/save',//上传资料
-    delMaterial: 'material/delete',//删除材料
+    myMaterial: 'material/getList', //我的材料
+    addMaterial: 'material/save', //上传资料
+    delMaterial: 'material/delete', //删除材料
     myReservation: 'reservation/getPageList.if', //我的预约
 
-    addCollect: 'collect/save',//添加收藏
-    delCollect: 'collect/cancel',//删除收藏
+    addCollect: 'collect/save', //添加收藏
+    delCollect: 'collect/cancel', //删除收藏
     myCollection: 'collect/getListByUserId', //我的收藏 
-    verifSmsCode:'sms/verifSmsCode.if',//验证手机验证码是否正确
-    evaluate:'evaluate/save.if',//增加评价
-    evaluateList:'evaluate/list.if',//评价列表
-    evaluateInfo:'evaluate/info.if',//评价详情
+    verifSmsCode: 'sms/verifSmsCode.if', //验证手机验证码是否正确
+    evaluate: 'evaluate/save.if', //增加评价
+    evaluateList: 'evaluate/list.if', //评价列表
+    evaluateInfo: 'evaluate/info.if', //评价详情
 
 
 
 
     // 宿管系统--学生端
-    getAccessInfo: 'access/getAccessInfo.if',//通行记录
-    sendPhoneCode:'visitor/sendPhoneCode.if',//访客申请
-    userLogin:'appletLogin/userLogin.if',//登录
-    selfInfo:'access/selfInfo.if',//访客统计
+    getAccessInfo: 'access/getAccessInfo.if', //通行记录
+    sendPhoneCode: 'visitor/sendPhoneCode.if', //访客申请
+    userLogin: 'appletLogin/userLogin.if', //登录
+    selfInfo: 'access/selfInfo.if', //访客统计
+
+    //宿管系统--教师端
+    getCollegeInfo: 'deptInfo/getDeptInfolevel', //获取学院信息
+    getRegisterInfo: 'dormManage/registerInfo.if', //获取注册和未注册的用户信息
+    getVisitorCheckInfo: 'visitor/visitorInfo.if' //获取审批中和已审批的访客信息
   },
-  [root] =
-    [["http://192.168.100.234:8080/oneportal/"],
-     ["http://192.168.100.254:9082/wx/"],
-     ["https://zhll.dgtis.com/wx/"]][index]
+  [root] = [
+    ["http://192.168.100.234:8080/oneportal/"],
+    ["http://192.168.100.254:9082/wx/"],
+    ["https://zhll.dgtis.com/wx/"]
+  ][index]
 Object.keys(api).forEach(x => {
   let v = api[x]
   api[x] = `${root}${v}`

+ 34 - 1
dorm-manager-wx/utils/util.js

@@ -106,6 +106,38 @@ function getDateStr(today, addDayCount){
   return y + "-" + m + "-" + d;
 }
 
+function httpRequest(url, data = {}, method = "GET") {
+  let contentType
+  if (method == 'GET' || method == 'get') {
+    contentType = 'application/json;charset=UTF-8'
+  } else if (method == 'POST' || method == 'post') {
+    contentType = 'application/x-www-form-urlencoded'
+  }
+  return new Promise(function (resolve, reject) {
+    wx.request({
+      url: url,
+      data: data,
+      method: method,
+      header: {
+        'Content-Type': contentType,
+      },
+      success: function (res) {
+        console.log(res);
+        if (res.data.errmsg == "success") {
+          resolve(res);
+        } else {
+          showErrorToast(res.data.errmsg);
+          console.log('请求失败');
+        }
+      },
+      fail: function (res) {
+        console.log(res);
+        resolve(res);
+      }
+    })
+  });
+}
+
 module.exports = {
   formatDate,
   formatTime,
@@ -113,5 +145,6 @@ module.exports = {
   dateLaters,
   dateLater,
   formatLocation,
-  getDateStr
+  getDateStr,
+  httpRequest
 }