Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ElectricitySheep
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄媛媛
ElectricitySheep
Commits
29377279
Commit
29377279
authored
Sep 30, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
5d4e5e1f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
75 additions
and
76 deletions
+75
-76
materialMan.vue
src/components/CommodityMan/materialMan.vue
+2
-2
educationEdit.vue
src/components/education/educationEdit.vue
+69
-72
ChooseFile.vue
src/components/global/ChooseFile.vue
+2
-2
index.js
src/plug/index.js
+2
-0
No files found.
src/components/CommodityMan/materialMan.vue
View file @
29377279
...
...
@@ -138,7 +138,7 @@
<div
class=
"material-item material-upload"
>
<div
class=
"app-upload"
flex=
"main:center cross:center"
style=
"width: 140px; height: 140px;"
>
<el-upload
class=
"avatar-uploader"
action=
""
accept=
"
video/mp4,video/ogg,video/webm
"
:show-file-list=
"false"
:http-request=
"UploadpdfFile"
accept=
"
.pdf,.PDF,.ppt,.PPT,.doc,.docx
"
:show-file-list=
"false"
:http-request=
"UploadpdfFile"
multiple
>
<i
class=
"el-icon-upload"
></i>
</el-upload>
...
...
@@ -522,7 +522,7 @@
this
.
Error
(
'请上传word ppt pdf文件'
);
return
;
}
this
.
Upload
SelfFile
(
this
.
FileType
().
GoodsImg
,
file
.
file
,
res
=>
{
this
.
Upload
FileToTencent
(
this
.
FileType
().
GoodsImg
,
file
.
file
,
res
=>
{
if
(
res
.
resultCode
==
1
)
{
that
.
addpageMsg
.
Image
=
res
.
VideoCoverImg
;
that
.
addpageMsg
.
Path
=
res
.
FileUrl
;
...
...
src/components/education/educationEdit.vue
View file @
29377279
This diff is collapsed.
Click to expand it.
src/components/global/ChooseFile.vue
View file @
29377279
...
...
@@ -41,7 +41,7 @@
</div>
<div
class=
"basefix app-attachment-list"
>
<div
class=
"app-attachment-item app-attachment-upload"
>
<el-upload
class=
"avatar-uploader"
action=
""
accept=
"
image/jpeg,image/gif,image/png,image/bmp
"
<el-upload
class=
"avatar-uploader"
action=
""
accept=
"
.pdf,.PDF,.ppt,.PPT,.doc,.docx
"
:show-file-list=
"false"
:http-request=
"UploadpdfFile"
multiple
>
<div
class=
"app-upload"
flex=
"main:center cross:center"
style=
"width: 100px; height: 100px;"
>
<i
class=
"el-icon-upload"
></i>
...
...
@@ -225,7 +225,7 @@
this
.
Error
(
'请上传word ppt pdf文件'
);
return
;
}
this
.
Upload
SelfFile
(
this
.
FileType
().
GoodsImg
,
file
.
file
,
res
=>
{
this
.
Upload
FileToTencent
(
this
.
FileType
().
GoodsImg
,
file
.
file
,
res
=>
{
if
(
res
.
resultCode
==
1
)
{
that
.
addpageMsg
.
Image
=
res
.
VideoCoverImg
;
that
.
addpageMsg
.
Path
=
res
.
FileUrl
;
...
...
src/plug/index.js
View file @
29377279
...
...
@@ -206,6 +206,8 @@ export default {
}).
always
(
function
()
{
//不管成功或失败,都会执行
})
}
else
{
this
.
uploadStart
(
path
,
fileObj
,
callback
)
}
},
Vue
.
prototype
.
uploadStart
=
function
(
path
,
fileObj
,
callback
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment