Skip to content

W
wechatapp.shangjiadao.com
Commit 81a7190a authored by lvtz's avatar lvtz
Browse files
Options

Merge branch 'sj-dev-0905' of git.server:wangxuelai/wechatapp.shangjiadao.com into tabtab_lvtz

parents ce99a20b 802a834a
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 30 deletions
business/components/clockitem/index.wxss
View file @ 81a7190a
......@@ -168,8 +168,8 @@
overflow: hidden;
}
.video-play-icon-box {
width: 118rpx;
height: 118rpx;
width: 80rpx;
height: 80rpx;
border-radius: 50%;
background-color: rgba(0,0,0,0.5);
position: absolute;
......
business/pages/commenteditor/index.wxss
View file @ 81a7190a
......@@ -317,7 +317,7 @@
height: 40rpx;
position: absolute;
top: 50%;
left:430rpx;
left:220rpx;
margin-top:-20rpx;
}
.teacher-uploadbox {
......@@ -333,10 +333,13 @@
margin-top: 24rpx;
position: relative;
/* width: 110rpx; */
flex: 1;
}
.radio-upload-box .media-type-icon {
margin-right: 4rpx;
/* margin-right: 4rpx; */
margin-bottom: 24rpx;
display: flex;
justify-content: center;
}
.radio-upload-box .media-type-icon .media-type-icon-img{
width: 50rpx;
......@@ -362,7 +365,7 @@
text-align: center;
}
.comment-editor-container .sjd-small-radio-box {
width:435rpx;
/* width:435rpx; */
}
.stamp-box{
padding-top: 64rpx;
......
components/guidecollection/index.wxss
View file @ 81a7190a
/* components/guidecollection/index.wxss */
.guidecollection-box{
width:479rpx;
height:130rpx;
/* height:130rpx; */
background:rgba(0,0,0,0.65);
border-radius:10rpx;
position: fixed;
......@@ -10,13 +10,14 @@
z-index: 200;
}
.line1{
padding: 28rpx 8rpx 15rpx 22rpx;
padding: 28rpx 0rpx 15rpx 0rpx;
font-size:26rpx;
font-family:PingFang SC;
font-weight:500;
color:rgba(255,255,255,1);
display: flex;
align-items: center;
justify-content: center;
letter-spacing: 2rpx;
}
......@@ -25,8 +26,10 @@
font-family:PingFang SC;
font-weight:500;
color:rgba(255,255,255,1);
padding-left: 22rpx;
/* padding-left: 22rpx; */
letter-spacing: 2rpx;
text-align: center;
padding-bottom: 28rpx;
}
.icon{
width: 28rpx;
......@@ -35,10 +38,10 @@
.close{
width: 40rpx;
height: 40rpx;
display: flex;
/* display: flex;
top: 30rpx;
right: 28rpx;
position: absolute;
position: absolute; */
}
.top-icon{
width: 0;
......
constants/constants.js
View file @ 81a7190a
export default {
imageRoot: 'https://cdn.img.shangjiadao.cn/source/images/dakav5/',
// 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: '20190826',
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/clockitemv2/index.wxml
View file @ 81a7190a
......@@ -276,9 +276,9 @@
</view>
</view>
<!-- <view class="teacher-commnet-text" data-eid="{{clock.review[1].id}}" wx:if="{{clock.review[1].content != ''}}" data-type="open"> -->
<view class="teacher-commnet-text" data-eid="{{clock.review[1].id}}" data-type="open">
<view class="teacher-commnet-text" data-eid="{{clock.review[1].id}}" data-type="open" data-eindex="{{id}}" data-eid="{{clock.review[1].id}}" data-customerid="{{clock.consumer_id}}" bindlongpress="replyTeacher" data-roottype="1">
{{clock.review[1].content}}
<view class="txt">
<view class="inline-wrapper">
<view class="sjd-small-radio-box teacher-radio-box" wx:if="{{clock.review[1].audio != '' && filter.jsonParse(clock.review[1].audio).src}}">
<view
class="action-mask"
......@@ -399,9 +399,9 @@
</view>
</view>
<!-- <view class="teacher-commnet-text" data-eid="{{clock.review[2].id}}" wx:if="{{clock.review[2].content != ''}}" data-type="open" > -->
<view class="teacher-commnet-text" data-eid="{{clock.review[2].id}}" data-type="open" >
<view class="teacher-commnet-text" data-eid="{{clock.review[2].id}}" data-type="open" data-eindex="{{id}}" bindlongpress="replyTeacher" data-eid="{{clock.review[2].id}}" data-customerid="{{clock.consumer_id}}" data-roottype="2">
{{clock.review[2].content}}
<view class="txt">
<view class="inline-wrapper">
<view class="sjd-small-radio-box teacher-radio-box" wx:if="{{clock.review[2].audio != '' && filter.jsonParse(clock.review[2].audio).src}}">
<view
class="action-mask"
......
src/components/clockitemv2/index.wxss
View file @ 81a7190a
......@@ -164,8 +164,8 @@
overflow: hidden;
}
.video-play-icon-box {
width: 118rpx;
height: 118rpx;
width: 50rpx;
height: 50rpx;
border-radius: 50%;
background-color: rgba(0,0,0,0.5);
position: absolute;
......@@ -177,15 +177,20 @@
align-items: center;
justify-content: center;
transform:translate(-50%, -50%);
border: 2rpx solid #fff;
box-sizing: content-box;
}
.video-play-icon-box .video-play-icon {
width: 31rpx;
height: 36rpx;
width: 15rpx;
height: 18rpx;
display: block;
position: absolute;
/* position: absolute;
top: 50%;
left: 46rpx;
transform: translateY(-50%);
transform: translateY(-50%); */
position: relative;
top: 2rpx;
left: 2rpx;
}
.sign-item-content-video .video-image {
display: block;
......@@ -274,6 +279,14 @@
float: left;
margin-right: 8rpx;
}
.mediacontent .mediabox .imgbox.optiond.videobox .video-play-icon-box{
width: 80rpx;
height: 80rpx;
}
.mediacontent .mediabox .imgbox.optiond.videobox .video-play-icon-box .video-play-icon{
width: 20rpx;
height: 24rpx;
}
.mediacontent .mediabox .imgbox.optiond.videobox .img{
width: 410rpx;
height: 410rpx;
......@@ -1323,4 +1336,27 @@
height:120rpx;
border-radius:9rpx;
}
@import "../../style/radio.wxss";
\ No newline at end of file
@import "../../style/radio.wxss";
@keyframes teacherradioaudioplay {
0% {
background-position-x: 0;
}
43.33% {
background-position-x: -9px;
}
76.67% {
background-position-x: -23px;
}
0% {
background-position-x: 0;
}
}
.teacher-radio-box .sjd-small-icon-box{
width: 8px;
height:12px;
background-position-x: -23px;
}
.teacher-radio-box .sjd-small-icon-box.play {
animation: teacherradioaudioplay 1.2s steps(1) infinite;
}
\ No newline at end of file
src/pages/clockeditor/index.js
View file @ 81a7190a
......@@ -182,6 +182,7 @@ Page({
}, () => {
this.userShow();
this.queryActivtySchoolInfo(this.data.sid);
this.pageScrollToBottom();
const visitor = LocalStorage.getItem('visitor');
activityLog({
type: 22,
......@@ -1263,4 +1264,12 @@ Page({
getmobiledialogshow: true
})
},
pageScrollToBottom: function() {
wx.createSelectorQuery().select('#clockeditor-page').boundingClientRect(function(rect){
wx.pageScrollTo({
scrollTop: rect.bottom + 5000,
duration:500
})
}).exec()
},
})
\ No newline at end of file
src/pages/clockeditor/index.wxml
View file @ 81a7190a
<wxs src="./../../../filter/index.wxs" module="filter" />
<view class="container">
<view class="container" id="clockeditor-page">
<view class="warntip" wx:if="{{showtip}}" >图片上传中，请等待</view>
<view class="clock-editor-container clearfix">
<view class="theme-detail-box" >
......
src/style/radio.wxss
View file @ 81a7190a
......@@ -23,7 +23,7 @@
.sjd-radio-box .play-btn {
width: 72rpx;
height: 72rpx;
background-color: #ffd146;
background-color: #65B8F4;
border-radius: 50%;
display: flex;
display: -webkit-flex;
......@@ -34,7 +34,7 @@
.sjd-radio-box .pause-btn {
width: 72rpx;
height: 72rpx;
background-color: #ffd146;
background-color: #65B8F4;
border-radius: 50%;
display: flex;
display: -webkit-flex;
......@@ -81,7 +81,7 @@
align-items: center;
position: relative;
border-radius: 29rpx;
background:linear-gradient(90deg,#FFB165,#FFD469);
background:linear-gradient(90deg,rgba(0,198,255,1),rgba(68,219,217,1));
}
@keyframes audioplay {
0% {
......@@ -217,4 +217,4 @@
height: 100%;
opacity: 0;
z-index: 3;
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment