From 13588d91eca647a27583e123e658f706fedded5b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 22 Jan 2021 14:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=9D=83=E9=99=90=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_mini/pages/main/main.js    |  1 +
 test_mini/pages/qtest/form.wxml |  2 +-
 test_server/crm/permission.py   | 11 ++++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/test_mini/pages/main/main.js b/test_mini/pages/main/main.js
index 35719ab..7cff6a9 100644
--- a/test_mini/pages/main/main.js
+++ b/test_mini/pages/main/main.js
@@ -20,6 +20,7 @@ Page({
     msgList: [
       { title: "欢迎使用辐射学堂!" },
       { title: "QQ交流群:1072443859" },
+      { title: "首次访问用户有3次自助模考机会" },
       { title: "如有疑问,请致电课程顾问" },
       ]
   },
diff --git a/test_mini/pages/qtest/form.wxml b/test_mini/pages/qtest/form.wxml
index aa937f1..319ae58 100644
--- a/test_mini/pages/qtest/form.wxml
+++ b/test_mini/pages/qtest/form.wxml
@@ -1,7 +1,7 @@
 <view >
 		<view class="weui-form__text-area" style="margin-top:20px;padding: 0 18px;">
 			<h2 class="weui-form__title">个人防护用品检测(铅当量)</h2>
-			<view class="weui-form__desc">中科辐射学堂和国家建材工业安防工程产品质量监督检验中心推出个人防护用品合格检测，免费检测一套个人防护用品,如有需要请提交您的申请。</view>
+			<view class="weui-form__desc">中科辐射学堂和国家建材工业安防工程产品质量监督检验中心推出个人防护用品合格检测, 如有需要可提交您的申请。</view>
 		</view>
 		<view style="text-align:center">
 		<button class="mini-btn" type="default" size="mini" bindtap="tap1">介绍和案例</button>
diff --git a/test_server/crm/permission.py b/test_server/crm/permission.py
index 34a0831..54be22d 100644
--- a/test_server/crm/permission.py
+++ b/test_server/crm/permission.py
@@ -50,17 +50,18 @@ class MyPermission(RbacPermission):
             else:
                 perms = get_consumerperm_list(request.user)
         if perms:
+            if 'account_exceed' in perms: #账户过期
+                if request.user.exceed_date and (request.user.exceed_date >= datetime.date(timezone.now())):
+                    pass
+                else:
+                    perms = ['questioncat_view','my_examtest','down_material']
             if not hasattr(view, 'perms_map'):
                 return True
-            elif 'account_exceed' in perms: #账户过期
-                if request.user.exceed_date and (request.user.exceed_date >= datetime.date(timezone.now())):
-                    return True
-                return False
             else:
                 perms_map = view.perms_map
                 _method = request._request.method.lower()
                 for i in perms_map:
                     for method, alias in i.items():
-                        if ((_method == method or method == '*') and alias in perms)or alias == '*':
+                        if ((_method == method or method == '*') and alias in perms) or alias == '*':
                             return True
         return False
\ No newline at end of file