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
f6d1eb5b
Commit
f6d1eb5b
authored
Sep 04, 2019
by
wangxuelai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
'小程序优化最新代码提交'
parent
eb877eaa
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
31 deletions
+29
-31
index.wxml
src/components/clockitem/index.wxml
+5
-5
index.wxss
src/components/clockitem/index.wxss
+1
-1
index.wxml
src/components/clockitemv2/index.wxml
+11
-13
index.wxss
src/components/clockitemv2/index.wxss
+12
-12
No files found.
src/components/clockitem/index.wxml
View file @
f6d1eb5b
...
...
@@ -3,14 +3,14 @@
<view class="blankclickarea" bindtap="goClockDetail" wx:if="{{type == 0}}"></view>
<image class="best-flag" src="{{imageRoot}}2b/common/jinx.png?x-oss-process=image/resize,w_200/format,jpg" mode="aspectFit|aspectFill|widthFix" lazy-load="true" wx:if="{{clock.place_top_at}}"></image>
<view class="sign-user-info" >
<view class="left-box"
bindtap="goGrowthRecord">
<view class="left-box" bindtap="goGrowthRecord">
<!-- <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<button form-type="submit" class="createidbutton">生成form</button>
</form> -->
<image class="sign-user-avator" src="{{filter.imagify(clock.school_student.avatar, 'image/resize,w_160/format,jpg')}}" mode="aspectFit|aspectFill|widthFix" lazy-load="true" binderror="" bindload=""></image>
<view class="sign-user-name-box"
>
<view class="sign-user-name"
>{{clock.school_student.nickname}}</view>
<view class="sign-create-box"
>
<image class="sign-user-avator"
bindtap="goGrowthRecord"
src="{{filter.imagify(clock.school_student.avatar, 'image/resize,w_160/format,jpg')}}" mode="aspectFit|aspectFill|widthFix" lazy-load="true" binderror="" bindload=""></image>
<view class="sign-user-name-box">
<view class="sign-user-name"
bindtap="goGrowthRecord"
>{{clock.school_student.nickname}}</view>
<view class="sign-create-box"
bindtap="goGrowthRecord"
>
<text class="sign-create-time" selectable="false" space="false" decode="false">{{filter.timeCompare(clock.created_at_time)}}</text>
<text class="sign-count" selectable="false" space="false" decode="false" wx:if="{{modeType==3}}">已闯{{clock.clock_days}}关</text>
<text class="sign-count" selectable="false" space="false" decode="false" wx:else>已坚持{{clock.clock_days}}天</text>
...
...
src/components/clockitem/index.wxss
View file @
f6d1eb5b
...
...
@@ -35,7 +35,7 @@
display: flex;
display: -webkit-flex;
justify-content: space-between;
margin
-bottom: 38rpx;
padding
-bottom: 38rpx;
}
.sign-item .sign-user-info.single {
padding: 0 23rpx;
...
...
src/components/clockitemv2/index.wxml
View file @
f6d1eb5b
...
...
@@ -3,17 +3,17 @@
<view class="blankclickarea" bindtap="goClockDetail" wx:if="{{type == 0 || othertype==1}}"></view>
<image class="best-flag" src="{{imageRoot}}2b/common/jinx.png?x-oss-process=image/resize,w_200/format,jpg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" wx:if="{{clock.place_top_at}}"></image>
<view class="sign-user-info">
<view class="left-box"
bindtap="goGrowthRecord"
>
<form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<view class="left-box">
<
!-- <
form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<button form-type="submit" class="createidbutton">生成form</button>
</form>
<image class="sign-user-avator" src="{{filter.imagify(clock.school_student.avatar, 'image/resize,w_160/format,jpg')}}" ></image>
</form>
-->
<image class="sign-user-avator"
bindtap="goGrowthRecord"
src="{{filter.imagify(clock.school_student.avatar, 'image/resize,w_160/format,jpg')}}" ></image>
<view class="sign-user-name-box">
<view class="sign-user-name">{{clock.school_student.nickname}}</view>
<view class="sign-user-name"
bindtap="goGrowthRecord"
>{{clock.school_student.nickname}}</view>
<view class="sign-create-box">
<text class="sign-create-time" >{{filter.timeCompare(clock.created_at_time)}}</text>
<text class="sign-count" wx:if="{{modeType==3}}">已闯{{clock.clock_days}}关</text>
<text class="sign-count" wx:else>已坚持{{clock.clock_days}}天</text>
<text class="sign-create-time"
bindtap="goGrowthRecord"
>{{filter.timeCompare(clock.created_at_time)}}</text>
<text class="sign-count" wx:if="{{modeType==3}}"
bindtap="goGrowthRecord"
>已闯{{clock.clock_days}}关</text>
<text class="sign-count" wx:else
bindtap="goGrowthRecord"
>已坚持{{clock.clock_days}}天</text>
</view>
</view>
</view>
...
...
@@ -34,8 +34,8 @@
<text class="sign-item-content-text" wx:if="{{type == 1}}" selectable="true">{{clock.content}}</text>
<text class="sign-item-content-text" wx:if="{{type == 0}}" selectable="true">{{!clock.contentexpand ? clock.content_100 : clock.content}}</text>
</view>
<view class="expand-content {{type == 1 ? '' : 'pdl64'}}"
bindtap="goClockDetail"
wx:if="{{clock.content.length > 100 && (type == 0 || othertype==1)}}">
<text class=""
>全文
</text>
<view class="expand-content {{type == 1 ? '' : 'pdl64'}}" wx:if="{{clock.content.length > 100 && (type == 0 || othertype==1)}}">
<text class=""
bindtap="goClockDetail">全文
</text>
</view>
<view class="mediacontent {{type == 1 ? '' : 'pdl64'}}" wx:if="{{clock.video_parse.length > 0 && (type == 0 &&type != 1 || othertype==1)}}">
<view class="mediabox clearfix" wx:if="{{clock.video_parse.length == 1}}">
...
...
@@ -136,11 +136,9 @@
</view>
</view>
<view class="radio-box {{type == 1 ? '' : 'pdl64'}}" wx:if="{{clock.audio_parse.length > 0}}">
<view class="sjd-radio-box
mb24
" wx:for="{{clock.audio_parse}}" wx:for-item="audio" wx:key="index">
<view class="sjd-radio-box
{{index == clock.audio_parse.length - 1 ? '' : 'mb24'}}
" wx:for="{{clock.audio_parse}}" wx:for-item="audio" wx:key="index">
<view
class="play-btn"
data-value="{{audio.src}}"
data-index="{{index}}"
data-duration="{{audio.duration}}"
...
...
src/components/clockitemv2/index.wxss
View file @
f6d1eb5b
...
...
@@ -100,15 +100,15 @@
font-weight:bold;
color:rgba(108,122,151,1);
letter-spacing: 2rpx;
width:400rpx;
max-
width:400rpx;
word-break:break-all;
text-overflow: -o-ellipsis-lastline;
/*
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
-webkit-box-orient: vertical;
*/
line-height: 1.1;
}
.sign-item .sign-user-info .sign-user-name-box .sign-create-box{
...
...
@@ -150,7 +150,7 @@
} */
.sign-item-content-text-box {
/* padding: 0 25rpx 24rpx 25rpx; */
margin
-bottom: 30rpx;
padding
-bottom: 30rpx;
position: relative;
z-index: 2;
}
...
...
@@ -199,7 +199,7 @@
} */
.mediacontent {
margin
-bottom: 30rpx;
padding
-bottom: 30rpx;
position: relative;
z-index: 2;
}
...
...
@@ -355,8 +355,8 @@
display: -webkit-flex;
align-items: flex-end;
justify-content: space-between;
margin-top: 40rpx;
margin
-bottom: 20rpx;
/* margin-top: 40rpx; */
padding
-bottom: 20rpx;
margin-left: 240rpx;
position: relative;
z-index: 2;
...
...
@@ -520,10 +520,9 @@
}
.expand-content {
text-align: left;
margin-bottom: 36rpx;
/* padding: 0 25rpx 0 25rpx; */
/* padding-top: 25rpx;
padding-bottom: 25rpx; */
padding-bottom: 36rpx;
position: relative;
z-index: 2;
}
.expand-content text {
color: #ffd146;
...
...
@@ -541,7 +540,7 @@
}
.radio-box {
/* padding: 0 25rpx 0 25rpx; */
margin
-bottom: 30rpx;
padding
-bottom: 30rpx;
position: relative;
z-index: 2;
}
...
...
@@ -902,6 +901,7 @@
}
.sign-item .sjd-radio-box {
width: 618rpx;
/* padding-bottom: 24px; */
}
/* .border-b-14px {
border-bottom: 14rpx solid rgba(247,247,249,1);
...
...
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