From 679b31dd15627f8f8a7cf00eb9aaf9546f31c422 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 26 Jun 2020 22:12:14 +0800
Subject: [PATCH] perm

---
 test_mini/pages/material/index.js   |  7 +++++++
 test_mini/pages/material/index.wxml | 19 +++++++++++--------
 test_mini/pages/quota/quota.wxml    |  2 +-
 test_server/crm/permission.py       |  3 ++-
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/test_mini/pages/material/index.js b/test_mini/pages/material/index.js
index b607799..7a58b91 100644
--- a/test_mini/pages/material/index.js
+++ b/test_mini/pages/material/index.js
@@ -96,5 +96,12 @@ Page({
   onShareAppMessage: function () {
 
   },
+  downFile:function(e){
+    console.log(e)
+    api.request('/cms/material/'+e.currentTarget.dataset.id+'/down/', 'GET').then(res => {
+      console.log(res.data.path)
+
+    })
+  }
 
 })
\ No newline at end of file
diff --git a/test_mini/pages/material/index.wxml b/test_mini/pages/material/index.wxml
index ae9acb4..eaa2ee7 100644
--- a/test_mini/pages/material/index.wxml
+++ b/test_mini/pages/material/index.wxml
@@ -1,21 +1,24 @@
 <view class="head">
 
-  {{count}}条资讯</view>
+  {{count}}份资料</view>
 <view class="weui-cells weui-cells_after-title">
   <block wx:for="{{results}}" wx:key="unique">
-    <navigator url="detail?id={{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+    <view class="weui-media-box weui-media-box_appmsg">
       <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
         <view class="weui-media-box__title">
-        <text class="weui-badge" style="background:orange" wx:if="{{item.is_top}}">置顶</text>
-        {{item.title}}</view>
+        {{item.name}}</view>
         <view class="weui-media-box__desc">
-          <span style="font-weight:bold;color:darkblue">{{item.ifrom}}  </span>
-          {{item.update_time}}
+        {{item.description}}
         </view>
       </view>
       <view class="weui-panel__ft weui-cell__ft_in-access">
-        <view class="weui-media-box__desc">查看详情</view>
+      <view class="weui-media-box__desc">
+        <a class="weui-btn weui-btn_mini weui-btn_primary" bindtap="downFile" data-id="{{item.id}}">下载</a>
+        </view>
+        <view class="weui-media-box__desc">
+        下载量:<span style="color:darkblue;font-weight:bold">{{item.down_count}}</span>
+        </view>
       </view>
-    </navigator>
+    </view>
   </block>
 </view>
\ No newline at end of file
diff --git a/test_mini/pages/quota/quota.wxml b/test_mini/pages/quota/quota.wxml
index b296531..22ef652 100644
--- a/test_mini/pages/quota/quota.wxml
+++ b/test_mini/pages/quota/quota.wxml
@@ -5,7 +5,7 @@
   <a class="weui-btn weui-btn_primary" bindtap="Baoming" style="margin-top:4px">前往正式报名</a>
 <view class="weui-cells weui-cells_after-title">
   <block wx:for="{{tests}}" wx:key="unique">
-    <view class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+    <view class="weui-media-box weui-media-box_appmsg">
       <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
         <view class="weui-media-box__title">{{item.cityName}} {{item.examDate}}</view>
         <view class="weui-media-box__desc">
diff --git a/test_server/crm/permission.py b/test_server/crm/permission.py
index 0cf1315..bd9666a 100644
--- a/test_server/crm/permission.py
+++ b/test_server/crm/permission.py
@@ -12,7 +12,8 @@ ConsumerPerms = [
     'my_subjects',
     'my_examtest',
     'examtest_create',
-    'exercise'
+    'exercise',
+    'down_material'
 ]
 
 VistorPerms = [