From e3cc947d4e8c32722988cbd0e77355a9c5697cea Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sat, 27 Jun 2020 13:58:25 +0800 Subject: [PATCH] material path --- test_mini/images/excel.svg | 1 + test_mini/images/file.svg | 1 + test_mini/images/mp4.svg | 1 + test_mini/images/pdf.svg | 1 + test_mini/images/ppt.svg | 1 + test_mini/images/word.svg | 1 + test_mini/images/zip.svg | 1 + test_mini/pages/material/index.js | 53 +++++++++++++++++++++++++++-- test_mini/pages/material/index.wxml | 8 ++++- test_server/cms/serializers.py | 2 +- test_server/crm/models.py | 7 ++++ 11 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 test_mini/images/excel.svg create mode 100644 test_mini/images/file.svg create mode 100644 test_mini/images/mp4.svg create mode 100644 test_mini/images/pdf.svg create mode 100644 test_mini/images/ppt.svg create mode 100644 test_mini/images/word.svg create mode 100644 test_mini/images/zip.svg diff --git a/test_mini/images/excel.svg b/test_mini/images/excel.svg new file mode 100644 index 0000000..5d76766 --- /dev/null +++ b/test_mini/images/excel.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test_mini/images/file.svg b/test_mini/images/file.svg new file mode 100644 index 0000000..478dc37 --- /dev/null +++ b/test_mini/images/file.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test_mini/images/mp4.svg b/test_mini/images/mp4.svg new file mode 100644 index 0000000..a989e54 --- /dev/null +++ b/test_mini/images/mp4.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test_mini/images/pdf.svg b/test_mini/images/pdf.svg new file mode 100644 index 0000000..3afe69f --- /dev/null +++ b/test_mini/images/pdf.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test_mini/images/ppt.svg b/test_mini/images/ppt.svg new file mode 100644 index 0000000..ea6c816 --- /dev/null +++ b/test_mini/images/ppt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test_mini/images/word.svg b/test_mini/images/word.svg new file mode 100644 index 0000000..64fbba3 --- /dev/null +++ b/test_mini/images/word.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test_mini/images/zip.svg b/test_mini/images/zip.svg new file mode 100644 index 0000000..5325174 --- /dev/null +++ b/test_mini/images/zip.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test_mini/pages/material/index.js b/test_mini/pages/material/index.js index 7a58b91..9f92b69 100644 --- a/test_mini/pages/material/index.js +++ b/test_mini/pages/material/index.js @@ -97,10 +97,57 @@ Page({ }, downFile:function(e){ - console.log(e) + var that = this api.request('/cms/material/'+e.currentTarget.dataset.id+'/down/', 'GET').then(res => { - console.log(res.data.path) - + that.data.results[e.currentTarget.dataset.index].down_count = res.data.down_count + var fileurl = getApp().globalData.host + res.data.path + wx.downloadFile({ + url: fileurl, + success(res) { + wx.showLoading({ + title: '成功,正在打开...', + }) + const filePath = res.tempFilePath + var filetype + if (fileurl.indexOf(".docx") != -1) { + filetype = 'docx' + } + else if (fileurl.indexOf(".doc") != -1) { + filetype = 'doc' + } + else if (fileurl.indexOf(".xlsx") != -1) { + filetype = 'xlsx' + } + else if (fileurl.indexOf(".xls") != -1) { + filetype = 'xls' + } + else if (fileurl.indexOf(".pptx") != -1) { + filetype = 'pptx' + } + else if (fileurl.indexOf(".ppt") != -1) { + filetype = 'ppt' + } + else if (fileurl.indexOf(".pdf") != -1) { + filetype = 'pdf' + } else { + wx.hideLoading() + return + } + wx.openDocument({ + filePath, + fileType: filetype, + success(res) { + wx.hideLoading() + console.log('打开文档成功') + }, fail: function (e) { + console.log(e) + } + }) + } + }) + that.setData({ + results:that.data.results + }) }) } diff --git a/test_mini/pages/material/index.wxml b/test_mini/pages/material/index.wxml index eaa2ee7..602e8fb 100644 --- a/test_mini/pages/material/index.wxml +++ b/test_mini/pages/material/index.wxml @@ -4,6 +4,12 @@ + + + + + + {{item.name}} @@ -13,7 +19,7 @@ - 下载 + 下载 下载量:{{item.down_count}} diff --git a/test_server/cms/serializers.py b/test_server/cms/serializers.py index d1a0a7f..7389f78 100644 --- a/test_server/cms/serializers.py +++ b/test_server/cms/serializers.py @@ -21,6 +21,6 @@ class ArticelListSerializer(serializers.ModelSerializer): class MaterialSerializer(serializers.ModelSerializer): class Meta: model = Material - exclude = ('path',) + fields = '__all__' diff --git a/test_server/crm/models.py b/test_server/crm/models.py index 857e4a7..b1a68a4 100644 --- a/test_server/crm/models.py +++ b/test_server/crm/models.py @@ -42,6 +42,13 @@ class Consumer(SoftCommonModel): def __str__(self): return self.name +# class ConsumerPerm(CommonModel): +# """ +# 权限表 +# """ + + + class PaySubject(CommonModel): ''' 付费学科关联表