Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
W
wechatapp.shangjiadao.com
Project
Project
Details
Activity
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
wangxuelai
wechatapp.shangjiadao.com
Commits
fdd6cd45
Commit
fdd6cd45
authored
Apr 17, 2020
by
lvtz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
70492ceb
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
28 additions
and
11 deletions
+28
-11
index.js
business/pages/deskcenter/index.js
+5
-0
index.wxml
business/pages/deskcenter/index.wxml
+1
-1
setting.js
business/pages/organizationalmgt/setting.js
+3
-1
setting.wxml
business/pages/organizationalmgt/setting.wxml
+1
-1
index.wxml
src/components/brickLayout/index.wxml
+3
-3
index.js
src/pages/websiteindex/index.js
+8
-2
index.wxml
src/pages/websiteindex/index.wxml
+3
-3
index.wxss
src/pages/websiteindex/index.wxss
+4
-0
No files found.
business/pages/deskcenter/index.js
View file @
fdd6cd45
...
...
@@ -337,6 +337,11 @@ Page({
url
:
`/business/pages/orgpotentialcustomer/index?sid=
${
this
.
data
.
sid
}
`
,
});
},
toStaticCenter
(){
wx
.
navigateTo
({
url
:
'/business/pages/helpcenter/detail?alias=pay'
,
})
},
// 待处理更多
toMoreDeal
()
{
wx
.
navigateTo
({
...
...
business/pages/deskcenter/index.wxml
View file @
fdd6cd45
...
...
@@ -96,7 +96,7 @@
<image class="item-icon" src="{{imageRoot}}2b/deskcenternew/menu/icon_points.png?{{imageVersion}}"/>
<view class="item-title">积分</view>
</view>
<view class="item" bindtap="">
<view class="item" bindtap="
toStaticCenter
">
<image class="item-icon" src="{{imageRoot}}2b/deskcenternew/menu/icon_statics.png?{{imageVersion}}"/>
<view class="item-title">数据中心</view>
</view>
...
...
business/pages/organizationalmgt/setting.js
View file @
fdd6cd45
...
...
@@ -72,6 +72,8 @@ Page({
// })
// },
goRecharge
()
{
console
.
log
(
'充值'
);
wx
.
navigateTo
({
url
:
'/business/pages/helpcenter/detail?alias=pay'
,
})
}
})
\ No newline at end of file
business/pages/organizationalmgt/setting.wxml
View file @
fdd6cd45
...
...
@@ -2,7 +2,7 @@
<view class="box">
<view class="line-item" bindtap='goRecharge'>
<view class="item-label">套餐续费</view>
<view class="right">
<view class="right"
>
<view class="expiretime" wx:if="{{schoolInfo.expire_time}}">{{schoolInfo.expire_time}}到期</view>
<view class="expiretime" wx:else>长期有效</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
...
...
src/components/brickLayout/index.wxml
View file @
fdd6cd45
...
...
@@ -11,12 +11,12 @@
<image class="icon-imglabel" src="{{imageRoot}}2c/websiteindex/img.png?{{imageVersion}}"></image>
</view> -->
<view class="item-content">
<view class="item-title">{{rawData[item].title}}
{{filter.jsonParse(rawData[item].content)[0].type}}
</view>
<
view class="item-info" wx:if="{{type!=1}}
">
<view class="item-title">{{rawData[item].title}}</view>
<
!-- <view class="item-info
">
<image class="avatar" src="{{filter.imagify(rawData[item].school_teacher.avatar, 'image/resize,w_160/format,jpg')}}" wx:if="{{rawData[item].school_teacher.avatar}}"></image>
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/defaultavatar.png" wx:else></image>
<view class="name">{{rawData[item].school_teacher.nickname ? rawData[item].school_teacher.nickname: '未知'}}</view>
</view>
</view>
-->
</view>
</view>
</view>
...
...
src/pages/websiteindex/index.js
View file @
fdd6cd45
...
...
@@ -923,16 +923,20 @@ Page({
data
}
=
res
;
if
(
code
==
200
)
{
console
.
log
(
data
,
code
,
"___________________________"
)
if
(
data
)
{
// const myLocation = LocalStorage.getItem('myLocation');
data
.
banner
=
data
.
banner
?
JSON
.
parse
(
data
.
banner
)
:
''
;
data
.
tags
=
data
.
tags
?
JSON
.
parse
(
data
.
tags
)
:
''
;
data
.
module_switch
=
data
.
module_switch
?
JSON
.
parse
(
data
.
module_switch
):
{
"clocklist"
:
true
,
"classmoments"
:
true
,
"onlineclass"
:
true
};
let
dataSort
=
''
;
// 机构信息/banner图片或视频/体验课 不参与排序 固定位置
if
(
data
.
sort
)
{
// dataSort = JSON.parse(data.sort);
dataSort
=
JSON
.
parse
(
data
.
sort
,
'++++++++++++++++++'
);
console
.
log
(
data
.
sort
,
dataSort
)
let
removeItem1
=
dataSort
.
findIndex
(
item
=>
item
.
name
==
"banner"
);
dataSort
.
splice
(
removeItem1
,
1
);
let
removeItem2
=
dataSort
.
findIndex
(
item
=>
item
.
name
==
"schoolinfo"
);
...
...
@@ -952,6 +956,7 @@ Page({
];
}
else
{
console
.
log
(
'怎么就进这里了'
)
this
.
schoolInfoGet
()
this
.
setData
({
websitehomeEmpty
:
true
,
...
...
@@ -964,6 +969,7 @@ Page({
schoolInfo
:
data
?
data
:
''
,
websitehomeEmpty
:
data
&&
data
.
banner
?
false
:
true
},()
=>
{
console
.
log
(
this
.
data
.
schoolInfo
,
'xuexiaoxinxi '
)
if
(
that
.
data
.
schoolInfo
.
banner
.
type
==
'video'
){
wxGetImageInfo
({
src
:
videoPoster
(
that
.
data
.
schoolInfo
.
banner
.
src
[
0
])}).
then
((
res
)
=>
{
let
w
=
750
,
initratio
,
bannerVideoH
;
...
...
src/pages/websiteindex/index.wxml
View file @
fdd6cd45
...
...
@@ -88,7 +88,7 @@
<view class="icon-box">
<image class="icon" src="{{localImageRoot}}2c/websiteindex/website_address.png?{{imageVersion}}"></image>
</view>
<view class="address" wx:if="{{schoolInfo.
distanc
e}}">
<view class="address" wx:if="{{schoolInfo.
longitud
e}}">
<view class="main">{{schoolInfo.location_address}}</view>
<view class="other" wx:if="{{schoolInfo.address}}">{{schoolInfo.address}}</view>
</view>
...
...
@@ -116,7 +116,7 @@
<view class="section-wrap section-teacher" wx:if="{{teacherTotal>0 && schoolInfo.module_switch.teacher}}">
<view class="box-title">
<view class="title">名师风采<view class="text">({{teacherTotal}})</view></view>
<view class="right" bindtap="toMoreList" data-type="schoolteacher">
<view class="right" bindtap="toMoreList" data-type="schoolteacher"
wx:if="{{teacherTotal>5}}"
>
更多<image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view>
</view>
...
...
@@ -131,7 +131,7 @@
</view>
</block>
<!-- 学校介绍 -->
<view class="section-wrap business-instro" id="business-info" wx:if="{{sortItem.name=='orgdesc' && schoolInfo.module_switch.orgdesc}}">
<view class="section-wrap business-instro" id="business-info" wx:if="{{sortItem.name=='orgdesc' && schoolInfo.module_switch.orgdesc
&& (schoolInfo.intro || schoolInfoList.length>0)
}}">
<view class="box-title">
<view class="title">学校介绍</view>
<view class="right" bindtap="toMoreList" data-type="schoolinfo1" wx:if="{{schoolInfoList.length>0}}">
...
...
src/pages/websiteindex/index.wxss
View file @
fdd6cd45
...
...
@@ -237,6 +237,10 @@ page{
font-size: 22rpx;
color: #999;
padding-top: 15rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.schoolinfo-box .address-box .icon-mobile{
width: 50rpx;
...
...
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