Skip to content

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

fix

parent fd7cbbf9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 544 additions and 1196 deletions
business/pages/calendarthemeeditor/index.js
View file @ c3097e7e
......@@ -92,7 +92,7 @@ Page({
time: 0,
upload: false
},
placeholder: '请输入打卡主题的具体要求，如：演唱歌曲《小小少年》\r\n演唱歌曲《小小少年》，具体要求\r\n1.跟随伴奏唱一段副歌\r\n2.视频录下唱歌过程\r\n3.上传歌唱视频打卡成功\r\n如果有该歌曲示例视频，你可以点击上传视频，供学员参考。',
placeholder: '请输入打卡作业的具体要求，如：演唱歌曲《小小少年》\r\n演唱歌曲《小小少年》，具体要求\r\n1.跟随伴奏唱一段副歌\r\n2.视频录下唱歌过程\r\n3.上传歌唱视频打卡成功\r\n如果有该歌曲示例视频，你可以点击上传视频，供学员参考。',
audioStorage: {
},
......@@ -502,7 +502,7 @@ Page({
if (_params.title.trim() === '') {
wx.showModal({
title: '提示',
content: '请输入主题名称',
content: '请输入作业名称',
confirm: true,
showCancel: false
})
......@@ -511,7 +511,7 @@ Page({
if (_params.title.trim().length > 20) {
wx.showModal({
title: '提示',
content: '主题名称不能超过20个字',
content: '作业名称不能超过20个字',
confirm: true,
showCancel: false
})
......@@ -955,7 +955,7 @@ Page({
tipsShow:encryptTips?false:true,
dailogtips:{
title:'打卡加密',
text:'开启后，打卡主题仅班级学员可以查看非班级学员只能看到学员作业',
text:'开启后，打卡作业仅班级学员可以查看非班级学员只能看到学员作业',
type:2
}
})
......@@ -994,7 +994,7 @@ Page({
tipsShow:readsTips?false:true,
dailogtips:{
title:'强制阅读模式',
text:'开启后，学员必须在主题区域阅读规定时间才能打卡',
text:'开启后，学员必须在作业区域阅读规定时间才能打卡',
type:3
}
})
......
business/pages/calendarthemeeditor/index.wxml
View file @ c3097e7e
......@@ -3,7 +3,7 @@
<view class="theme-editor-container clearfix {{showWarn ? 'opacitybody' : ''}}">
<view class="broadcast-box mb24">
<image class="broadcast-img" src="{{imageRoot}}2b/shopeditor/voiceicon.png?{{imageVersion}}"></image>
<text class="broadcast-text">主题发布后老师带头打卡，可提高学员参与积极性至3倍。</text>
<text class="broadcast-text">作业发布后老师带头打卡，可提高学员参与积极性至3倍。</text>
</view>
<view class="class-select-box mb24" bindtap="showClassSelectModal" wx:if="{{tid==0}}">
<view class="label">班级:</view>
......@@ -17,7 +17,7 @@
<view class="circle-name-box" >
<view class="circle-name-mock" wx:if="{{modalClass}}">{{params.title}}</view>
<textarea class="circle-name" name="" id="" bindinput="titleInput" value="{{params.title}}"
placeholder="请输入打卡主题。如：拍摄一段诗歌朗诵视频" wx:if="{{!modalClass}}"></textarea>
placeholder="请输入作业标题。如：拍摄一段诗歌朗诵视频" wx:if="{{!modalClass}}"></textarea>
<text class="length-rate" selectable="false" space="false" decode="false">
{{params.title.length}}/20
</text>
......@@ -240,10 +240,10 @@
</sjd-media-editor>
</view>
<form report-submit="true" bindsubmit="saveTheme">
<button class="submitbtn" form-type="submit">发布主题</button>
<button class="submitbtn" form-type="submit">发布作业</button>
</form>
<view class="warn-text-red" >
一个主题每个学员只能打卡一次喔！
一个作业每个学员只能打卡一次喔！
</view>
<sound-recording sid="{{sid}}" show="{{audioStatus.show}}" bind:addVoice="addVoice" bind:pushVoice="pushVoice">
</sound-recording>
......
business/pages/calendarthemeindex/index.wxml
View file @ c3097e7e
......@@ -171,8 +171,8 @@
<view class="noticeDailog" wx:if="{{remindTips.show}}">
<view class="content">
<view class="title">提示</view>
<view class="text" wx:if="{{remindTips.pushStatus==1}}">主题未到开始时间，开始后可提醒</view>
<view class="text" wx:elif="{{remindTips.pushStatus==3}}">打卡主题已结束，不支持提醒</view>
<view class="text" wx:if="{{remindTips.pushStatus==1}}">作业未到开始时间，开始后可提醒</view>
<view class="text" wx:elif="{{remindTips.pushStatus==3}}">打卡已结束，不支持提醒</view>
<view class="text" wx:elif="{{!remindTips.status}}">已提醒所有未打卡学员打卡</view>
<view class="text" wx:else>
<view>已经提醒过未打卡学员</view>
......
business/pages/circleindex/index.wxml
View file @ c3097e7e
......@@ -286,14 +286,14 @@
<image class="clocktypeicon" src="{{imageRoot}}2b/circleindex/normalclock.png?{{imageVersion}}"></image>
<view class="clocktypedesc">
<view class="clocktypetitle">作业打卡</view>
<view class="clocktypetext">老师编辑打卡主题内容，合理设置发布时间以及打卡时间段，并且还能定时通知学员打卡。</view>
<view class="clocktypetext">老师编辑打卡作业内容，合理设置发布时间以及打卡时间段，并且还能定时通知学员打卡。</view>
</view>
</view>
<view class="themetypecard rili mb24" bindtap="createRiliTheme">
<image class="clocktypeicon" src="{{imageRoot}}2b/circleindex/riliclock.png?{{imageVersion}}"></image>
<view class="clocktypedesc">
<view class="clocktypetitle">日历打卡</view>
<view class="clocktypetext">只需编辑一次主题，完成设定主题打卡周期，以及每日打卡时间规则等个性化设置，系统即可每天自动发布打卡主题。</view>
<view class="clocktypetext">只需编辑一次作业，完成设定作业打卡周期，以及每日打卡时间规则等个性化设置，系统即可每天自动发布打卡作业。</view>
</view>
</view>
<view class="themetypecard unlock" bindtap="createUnlockTheme">
......@@ -310,7 +310,7 @@
</view>
<view class="delete-theme-box" wx:if="{{deleteBox}}" >
<view class="content" >
<view class="title" >删除主题将清除数据</view>
<view class="title" >删除作业将清除数据</view>
<view class="title" >请输入“确认删除”执行删除操作</view>
<view class="ipt-box" >
<input type="text" placeholder-class="placeholderclass" class="iteminput" maxlength="10" value="{{suretext}}" bindinput="suretextInput" placeholder="请在此输入“确认删除”"></input>
......
business/pages/classservice/rollcalldetail.wxml
View file @ c3097e7e
......@@ -98,14 +98,14 @@
<image class="clocktypeicon" src="{{imageRoot}}2b/circleindex/normalclock.png?{{imageVersion}}"></image>
<view class="clocktypedesc">
<view class="clocktypetitle">作业打卡</view>
<view class="clocktypetext">老师编辑打卡主题内容，合理设置发布时间以及打卡时间段，并且还能定时通知学员打卡。</view>
<view class="clocktypetext">老师编辑打卡内容，合理设置发布时间以及打卡时间段，并且还能定时通知学员打卡。</view>
</view>
</view>
<view class="themetypecard rili mb24" bindtap="createRiliTheme">
<image class="clocktypeicon" src="{{imageRoot}}2b/circleindex/riliclock.png?{{imageVersion}}"></image>
<view class="clocktypedesc">
<view class="clocktypetitle">日历打卡</view>
<view class="clocktypetext">只需编辑一次主题，完成设定主题打卡周期，以及每日打卡时间规则等个性化设置，系统即可每天自动发布打卡主题。</view>
<view class="clocktypetext">只需编辑一次作业，完成设定作业打卡周期，以及每日打卡时间规则等个性化设置，系统即可每天自动发布打卡作业。</view>
</view>
</view>
<view class="themetypecard unlock" bindtap="createUnlockTheme">
......
business/pages/commenteditor/modifyscoretemp.wxml
View file @ c3097e7e
......@@ -6,6 +6,6 @@
<!-- <input type="text" class="inputitem" data-index="2" bindinput="tempinput" value="{{templates.tmp_2}}" placeholder="请输入打分项名称" maxlength="4" />
<input type="text" class="inputitem" data-index="3" bindinput="tempinput" value="{{templates.tmp_3}}" placeholder="请输入打分项名称" maxlength="4" />
<input type="text" class="inputitem" data-index="4" bindinput="tempinput" value="{{templates.tmp_4}}" placeholder="请输入打分项名称" maxlength="4" /> -->
<view class="savebtn savebtnprimary" data-useall="0" bindtap="save">保存模板并应用到当前主题</view>
<view class="savebtn savebtnprimary" data-useall="0" bindtap="save">保存模板并应用到当作业</view>
<!-- <view class="savebtn " data-useall="1" bindtap="save">将模板应用到校区所有班级</view> -->
</view>
\ No newline at end of file
business/pages/deskcenter/clocklist.js
View file @ c3097e7e
......@@ -44,9 +44,9 @@ Page({
modalThemeType: false,
modelThemeTypeAnimate: false,
selectThemeType: { type: 0, title: "全部打卡" },
selectThemeType: { type: 0, title: "全部类型" },
themeTypeArr: [
{ type: 0, title: "全部打卡" },
{ type: 0, title: "全部类型" },
{ type: 1, title: "作业打卡" },
{ type: 2, title: "日历打卡" },
{ type: 3, title: "闯关打卡" }
......
business/pages/deskcenter/clocklist.wxml
View file @ c3097e7e
......@@ -210,7 +210,7 @@
<view class="modal modal-themedelete" wx:if="{{deleteBox}}">
<view class="content">
<view class="title">删除主题将清除数据</view>
<view class="title">删除作业将清除数据</view>
<view class="title">请输入“确认删除”执行删除操作</view>
<view class="ipt-box">
<input type="text" placeholder-class="placeholderclass" class="iteminput" maxlength="10" value="{{suretext}}" bindinput="suretextInput" placeholder="请在此输入“确认删除”"></input>
......
business/pages/morethemeindex/index.js
View file @ c3097e7e
......@@ -266,7 +266,7 @@ Page({
if(!data){
wx.showModal({
title: '提示',
content: '主题已被删除，点击确定返回班级首页',
content: '作业已被删除，点击确定返回班级首页',
showCancel:false,
confirmText:"确定",
success(r) {
......
business/pages/morethemeindex/index.wxml
View file @ c3097e7e
......@@ -82,8 +82,8 @@
<view class="noticeDailog" wx:if="{{remindTips.show}}">
<view class="content">
<view class="title">提示</view>
<view class="text" wx:if="{{remindTips.pushStatus==1}}">主题未到开始时间，开始后可提醒</view>
<view class="text" wx:elif="{{remindTips.pushStatus==3}}">打卡主题已结束，不支持提醒</view>
<view class="text" wx:if="{{remindTips.pushStatus==1}}">作业未到开始时间，开始后可提醒</view>
<view class="text" wx:elif="{{remindTips.pushStatus==3}}">打卡已结束，不支持提醒</view>
<view class="text" wx:elif="{{!remindTips.status}}">已提醒所有未打卡学员打卡</view>
<view class="text" wx:else>
<view>已经提醒过未打卡学员</view>
......
business/pages/morethemeindex/indexcopy.js
View file @ c3097e7e
......@@ -287,7 +287,7 @@ Page({
if(!data){
wx.showModal({
title: '提示',
content: '主题已被删除，点击确定返回班级首页',
content: '作业已被删除，点击确定返回班级首页',
showCancel:false,
confirmText:"确定",
success(r) {
......
business/pages/morethemeindex/indexcopy.wxml
View file @ c3097e7e
......@@ -229,8 +229,8 @@
<view class="noticeDailog" wx:if="{{remindTips.show}}">
<view class="content">
<view class="title">提示</view>
<view class="text" wx:if="{{remindTips.pushStatus==1}}">主题未到开始时间，开始后可提醒</view>
<view class="text" wx:elif="{{remindTips.pushStatus==3}}">打卡主题已结束，不支持提醒</view>
<view class="text" wx:if="{{remindTips.pushStatus==1}}">作业未到开始时间，开始后可提醒</view>
<view class="text" wx:elif="{{remindTips.pushStatus==3}}">打卡已结束，不支持提醒</view>
<view class="text" wx:elif="{{!remindTips.status}}">已提醒所有未打卡学员打卡</view>
<view class="text" wx:else>
<view>已经提醒过未打卡学员</view>
......
business/pages/organizationalmgt/index.js
View file @ c3097e7e
......@@ -168,7 +168,7 @@ Page({
// 个人信息
gobusinessinfo () {
wx.navigateTo({
url: `/business/pages/organizationalmgt/info?sid=${this.data.sid}`
url: `/business/pages/organizationalmgt/newinfo?sid=${this.data.sid}`
})
},
goLogin(){
......
business/pages/organizationalmgt/newinfo.js
View file @ c3097e7e
......@@ -51,12 +51,12 @@ Page({
location_address: "",
address: "",
category: "",
tel_phone: "",
province: "",
city: "",
area: "",
logo: "qingxiao/daka/images/2c/common/logologo.png"
logo: "qingxiao/daka/images/2c/common/logologo.png",
},
mobileArr: [''],
submitting: false,
callBackSchoolId: 0,
from: 0 // 页面来源 1登录页面 2注册页面 3 校区管理的校区列表编辑按钮 4 校区详情页面的编辑按钮
......@@ -73,6 +73,51 @@ Page({
});
this.getCategory();
wx.setNavigationBarTitle({
title: this.data.sid==0 ? '添加学校信息': '完善信息'
})
if (this.data.sid == 0) {
return
}
wx.showLoading({
title: '数据加载中...'
})
schoolDetailGet({
id: this.data.sid,
school_id: this.data.sid,
}).then((res) => {
wx.hideLoading();
if (res.code == 200) {
const { data } = res;
if (data) { // 是编辑状态
const { logo, title, tel_phone, latitude, longitude, address, location_address, category, province, city, area } = data;
let selectedSubjectStyle = {};
for (let i = 0; i < category.length; i++) {
selectedSubjectStyle[category[i]] = true;
}
this.setData({
mobileArr: tel_phone ? JSON.parse(tel_phone) : [''],
selectedSubjectStyle: selectedSubjectStyle,
selectedSubject: category,
'params.title': title,
'params.longitude': longitude,
'params.latitude': latitude,
'params.address': address || '',
'params.location_address': location_address,
'params.logo': logo || 'qingxiao/daka/images/2c/pclogin/logo.png',
"params.province": province || '',
"params.city": city || '',
"params.area": area || ''
})
console.log(this.data.mobileArr,'手机号')
} else { // 是新建状态
}
}
}).catch(() => {
wx.hideLoading()
});
},
onReady: function() {
// Do something when page ready.
......@@ -80,7 +125,105 @@ Page({
cropperload(e) {
console.log("cropper初始化完成");
},
onShow: function() {},
onShow: function() {
if(this.data.sid && this.data.sid!=0){
this.userShow();
}
},
userShow () {
const visitor = LocalStorage.getItem('visitor');
getMemberMe({
school_id: this.data.sid
}).then(res=>{
const{code,data} = res;
if (code == 200) {
this.setData({
nickname: data.schoolTeacher.nickname ? data.schoolTeacher.nickname : visitor && visitor.userInfo && visitor.userInfo.nickName,
avatarUrl: data.schoolTeacher.avatar ? data.schoolTeacher.avatar : visitor && visitor.userInfo && visitor.userInfo.avatarUrl,
})
}else{
this.setData({
nickname: visitor && visitor.userInfo && visitor.userInfo.nickName || '',
avatarUrl: visitor && visitor.userInfo && visitor.userInfo.avatarUrl || 'qingxiao/daka/images/common/empty/avatar_user',
})
}
})
},
updateNickname(e){
let nickname = this.data.nickname
wx.navigateTo({
url: `/business/pages/personinfo/index?sid=${this.data.sid}&&nickname=${nickname}&&modify=1`,
})
},
// openSetting() {
// wxOpenSetting();
// this.setData({
// showAuthSettingDia: false
// })
// },
updateAvatar(e) {
let access = {};
let filename = '';
bOssAccess({
school_id: this.data.sid != 0 ? this.data.sid : this.data.school_id
}).then((acc) => {
access = acc.data;
return wxChooseImage({})
}).then((res) => {
const { tempFiles } = res;
filename = `${access.dir}${getRandomFilename(tempFiles[0].path)}`;
wx.showLoading({
title: '图片上传中'
})
return wxUploadFile({
url: "https://cdn.s.shangjiadao.cn",
formData: {
key: filename,
policy: access.policy,
OSSAccessKeyId: access.accessid,
signature: access.signature,
callback: access.callback,
},
filePath: tempFiles[0].path,
name: 'file',
})
}).then((res) => {
const { data } = res;
if (data == '{"status":"ok"}') {
// wx.showToast({
// title: '上传成功'
// })
this.setData({
'avatarUrl': filename
},()=>{
nicknameStore({
school_id: this.data.sid,
avatar: this.data.avatarUrl
}).then(res => {
if (res.code == 200) {
wx.showToast({
title: '头像保存成功'
})
}
}).catch(() => {
})
})
} else {
wx.hideLoading();
wx.showModal({
title: '提示',
content: '上传失败',
showCancel: false
})
}
}).catch((err) => {
});
},
//选择学科
selectSubject(event) {
......@@ -243,8 +386,10 @@ Page({
},
phoneInput(e) {
const { value } = e.detail;
let index = e.currentTarget.dataset.index;
this.setData({
"params.tel_phone": value
[`mobileArr[${index}]`]: value,
});
},
addressSelect() {
......@@ -265,7 +410,7 @@ Page({
}
var _this = this;
qqmapsdk.reverseGeocoder({
location: `${value.latitude},${value.longitude}` || "",
location: `${value.latitude},${value.longitude}` || `${this.data.params.latitude},${this.data.params.longitude}` || "",
get_poi: 0, //是否返回周边POI列表：1.返回；0不返回(默认),非必须
success: function(res) {
console.log(res, "结果");
......@@ -311,10 +456,7 @@ Page({
},
save(e) {
wx.redirectTo({
url: `/business/pages/organizationalmgt/qxknow?sid=3`
});
return;
console.log(this.data.mobileArr[0],'手机 ')
let saveParams = this.objValueTrim(this.data.params);
saveParams.category = this.data.selectedSubject.join(",");
......@@ -336,7 +478,7 @@ Page({
});
return;
}
if (!saveParams.tel_phone) {
if (!this.data.mobileArr[0]) {
wx.showModal({
title: "提示",
content: "请输入电话号码",
......@@ -374,10 +516,9 @@ Page({
title: "信息保存中...",
mask: true
});
// saveParams.sort = 0;
saveParams.id = this.data.sid;
// saveParams.school_id =
// this.data.sid != 0 ? this.data.sid : this.data.school_id;
saveParams.school_id = this.data.sid != 0 ? this.data.sid : this.data.school_id;
saveParams.tel_phone = JSON.stringify(this.data.mobileArr);
console.log(saveParams, "提交参数");
setSchoolInfo(saveParams)
.then(res => {
......@@ -385,16 +526,23 @@ Page({
submitting: false
});
wx.hideLoading();
if (res.code == 200) {
// 成功的操作
wx.showToast({
title: "保存成功",
success() {
wx.redirectTo({
url: `/business/pages/organizationalmgt/qxknow?sid=${res.data.id}`
});
}
});
if (res.code == 200) { // 成功的操作
if (this.data.sid == 0) { // 新增的操作
LocalStorage.setItem('dakarole', 1);
permissionUtils.myMenulistGet(res.data.id)
wx.redirectTo({
url: `/business/pages/organizationalmgt/qxknow?sid=${res.data.id}`
});
} else {
wx.showToast({
title: '保存成功',
success() {
wx.navigateBack({
delta: 1, // 回退前 delta(默认为1) 页面
})
}
})
}
}
})
.catch(e => {
......
business/pages/organizationalmgt/newinfo.wxml
View file @ c3097e7e
......@@ -35,10 +35,10 @@
<!-- <image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image> -->
</view>
</view>
<view class="line-item">
<view class="line-item" wx:for="{{mobileArr}}" wx:key="index">
<view class="item-label">联系电话</view>
<view class="right">
<input type="text" placeholder-class="placeholderclass" class="iteminput" maxlength="11" value="{{params.tel_phone}}" bindinput="phoneInput" placeholder="请输入学校联系电话"></input>
<input type="text" placeholder-class="placeholderclass" class="iteminput" maxlength="11" value="{{item}}" bindinput="phoneInput" data-index="{{index}}" placeholder="请输入学校联系电话"></input>
<!-- <image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image> -->
</view>
</view>
......@@ -70,7 +70,7 @@
</view>
</view>
<view class="submitbtn-box">
<view class="submitbtn" bindtap="save">创建作业打卡</view>
<view class="submitbtn" bindtap="save">{{sid? '完成': '创建作业打卡'}}</view>
</view>
</view>
</permission-box>
......
business/pages/staticcenter/index.wxml
View file @ c3097e7e
......@@ -65,7 +65,7 @@
<view class="class-data" >
<view class="data-item" >
<view class="num" >{{item.subject_count}}</view>
<view class="name" >主题</view>
<view class="name" >作业</view>
</view>
<view class="data-item" >
<view class="num" >{{item.record_count}}</view>
......@@ -83,7 +83,7 @@
<view class="teacher-name" >教师</view>
<view class="header-name" >班级数</view>
<view class="header-name" >学员数</view>
<view class="header-name" >发布主题</view>
<view class="header-name" >发布作业</view>
<view class="header-name" >点评次数</view>
</view>
<view class="teacher-item" wx:for="{{teacherstatistics}}" wx:key="{{item.id}}">
......@@ -192,7 +192,7 @@
{{item.subject_count}}
<image class="upup" wx:if="{{item.subject_count>0}}" src="{{imageRoot}}2b/organizationalmgt/upup.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
</view>
<view class="name" >主题</view>
<view class="name" >作业</view>
</view>
<view class="data-item" >
<view class="num" >
......@@ -216,7 +216,7 @@
<view class="teacher-name" >教师</view>
<view class="header-name" >班级数</view>
<view class="header-name" >学员数</view>
<view class="header-name" >发布主题</view>
<view class="header-name" >发布作业</view>
<view class="header-name" >点评次数</view>
</view>
<view class="teacher-item" wx:for="{{addteacherstatistics}}" wx:key="{{item.id}}">
......
business/pages/themead/index.js
View file @ c3097e7e
......@@ -53,7 +53,7 @@ Page({
],
},
],
placeholder: '请输入打卡主题的具体要求，如：演唱歌曲《小小少年》\r\n演唱歌曲《小小少年》，具体要求\r\n1.跟随伴奏唱一段副歌\r\n2.视频录下唱歌过程\r\n3.上传歌唱视频打卡成功\r\n如果有该歌曲示例视频，你可以点击上传视频，供学员参考。',
placeholder: '请输入打卡作业的具体要求，如：演唱歌曲《小小少年》\r\n演唱歌曲《小小少年》，具体要求\r\n1.跟随伴奏唱一段副歌\r\n2.视频录下唱歌过程\r\n3.上传歌唱视频打卡成功\r\n如果有该歌曲示例视频，你可以点击上传视频，供学员参考。',
audioStorage: {},
has_subject: false,
......@@ -651,14 +651,14 @@ Page({
const that = this;
if (this.data.has_subject) {
wx.showModal({
title: '这个营销页已经有主题使用，不能删除',
title: '这个营销页已经有作业使用，不能删除',
confirmText: '确定',
showCancel: false,
})
return;
}
wx.showModal({
title: '您确定删除这个主题营销页吗？',
title: '您确定删除这个作业营销页吗？',
cancelText: '取消',
confirmText: '删除',
success(res) {
......
business/pages/themeeditor/index.js
View file @ c3097e7e
......@@ -72,7 +72,7 @@ Page({
title: '',
content: [{
type: 'text',
value: '日历打卡的描述'
value: ''
}],
is_cheat: 0,
is_encrypt: 0,
......@@ -106,7 +106,7 @@ Page({
title: '',
content: [{
type: 'text',
value: '作业打卡的描述'
value: ''
}],
is_cheat: 0,
// is_encrypt: 0,
......
business/pages/themeeditor/index.wxss
View file @ c3097e7e
......@@ -244,7 +244,7 @@ page{
font-weight: bold;
display: flex;
align-items: center;
width: 180rpx;
min-width: 180rpx;
}
.form-item .item-l .tip{
font-size: 24rpx;
......
business/pages/themeeditor/setting.js
View file @ c3097e7e
......@@ -23,7 +23,7 @@ Page({
editType: 1,
tipObj: [
{type: '1', title: '防作弊模式', content: ['开启后学员打卡后','才能看到其他同学的打卡作品！']},
{type: '2', title: '加密模式', content: ['开启后非本校在读人员','看不到老师的主题内容的！']},
{type: '2', title: '加密模式', content: ['开启后非本校在读人员','看不到老师的作业内容的！']},
{type: '3', title: '强制阅读', content: ['开启后，学员将先进入阅读页面','倒计时结束后才能去提交作业！']},
{type: '4', title: '文字要求', content: ['学员输入文字最少多少字']},
{type: '5', title: '图片要求', content: ['学员上传图片最少多少张']},
......
business/pages/themeeditor/setting.wxml
View file @ c3097e7e
......@@ -19,7 +19,7 @@
<text class="title">任何人都可参与</text>
<text class="title" style="color: #999999">(指定班级学生收到通知)</text>
</view>
<view wx:if="{{ join_rule_type == 2 }}" style="font-size: 22rpx;color: #999999;"><text wx:for="{{classes}}" wx:for-item="class" wx:key="id">{{class.title}}<text wx:if="{{index < classes.length}}">,</text></text></view>
<view wx:if="{{ join_rule_type == 2 }}" style="font-size: 22rpx;color: #999999;"><text wx:for="{{classes}}" wx:for-item="class" wx:key="id">{{class.title}}<text wx:if="{{index < classes.length-1}}">,</text></text></view>
</view>
<view class="item-r">
<image class="selectedicon" src="{{imageRoot}}2b/common/{{join_rule_type == 2 ? 'select1' : 'notselect'}}.png"></image>
......
business/pages/themeeditor/subjecteditor.js
View file @ c3097e7e
......@@ -55,7 +55,7 @@ Page({
time: 0,
upload: false
},
placeholder: '请输入打卡主题的具体要求，如：演唱歌曲《小小少年》\r\n演唱歌曲《小小少年》，具体要求\r\n1.跟随伴奏唱一段副歌\r\n2.视频录下唱歌过程\r\n3.上传歌唱视频打卡成功\r\n如果有该歌曲示例视频，你可以点击上传视频，供学员参考。',
placeholder: '请输入打卡作业的具体要求，如：演唱歌曲《小小少年》\r\n演唱歌曲《小小少年》，具体要求\r\n1.跟随伴奏唱一段副歌\r\n2.视频录下唱歌过程\r\n3.上传歌唱视频打卡成功\r\n如果有该歌曲示例视频，你可以点击上传视频，供学员参考。',
audioStorage: {
},
......
business/pages/themeeditor/subjecteditor.wxml
View file @ c3097e7e
......@@ -4,7 +4,7 @@
<view class="broadcast-box clearfix mb24">
<image class="broadcast-img" src="{{imageRoot}}2b/shopeditor/voiceicon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="">
</image>
<text class="broadcast-text">主题发布后老师带头打卡，可提高学员参与积极性至3倍。</text>
<text class="broadcast-text">作业发布后老师带头打卡，可提高学员参与积极性至3倍。</text>
</view>
<view class="box-item">
......
business/pages/themeeditorlock/courses.wxml
View file @ c3097e7e
......@@ -37,7 +37,7 @@
<view class="stepimgbox" >
<image class="stepimg" src="{{imageRoot}}2b/themeeditor/stepactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
</view>
<view class="steptext" >主题内容设置</view>
<view class="steptext" >内容设置</view>
</view>
</view>
<view class="themelock-editor-container" >
......
business/pages/themeeditorlock/index.js
View file @ c3097e7e
......@@ -113,7 +113,7 @@ Page({
modalClass: false,
modelClassAnimate: false,
selectClass: '', // 当前班级
placeholder: '请输入打卡主题的具体要求，如：演唱歌曲《小小少年》\r\n演唱歌曲《小小少年》，具体要求\r\n1.跟随伴奏唱一段副歌\r\n2.视频录下唱歌过程\r\n3.上传歌唱视频打卡成功\r\n如果有该歌曲示例视频，你可以点击上传视频，供学员参考。',
placeholder: '请输入作业的具体要求，如：演唱歌曲《小小少年》\r\n演唱歌曲《小小少年》，具体要求\r\n1.跟随伴奏唱一段副歌\r\n2.视频录下唱歌过程\r\n3.上传歌唱视频打卡成功\r\n如果有该歌曲示例视频，你可以点击上传视频，供学员参考。',
audioStorage: {
},
......@@ -295,7 +295,7 @@ Page({
if (this.data.subjectStatus == 2) {
wx.showToast({
icon: 'none',
title: '闯关主题已发布，不能修改闯关规则'
title: '闯关打卡已发布，不能修改闯关规则'
})
return;
}
......
business/pages/themeeditorlock/subjecteditor.js
View file @ c3097e7e
......@@ -52,7 +52,7 @@ Page({
time: 0,
upload: false
},
placeholder: '请输入打卡主题的具体要求，如：演唱歌曲《小小少年》\r\n演唱歌曲《小小少年》，具体要求\r\n1.跟随伴奏唱一段副歌\r\n2.视频录下唱歌过程\r\n3.上传歌唱视频打卡成功\r\n如果有该歌曲示例视频，你可以点击上传视频，供学员参考。',
placeholder: '请输入打卡作业的具体要求，如：演唱歌曲《小小少年》\r\n演唱歌曲《小小少年》，具体要求\r\n1.跟随伴奏唱一段副歌\r\n2.视频录下唱歌过程\r\n3.上传歌唱视频打卡成功\r\n如果有该歌曲示例视频，你可以点击上传视频，供学员参考。',
audioStorage: {
},
......
business/pages/themeeditorlock/subjecteditor.wxml
View file @ c3097e7e
......@@ -4,7 +4,7 @@
<view class="broadcast-box clearfix mb24">
<image class="broadcast-img" src="{{imageRoot}}2b/shopeditor/voiceicon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="">
</image>
<text class="broadcast-text">主题发布后老师带头打卡，可提高学员参与积极性至3倍。</text>
<text class="broadcast-text">作业发布后老师带头打卡，可提高学员参与积极性至3倍。</text>
</view>
<view class="box-item">
......
business/pages/themeindex/index.js
View file @ c3097e7e
......@@ -254,7 +254,7 @@ Page({
if(!data){
wx.showModal({
title: '提示',
content: '主题已被删除，点击确定返回班级首页',
content: '作业已被删除，点击确定返回班级首页',
showCancel:false,
confirmText:"确定",
success(r) {
......
business/pages/themeindex/index.wxml
View file @ c3097e7e
......@@ -113,8 +113,8 @@
<view class="noticeDailog" wx:if="{{remindTips.show}}">
<view class="content">
<view class="title">提示</view>
<view class="text" wx:if="{{remindTips.pushStatus==1}}">主题未到开始时间，开始后可提醒</view>
<view class="text" wx:elif="{{remindTips.pushStatus==3}}">打卡主题已结束，不支持提醒</view>
<view class="text" wx:if="{{remindTips.pushStatus==1}}">作业未到开始时间，开始后可提醒</view>
<view class="text" wx:elif="{{remindTips.pushStatus==3}}">打卡已结束，不支持提醒</view>
<view class="text" wx:elif="{{!remindTips.status}}">已提醒所有未打卡学员打卡</view>
<view class="text" wx:else>
<view>已经提醒过未打卡学员</view>
......
components/basetextarea/index.js
View file @ c3097e7e
......@@ -8,7 +8,6 @@ Component({
externalClasses: ['basetextarea-style']
},
properties: {
///////自带属性
value: {
type: String,
value: '',
......@@ -68,7 +67,7 @@ Component({
},
autoHeight: {
type: Boolean,
value: false,
value: true,
},
fixed: {
type: Boolean,
......@@ -85,10 +84,6 @@ Component({
value: 'textarea'
}
},
/**
* 组件的初始数据
*/
data: {
focus:true,
cursor:''
......
components/basetextarea/index.wxml
View file @ c3097e7e
<!--components/basetextarea/index.wxml-->
<view class='basetextarea-box'>
<view class="textarea-wrapper" bindtap="wrapperFocus">
<text class="{{value ? '' : 'placeholderClass'}}" selectable="false" space="false" decode="false">{{value}}</text>
<view class="textarea-wrapper" bindtap="wrapperFocus" wx:if="{{ !focus }}">
<view class="mockSpan {{value ? '' : 'placeholderClass'}}">{{value? value: placeholder}}</view>
</view>
<textarea
class=""
......@@ -12,7 +12,7 @@
value="{{ value }}"
maxlength="{{ maxlength }}"
focus="{{ focus }}"
autoHeight="{{ autoHeight }}"
auto-height = "{{autoHeight}}"
cursor="{{ cursor }}"
cursor-spacing="{{ cursorSpacing }}"
placeholder="{{ placeholder }}"
......@@ -22,7 +22,11 @@
selection-end="{{ selectionEnd }}"
adjust-position="{{ adjustPosition }}"
bindinput="handlerChange"
bindfocus="handlerFocus" bindlinechange="handerLineChange" bindconfirm="handlerConfirm" bindblur="handlerBlur" wx:if="{{ type==='textarea' && focus}}"
bindfocus="handlerFocus"
bindlinechange="handerLineChange"
bindconfirm="handlerConfirm"
bindblur="handlerBlur"
wx:if="{{ type==='textarea' && focus}}"
/>
<input
wx:if="{{ type !='textarea' && focus}}"
......
components/basetextarea/index.wxss
View file @ c3097e7e
......@@ -2,31 +2,30 @@
.basetextarea-box{
position: relative;
width: 100%;
height: 400rpx;
overflow: hidden;
line-height: 1.2;
background:rgba(248,248,248,1);
border-radius: 8rpx;
padding: 16rpx;
height: 400rpx;
margin-bottom: 40rpx;
padding: 20rpx;
}
.basetextarea-box .textarea-wrapper{
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
padding: 30rpx;
line-height: 1.2;
}
.basetextarea-box .textarea-wrapper .placeholderClass{
color: rgba(125,125,130,.5);
font-size: 28rpx;
}
.basetextarea-box .textarea-wrapper .mockSpan{
word-break: break-all;
line-height: 1.2;
font-weight: 500;
min-height: 160rpx;
}
.basetextarea-box textarea{
line-height: 1.2;
position: relative;
z-index: 1;
padding: 0;
height: 160rpx;
min-height: 160rpx;
}
.basetextarea-box .textarea-wrapper text{
word-break: break-all;
line-height: 1.2;
font-weight: 500;
}
\ No newline at end of file
components/newbasetextarea/index.js
View file @ c3097e7e
......@@ -68,7 +68,7 @@ Component({
},
autoHeight: {
type: Boolean,
value: false,
value: true,
},
fixed: {
type: Boolean,
......
components/newbasetextarea/index.wxml
View file @ c3097e7e
<!--components/basetextarea/index.wxml-->
<view class='basetextarea-box'>
<view class="textarea-wrapper" bindtap="wrapperFocus">
<text class="{{value ? '' : 'placeholderClass'}}" selectable="false" space="false" decode="false">{{value}}</text>
<view class="textarea-wrapper" bindtap="wrapperFocus" wx:if="{{ !focus }}">
<view class="mockSpan {{value ? '' : 'placeholderClass'}}">{{value? value: placeholder}}</view>
</view>
<textarea
class=""
......@@ -12,7 +12,7 @@
value="{{ value }}"
maxlength="{{ maxlength }}"
focus="{{ focus }}"
autoHeight="{{ autoHeight }}"
auto-height = "{{autoHeight}}"
cursor="{{ cursor }}"
cursor-spacing="{{ cursorSpacing }}"
placeholder="{{ placeholder }}"
......@@ -22,7 +22,11 @@
selection-end="{{ selectionEnd }}"
adjust-position="{{ adjustPosition }}"
bindinput="handlerChange"
bindfocus="handlerFocus" bindlinechange="handerLineChange" bindconfirm="handlerConfirm" bindblur="handlerBlur" wx:if="{{ type==='textarea' && focus}}"
bindfocus="handlerFocus"
bindlinechange="handerLineChange"
bindconfirm="handlerConfirm"
bindblur="handlerBlur"
wx:if="{{ type==='textarea' && focus}}"
/>
<input
wx:if="{{ type !='textarea' && focus}}"
......
components/newbasetextarea/index.wxss
View file @ c3097e7e
......@@ -2,35 +2,30 @@
.basetextarea-box{
position: relative;
width: 100%;
height: 400rpx;
overflow: hidden;
line-height: 1.2;
/* background:rgba(248,248,248,1); */
border-radius: 8rpx;
/* padding: 16rpx; */
height: 400rpx;
margin-bottom: 40rpx;
padding: 20rpx;
}
.basetextarea-box .textarea-wrapper{
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
/* padding: 30rpx; */
line-height: 1.2;
}
.textarea {
.basetextarea-box .textarea-wrapper .placeholderClass{
color: rgba(125,125,130,.5);
font-size: 28rpx;
}
.basetextarea-box .textarea-wrapper .mockSpan{
word-break: break-all;
line-height: 1.2;
font-weight: 500;
min-height: 160rpx;
}
.basetextarea-box textarea{
line-height: 1.2;
position: relative;
z-index: 1;
padding: 0;
height: 160rpx;
min-height: 160rpx;
}
.basetextarea-box .textarea-wrapper text{
word-break: break-all;
line-height: 1.2;
font-weight: 500;
}
\ No newline at end of file
components/newsjdmediaeditor/index.wxml
View file @ c3097e7e
......@@ -2,19 +2,26 @@
<view class="sjd-media-editor {{withmask ? 'opacitybody' : ''}}" >
<view class="media-content-box {{exchangeIndex - 1 == index ? 'down' : '' }} {{exchangeIndex == index ? 'up' : '' }}" wx:for="{{content}}" wx:key="index">
<view class="media-box-item media-text-item" data-type="{{item.type}}" data-index="{{index}}" wx:if="{{item.type == 'text'}}">
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{imageRoot}}2b/common/reddelicon.png?{{imageVersion}}" lazy-load="false" binderror="" bindload="" bindtap="delitem"></image>
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{imageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<basetextarea class="basetextarea-style" bindinput="textareaChange" data-type="{{item.type}}" maxlength="500" data-index="{{index}}" value="{{item.value}}" placeholder="{{placeholder}}"></basetextarea>
<text class="word-count" selectable="false" space="false" decode="false">{{item.value.length}}/500</text>
<image class="exchange-icon" wx:if="{{index != 0}}" data-type="{{item.type}}" data-index="{{index}}" bindtap="exchange" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
<text class="word-count">{{item.value.length}}/500</text>
<view class="exchange-btn" wx:if="{{index != 0}}" data-type="{{item.type}}" data-index="{{index}}" bindtap="exchange" >
<image class="exchange-icon" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
</view>
</view>
<view class="media-box-item media-img-item" wx:if="{{item.type == 'img'}}" data-index="{{index}}" >
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{imageRoot}}2b/common/reddelicon.png?{{imageVersion}}" lazy-load="false" binderror="" bindload="" bindtap="delitem"></image>
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{imageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<image class="" src="{{filter.imagify(item.value, 'image/resize,w_640/format,jpg/quality,q_50')}}" mode="widthFix" lazy-load="false" binderror="" data-index="{{index}}" data-src="{{item.value}}" bindtap="prevImg" bindload=""></image>
<image class="exchange-icon" wx:if="{{index != 0}}" data-type="{{item.type}}" data-index="{{index}}" bindtap="exchange" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
<view class="exchange-btn" wx:if="{{index != 0}}" data-type="{{item.type}}" data-index="{{index}}" bindtap="exchange">
<image class="exchange-icon" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
</view>
</view>
<view class="media-box-item media-voice-item" wx:if="{{item.type == 'voice'}}">
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" data-value="{{item.value}}" src="{{imageRoot}}2b/common/reddelicon.png?{{imageVersion}}" lazy-load="false" binderror="" bindload="" bindtap="delitem"></image>
<image class="exchange-icon" wx:if="{{index != 0}}" data-type="{{item.type}}" data-index="{{index}}" bindtap="exchange" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" data-value="{{item.value}}" src="{{imageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<view class="exchange-btn" wx:if="{{index != 0}}" data-type="{{item.type}}" data-index="{{index}}" bindtap="exchange">
<image class="exchange-icon" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
</view>
<view class="sjd-radio-box">
<!-- 播放的icon -->
<view
......@@ -40,7 +47,7 @@
data-duration="{{item.duration}}"
bindtap="pausevoice"
>
<image class="pause-btn-icon" src="{{imageRoot}}2c/common/pauseicon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="pause-btn-icon" src="{{imageRoot}}2c/common/pauseicon.png?{{imageVersion}}"></image>
</view>
<!-- 暂停的icon -->
<view class="play-time">
......@@ -68,14 +75,16 @@
</view>
</view>
<view class="media-box-item media-video-item" wx:if="{{item.type == 'video'}}">
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{imageRoot}}2b/common/reddelicon.png?{{imageVersion}}" lazy-load="false" binderror="" bindload="" bindtap="delitem"></image>
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{imageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<!-- <video class="media-box-video-item" src="{{filter.ossVideofy(item.value,item.mode)}}" poster="{{filter.videoPoster(item.value)}}"></video> -->
<view class="video-play-icon-box" data-src="{{item.value}}" data-mode="{{item.mode}}" data-from="mediashow" bindtap="playvideo">
<image class="video-play-icon" src="{{imageRoot}}2c/common/playicon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="video-play-icon" src="{{imageRoot}}2c/common/playicon.png?{{imageVersion}}"></image>
</view>
<!-- <image class="video-image" data-src="{{item.value}}" data-mode="{{item.mode}}" data-from="mediashow" bindtap="playvideo" src="{{imageRoot}}common/videodefaultbg.png?{{imageVersion}}" mode="widthFix" lazy-load="false" binderror="" bindload=""></image> -->
<!-- <image class="video-image" data-src="{{item.value}}" data-mode="{{item.mode}}" data-from="mediashow" bindtap="playvideo" src="{{imageRoot}}common/videodefaultbg.png?{{imageVersion}}" mode="widthFix"></image> -->
<image class="video-image" data-index="{{index}}" data-src="{{item.value}}" data-mode="{{item.mode}}" data-from="mediashow" bindtap="playvideo" src="{{filter.videoPoster(item.poster || item.value)}}" mode="aspectFit" lazy-load="false" binderror="imgloaderr" bindload=""></image>
<image wx:if="{{index != 0}}" class="exchange-icon" data-type="{{item.type}}" bindtap="exchange" data-index="{{index}}" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
<view class="exchange-btn" wx:if="{{index != 0}}" data-type="{{item.type}}" data-index="{{index}}" bindtap="exchange">
<image wx:if="{{index != 0}}" class="exchange-icon" data-type="{{item.type}}" bindtap="exchange" data-index="{{index}}" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
</view>
</view>
</view>
<view class="media-type-box">
......
components/newsjdmediaeditor/index.wxss
View file @ c3097e7e
......@@ -97,16 +97,12 @@
animation: moveup 0.5s linear forwards;
}
.sjd-media-editor .media-content-box .media-box-item{
margin-bottom: 106rpx;
margin-bottom: 60rpx;
position: relative;
}
.sjd-media-editor .media-content-box .media-box-item.media-text-item textarea{
/* background:rgba(248,248,248,1); */
/* border-radius: 8rpx; */
width: 100%;
/* padding: 16rpx; */
height: 400rpx;
padding-bottom: 40rpx;
.sjd-media-editor .media-content-box .media-box-item.media-text-item{
border: 1px dashed #DADBDC;
border-radius: 8rpx;
}
.sjd-media-editor .media-content-box .media-box-item.media-text-item .word-count {
position: absolute;
......@@ -154,15 +150,13 @@
letter-spacing: 2rpx;
text-align: center;
}
.sjd-media-editor .media-content-box .media-box-item image.del-icon {
width: 40rpx;
height: 40rpx;
display: block;
position: absolute;
top: 0;
right: 0;
top: -10rpx;
right: -10rpx;
z-index: 2;
}
.sjd-media-editor .media-content-box .media-box-item.media-video-item {
......@@ -171,13 +165,20 @@
.sjd-media-editor .media-content-box .media-box-item.media-video-item image.del-icon{
top: -40rpx;
}
.sjd-media-editor .media-content-box .media-box-item image.exchange-icon {
display: block;
width: 48rpx;
height: 48rpx;
.sjd-media-editor .media-content-box .media-box-item .exchange-btn {
position: absolute;
top: -81rpx;
top: -60rpx;
left: 0;
padding: 10rpx 0;
display: flex;
align-items: center;
font-size: 22rpx;
color: #16B0FD;
}
.sjd-media-editor .media-content-box .media-box-item .exchange-btn .exchange-icon{
width: 40rpx;
height: 40rpx;
margin-right: 10rpx
}
.sjd-media-editor .media-content-box .media-box-item .media-box-video-item {
width: 100%;
......@@ -185,6 +186,7 @@
.sjd-media-editor .media-content-box .media-box-item .media-box-audio-item {
display: none;
}
.video-play-icon-box {
width: 118rpx;
height: 118rpx;
......
components/sjdmediaeditor/index.wxml
View file @ c3097e7e
......@@ -4,7 +4,7 @@
<view class="media-box-item media-text-item" data-type="{{item.type}}" data-index="{{index}}" wx:if="{{item.type == 'text'}}">
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{imageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<basetextarea class="basetextarea-style" bindinput="textareaChange" data-type="{{item.type}}" maxlength="500" data-index="{{index}}" value="{{item.value}}" placeholder="{{placeholder}}"></basetextarea>
<text class="word-count" selectable="false" space="false" decode="false">{{item.value.length}}/500</text>
<text class="word-count">{{item.value.length}}/500</text>
<view class="exchange-btn" wx:if="{{index != 0}}" data-type="{{item.type}}" data-index="{{index}}" bindtap="exchange" >
<image class="exchange-icon" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
</view>
......
components/sjdmediaeditor/index.wxss
View file @ c3097e7e
......@@ -100,13 +100,9 @@
margin-bottom: 60rpx;
position: relative;
}
.sjd-media-editor .media-content-box .media-box-item.media-text-item textarea{
background:rgba(248,248,248,1);
.sjd-media-editor .media-content-box .media-box-item.media-text-item{
border: 1px dashed #DADBDC;
border-radius: 8rpx;
width: 100%;
padding: 16rpx;
height: 400rpx;
padding-bottom: 40rpx;
}
.sjd-media-editor .media-content-box .media-box-item.media-text-item .word-count {
position: absolute;
......
dist/w-countdown/index.wxml
View file @ c3097e7e
......@@ -13,7 +13,7 @@
秒
</view>
<view class="down" >
<image class="" src="{{localImageRoot}}common/cutdown/readCutd.gif" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
<image class="" src="{{imageRoot}}common/cutdown/readCutd.gif" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
</view>
</view>
<view class="clock-cut" wx:if="{{isRead==2}}">
......
src/pages/clockeditor/index.wxml
View file @ c3097e7e
......@@ -21,7 +21,7 @@
widthtext="{{false}}"
expanded="{{true}}"
actionsPalyvalue="{{actPalyaudioValue}}"
text="主题"
text="作业"
bind:playvideo="playvideoa"
expandeddefault="{{false}}"
>
......@@ -176,7 +176,7 @@
</view>
<!-- 打卡出问题，去客服消息跳 H5 -->
<!-- <view class="red-text" wx:if="{{pagefrom!='morethemeindex'}}">一个主题只能打卡一次喔！</view> -->
<!-- <view class="red-text" wx:if="{{pagefrom!='morethemeindex'}}">一个作业只能打卡一次喔！</view> -->
<sound-recording
show="{{audioStatus.show}}"
......
src/pages/mynews/index.wxml
View file @ c3097e7e
......@@ -6,7 +6,7 @@
<view class="box {{currentType == 1 ? 'active' : ''}}" data-currenttype="1" bindtap="typeselect">
<image class="boximg" src="{{imageRoot}}2c/common/themenotice.png?{{imageVersion}}" ></image>
<view class="boxname">
<text class="" >主题发布通知</text>
<text class="" >作业发布通知</text>
<view class="red-dot" wx:if="{{themeNotice > 0}}">{{themeNotice}}</view>
</view>
<view class="line" ></view>
......@@ -48,7 +48,7 @@
<view class="time">{{item.created_at}}</view>
</view>
<view class="item-bottom">
<view class="item-text">发布了主题：</view>
<view class="item-text">发布了作业：</view>
<view class="item-content">{{item.title}}</view>
</view>
</view>
......
src/pages/readthemeindex/index.js
View file @ c3097e7e
......@@ -5,7 +5,6 @@ import {
joinCircle,
circleRemark,
circleDetail,
adInfoGet,
getPrize,
newLikeIndex,
newCommentIndex
......@@ -115,7 +114,6 @@ Page({
likesObj: {},
commentsObj: {},
schoolInfo: '',
auditStatus: 3, // 1未申请2审核中3已通过
studentStatus: 1,
noUser: false,
commenteditor: false, // 评论input框
......@@ -134,30 +132,27 @@ Page({
if (options.scene) {
let sceneQuery = scenQueryGet(options.scene);
const {
i,
t
t,s
} = sceneQuery;
this.setData({
id: i,
tid: t,
sid: sid || 0,
pagefrom: ''
})
} else {
const {
id,
tid,
sid,
pagefrom,
sub,
clockdate
} = options;
// const {id, tid} = options;
// let pagefrom = 'businesstheme';
this.setData({
id,
tid,
clockdate:clockdate||'',
pagefrom: pagefrom ? pagefrom : '',
sub:sub || ''
sub:sub || '',
sid: sid || 0
}, () => {
})
......@@ -168,8 +163,8 @@ Page({
},
onShow: function (options) { // Do something when page show.
app.getCurrentSchoolStudentId({
source_id: this.data.id,
source_type: 7,
source_id: this.data.tid,
source_type: 8,
}).then(() => {
this.themeDetail();
this.getClockRead();
......@@ -178,72 +173,20 @@ Page({
hasmore: true,
clockPage: 1,
})
// this.clockListGet('init');
// this.selfClockGet();
// this.doAnimation();
this.userShow()
})
},
adInfoGet() {
adInfoGet({
class_id: this.data.id
}).then((res) => {
const {
code,
data
} = res;
if (code == 200 && data) {
if (data.custom == '') {
data.custom = []
} else {
try {
data.custom = JSON.parse(data.custom);
} catch (error) {
data.custom = []
}
}
this.setData({
adInfo: data
})
} else {
this.setData({
adInfo: {
custom: []
}
})
}
})
},
onHide: function () { // Do something when page hide.
// this.innerAudioContext.pause();
// this.resetAudiosPlayStatus()
// clearInterval(this.data.voiceInterval);
// this.didAnimation();
onHide: function () {
},
onUnload: function () { // Do something when page close.
// this.innerAudioContext.destroy();
// this.setData({
// audioStorage: {
// }
// })
// clearInterval(this.data.voiceInterval);
// this.didAnimation();
onUnload: function () {
},
onPullDownRefresh: function () { // Do something when pull down.
// this.setData({
// hasmore: true,
// clockPage: 1,
// })
// this.themeDetail();
// this.clockListGet('down');
onPullDownRefresh: function () {
},
onReachBottom: function () { // Do something when page reach bottom.
// this.clockListGet('up');
onReachBottom: function () {
},
userShow() {
studentidentity({
class_id: this.data.id,
school_id: this.data.sid,
}).then((res) => {
wx.hideLoading();
const {
......@@ -253,7 +196,6 @@ Page({
if (code == 200 && data) {
this.setData({
auditStatus: data.audit_status,
studentStatus: data.student_status || 1
})
} else {
this.setData({
......@@ -280,49 +222,6 @@ Page({
// isexpand: !this.data.isexpand
// })
},
onTabItemTap(item) {},
getCircleDetail(id) {
circleDetail({
class_id: id
}).then((res) => {
if (res.code == 200) {
let content = [];
try {
content = JSON.parse(res.data.content);
} catch (e) {
content = []
}
if (res.code == 40000) {
if (res.msg) {
wx.showModal({
title: '提示',
content: '班级已被删除，点击确定返回机构首页',
showCancel: false,
confirmText: "确定",
success(r) {
if (r.confirm) {
wx.reLaunch({
url: `/src/pages/shopindex/index?mid=${res.data.member_id}`
})
}
}
})
// return;
}
}
res.data.content = content;
// res.data.clock_address.tel_parse = JSON.parse(res.data.clock_address.tel);
this.setData({
circleInfo: res.data
}, () => {
wx.setNavigationBarTitle({
title: this.data.circleInfo.title || '圈子主页'
})
})
}
// this.judgeIsClock(this.data.tid);
})
},
themeDetail() {
themeDetail({
subject_id: this.data.sub?this.data.sub:this.data.tid
......@@ -339,7 +238,6 @@ Page({
themeSelect: data,
cutDownDate: StorageTime ? new Date().getTime() + StorageTime * 1000 : new Date(new Date().setMinutes(new Date().getMinutes() + data.force_num)).getTime()
})
this.getCircleDetail(data.class_id);
const visitor = LocalStorage.getItem('visitor');
activityLog({
type: 22,
......@@ -371,27 +269,6 @@ Page({
callBack(rect)
}).exec()
},
hideUserGuide() {
LocalStorage.setItem('themeIndexGuideA', 1);
this.setData({
userguide: false
})
},
hideUserGuideB() {
let guideBStep = this.data.guideBStep;
guideBStep++;
this.setData({
guideBStep
}, () => {
if (this.data.guideBStep == 3) {
this.setData({
guideBStep: 1,
userguideb: false
})
LocalStorage.setItem('themeIndexGuideB', 1);
}
})
},
componentPositionGet(id, callBack) {
const query = wx.createSelectorQuery().in(this);
query.select(`${id}`).boundingClientRect(function (rect) {
......@@ -399,18 +276,6 @@ Page({
}).exec()
},
preventTouchMove() {},
// 联系方式弹窗相关
closecontact() {
this.setData({
concatDiaShow: false
})
},
contactShop() {
wx.navigateTo({
url: `/src/pages/contactindex/index?sid=${this.data.circleInfo.school_id}`,
})
},
// 联系方式弹窗相关
judgeIsClock(tid) {
const visitor = LocalStorage.getItem('visitor');
judgeIsClock({
......@@ -495,14 +360,13 @@ Page({
} else {
const pageName = this.data.pagefrom
wx.redirectTo({
url: `/src/pages/clockeditor/index?id=${this.data.id}&tid=${this.data.tid}&cid=0&pagefrom=${pageName}&clockdate=${this.data.clockdate}&sub=${this.data.sub}`
url: `/src/pages/clockeditor/index?tid=${this.data.tid}&cid=0&pagefrom=${pageName}&clockdate=${this.data.clockdate}&sub=${this.data.sub}`
})
}
},
shareFriend() {
},
// generatePoster () {
// },
// 设置昵称相关
setname() {
this.setData({
......@@ -540,11 +404,7 @@ Page({
})
},
// 加入圈子输入码相关代码
goCircleIndex() {
wx.redirectTo({
url: `/src/pages/circleindex/index?id=${this.data.id}`
})
},
openLocation(e) {
const {
dataset
......@@ -558,21 +418,6 @@ Page({
address: selectedClock.location_address
})
},
closeAd() {
this.setData({
adShow: false
})
},
toGetAd() {
this.setData({
adGetShow: true
})
},
closeAdModal() {
this.setData({
adGetShow: false
})
},
adMobileInput(e) {
const {
value
......@@ -790,13 +635,6 @@ Page({
posterBoxShow: false
})
},
graduateClock() {
wx.showModal({
title: '提示',
content: '抱歉，您已结业，已结业学员无法继续打卡。',
showCancel: false
})
},
generatePoster() {
const that = this;
const visitor = LocalStorage.getItem('visitor');
......@@ -817,7 +655,7 @@ Page({
mask: true,
})
generateCustomerQrcode({
scene: `i=${this.data.id}&t=${this.data.tid}&p=7&w=${app.globalData.currentSchoolStudentId}`,
scene: `t=${this.data.tid}&p=7&w=${app.globalData.currentSchoolStudentId}`,
page: `src/pages/themeindex/index`
}).then((res) => {
const {
......@@ -1153,11 +991,6 @@ Page({
url: `/src/pages/websiteindex/index?sid=${this.data.circleInfo.school_id}`,
})
},
goBusinessClock() {
wxNavigateToMiniProgram({
path: `/src/pages/businessindex/index`,
})
},
getPrize(e) {
const {
adMobile
......
src/pages/readthemeindex/index.wxml
View file @ c3097e7e
<wxs src="./../../../filter/index.wxs" module="filter" />
<view class="container">
<view class="theme-index-container clearfix">
<view class="theme-detail-box">
<view class="theme-index-title">
<view class="big-title">
{{themeSelect.title}}
</view>
<view class="big-time">{{themeSelect.created_at}}
</view>
<view class="section">
<view class="banner-box" >
<image class="banner" src="{{filter.imagify(themeSelect.land_content.cover)}}" wx:if="{{themeSelect.land_content.cover}}"></image>
<image class="banner" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png" wx:else></image>
<!-- <view class="btn-group">
<view class="btn" bindtap="goRankList">排行榜</view>
<view class="btn" bindtap="generateNewPoster">分享</view>
</view> -->
<view class="shadow-box"></view>
<view class="title-box">
<view class="title">{{themeSelect.title}}</view>
<view class="time">{{themeSelect.subject_creator.nickname}} {{themeSelect.homework_set.publish_time}} 发布</view>
</view>
<view class=""
wx:if="{{(!noUser && auditStatus == 3) || themeSelect.is_encrypt == 0}}">
<view class="{{detailExpand ? 'sjd-media-show-box noheight' : 'sjd-media-show-box'}}"
wx:if="{{themeSelect.content.length > 0}}">
<sjd-media-show content="{{themeSelect.content}}" bind:playvoice="playvoice" actionsPalyvalue="{{actPalyaudioValue}}"
bind:pausevoice="pausevoice" bind:voiceslide="voiceslide" audioStorage="{{audioStorage}}"
bind:slidestart="slidestart" bind:slideend="slideend" widthtext="{{true}}"
expanded="{{isexpand}}" bind:expandaction="expandaction" defineheight="{{90}}" text=""
bind:playvideo="playvideo">
</sjd-media-show>
</view>
</view>
<view class="small-gray-box"></view>
</view>
<view class="footer-box">
<view class="cutdown-box">
<view class="text">
阅读倒计时
</view>
<view class="" wx:if="{{!isExpire}}">
<w-countdown time="{{ cutDownDate }}" bindcallback="countdownComplate" themeId="{{themeSelect.id}}" format="MM" isRead="{{1}}"/>
</view>
<view class="" wx:if="{{isExpire}}">00:00</view>
<!-- wx:if="{{!noUser && auditStatus == 3"> -->
<view class="instro-box" wx:if="{{themeSelect.content.length>0}}">
<view class="media-box">
<sjd-media-show
actionsPalyvalue="{{actPalyaudioValue}}"
content="{{themeSelect.content}}"
bind:playvoice="playvoice"
bind:pausevoice="pausevoice"
bind:voiceslide="voiceslide"
audioStorage="{{audioStorage}}"
bind:slidestart="slidestart"
bind:slideend="slideend"
widthtext="{{false}}"
expanded="{{isexpand}}"
bind:expandaction="expandaction"
text="点击"
bind:playvideo="playvideo"
defineheight="{{500}}"
expandeddefault="{{false}}"
>
</sjd-media-show>
</view>
<view class="btn-box" style="{{isExpire?'':'opacity:0.4'}}" bindtap="goClock">去打卡</view>
</view>
<psd-editor bind:closepsddia="closepsddia" circleid="{{id}}" wx:if="{{showPsdDia}}" bind:checkPsd="checkPsd">
</psd-editor>
<remark-editor wx:if="{{showNameSetDia}}" remark="{{remark}}" bind:closenamedia="closenamedia" circleid="{{id}}"
bind:setname="setname">
</remark-editor>
<poster-box wx:if="{{posterBoxShow}}" canvasimagepath="{{canvasImagePath}}" bind:closeposter="closeposter">
</poster-box>
<view class='poste_box' id='canvas-container' wx:if="{{canvasShow}}">
<canvas canvas-id="myCanvas" style="width:100%;height:1334rpx;" />
</view>
<sjd-contact wx:if="{{concatDiaShow}}" address="{{circleInfo.clock_address}}" bind:closecontact="closecontact">
</sjd-contact>
<btn-drag bind:btnDragEvent='goindex' tobottomDis='88' width='60' height="60" catchtouchmove="ture">
<view class="gohome gohome-c" bindtap="goindex" slot="dragcontent">
<view class="home-text">首页</view>
</view>
<view class="footer-box">
<view class="cutdown-box">
<view class="text">
阅读倒计时
</view>
<view class="" wx:if="{{!isExpire}}">
<w-countdown time="{{ cutDownDate }}" bindcallback="countdownComplate" themeId="{{themeSelect.id}}" format="MM" isRead="{{1}}"/>
</view>
</btn-drag>
<view class="" wx:if="{{isExpire}}">00:00</view>
</view>
<view class="btn-box" style="{{isExpire?'':'opacity:0.4'}}" bindtap="goClock">去打卡</view>
</view>
<psd-editor bind:closepsddia="closepsddia" circleid="{{id}}" wx:if="{{showPsdDia}}" bind:checkPsd="checkPsd">
</psd-editor>
<remark-editor wx:if="{{showNameSetDia}}" remark="{{remark}}" bind:closenamedia="closenamedia" circleid="{{id}}"
bind:setname="setname">
</remark-editor>
<poster-box wx:if="{{posterBoxShow}}" canvasimagepath="{{canvasImagePath}}" bind:closeposter="closeposter">
</poster-box>
<view class='poste_box' id='canvas-container' wx:if="{{canvasShow}}">
<canvas canvas-id="myCanvas" style="width:100%;height:1334rpx;" />
</view>
<btn-drag bind:btnDragEvent='goindex' tobottomDis='88' width='60' height="60" catchtouchmove="ture">
<view class="gohome gohome-c" bindtap="goindex" slot="dragcontent">
<view class="home-text">首页</view>
</view>
</btn-drag>
<go-top wx:if="{{backTopValue}}"></go-top>
<view class="" data-editor="commenteditor">
<comment-editor wx:if="{{commenteditor}}" prams="{{commentclock}}" bind:hidecommenteditor="hidecommenteditor"
......
src/pages/readthemeindex/index.wxss
View file @ c3097e7e
This diff is collapsed.
ucenter/index.js
View file @ c3097e7e
......@@ -276,7 +276,7 @@ Page({
},
loginToManagerWaitDel() {
wx.navigateTo({
url: `/business/pages/organizationalmgt/newinfo?sid=${this.data.sid}`
url: `/business/pages/organizationalmgt/newinfo?sid=0&school_id=0`
});
},
// 新授权
......
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