Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mallapp
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
viitto
mallapp
Commits
a7e7128b
Commit
a7e7128b
authored
Dec 28, 2020
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
老师列表
parent
fafe906a
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
251 additions
and
16 deletions
+251
-16
index.vue
components/educationteacher/index.vue
+93
-0
style1.vue
components/educationteacher/style1.vue
+117
-0
style5.vue
components/studyArticle/style5.vue
+15
-10
index.vue
pages/index/index.vue
+5
-2
articleDetails.vue
pages/school/articleDetails.vue
+1
-1
teacherDetails.vue
pages/school/teacherDetails.vue
+3
-0
api.js
plugin/api.js
+17
-3
No files found.
components/educationteacher/index.vue
0 → 100644
View file @
a7e7128b
<
template
>
<div
class=
"goods-box"
:class=
"
{ flex: goods.catPosition == 'left' }">
<view
:style=
"
{ margin: goods.catStyle == 1 ? '0px' : '10px 5px' }">
<u-tabs
v-if=
"goods.showCat && goods.catPosition == 'top' && goods.catList.length > 1"
name=
"menuName"
:list=
"goods.catList"
:is-scroll=
"true"
:active-color=
"mainColor"
:current=
"activeKey"
:show-bar=
"goods.catStyle == 1"
:bold=
"false"
:type-style=
"goods.catStyle"
:height=
"goods.catStyle == 1 ? '88' : '44'"
@
change=
"tabChangeHandler"
></u-tabs>
</view>
<div
:class=
"
{ 'right-slider': goods.catPosition == 'top' }">
<template>
<!--列表模式-->
<style
1
v-if=
"goods.listStyle == 0"
:goods-info=
"goods"
:good-list=
"currentList"
></style1>
</
template
>
</div>
</div>
</template>
<
script
>
import
style1
from
'./style1'
;
export
default
{
props
:
[
'goods'
],
components
:
{
style1
,
},
data
()
{
return
{
mainColor
:
''
,
activeKey
:
0
,
currentList
:
[]
};
},
created
()
{
this
.
mainColor
=
this
.
$uiConfig
.
mainColor
;
if
(
this
.
goods
.
showCat
)
{
this
.
currentList
=
this
.
goods
.
catList
[
0
].
goodsList
;
}
else
{
this
.
currentList
=
this
.
goods
.
TeacherList
;
}
},
methods
:
{
tabChangeHandler
(
i
)
{
this
.
currentList
=
this
.
goods
.
catList
[
i
].
goodsList
;
this
.
activeKey
=
i
;
}
}
};
</
script
>
<
style
>
.style4View
{
display
:
inline-block
;
width
:
100%
;
padding-left
:
80px
;
box-sizing
:
border-box
;
}
.goods-box
{
/* margin: 20rpx 0; */
}
.goods-box
.tips
{
z-index
:
50
!important
;
}
.goods-box.flex
{
display
:
flex
;
}
.goods-box.flex
.left-slider
{
width
:
80px
;
position
:
absolute
;
}
.goods-box.flex
.right-slider
{
flex
:
1
;
width
:
1
rpx
;
}
.defaultz
.van-sticky
{
z-index
:
1
!important
;
}
.goods-box
.van-tabs__scroll
{
background
:
none
;
}
.goods-box
._div
{
width
:
100%
;
}
</
style
>
components/educationteacher/style1.vue
0 → 100644
View file @
a7e7128b
<
template
>
<view
class=
"her-scoller"
:style=
"
{
'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}"
>
<view
class=
"good-five"
@
click=
"openGood(item)"
v-for=
"(item, gli) in goodList"
:key=
"gli"
:style=
"
{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
}"
>
<view
class=
"list-box"
@
click=
"openGood(item)"
>
<view
class=
"img-box"
>
<image
style=
"width: 100%; height: 100%; border-radius: 50%;"
mode=
"aspectFit"
:src=
"item.picUrl"
/>
</view>
<view
class=
"textone"
style=
"font-size: 14px;font-weight: bold;margin: 5px 0;"
>
{{
item
.
name
}}
</view>
<view
style=
"display: flex;align-items: center;margin-top: 5px;margin-bottom: 14px;"
>
<image
style=
"width: 15px; height: 15px; border-radius: 50%;margin-right: 5px;"
mode=
"aspectFill"
:src=
"item.foreignersUrl"
/>
<text
>
{{
item
.
nationality
}}
</text>
</view>
<view
class=
"textone"
>
<text
v-for=
"(x, y) in item.lableNameList"
:key=
"y"
>
{{
x
}}{{
item
.
lableNameList
.
length
==
y
+
1
?
''
:
'、'
}}
</text>
</view>
</view>
</view>
<good-sku
v-if=
"showSku"
:option-type=
"2"
borderRadius=
"20"
v-model=
"showSku"
:good=
"sku"
></good-sku>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
"gbAuth"
></auth>
</view>
</
template
>
<
script
>
import
goodSku
from
'../goods/goodsku'
;
import
auth
from
'@/components/auth/index.vue'
;
export
default
{
components
:
{
goodSku
,
auth
},
props
:
[
'goodList'
,
'goodsInfo'
],
data
()
{
return
{
mainColor
:
''
,
activeKey
:
0
,
showSku
:
false
,
sku
:
{},
showAuth
:
false
,
u
:
{}
};
},
created
()
{
this
.
mainColor
=
this
.
$uiConfig
.
mainColor
;
},
methods
:
{
openGood
(
item
)
{
uni
.
navigateTo
({
url
:
'/pages/school/teacherDetails?ID='
+
item
.
id
});
},
}
};
</
script
>
<
style
>
.her-scoller
{
overflow-x
:
auto
!important
;
padding
:
12px
;
/* display: flex; */
white-space
:
nowrap
;
}
/* .her-scoller::after {
clear: both;
content: " ";
display: block;
} */
.her-scoller
.good-five
{
position
:
relative
;
margin-right
:
12px
;
width
:
120px
;
border
:
1
rpx
solid
transparent
;
border-radius
:
10
rpx
;
padding
:
10px
;
display
:
inline-block
;
box-shadow
:
0
0
10
upx
rgba
(
0
,
0
,
0
,
0.1
);
background
:
#FFF
;
/* float: left; */
}
.her-scoller
.good-five
.img-box
{
width
:
40px
;
height
:
40px
;
border-radius
:
50%
;
}
.list-box
{
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
font-size
:
12px
;
color
:
#333F53
;
}
.textone
{
width
:
100%
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
text-align
:
center
;
}
</
style
>
components/studyArticle/style5.vue
View file @
a7e7128b
...
...
@@ -14,9 +14,9 @@
</view>
<view
class=
"good-info"
>
<view
class=
"good-name"
v-if=
"item.name"
>
{{
item
.
name
}}
</view>
<view
style=
"
overflow: hidden
;"
>
<view
style=
"
width: 130px
;"
>
<view
class=
"style_five_label"
:style=
"
{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
:style=
"
{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList"
:key="subIndex">
{{
subItem
}}
</view>
</view>
...
...
@@ -95,18 +95,21 @@
border
:
10
rpx
;
padding-bottom
:
0
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
justify-content
:
space-between
;
/* width:20%; */
}
.good-five-stydy
.good-info
.good-name
{
font-size
:
13px
;
margin-bottom
:
5px
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
-webkit-line-clamp
:
1
;
margin-bottom
:
5px
;
white-space
:
pre-wrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
display
:
-webkit-box
;
-webkit-line-clamp
:
2
;
line-clamp
:
2
;
-webkit-box-orient
:
vertical
;
display
:
inline-block
;
width
:
130px
;
}
...
...
@@ -135,8 +138,10 @@
.her_Two_study
{
overflow-x
:
auto
!important
;
display
:
flex
;
white-space
:
nowrap
;
}
.style_five_label
{
float
:
left
;
padding
:
2px
4px
;
border-radius
:
2px
;
padding
:
0px
5px
;
border-radius
:
2px
;
height
:
18px
;
line-height
:
18px
;
font-size
:
10px
;
color
:
#FAF8F9
;
margin
:
0
5px
5px
0
;
...
...
pages/index/index.vue
View file @
a7e7128b
...
...
@@ -55,6 +55,8 @@
<store
v-if=
"d.id == 'reservestore'"
:goods=
"d.data"
:storeinfo=
'storeInfo'
></store>
<!-- 线下服务商品 -->
<sindex
v-if=
"d.id == 'storeGoods'"
:goods=
"d.data"
:key=
"di"
></sindex>
<!-- 老师列表 -->
<educationteacher
v-if=
"d.id == 'educationteacher'"
:goods=
"d.data"
:key=
"di"
></educationteacher>
</
template
>
</view>
...
...
@@ -111,6 +113,7 @@
import
argoods
from
"@/components/studyArticle/index.vue"
;
import
store
from
"@/components/store/store.vue"
import
sindex
from
"@/components/store/index.vue"
import
educationteacher
from
"@/components/educationteacher/index"
const
innerAudioContext
=
uni
.
createInnerAudioContext
();
export
default
{
data
()
{
...
...
@@ -176,7 +179,8 @@
rgoods
,
argoods
,
store
,
sindex
sindex
,
educationteacher
},
onLoad
(
options
)
{
let
that
=
this
;
...
...
@@ -483,7 +487,6 @@
data
:
{},
},
(
res
)
=>
{
console
.
log
(
res
,
'res'
)
uni
.
setStorageSync
(
"GetAppConfig"
,
res
.
data
);
//方便在分类判断
if
(
res
.
resultCode
==
1
)
{
if
(
res
.
data
.
IsOpenReserve
==
1
){
...
...
pages/school/articleDetails.vue
View file @
a7e7128b
...
...
@@ -7,7 +7,7 @@
<u-avatar
:src=
"mall.setting.share_pic"
size=
"60"
v-if=
"article.TeacherLogo==null || article.TeacherLogo==''"
></u-avatar>
<view
class=
"ad-box-txr"
>
<text
style=
"font-weight: bold;"
v-if=
"article.TeacherName!=null && article.TeacherName!=''"
>
{{
article
.
TeacherName
}}
</text>
<text
style=
"font-weight: bold;"
v-if=
"article.TeacherName==null || article.TeacherName==''"
>
{{
mall
.
setting
.
share_title
}}
</text>
<text
style=
"font-weight: bold;"
v-if=
"article.TeacherName==null || article.TeacherName==''"
>
{{
mall
.
name
!=
null
?
mall
.
name
:
'无'
}}
</text>
<text
style=
"font-size: 11px;color: #9A9A9A;"
>
{{
article
.
CreateDate
}}
</text>
</view>
</view>
...
...
pages/school/teacherDetails.vue
View file @
a7e7128b
...
...
@@ -431,4 +431,7 @@
margin
:
5px
10px
;
width
:
24px
;
}
.teacherDetails
.u-empty
{
padding-top
:
20px
!important
;
}
</
style
>
plugin/api.js
View file @
a7e7128b
...
...
@@ -2,9 +2,9 @@ export default {
install
(
Vue
,
options
)
{
Vue
.
prototype
.
host
=
"https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
// Vue.prototype.host2 = "http://192.168.0.110:8200"
Vue
.
prototype
.
host2
=
"https://mallApi.oytour.com"
//
Vue.prototype.host2 = "https://mallApi.oytour.com"
// Vue.prototype.host2 = "http://192.168.1.5:8088"
//
Vue.prototype.host2 = "http://192.168.1.48:8014"
Vue
.
prototype
.
host2
=
"http://192.168.1.48:8014"
// Vue.prototype.host2 = "http://testmall.oytour.com/"
Vue
.
prototype
.
request
=
function
(
param
,
success
,
failed
)
{
...
...
@@ -130,12 +130,26 @@ export default {
};
break
;
case
4
:
appObj
=
{
appObj
=
{
//郍田
AppId
:
'wx1bf3a7c76b10bb6d'
,
TenantId
:
16
,
MallBaseId
:
6
,
};
break
;
case
5
:
appObj
=
{
//惠爱
AppId
:
'wxcab2515c608644b9'
,
TenantId
:
17
,
MallBaseId
:
7
,
};
break
;
case
6
:
appObj
=
{
//甲鹤
AppId
:
'wx38e054ee42b054f4'
,
TenantId
:
15
,
MallBaseId
:
5
,
};
break
;
}
return
appObj
;
}
...
...
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