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
7adb1fe9
Commit
7adb1fe9
authored
Nov 03, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
845a6711
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
276 additions
and
296 deletions
+276
-296
userCenter.vue
src/components/StoreDesign/userCenter.vue
+0
-1
choicezx.vue
src/components/common/choicezx.vue
+0
-1
directorGoodsEdit.vue
src/components/director/directorGoodsEdit.vue
+0
-1
educationEdit.vue
src/components/education/educationEdit.vue
+67
-54
educationOrderDetail.vue
src/components/education/educationOrderDetail.vue
+46
-39
informationEvalution.vue
src/components/education/informationEvalution.vue
+0
-22
informationManage.vue
src/components/education/informationManage.vue
+1
-8
ServiceManageEdit.vue
src/components/offlineService/ServiceManageEdit.vue
+0
-1
ServiceMannage.vue
src/components/offlineService/ServiceMannage.vue
+0
-1
customerEvaluation.vue
src/components/orderMan/customerEvaluation.vue
+162
-166
educationArticle.vue
src/components/sallCenter/plugin/educationArticle.vue
+0
-2
No files found.
src/components/StoreDesign/userCenter.vue
View file @
7adb1fe9
...
...
@@ -1054,7 +1054,6 @@
this
.
apipost
(
"/api/Tenant/GetMiniprogramPageListExt"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
userCenterMsg
.
MenuList
=
res
.
data
.
data
;
console
.
log
(
res
,
'userCenter'
);
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
...
...
src/components/common/choicezx.vue
View file @
7adb1fe9
...
...
@@ -65,7 +65,6 @@
getList
()
{
this
.
apipost
(
"/api/Education/GetArticlePageList"
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
res
,
'res'
);
this
.
total
=
res
.
data
.
data
.
count
;
var
tempArray
=
res
.
data
.
data
.
pageData
;
if
(
tempArray
&&
tempArray
.
length
>
0
)
{
...
...
src/components/director/directorGoodsEdit.vue
View file @
7adb1fe9
...
...
@@ -1678,7 +1678,6 @@
})
},
changeCarColorList
(
val
)
{
console
.
log
(
val
)
},
changeEnumList
(
val
)
{
this
.
EnumType
=
val
...
...
src/components/education/educationEdit.vue
View file @
7adb1fe9
...
...
@@ -208,11 +208,12 @@
<
template
v-if=
"addMsg.TeacherList.length>0"
>
<div>
<div
class=
"Teacher_List"
v-for=
"(item,index) in addMsg.TeacherList"
:key=
"index"
>
<div
class=
"Teacher_tou"
>
<img
style=
"width:100%;height:100%;"
:src=
"item.TeacherLogo"
alt=
""
/>
</div>
{{
item
.
Name
}}
<el-button
@
click=
"yichuTeacher(index)"
class=
"edu_edlBtn"
type=
"danger"
icon=
"el-icon-close"
circle
></el-button>
<div
class=
"Teacher_tou"
>
<img
style=
"width:100%;height:100%;"
:src=
"item.TeacherLogo"
alt=
""
/>
</div>
{{
item
.
Name
}}
<el-button
@
click=
"yichuTeacher(index)"
class=
"edu_edlBtn"
type=
"danger"
icon=
"el-icon-close"
circle
></el-button>
</div>
</div>
<!--
<el-tag
v-for=
"(item,index) in addMsg.TeacherList"
closable
size=
"small"
...
...
@@ -220,7 +221,8 @@
{{
item
.
Name
}}
</el-tag>
-->
</
template
>
<el-button
@
click=
"choosejsDig=true"
style=
"position:relative;top:-4px;"
size=
"mini"
>
选择教师
</el-button>
<el-button
@
click=
"choosejsDig=true"
style=
"position:relative;top:-4px;"
size=
"mini"
>
选择教师
</el-button>
</el-form-item>
<el-form-item
label=
"标签"
size=
"small"
>
<el-tag
:key=
"tag"
size=
"small"
v-for=
"tag in dynamicTags"
closable
:disable-transitions=
"false"
...
...
@@ -261,9 +263,9 @@
<div
style=
"width:100px;"
>
{{subItem.Sort}}
</div>
<div
style=
"width:120px;"
>
{{subItem.SortName}}
</div>
<div
class=
"edu_fileName"
style=
"width:300px;"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"subItem.Name"
placement=
"top"
>
<div
style=
"padding:5px;"
>
{{subItem.Name}}
</div>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"subItem.Name"
placement=
"top"
>
<div
style=
"padding:5px;"
>
{{subItem.Name}}
</div>
</el-tooltip>
</div>
<div>
<span
v-if=
"subItem.Type==1"
>
视频
</span>
...
...
@@ -285,12 +287,16 @@
<div
class=
"eduFileDiv"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"预览文件"
placement=
"top"
>
<img
v-if=
"getFileType(subItem.FilePath)==1"
@
click=
"goUrlVideo(subItem.FilePath)"
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/z_video.png"
alt=
""
>
<img
v-if=
"getFileType(subItem.FilePath)==2"
@
click=
"showUpLoadFileT(subItem.FilePath)"
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/z_video.png"
alt=
""
>
<img
v-if=
"getFileType(subItem.FilePath)==2"
@
click=
"showUpLoadFileT(subItem.FilePath)"
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/WORD.png"
alt=
""
>
<img
v-if=
"getFileType(subItem.FilePath)==3"
@
click=
"showUpLoadFileT(subItem.FilePath)"
<img
v-if=
"getFileType(subItem.FilePath)==3"
@
click=
"showUpLoadFileT(subItem.FilePath)"
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pdf.png"
alt=
""
>
<img
v-if=
"getFileType(subItem.FilePath)==4"
@
click=
"showUpLoadFileT(subItem.FilePath)"
<img
v-if=
"getFileType(subItem.FilePath)==4"
@
click=
"showUpLoadFileT(subItem.FilePath)"
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/PPT.png"
alt=
""
>
</el-tooltip>
</div>
...
...
@@ -674,9 +680,9 @@
<div>
<el-checkbox-group
v-model=
"ckedTeacher"
>
<el-checkbox
v-for=
"(item,index) in teacherList"
:label=
"item.ID"
:key=
"index"
>
<div
class=
"teacherHead"
>
<img
:src=
"item.TeacherLogo"
alt=
""
/>
</div>
{{item.Name}}
<div
class=
"teacherHead"
>
<img
:src=
"item.TeacherLogo"
alt=
""
/>
</div>
{{item.Name}}
</el-checkbox>
</el-checkbox-group>
</div>
...
...
@@ -837,7 +843,7 @@
TeacherList
:
[],
//教师
CourseList
:
[],
//课程
SalesNum
:
0
,
//已售数量
CourseLableList
:[]
//标签
CourseLableList
:
[]
//标签
},
predefineColors
:
[
'#000000'
,
...
...
@@ -986,7 +992,7 @@
dynamicTags
:
[],
inputVisible
:
false
,
inputValue
:
''
,
commonTitle
:
'新增课程'
,
commonTitle
:
'新增课程'
,
};
},
created
()
{
...
...
@@ -1501,7 +1507,7 @@
if
(
this
.
addMsg
.
PresentFXGrade
==
0
)
{
this
.
addMsg
.
PresentFXGrade
=
''
}
if
(
this
.
addMsg
.
CourseLableList
&&
this
.
addMsg
.
CourseLableList
.
length
>
0
)
{
if
(
this
.
addMsg
.
CourseLableList
&&
this
.
addMsg
.
CourseLableList
.
length
>
0
)
{
this
.
dynamicTags
=
this
.
addMsg
.
CourseLableList
}
if
(
this
.
addMsg
.
TeacherList
.
length
>
0
)
{
...
...
@@ -1717,14 +1723,13 @@
},
getckedTeachArr
()
{
this
.
addMsg
.
TeacherList
=
[];
console
.
log
(
this
.
ckedTeacher
,
'this.ckedTeacher'
);
this
.
ckedTeacher
.
forEach
(
x
=>
{
this
.
teacherList
.
forEach
(
y
=>
{
if
(
x
==
y
.
ID
)
{
this
.
addMsg
.
TeacherList
.
push
({
TeacherId
:
y
.
ID
,
Name
:
y
.
Name
,
TeacherLogo
:
y
.
TeacherLogo
TeacherLogo
:
y
.
TeacherLogo
})
}
})
...
...
@@ -1824,7 +1829,7 @@
},
//修改课件
updateCourse
(
subItem
,
index
)
{
this
.
commonTitle
=
'修改课程'
;
this
.
commonTitle
=
'修改课程'
;
this
.
isReplace
=
index
;
this
.
courseDialog
=
true
;
this
.
courseMsg
.
Id
=
subItem
.
Id
;
...
...
@@ -1872,9 +1877,6 @@
if
(
Url
.
substring
(
Url
.
lastIndexOf
(
'.'
)
+
1
,
Url
.
length
).
toUpperCase
()
==
'PDF'
)
{
this
.
previewPDF
(
Url
)
}
else
{
// let dom = document.querySelector("#groupTourOrder_DownLoad");
// dom.href = Url;
// dom.click();
window
.
open
(
"https://view.officeapps.live.com/op/view.aspx?src="
+
Url
)
}
},
...
...
@@ -2183,7 +2185,7 @@
width
:
100%
;
height
:
100%
;
border
:
1px
solid
#EBEEF5
;
border-bottom
:
0
;
border-bottom
:
0
;
}
.courseHeader
{
...
...
@@ -2280,62 +2282,72 @@
width
:
100%
;
height
:
100%
;
}
.directorGoodsEdit
.input-new-tag
{
width
:
90px
;
margin-left
:
10px
;
vertical-align
:
bottom
;
}
.directorGoodsEdit
.el-tag
+
.el-tag
{
.directorGoodsEdit
.el-tag
+
.el-tag
{
margin-left
:
10px
;
}
.teacherHead
{
width
:
30px
;
height
:
30px
;
.teacherHead
{
width
:
30px
;
height
:
30px
;
display
:
inline-block
;
border-radius
:
50%
;
overflow
:
hidden
;
position
:
relative
;
top
:
10px
;
margin-right
:
3px
;
top
:
10px
;
margin-right
:
3px
;
}
.directorGoodsEdit
.teacherHead
img
{
width
:
100%
;
height
:
100%
;
.directorGoodsEdit
.teacherHead
img
{
width
:
100%
;
height
:
100%
;
}
.directorGoodsEdit
.el-checkbox
{
margin-bottom
:
10px
;
.directorGoodsEdit
.el-checkbox
{
margin-bottom
:
10px
;
}
.Teacher_List
{
padding
:
2px
5px
;
.Teacher_List
{
padding
:
2px
5px
;
position
:
relative
;
margin-right
:
5px
;
border
:
1px
solid
#d1d1d1
;
border-radius
:
4px
;
margin-right
:
5px
;
border
:
1px
solid
#d1d1d1
;
border-radius
:
4px
;
display
:
flex
;
align-items
:
center
;
line-height
:
normal
;
font-size
:
12px
;
float
:
left
;
}
.Teacher_tou
{
width
:
25px
;
height
:
25px
;
.Teacher_tou
{
width
:
25px
;
height
:
25px
;
overflow
:
hidden
;
margin-right
:
3px
;
margin-right
:
3px
;
border-radius
:
50%
;
display
:
inline-block
;
}
.edu_edlBtn
{
.edu_edlBtn
{
position
:
absolute
;
right
:
-8px
;
top
:
-14px
;
padding
:
1px
1px
!important
;
right
:
-8px
;
top
:
-14px
;
padding
:
1px
1px
!important
;
}
.edu_fileName
{
text-align
:
left
!important
;
line-height
:
normal
!important
;
.edu_fileName
{
text-align
:
left
!important
;
line-height
:
normal
!important
;
}
.edu_fileName
>
div
{
.edu_fileName
>
div
{
text-overflow
:
-o-ellipsis-lastline
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
...
...
@@ -2344,4 +2356,5 @@
line-clamp
:
2
;
-webkit-box-orient
:
vertical
;
}
</
style
>
src/components/education/educationOrderDetail.vue
View file @
7adb1fe9
This diff is collapsed.
Click to expand it.
src/components/education/informationEvalution.vue
View file @
7adb1fe9
...
...
@@ -215,26 +215,6 @@
TableSelectChange
(
val
)
{
this
.
SelectList
=
val
;
},
// // 批量回复
// plHf() {
// let that = this;
// if (this.SelectList.length == 0) {
// this.Error("请勾选数据!");
// return;
// }
// let Ids = "";
// let IdList = [];
// this.SelectList.forEach(item => {
// IdList.push(item.OrderDetailId);
// })
// Ids = IdList.join(',');
// this.hfMsg = {
// OrderDetailIds: Ids,
// Type: 1,
// Content: '',
// }
// this.addDig = true;
// },
//改变下拉切换搜索名称或者内容 标题
ChangeId
(
val
)
{
let
msgVal
=
this
.
msgVal
;
...
...
@@ -255,7 +235,6 @@
}
this
.
getList
();
},
//获取数据
getList
()
{
if
(
this
.
dateList
&&
this
.
dateList
.
length
>
0
)
{
...
...
@@ -269,7 +248,6 @@
this
.
apipost
(
"/api/Education/GetArticleCommentPageList"
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
res
,
'数据'
);
this
.
total
=
res
.
data
.
data
.
count
;
let
pageData
=
res
.
data
.
data
.
pageData
;
this
.
tableData
=
pageData
;
...
...
src/components/education/informationManage.vue
View file @
7adb1fe9
...
...
@@ -299,7 +299,7 @@
},
//保存
saveMsg
()
{
if
(
this
.
addMsg
.
LableNameList
.
length
==
0
)
{
if
(
this
.
addMsg
.
LableNameList
.
length
==
0
)
{
this
.
Error
(
'请选择标签'
);
return
;
}
...
...
@@ -326,7 +326,6 @@
})
},
changeSupplier
(
val
)
{},
//单个删除
Delete
(
item
)
{
let
that
=
this
;
...
...
@@ -424,17 +423,14 @@
handleClose
(
tag
)
{
this
.
addMsg
.
LableNameList
.
splice
(
this
.
addMsg
.
LableNameList
.
indexOf
(
tag
),
1
);
},
showInput
()
{
this
.
inputVisible
=
true
;
this
.
$nextTick
(
_
=>
{
this
.
$refs
.
saveTagInput
.
$refs
.
input
.
focus
();
});
},
handleInputConfirm
()
{
let
inputValue
=
this
.
inputValue
;
console
.
log
(
inputValue
)
if
(
inputValue
)
{
this
.
addMsg
.
LableNameList
.
push
(
inputValue
);
}
...
...
@@ -442,7 +438,6 @@
this
.
inputValue
=
''
;
},
openChangeDig
(
num
)
{
this
.
changeState
=
true
;
this
.
imgType
=
num
;
},
...
...
@@ -453,13 +448,11 @@
}
this
.
changeState
=
false
;
},
},
mounted
()
{
}
};
</
script
>
<
style
>
.informationManage
.content
.searchInput
{
...
...
src/components/offlineService/ServiceManageEdit.vue
View file @
7adb1fe9
...
...
@@ -262,7 +262,6 @@
this
.
apipost
(
"/api/Reserve/GetGenderEnumList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
genderList
=
res
.
data
.
data
;
console
.
log
(
res
,
'行呗'
);
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
...
...
src/components/offlineService/ServiceMannage.vue
View file @
7adb1fe9
...
...
@@ -164,7 +164,6 @@
this
.
apipost
(
"/api/Reserve/GetServicePersonalPageList"
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
res
,
'数据'
);
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
}
else
{
...
...
src/components/orderMan/customerEvaluation.vue
View file @
7adb1fe9
This diff is collapsed.
Click to expand it.
src/components/sallCenter/plugin/educationArticle.vue
View file @
7adb1fe9
...
...
@@ -491,13 +491,11 @@
},
//选择图片
SelectId
(
msg
)
{
// this.data.goodsTagPicUrl = msg.url;
this
.
choicImg
=
false
;
},
//选择商品
getGoodsChoice
()
{
var
ckedArr
=
this
.
$refs
.
choiceGood
.
getChoicedGoods
();
console
.
log
(
ckedArr
,
'ckedarrrr'
);
var
myArray
=
[];
if
(
ckedArr
&&
ckedArr
.
length
>
0
)
{
ckedArr
.
forEach
(
element
=>
{
...
...
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