Skip to content

M
mt-education-mobile
Commit c8c938aa authored by wangjiankun's avatar wangjiankun
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/TrainDetail/index.vue
parents 56a85934 701448e0
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 19 deletions
src/components/PersonalCenter/curriculum.vue
View file @ c8c938aa
......@@ -296,7 +296,8 @@ export default {
.Popup-span{
cursor: pointer;
& > img{
width: 17px;
width: 1rem;
height: 0.2rem;
}
}
}
......
src/views/addTrain/index.vue
View file @ c8c938aa
......@@ -586,19 +586,19 @@ export default {
break
case 'txt':
iconUrl = require('@assets/images/MyInformation/TXT.png')
fileType = '5'
fileType = '6'
break
case 'rar':
iconUrl = require('@assets/images/MyInformation/RAR.png')
fileType = '6'
fileType = '11'
break
case 'zip':
iconUrl = require('@assets/images/MyInformation/ZIP.png')
fileType = '6'
fileType = '12'
break
case 'gif':
iconUrl = require('@assets/images/MyInformation/GIF.png')
fileType = '7'
fileType = '9'
break
case 'jpg':
iconUrl = require('@assets/images/MyInformation/JPG.png')
......@@ -606,26 +606,26 @@ export default {
break
case 'png':
iconUrl = require('@assets/images/MyInformation/PNG.png')
fileType = '7'
fileType = '8'
break
case 'xls':
iconUrl = require('@assets/images/MyInformation/XLS.png')
fileType = '8'
fileType = '5'
break
case 'xml':
iconUrl = require('@assets/images/MyInformation/XML.png')
fileType = '8'
fileType = '5'
break
case 'xlsx':
iconUrl = require('@assets/images/MyInformation/XLSX.png')
fileType = '8'
fileType = '5'
break
default:
iconUrl = require('@assets/images/MyInformation/未知.png')
if (fileFormat === 'word') {
fileType = '4'
} else if (fileFormat === 'text') {
fileType = '5'
fileType = '6'
} else if (fileFormat === 'bmp' || fileFormat === 'jpeg') {
fileType = '7'
}
......@@ -877,19 +877,19 @@ export default {
break
case 'txt':
iconUrl = require('@assets/images/MyInformation/TXT.png')
type = '5'
type = '6'
break
case 'rar':
iconUrl = require('@assets/images/MyInformation/RAR.png')
type = '6'
type = '11'
break
case 'zip':
iconUrl = require('@assets/images/MyInformation/ZIP.png')
type = '6'
type = '12'
break
case 'gif':
iconUrl = require('@assets/images/MyInformation/GIF.png')
type = '7'
type = '9'
break
case 'jpg':
iconUrl = require('@assets/images/MyInformation/JPG.png')
......@@ -897,26 +897,26 @@ export default {
break
case 'png':
iconUrl = require('@assets/images/MyInformation/PNG.png')
type = '7'
type = '8'
break
case 'xls':
iconUrl = require('@assets/images/MyInformation/XLS.png')
type = '8'
type = '5'
break
case 'xml':
iconUrl = require('@assets/images/MyInformation/XML.png')
type = '8'
type = '5'
break
case 'xlsx':
iconUrl = require('@assets/images/MyInformation/XLSX.png')
type = '8'
type = '5'
break
default:
iconUrl = require('@assets/images/MyInformation/未知.png')
if (fileFormat === 'word') {
type = '4'
} else if (fileFormat === 'text') {
type = '5'
type = '6'
} else if (fileFormat === 'bmp' || fileFormat === 'jpeg') {
type = '7'
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment