Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
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
罗超
confucius
Commits
8f42f0fd
Commit
8f42f0fd
authored
Nov 25, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
74fc3448
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
1732 additions
and
1805 deletions
+1732
-1805
myOrder-form.vue
src/components/sale/myOrder-form.vue
+0
-1
orderlist.vue
src/components/sale/orderlist.vue
+0
-1
perCustomer-form.vue
src/components/sale/perCustomer-form.vue
+0
-1
visitorcreate-form.vue
src/components/schedul/visitorcreate-form.vue
+0
-1
feedback-form.vue
src/components/teacher/feedback-form.vue
+0
-2
SJBillModule.vue
src/pages/financial/components/SJBillModule.vue
+381
-364
mySJModule.vue
src/pages/financial/components/mySJModule.vue
+0
-1
CommissionUserDetailList.vue
...pages/financial/contribution/CommissionUserDetailList.vue
+220
-229
ordercommission.vue
src/pages/financial/studyabroad/ordercommission.vue
+0
-5
ChooseImg.vue
src/pages/teacher/components/ChooseImg.vue
+0
-1
alladdsc.vue
src/pages/teacher/components/alladdsc.vue
+20
-39
videomaterial.vue
src/pages/teacher/components/videomaterial.vue
+157
-157
addimageText.vue
src/pages/teacher/contribution/addimageText.vue
+601
-649
contributeManage.vue
src/pages/teacher/contribution/contributeManage.vue
+338
-342
graphicType.vue
src/pages/teacher/contribution/graphicType.vue
+0
-1
contributionUE.vue
src/pages/teacher/contribution/ue/contributionUE.vue
+15
-11
No files found.
src/components/sale/myOrder-form.vue
View file @
8f42f0fd
...
@@ -712,7 +712,6 @@
...
@@ -712,7 +712,6 @@
}
}
},
},
created
()
{
created
()
{
console
.
log
(
this
.
saveObj
)
if
(
this
.
saveObj
.
tab
)
{
if
(
this
.
saveObj
.
tab
)
{
this
.
tab
=
(
this
.
saveObj
.
tab
).
toString
();
this
.
tab
=
(
this
.
saveObj
.
tab
).
toString
();
}
}
...
...
src/components/sale/orderlist.vue
View file @
8f42f0fd
...
@@ -1737,7 +1737,6 @@
...
@@ -1737,7 +1737,6 @@
})
})
},
},
studyabroadorderconfirmation
(
item
)
{
//留学订单确认
studyabroadorderconfirmation
(
item
)
{
//留学订单确认
console
.
log
(
item
)
let
that
=
this
let
that
=
this
this
.
$q
.
dialog
({
this
.
$q
.
dialog
({
title
:
'提示信息'
,
title
:
'提示信息'
,
...
...
src/components/sale/perCustomer-form.vue
View file @
8f42f0fd
...
@@ -230,7 +230,6 @@
...
@@ -230,7 +230,6 @@
CustomerId
:
this
.
customerObj
.
CustomerId
CustomerId
:
this
.
customerObj
.
CustomerId
}
}
GetCustomer
(
msg
).
then
(
res
=>
{
GetCustomer
(
msg
).
then
(
res
=>
{
console
.
log
(
res
,
'数据'
);
if
(
res
.
Code
==
1
)
{
if
(
res
.
Code
==
1
)
{
let
tempData
=
res
.
Data
;
let
tempData
=
res
.
Data
;
this
.
objOption
.
CustomerId
=
tempData
.
CustomerId
;
this
.
objOption
.
CustomerId
=
tempData
.
CustomerId
;
...
...
src/components/schedul/visitorcreate-form.vue
View file @
8f42f0fd
...
@@ -64,7 +64,6 @@
...
@@ -64,7 +64,6 @@
this
.
getEmployeeList
();
this
.
getEmployeeList
();
},
},
mounted
()
{
mounted
()
{
console
.
log
(
"this.saveObj"
,
this
.
saveObj
)
if
(
this
.
saveObj
&&
this
.
saveObj
.
Id
>
0
)
{
if
(
this
.
saveObj
&&
this
.
saveObj
.
Id
>
0
)
{
this
.
objOption
.
Id
=
this
.
saveObj
.
Id
;
this
.
objOption
.
Id
=
this
.
saveObj
.
Id
;
this
.
objOption
.
CreateBy
=
this
.
saveObj
.
CreateBy
;
this
.
objOption
.
CreateBy
=
this
.
saveObj
.
CreateBy
;
...
...
src/components/teacher/feedback-form.vue
View file @
8f42f0fd
...
@@ -142,7 +142,6 @@ export default {
...
@@ -142,7 +142,6 @@ export default {
e
.
TeacherId
=
e
.
Teacher_Id
;
e
.
TeacherId
=
e
.
Teacher_Id
;
delete
e
.
Teacher_Id
;
delete
e
.
Teacher_Id
;
});
});
console
.
log
(
this
.
dataList
);
setFeedBack
(
this
.
dataList
)
setFeedBack
(
this
.
dataList
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
this
.
saveLoading
=
false
;
this
.
saveLoading
=
false
;
...
@@ -161,7 +160,6 @@ export default {
...
@@ -161,7 +160,6 @@ export default {
});
});
},
},
uploadFile
(
files
,
index
)
{
uploadFile
(
files
,
index
)
{
console
.
log
(
files
,
index
,
this
.
dataList
);
let
type
=
let
type
=
files
.
type
.
indexOf
(
"video"
)
!=
-
1
||
files
.
type
.
indexOf
(
"image"
)
!=
-
1
;
files
.
type
.
indexOf
(
"video"
)
!=
-
1
||
files
.
type
.
indexOf
(
"image"
)
!=
-
1
;
if
(
type
)
{
if
(
type
)
{
...
...
src/pages/financial/components/SJBillModule.vue
View file @
8f42f0fd
This diff is collapsed.
Click to expand it.
src/pages/financial/components/mySJModule.vue
View file @
8f42f0fd
...
@@ -314,7 +314,6 @@
...
@@ -314,7 +314,6 @@
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
$refs
.
imgcode
.
src
=
this
.
imgUrl
;
this
.
$refs
.
imgcode
.
src
=
this
.
imgUrl
;
})
})
console
.
log
(
this
.
imgUrl
)
tipLoadding
.
hide
();
tipLoadding
.
hide
();
}
else
{
}
else
{
tipLoadding
.
hide
();
tipLoadding
.
hide
();
...
...
src/pages/financial/contribution/CommissionUserDetailList.vue
View file @
8f42f0fd
This diff is collapsed.
Click to expand it.
src/pages/financial/studyabroad/ordercommission.vue
View file @
8f42f0fd
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
}
}
.userCommissionDetails
.border-bottom
{
.userCommissionDetails
.border-bottom
{
/* border-bottom: 1px dashed #EEE; */
padding-bottom
:
5px
;
padding-bottom
:
5px
;
margin-bottom
:
5px
;
margin-bottom
:
5px
;
}
}
...
@@ -83,8 +82,6 @@
...
@@ -83,8 +82,6 @@
<div
v-if=
"scope.row.OrderId"
style=
"cursor: pointer;text-decoration: underline;"
@
click=
"goUrlorderList('/sale/orderStatistics',scope.row)"
>
<div
v-if=
"scope.row.OrderId"
style=
"cursor: pointer;text-decoration: underline;"
@
click=
"goUrlorderList('/sale/orderStatistics',scope.row)"
>
{{
scope
.
row
.
OrderId
}}
{{
scope
.
row
.
OrderId
}}
</div>
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"CommissionMoney"
label=
"订单提成"
></el-table-column>
<el-table-column
prop=
"CommissionMoney"
label=
"订单提成"
></el-table-column>
...
@@ -156,7 +153,6 @@
...
@@ -156,7 +153,6 @@
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
OrderId
)
{
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
OrderId
)
{
this
.
msg
.
OrderId
=
this
.
$route
.
query
.
OrderId
this
.
msg
.
OrderId
=
this
.
$route
.
query
.
OrderId
}
}
console
.
log
(
this
.
msg
.
PeriodId
)
this
.
getList
()
this
.
getList
()
this
.
getStudyAbroad
()
this
.
getStudyAbroad
()
},
},
...
@@ -318,6 +314,5 @@
...
@@ -318,6 +314,5 @@
</
script
>
</
script
>
<
style
lang=
"sass"
>
<
style
lang=
"sass"
>
@import
url('~assets/css/table.sass')
@import
url('~assets/css/table.sass')
</
style
>
</
style
>
\ No newline at end of file
src/pages/teacher/components/ChooseImg.vue
View file @
8f42f0fd
...
@@ -223,7 +223,6 @@
...
@@ -223,7 +223,6 @@
},
},
//选择图片
//选择图片
PageSelect
(
item
)
{
PageSelect
(
item
)
{
console
.
log
(
item
,
'item'
);
if
(
this
.
type
!=
1
){
//单选
if
(
this
.
type
!=
1
){
//单选
this
.
emitmsg
=
[];
this
.
emitmsg
=
[];
this
.
emitmsg
.
push
(
item
)
this
.
emitmsg
.
push
(
item
)
...
...
src/pages/teacher/components/alladdsc.vue
View file @
8f42f0fd
...
@@ -29,7 +29,8 @@
...
@@ -29,7 +29,8 @@
<q-img
v-else
:src=
"imgPath"
style=
"width: 110px;height: 110px;border-radius: 6px;display: flex;"
>
<q-img
v-else
:src=
"imgPath"
style=
"width: 110px;height: 110px;border-radius: 6px;display: flex;"
>
</q-img>
</q-img>
</el-upload>
</el-upload>
<q-img
v-else
:src=
"imgPath"
style=
"width: 110px;height: 110px;border-radius: 6px;display: flex;"
v-if=
"ismodify"
></q-img>
<q-img
v-else
:src=
"imgPath"
style=
"width: 110px;height: 110px;border-radius: 6px;display: flex;"
v-if=
"ismodify"
></q-img>
<!--
<el-upload
class=
"avatar-uploader materialupload"
action=
""
:before-upload=
"uploadFile"
<!--
<el-upload
class=
"avatar-uploader materialupload"
action=
""
:before-upload=
"uploadFile"
accept=
"image/gif,image/jpeg,image/png,image/jpg,image/bmp"
:show-file-list=
"false"
>
accept=
"image/gif,image/jpeg,image/png,image/jpg,image/bmp"
:show-file-list=
"false"
>
<i
class=
"el-icon-plus avatar-uploader-icon"
style=
"font-size: 30px;"
v-if=
"addMsg.Path==''"
></i>
<i
class=
"el-icon-plus avatar-uploader-icon"
style=
"font-size: 30px;"
v-if=
"addMsg.Path==''"
></i>
...
@@ -79,7 +80,8 @@
...
@@ -79,7 +80,8 @@
</span>
</span>
</q-circular-progress>
</q-circular-progress>
<div
style=
"margin-top: 15px;"
>
<div
style=
"margin-top: 15px;"
>
<el-upload
class=
"avatar-uploader "
action=
""
:before-upload=
"uploadFile"
:show-file-list=
"false"
v-if=
"ismodify==false"
>
<el-upload
class=
"avatar-uploader "
action=
""
:before-upload=
"uploadFile"
:show-file-list=
"false"
v-if=
"ismodify==false"
>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
icon=
"cloud_upload"
label=
"上传"
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
icon=
"cloud_upload"
label=
"上传"
@
click=
'stopPlayVoice()'
>
@
click=
'stopPlayVoice()'
>
</q-btn>
</q-btn>
...
@@ -114,11 +116,13 @@
...
@@ -114,11 +116,13 @@
v-model=
"addMsg.PlatformType"
@
input=
"$forceUpdate()"
ref=
"Id"
:options=
"platTypeList"
label=
"平台类型"
v-model=
"addMsg.PlatformType"
@
input=
"$forceUpdate()"
ref=
"Id"
:options=
"platTypeList"
label=
"平台类型"
:dense=
"false"
emit-value
map-options
/>
-->
:dense=
"false"
emit-value
map-options
/>
-->
<q-input
clearable
filled
v-model=
"addMsg.MediaName"
placeholder=
"请输入视频名称"
class=
"q-mt-lg"
maxlength=
"20"
/>
<q-input
clearable
filled
v-model=
"addMsg.MediaName"
placeholder=
"请输入视频名称"
class=
"q-mt-lg"
maxlength=
"20"
/>
<q-input
clearable
filled
v-model=
"addMsg.Description"
placeholder=
"请输入视频介绍"
class=
"q-mt-lg"
type=
"textarea"
maxlength=
"300"
counter
/>
<q-input
clearable
filled
v-model=
"addMsg.Description"
placeholder=
"请输入视频介绍"
class=
"q-mt-lg"
type=
"textarea"
maxlength=
"300"
counter
/>
<div
style=
"margin-top: 15px;"
>
<div
style=
"margin-top: 15px;"
>
<div
style=
"width:80px"
>
视频封面图:
</div>
<div
style=
"width:80px"
>
视频封面图:
</div>
<div
style=
"margin-top: 15px;"
>
<div
style=
"margin-top: 15px;"
>
<div
style=
"width:100px;height:100px;border:1px solid #d1d1d1;text-align:center;line-height:100px;"
@
click=
"getImgChoice=true"
>
<div
style=
"width:100px;height:100px;border:1px solid #d1d1d1;text-align:center;line-height:100px;"
@
click=
"getImgChoice=true"
>
<i
class=
"el-icon-plus avatar-uploader-icon"
style=
"font-size: 30px;"
<i
class=
"el-icon-plus avatar-uploader-icon"
style=
"font-size: 30px;"
v-if=
"addMsg.VideoWXImage==''"
></i>
v-if=
"addMsg.VideoWXImage==''"
></i>
<q-img
v-else
:src=
"addMsg.VideoWXImage"
style=
"width: 100%;height: 100%;"
>
<q-img
v-else
:src=
"addMsg.VideoWXImage"
style=
"width: 100%;height: 100%;"
>
...
@@ -142,7 +146,8 @@
...
@@ -142,7 +146,8 @@
<source
:src=
"addMsg.Path"
type=
"video/mp4"
/>
<source
:src=
"addMsg.Path"
type=
"video/mp4"
/>
</video>
</video>
<div
style=
"margin-top: 15px;"
>
<div
style=
"margin-top: 15px;"
>
<el-upload
class=
"avatar-uploader "
action=
""
:before-upload=
"uploadFile"
:show-file-list=
"false"
v-if=
"ismodify==false"
>
<el-upload
class=
"avatar-uploader "
action=
""
:before-upload=
"uploadFile"
:show-file-list=
"false"
v-if=
"ismodify==false"
>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
icon=
"cloud_upload"
label=
"上传"
>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
icon=
"cloud_upload"
label=
"上传"
>
</q-btn>
</q-btn>
</el-upload>
</el-upload>
...
@@ -222,19 +227,19 @@
...
@@ -222,19 +227,19 @@
imgPath
:
''
,
imgPath
:
''
,
importFileUrl2
:
''
,
importFileUrl2
:
''
,
getImgChoice
:
false
,
getImgChoice
:
false
,
ismodify
:
false
,
//是否修改
ismodify
:
false
,
//是否修改
}
}
},
},
created
()
{
created
()
{
if
(
this
.
editobj
!=
null
)
{
if
(
this
.
editobj
!=
null
)
{
this
.
addMsg
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
editobj
))
this
.
addMsg
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
editobj
))
this
.
ismodify
=
true
this
.
ismodify
=
true
if
(
this
.
type
==
1
)
{
if
(
this
.
type
==
1
)
{
this
.
imgPath
=
this
.
addMsg
.
ImageUrl
;
this
.
imgPath
=
this
.
addMsg
.
ImageUrl
;
}
}
}
}
let
address
=
process
.
env
.
API
;
let
address
=
process
.
env
.
API
;
this
.
importFileUrl2
=
address
+
'/upload/UploadTemporaryFile'
this
.
importFileUrl2
=
address
+
'/upload/UploadTemporaryFile'
},
},
mounted
()
{
mounted
()
{
this
.
getPlatForm
();
this
.
getPlatForm
();
...
@@ -247,7 +252,6 @@
...
@@ -247,7 +252,6 @@
//获取已开放平台
//获取已开放平台
getPlatForm
()
{
getPlatForm
()
{
GetContributePlatfrom
({}).
then
(
res
=>
{
GetContributePlatfrom
({}).
then
(
res
=>
{
console
.
log
(
res
,
'数据'
);
if
(
res
.
Code
==
1
)
{
if
(
res
.
Code
==
1
)
{
this
.
platTypeList
=
res
.
Data
;
this
.
platTypeList
=
res
.
Data
;
}
}
...
@@ -262,7 +266,6 @@
...
@@ -262,7 +266,6 @@
message
:
res
.
Message
,
message
:
res
.
Message
,
position
:
'top'
position
:
'top'
})
})
//this.gettype()
this
.
$emit
(
'editsuccess'
)
this
.
$emit
(
'editsuccess'
)
})
})
},
},
...
@@ -273,7 +276,7 @@
...
@@ -273,7 +276,7 @@
if
(
file
.
Code
==
1
)
{
if
(
file
.
Code
==
1
)
{
let
address
=
process
.
env
.
API
;
let
address
=
process
.
env
.
API
;
let
aOne
=
address
.
split
(
'/api'
)[
0
];
let
aOne
=
address
.
split
(
'/api'
)[
0
];
this
.
imgPath
=
aOne
+
file
.
Data
.
HttpPath
;
this
.
imgPath
=
aOne
+
file
.
Data
.
HttpPath
;
this
.
addMsg
.
Path
=
file
.
Data
.
Path
;
this
.
addMsg
.
Path
=
file
.
Data
.
Path
;
this
.
addMsg
.
MediaName
=
file
.
Data
.
Name
;
this
.
addMsg
.
MediaName
=
file
.
Data
.
Name
;
}
}
...
@@ -298,12 +301,7 @@
...
@@ -298,12 +301,7 @@
position
:
'top'
position
:
'top'
})
})
}
else
{
}
else
{
// UploadSelfFile('wechatcatalogue', files, res => {
// console.log(res, '数据');
// if (res.Code == 1) {
// this.addMsg.Path = res.FileUrl;
// }
// })
}
}
}
}
if
(
this
.
type
==
2
)
{
//音频上传
if
(
this
.
type
==
2
)
{
//音频上传
...
@@ -313,14 +311,6 @@
...
@@ -313,14 +311,6 @@
const
isLt2M
=
files
.
size
/
1024
/
1024
<
2
;
const
isLt2M
=
files
.
size
/
1024
/
1024
<
2
;
let
Times
=
this
.
getTimes
(
files
)
let
Times
=
this
.
getTimes
(
files
)
const
isTime60S
=
Times
>=
60
?
true
:
false
;
const
isTime60S
=
Times
>=
60
?
true
:
false
;
// 获取时长
// if (!isAudio) {
// this.$q.notify({
// type: 'negative',
// message: `上传文件只能是mp3、wma、wav、amr格式!`,
// position: 'top'
// })
// } else {
if
(
!
isLt2M
)
{
if
(
!
isLt2M
)
{
this
.
$q
.
notify
({
this
.
$q
.
notify
({
type
:
'negative'
,
type
:
'negative'
,
...
@@ -350,9 +340,8 @@
...
@@ -350,9 +340,8 @@
}
else
{
}
else
{
that
.
$forceUpdate
();
that
.
$forceUpdate
();
that
.
addMsg
.
Path
=
res
.
FileUrl
;
that
.
addMsg
.
Path
=
res
.
FileUrl
;
that
.
addMsg
.
MediaName
=
res
.
FileName
?
res
.
FileName
:
''
;
that
.
addMsg
.
MediaName
=
res
.
FileName
?
res
.
FileName
:
''
;
that
.
addMsg
.
Minutes
=
parseInt
(
that
.
duration
.
toFixed
());
that
.
addMsg
.
Minutes
=
parseInt
(
that
.
duration
.
toFixed
());
console
.
log
(
that
.
addMsg
.
Minutes
,
'Minutes'
);
}
}
}).
catch
((
e
)
=>
{
}).
catch
((
e
)
=>
{
...
@@ -360,13 +349,11 @@
...
@@ -360,13 +349,11 @@
}
}
})
})
}
}
// }
}
}
}
}
if
(
this
.
type
==
3
)
{
//视频上传
if
(
this
.
type
==
3
)
{
//视频上传
// 文件类型进行判断
// 文件类型进行判断
const
isLt10M
=
files
.
size
/
1024
/
1024
<
10
;
const
isLt10M
=
files
.
size
/
1024
/
1024
<
10
;
if
([
'video/mp4'
].
indexOf
(
files
.
type
)
==
-
1
)
{
if
([
'video/mp4'
].
indexOf
(
files
.
type
)
==
-
1
)
{
this
.
$q
.
notify
({
this
.
$q
.
notify
({
type
:
'negative'
,
type
:
'negative'
,
...
@@ -387,18 +374,15 @@
...
@@ -387,18 +374,15 @@
isCreateCover
:
1
isCreateCover
:
1
}
}
UploadSelfFile
(
'wechatcatalogue'
,
files
,
res
=>
{
UploadSelfFile
(
'wechatcatalogue'
,
files
,
res
=>
{
console
.
log
(
res
,
'数据'
);
if
(
res
.
Code
==
1
)
{
if
(
res
.
Code
==
1
)
{
let
amr
=
new
BenzAMRRecorder
()
let
amr
=
new
BenzAMRRecorder
()
let
that
=
this
let
that
=
this
amr
.
initWithUrl
(
res
.
FileUrl
).
then
(
function
()
{
amr
.
initWithUrl
(
res
.
FileUrl
).
then
(
function
()
{
that
.
duration
=
amr
.
getDuration
();
that
.
duration
=
amr
.
getDuration
();
that
.
addMsg
.
Path
=
res
.
FileUrl
;
that
.
addMsg
.
Path
=
res
.
FileUrl
;
that
.
addMsg
.
MediaName
=
res
.
FileName
?
res
.
FileName
:
''
;
that
.
addMsg
.
MediaName
=
res
.
FileName
?
res
.
FileName
:
''
;
that
.
addMsg
.
Minutes
=
parseInt
(
that
.
duration
.
toFixed
());
that
.
addMsg
.
Minutes
=
parseInt
(
that
.
duration
.
toFixed
());
}).
catch
((
e
)
=>
{
}).
catch
((
e
)
=>
{})
})
}
}
})
})
}
}
...
@@ -408,7 +392,6 @@
...
@@ -408,7 +392,6 @@
let
audioDuration
=
0
let
audioDuration
=
0
//获取录音时长
//获取录音时长
var
url
=
URL
.
createObjectURL
(
content
);
var
url
=
URL
.
createObjectURL
(
content
);
console
.
log
(
url
,
'进入url'
);
//经测试,发现audio也可获取视频的时长
//经测试,发现audio也可获取视频的时长
var
audioElement
=
new
Audio
(
url
);
var
audioElement
=
new
Audio
(
url
);
audioElement
.
addEventListener
(
"loadedmetadata"
,
function
(
_event
)
{
audioElement
.
addEventListener
(
"loadedmetadata"
,
function
(
_event
)
{
...
@@ -534,7 +517,6 @@
...
@@ -534,7 +517,6 @@
}
}
}
}
</
script
>
</
script
>
<
style
>
<
style
>
...
@@ -641,5 +623,4 @@
...
@@ -641,5 +623,4 @@
.fullscreen
{
.fullscreen
{
z-index
:
999
;
z-index
:
999
;
}
}
</
style
>
</
style
>
\ No newline at end of file
src/pages/teacher/components/videomaterial.vue
View file @
8f42f0fd
This diff is collapsed.
Click to expand it.
src/pages/teacher/contribution/addimageText.vue
View file @
8f42f0fd
This diff is collapsed.
Click to expand it.
src/pages/teacher/contribution/contributeManage.vue
View file @
8f42f0fd
This diff is collapsed.
Click to expand it.
src/pages/teacher/contribution/graphicType.vue
View file @
8f42f0fd
...
@@ -34,7 +34,6 @@
...
@@ -34,7 +34,6 @@
}
}
},
},
created
()
{
created
()
{
// console.log(this.$route.query)
if
(
this
.
$route
.
query
){
if
(
this
.
$route
.
query
){
this
.
Image
=
this
.
$route
.
query
.
Image
;
this
.
Image
=
this
.
$route
.
query
.
Image
;
this
.
Name
=
this
.
$route
.
query
.
Name
;
this
.
Name
=
this
.
$route
.
query
.
Name
;
...
...
src/pages/teacher/contribution/ue/contributionUE.vue
View file @
8f42f0fd
...
@@ -116,7 +116,8 @@
...
@@ -116,7 +116,8 @@
let
html
=
''
;
let
html
=
''
;
//s视频
//s视频
fileArray
.
forEach
(
item
=>
{
fileArray
.
forEach
(
item
=>
{
html
+=
"<iframe frameborder='0' width='100%' height='200px' src='https://v.qq.com/iframe/player.html?vid=v326875u4ek' allowfullscreen='true'></iframe>"
html
+=
"<iframe frameborder='0' width='100%' height='200px' src='https://v.qq.com/iframe/player.html?vid=v326875u4ek' allowfullscreen='true'></iframe>"
})
})
if
(
html
&&
html
!=
''
)
{
if
(
html
&&
html
!=
''
)
{
...
@@ -157,24 +158,29 @@
...
@@ -157,24 +158,29 @@
},
},
applet
(
data
)
{
applet
(
data
)
{
let
html
=
''
;
let
html
=
''
;
if
(
data
.
type
==
1
)
{
//文字小程序
if
(
data
.
type
==
1
)
{
//文字小程序
html
+=
`<p><a data-miniprogram-appid="
${
data
.
appletmsg
.
AppID
}
" data-miniprogram-path="
${
data
.
route
}
" href="">
${
data
.
title
}
</a></p>`
;
html
+=
`<p><a data-miniprogram-appid="
${
data
.
appletmsg
.
AppID
}
" data-miniprogram-path="
${
data
.
route
}
" href="">
${
data
.
title
}
</a></p>`
;
}
else
if
(
data
.
type
==
2
)
{
//图片小程序
}
else
if
(
data
.
type
==
2
)
{
//图片小程序
html
+=
`<p><a data-miniprogram-appid="
${
data
.
appletmsg
.
AppID
}
" data-miniprogram-path="
${
data
.
route
}
" href=""><img src="
${
data
.
imgUrl
}
" alt="" data-width="null" ></a></p>`
html
+=
`<p><a data-miniprogram-appid="
${
data
.
appletmsg
.
AppID
}
" data-miniprogram-path="
${
data
.
route
}
" href=""><img src="
${
data
.
imgUrl
}
" alt="" data-width="null" ></a></p>`
}
else
if
(
data
.
type
==
3
)
{
}
else
if
(
data
.
type
==
3
)
{
let
dataTime
=
Date
.
parse
(
new
Date
())
let
dataTime
=
Date
.
parse
(
new
Date
())
// 给公众号的写法
// 给公众号的写法
html
+=
`<mp-miniprogram data-time="
${
dataTime
}
" data-miniprogram-appid="
${
data
.
appletmsg
.
AppID
}
" data-miniprogram-path="
${
data
.
route
}
"
html
+=
`<mp-miniprogram data-time="
${
dataTime
}
" data-miniprogram-appid="
${
data
.
appletmsg
.
AppID
}
" data-miniprogram-path="
${
data
.
route
}
"
data-miniprogram-title="
${
data
.
title
}
"
data-miniprogram-title="
${
data
.
title
}
"
data-miniprogram-imageurl="
${
data
.
imgUrl
}
"
data-miniprogram-imageurl="
${
data
.
imgUrl
}
"
data-miniprogram-type="card" data-miniprogram-servicetype="0"></mp-miniprogram><span data-time="
${
dataTime
}
"></span>`
data-miniprogram-type="card" data-miniprogram-servicetype="0"></mp-miniprogram><span data-time="
${
dataTime
}
"></span>`
//自己看的写法
//自己看的写法
html
+=
'<p><iframe height="320" width="auto" data-time='
+
dataTime
+
' data-miniprogram-appid='
+
data
.
appletmsg
.
AppID
+
' frameborder="0" allowtransparency="true" '
+
html
+=
'<p><iframe height="320" width="auto" data-time='
+
dataTime
+
' data-miniprogram-appid='
+
data
.
appletmsg
.
AppID
+
' frameborder="0" allowtransparency="true" '
+
' style="background-color:transparent;border-radius: 3px;overflow: hidden;z-index: 0;" scrolling="no" '
+
' style="background-color:transparent;border-radius: 3px;overflow: hidden;z-index: 0;" scrolling="no" '
+
' src="http://edu.oytour.com/#/teacher/contribution/graphicType?Name='
+
data
.
appletmsg
.
Name
+
'&Image='
+
' src="http://edu.oytour.com/#/teacher/contribution/graphicType?Name='
+
data
.
appletmsg
.
Name
+
'&Image='
+
data
.
appletmsg
.
Image
+
'&title='
+
data
.
title
+
'&imgUrl='
+
data
.
imgUrl
+
data
.
appletmsg
.
Image
+
'&title='
+
data
.
title
+
'&imgUrl='
+
data
.
imgUrl
+
'" class="ans-insertaudio-module" module="_insertaudio">'
+
' </iframe><span data-time='
+
dataTime
+
'></span></p>'
;
'" class="ans-insertaudio-module" module="_insertaudio">'
+
' </iframe><span data-time='
+
dataTime
+
'></span></p>'
;
}
}
...
@@ -254,7 +260,6 @@
...
@@ -254,7 +260,6 @@
});
});
this
.
ue
.
addListener
(
'keyup'
,
editor
=>
{
this
.
ue
.
addListener
(
'keyup'
,
editor
=>
{
this
.
isInputChange
=
true
;
this
.
isInputChange
=
true
;
// this.$emit('input', this.ue.getContent());
});
});
this
.
ue
.
addListener
(
'contentChange'
,
(
editor
,
e
)
=>
{
this
.
ue
.
addListener
(
'contentChange'
,
(
editor
,
e
)
=>
{
this
.
isInputChange
=
true
;
this
.
isInputChange
=
true
;
...
@@ -268,7 +273,7 @@
...
@@ -268,7 +273,7 @@
this
.
$emit
(
'focus'
);
this
.
$emit
(
'focus'
);
});
});
this
.
ue
.
addListener
(
'selectionchange'
,
editor
=>
{
this
.
ue
.
addListener
(
'selectionchange'
,
editor
=>
{
// console.log(this.ue.selection.getStart() )
})
})
this
.
ue
.
addListener
(
'click'
,
(
editor
,
a
)
=>
{
this
.
ue
.
addListener
(
'click'
,
(
editor
,
a
)
=>
{
...
@@ -276,7 +281,6 @@
...
@@ -276,7 +281,6 @@
}
}
},
},
}
}
</
script
>
</
script
>
<
style
scoped
>
<
style
scoped
>
...
...
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