From 1d91970f70c3ccd6766ee07f0c8f756539d34cb1 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 24 Aug 2020 11:33:01 +0800
Subject: [PATCH] consumer exceed

---
 test_mini/app.js              | 4 ++--
 test_mini/project.config.json | 6 +++---
 test_server/crm/permission.py | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test_mini/app.js b/test_mini/app.js
index 4e9ce27..75f30df 100644
--- a/test_mini/app.js
+++ b/test_mini/app.js
@@ -69,9 +69,9 @@ App({
   globalData: {
     userInfo: {},
     userinfo: {}, // 服务器传回的消费者信息
-    host: 'https://apitest.ahctc.cn',
+    //host: 'https://apitest.ahctc.cn',
     mediahost: 'https://apitest.ahctc.cn',
-    //host: 'http://127.0.0.1:8000',
+    host: 'http://127.0.0.1:8000',
     //mediahost: 'http://127.0.0.1:8000',
     token : '',
   }
diff --git a/test_mini/project.config.json b/test_mini/project.config.json
index 51718bc..631541b 100644
--- a/test_mini/project.config.json
+++ b/test_mini/project.config.json
@@ -18,15 +18,15 @@
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
-		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useIsolateContext": true,
 		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
+		"userConfirmedUseCompilerModuleSwitch": false,
+		"compileHotReLoad": false,
+		"useIsolateContext": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.10.3",
diff --git a/test_server/crm/permission.py b/test_server/crm/permission.py
index 1d8167f..4ced8ac 100644
--- a/test_server/crm/permission.py
+++ b/test_server/crm/permission.py
@@ -4,6 +4,7 @@ from crm.models import Consumer
 from rest_framework.permissions import IsAuthenticated
 from django.core.cache import cache
 from django.utils import timezone
+from datetime import datetime
 # 学员接口列表
 ConsumerPerms = [
     'paper_view',
@@ -23,7 +24,7 @@ VistorPerms = [
 ]
 def get_consumerperm_list(consumer):
     perms = consumer.role.perms.values_list('code', flat=True)
-    if consumer.exceed_date < timezone.now():
+    if consumer.exceed_date < datetime.date(timezone.now()):
         perms.append('account_exceed')
     cache.get_or_set('cperms_'+str(consumer.id), perms)
     return perms