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
26e0aa6c
Commit
26e0aa6c
authored
Nov 30, 2019
by
lvtz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
712570e6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
42 additions
and
24 deletions
+42
-24
rollcallindex.js
business/pages/classservice/rollcallindex.js
+11
-1
rollcallindex.wxml
business/pages/classservice/rollcallindex.wxml
+9
-3
rollcallindex.wxss
business/pages/classservice/rollcallindex.wxss
+14
-5
constants.js
constants/constants.js
+4
-4
index.js
src/components/brickLayout/index.js
+4
-11
No files found.
business/pages/classservice/rollcallindex.js
View file @
26e0aa6c
...
...
@@ -470,5 +470,15 @@ Page({
})
},
// 防止悬浮窗滚动页面滚动,无特殊意义
true
(){}
true
(){},
// 拨打电话
phoneCall
(
e
){
const
{
mobile
}
=
e
.
currentTarget
.
dataset
;
if
(
!
mobile
){
return
}
wx
.
makePhoneCall
({
phoneNumber
:
mobile
})
}
})
\ No newline at end of file
business/pages/classservice/rollcallindex.wxml
View file @
26e0aa6c
...
...
@@ -44,8 +44,11 @@
<view class="item-left" wx:if="{{from=='rollcalldetail'}}">
<image class="avatar" src="{{filter.imagify(item.formal_school_student.avatar, 'image/resize,w_160/format,jpg')}}" wx:if="{{item.formal_school_student.avatar}}"></image>
<image class="avatar" src="{{imageRoot}}common/empty/avatar_user.png?{{imageVersion}}" wx:else></image>
<view class="content">
<view class="name">{{item.formal_school_student.name}}</view>
<view class="content" >
<view class="name-box">
<view class="name">{{item.formal_school_student.name}}</view>
<image src="{{imageRoot}}2b/studentdetail/phone.png?{{imageVersion}}" class="icon-phone" bindtap="phoneCall" data-mobile='{{item.formal_school_student.mobile}}' wx:if="{{item.formal_school_student.mobile}}"></image>
</view>
<view class="count">
<view class="count-name">剩余课时:</view>
<view class="count-data">{{item.student_course?item.student_course.surplus:0}}</view>
...
...
@@ -57,7 +60,10 @@
<image class="avatar" src="{{filter.imagify(item.avatar, 'image/resize,w_160/format,jpg')}}" wx:if="{{item.avatar}}"></image>
<image class="avatar" src="{{imageRoot}}common/empty/avatar_user.png?{{imageVersion}}" wx:else></image>
<view class="content">
<view class="name">{{item.name}}</view>
<view class="name-box">
<view class="name">{{item.name}}</view>
<image src="{{imageRoot}}2b/studentdetail/phone.png?{{imageVersion}}" class="icon-phone" bindtap="phoneCall" data-mobile='{{item.mobile}}' wx:if="{{item.mobile}}"></image>
</view>
<view class="count">
<view class="count-name">剩余课时:</view>
<view class="count-data">{{item.surplus}}</view>
...
...
business/pages/classservice/rollcallindex.wxss
View file @
26e0aa6c
...
...
@@ -190,7 +190,6 @@
justify-content: space-between;
align-items: center;
padding: 24rpx 0 24rpx 24rpx;
height: 110rpx;
display: flex;
align-items: center;
position: relative;
...
...
@@ -217,12 +216,22 @@
}
.student-list .list-item .item-left .content{
}
.student-list .list-item .item-left .content .name-box{
display: flex;
align-items: center;
}
.student-list .list-item .item-left .content .name{
font-size:26rpx;
color:rgba(0,0,0,1);
line-height: 1;
padding-bottom: 16rpx;
font-size: 26rpx;
color: #000;
line-height: 1.2;
padding: 6rpx 0;
}
.student-list .list-item .item-left .content .icon-phone{
width: 40rpx;
min-width: 40rpx;
height: 40rpx;
margin-left: 10rpx;
}
.student-list .list-item .item-left .content .count{
display: flex;
...
...
constants/constants.js
View file @
26e0aa6c
export
default
{
imageRoot
:
'https://cdn.img.shangjiadao.cn/qingxiao/daka/images/'
,
host
:
'https://qxapi.qingxiao.online/daka'
,
host2
:
'https://wx.m.shangjiadao.cn'
,
//
host: 'https://qxapi.qingxiao.online/daka',
//
host2: 'https://wx.m.shangjiadao.cn',
storageVersion
:
'4.0'
,
imageVersion
:
'20191104'
,
//
host: 'https://clock.wp53.cn',
//
host2: 'https://test.wp53.cn',
host
:
'https://clock.wp53.cn'
,
host2
:
'https://test.wp53.cn'
,
appId
:
'wxc1246ea029394785'
,
miniProgram
:
{
clock
:
'wxdeee20e52a1fd7ee'
...
...
src/components/brickLayout/index.js
View file @
26e0aa6c
const
DEFAULT_HEIGHT
=
182
// const DEFAULT_HEIGHT = 182
const
DEFAULT_HEIGHT
=
0
let
init
=
true
let
_columns
=
2
...
...
@@ -12,14 +13,6 @@ Component({
rawData
:
{},
// 源数据
orderArr
:
[],
// 记录原始数值
renderList
:
[],
// 记录用于渲染的数组排序
_tplName
:
'default'
,
_imageFillMode
:
'widthFix'
,
// 图片适配 mode
_fontColor
:
'black'
,
_likeIcon
:
{
like
:
'../../asset/icon/icon-like-full.svg'
,
default
:
'../../asset/icon/icon-like.svg'
},
_limitContent
:
true
,
},
properties
:
{
...
...
@@ -95,7 +88,6 @@ Component({
return
new
Promise
((
resolve
,
reject
)
=>
{
let
query
=
wx
.
createSelectorQuery
().
in
(
this
)
query
.
select
(
'#card-'
+
card_id
+
'-type'
+
type
).
boundingClientRect
(
res
=>
{
console
.
log
(
res
)
resolve
({
card_id
,
height
:
res
.
height
})
})
query
.
exec
()
...
...
@@ -163,7 +155,8 @@ Component({
let
heightArr
=
[]
const
arrLength
=
_columns
const
{
orderArr
,
rawData
}
=
this
.
data
heightArr
=
Array
(
arrLength
).
fill
(
0
)
heightArr
=
Array
(
arrLength
).
fill
(
0
);
// initial render Arr
for
(
let
i
=
0
;
i
<
arrLength
;
i
++
)
{
...
...
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