Merge branch 'behavior_limition_remould'

app/controllers/admin/forumIdentifyUser.js

@@ -27,14 +27,14 @@ function date_format(date) {
 
 //判断时间是否在指定范围
 function compareTime(now, begin_time, end_time) {
-    now = date_format(now);
-    begin_time = date_format(begin_time);
-    end_time = date_format(end_time);
-    if (moment(now).isSame(begin_time) || moment(now).isSame(end_time)) { //如果等于开始时间或者结束时间
-        return true;
-    } else {
-        return moment(now).isBetween(begin_time, end_time);
-    }
+    var begin_time = new Date(begin_time).getTime(),
+		ent_time = new Date(end_time).getTime(),
+		this_now = new Date(now).getTime();
+	if(this_now >= begin_time && this_now <= ent_time){
+		return true;
+	}else{
+		return false;
+	}
 }
 
 
@@ -96,15 +96,11 @@ router.get('/user/from/share', function(req, res, next) {
     		}
     	}
     });
-
-    // httpService.sendRequest(ent_code,mid,action);
-    // res.status(200).end();
 });
 
 //检查用户权限  旧版
 router.post('/user/checkLimitAction', function(req, res, next) {
-	var entity=req.body;
-	var userId = entity.mid;
+	var userId = req.body.userId;
 	if(userId){
 		var array = [];