Skip to content

W
wechatapp.shangjiadao.com
Commit eb17b94f authored by wangxuelai's avatar wangxuelai
Browse files
Options

'bug修复'

parent 33212ae7
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 54 deletions
business/components/calendar/index.js
View file @ eb17b94f
......@@ -60,21 +60,22 @@ Component({
chooseMonth(type) {
const { curYear, curMonth } = this.data.calendar;
if (!curYear || !curMonth) return warn('异常：未获取到当前年月');
let newYear = curYear;
let newMonth = curMonth;
let newYear = Number(curYear);
let newMonth = Number(curMonth);
if (type === 'prev_month') {
newMonth = curMonth - 1;
if (newMonth < 1) {
newYear = curYear - 1;
newYear = newYear - 1;
newMonth = 12;
}
} else if (type === 'next_month') {
newMonth = curMonth + 1;
newMonth = newMonth + 1;
if (newMonth > 12) {
newYear = Number(curYear) + 1;
newYear = Number(newYear) + 1;
newMonth = 1;
}
}
console.log(curYear, curMonth, newYear, newMonth, 'curYear, curMonth, newYear, newMonth');
this.calculate(curYear, curMonth, newYear, newMonth);
},
calculate(curYear, curMonth, newYear, newMonth) {
......
business/pages/themeeditor/index.wxml
View file @ eb17b94f
......@@ -334,7 +334,7 @@
<sound-recording sid="{{sid}}" show="{{audioStatus.show}}" bind:addVoice="addVoice" bind:pushVoice="pushVoice">
</sound-recording>
</view>
<cover-view class="form-fixbtn" bindtap="saveTheme">发布</cover-view>
<cover-view class="form-fixbtn" bindtap="saveTheme" wx:if="{{!audioStatus.show}}">发布</cover-view>
</view>
<view class="modal-dialog" wx:if="{{changesubjectCountInputShow}}">
<view class="modal-mask"></view>
......@@ -367,19 +367,20 @@
</view>
</view>
</view>
<view class="modal-dialog success-dailog" wx:if="{{successDailogShow}}" catchtouchmove="true">
<view class="modal-mask" bindtap="gothemeindex"></view>
<view class="modal-box">
<image class="iconclose" src="{{imageRoot}}common/icon_close.png" bindtap="gothemeindex"></image>
<image class="successicon" src="{{imageRoot}}2b/themeeditor/successicon.png"></image>
<view class="successtext">创建成功</view>
<view class="successguidetext">打卡可以方便记录和统计作业情况,</view>
<view class="successguidetext"> 督促孩子在家学习。</view>
<cover-view class="modal-dialog success-dailog" wx:if="{{successDailogShow}}" catchtouchmove="true">
<cover-view class="modal-mask" bindtap="gothemeindex"></cover-view>
<cover-view class="modal-box">
<cover-image class="iconclose" src="{{imageRoot}}common/icon_close.png" bindtap="gothemeindex"></cover-image>
<cover-image class="successicon" src="{{imageRoot}}2b/themeeditor/successicon.png"></cover-image>
<cover-view class="successtext">创建成功</cover-view>
<cover-view class="successguidetext">打卡可以方便记录和统计作业情况,</cover-view>
<cover-view class="successguidetext"> 督促孩子在家学习。</cover-view>
<button class="btn btn-primary sharebtn" open-type="share">
<image class="wechaticon" src="{{imageRoot}}2b/themeeditor/wechat.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<!-- <cover-image class="wechaticon" src="{{imageRoot}}2b/themeeditor/wechat.png" mode="aspectFit|aspectFill|widthFix"></cover-image>
<cover-view></cover-view> -->
分享给学员
</button>
<view class="shareguidetext"> 分享到微信群，邀请学生参与打卡!</view>
</view>
</view>
<cover-view class="shareguidetext"> 分享到微信群，邀请学生参与打卡!</cover-view>
</cover-view>
</cover-view>
<expiredTip/>
business/pages/themeeditor/index.wxss
View file @ eb17b94f
......@@ -72,6 +72,8 @@ page{
background: rgba(22,176,253,1);
font-size: 32rpx;
bottom: 36rpx;
text-align: center;
line-height: 90rpx;
}
.showorhide-icon{
......@@ -457,10 +459,12 @@ page{
text-align: center;
}
.success-dailog .modal-box .sharebtn{
display: flex;
/* display: flex;
align-items: center;
justify-content: center;
justify-content: center; */
background-color: #02AE5F;
text-align: center;
line-height: 100rpx;
width: 478rpx;
height: 100rpx;
border-radius: 50rpx;
......@@ -476,7 +480,7 @@ page{
.success-dailog .modal-box .sharebtn .wechaticon {
width: 52rpx;
height: 44rpx;
display: block;
/* display: block; */
margin-right: 20rpx;
}
.success-dailog .modal-box .successicon {
......
components/soundrecording/index.wxml
View file @ eb17b94f
<view class="sjd-radio-upload-box" wx:if="{{show}}">
<view class="sjd-radio-mask" bindtap="maskClose"></view>
<view class="sjd-radio-upload-content" wx:if="{{audioStatus.playStatus == 'no'}}">
<view class="sjd-radio-upload-title" >点击开始录音</view>
<view class="sjd-radio-upload-icon" >
<image class="" src="{{imageRoot}}2b/common/voiceicon.png?{{imageVersion}}" lazy-load="false" binderror="" bindload="" bindtap="startrecord"></image>
</view>
</view>
<view class="" >
<cover-view class="sjd-radio-upload-box" wx:if="{{show}}">
<cover-view class="sjd-radio-mask" bindtap="maskClose"></cover-view>
<cover-view class="sjd-radio-upload-content" wx:if="{{audioStatus.playStatus == 'no'}}">
<cover-view class="sjd-radio-upload-title" >点击开始录音</cover-view>
<cover-view class="sjd-radio-upload-icon" >
<cover-image class="" src="{{imageRoot}}2b/common/voiceicon.png?{{imageVersion}}" lazy-load="false" binderror="" bindload="" bindtap="startrecord"></cover-image>
</cover-view>
</cover-view>
<cover-view class="" >
</view>
<view class="sjd-radio-upload-content" wx:if="{{audioStatus.playStatus != 'no'}}">
<view class="sjd-radio-upload-title" >点击{{audioStatus.playStatus != 'pause' ? '暂停' : '继续'}}录音</view>
<view class="sjd-radio-upload-icon" >
<image class="" src="{{imageRoot}}2b/common/audioplay.png?{{imageVersion}}" lazy-load="false" binderror="" bindload="" wx:if="{{audioStatus.playStatus != 'pause'}}" bindtap="pauserecord"></image>
<image class="" src="{{imageRoot}}2b/common/audiopause.png?{{imageVersion}}" lazy-load="false" binderror="" bindload="" wx:if="{{audioStatus.playStatus != 'play'}}" bindtap="startrecord"></image>
<view class="time-count" >{{duration}}"</view>
</view>
<view class="sjd-radio-upload-cancel" bindtap="cancelrecord">
</cover-view>
<cover-view class="sjd-radio-upload-content" wx:if="{{audioStatus.playStatus != 'no'}}">
<cover-view class="sjd-radio-upload-title" >点击{{audioStatus.playStatus != 'pause' ? '暂停' : '继续'}}录音</cover-view>
<cover-view class="sjd-radio-upload-icon" >
<cover-image class="" src="{{imageRoot}}2b/common/audioplay.png?{{imageVersion}}" lazy-load="false" binderror="" bindload="" wx:if="{{audioStatus.playStatus != 'pause'}}" bindtap="pauserecord"></cover-image>
<cover-image class="" src="{{imageRoot}}2b/common/audiopause.png?{{imageVersion}}" lazy-load="false" binderror="" bindload="" wx:if="{{audioStatus.playStatus != 'play'}}" bindtap="startrecord"></cover-image>
</cover-view>
<cover-view class="time-count">{{duration}}"</cover-view>
<cover-view class="sjd-radio-upload-cancel" bindtap="cancelrecord">
取消
</view>
<view class="sjd-radio-upload-complete" bindtap="completerecord">
</cover-view>
<cover-view class="sjd-radio-upload-complete" bindtap="completerecord">
完成
</view>
</view>
<view class="common-dialog" wx:if="{{showAuthSettingDia}}">
<view class="dialog-box" >
<view class="warn-text" >
</cover-view>
</cover-view>
<cover-view class="common-dialog" wx:if="{{showAuthSettingDia}}">
<cover-view class="dialog-box" >
<cover-view class="warn-text" >
点击确认前往设置页面开启使用录音功能
</view>
<view class="button-box" >
</cover-view>
<cover-view class="button-box" >
<button type="default" class="btn cancel" bindtap="closeDia">取消</button>
<button type="default" class="btn sure" bindtap="openSetting">确认</button>
</view>
</view>
</view>
</view>
\ No newline at end of file
</cover-view>
</cover-view>
</cover-view>
</cover-view>
\ No newline at end of file
src/pages/calendarthemeindex/index.js
View file @ eb17b94f
......@@ -903,6 +903,9 @@ Page({
return _length;
},
clockListGet(type) {
if (!this.data.studentId) {
return;
}
const that = this;
const _BetweenDateStr = this.data.BetweenDateStr;
const _activeIndex = this.data.activeIndex;
......
src/pages/morethemeindex/index.js
View file @ eb17b94f
......@@ -780,6 +780,9 @@ Page({
return _length;
},
clockListGet(type) {
if (!this.data.studentId) {
return;
}
const that = this;
const visitor = LocalStorage.getItem('visitor');
if (!this.data.hasmore) {
......
src/pages/themeindex/index.js
View file @ eb17b94f
......@@ -818,6 +818,9 @@ Page({
return _length;
},
clockListGet(type) {
if (!this.data.myBaseinfo.id) {
return;
}
const that = this;
const visitor = LocalStorage.getItem('visitor');
if (!this.data.hasmore) {
......
style/radio.wxss
View file @ eb17b94f
......@@ -187,7 +187,7 @@
height: 119rpx;
margin: 0 auto;
}
.sjd-radio-upload-box .sjd-radio-upload-content .sjd-radio-upload-icon .time-count {
.sjd-radio-upload-box .sjd-radio-upload-content .time-count {
/* /* position: absolute; */
top: 5rpx;
left: -66rpx;
......@@ -196,6 +196,7 @@
letter-spacing: 2rpx;
text-align: center;
margin-top: 20rpx;
}
.sjd-radio-upload-box .sjd-radio-upload-content .sjd-radio-upload-cancel, .sjd-radio-upload-box .sjd-radio-upload-content .sjd-radio-upload-complete {
color: #16B0FD;
......
ucenter/index.js
View file @ eb17b94f
......@@ -86,7 +86,6 @@ Page({
this.setData({
loginCode: res.code
});
console.log(res, this.data.loginCode, "水水飞洒");
});
// app.getCurrentSchoolStudentId({
// source_id: this.data.sid,
......
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