Skip to content

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

fix

parents 9aa46683 c7e0ae5f
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 87 deletions
business/components/clockitem/index.js
View file @ 90e3d9e5
......@@ -119,8 +119,8 @@ Component({
},
openLocation(e) {
wxOpenLocation({
latitude: this.data.clock.latitude,
longitude: this.data.clock.longitude,
latitude: Number(this.data.clock.latitude),
longitude: Number(this.data.clock.longitude),
name: '',
address: this.data.clock.location_address
})
......
business/components/commentEditorTypeChoose/index.js
View file @ 90e3d9e5
......@@ -53,7 +53,7 @@ Component({
goScoreMode () {
const that = this;
wx.navigateTo({
url: `/business/pages/commenteditor/index?id=${this.data.classid}&tid=${this.data.tid}&cid=${this.data.cid}&sid=${this.data.sid}`,
url: `/business/pages/commenteditor/index?tid=${this.data.tid}&cid=${this.data.cid}&sid=${this.data.sid}`,
success () {
that.triggerEvent('hideChooseTypeDia')
}
......@@ -62,7 +62,7 @@ Component({
interactionmode () {
const that = this;
wx.navigateTo({
url: `/business/pages/commenteditor/imagelistshow?id=${this.data.classid}&tid=${this.data.tid}&cid=${this.data.cid}&sid=${this.data.sid}`,
url: `/business/pages/commenteditor/imagelistshow?tid=${this.data.tid}&cid=${this.data.cid}&sid=${this.data.sid}`,
success () {
that.triggerEvent('hideChooseTypeDia')
}
......
business/pages/commenteditor/index.js
View file @ 90e3d9e5
......@@ -166,6 +166,16 @@ Page({
scoreObject: this.data.scoreObject,
})
},
shortWordsShow() {
shortWordsShow({
school_id: this.data.sid
}).then((res) => {
const { code, data } = res;
if (code == 200) {
console.log(data,'datadata')
}
})
},
calculatetotal () {
let totalScore = 0;
for (let i in this.data.scoreObject) {
......@@ -190,18 +200,16 @@ Page({
},
goModifyScoreTemp () {
wx.navigateTo({
url: `/business/pages/commenteditor/modifyscoretemp?id=${this.data.id}`,
url: `/business/pages/commenteditor/modifyscoretemp?tid=${this.data.tid}`,
})
},
onLoad: function (options) { // Do some initialize when page load.
const {
id,
tid,
cid,
sid
} = options;
this.setData({
id,
tid,
cid,
sid
......@@ -210,6 +218,7 @@ Page({
this.commentDetailGet();
this.memberComment();
this.privateMemberComment();
// this.shortWordsShow();
},
onReady: function () { // Do something when page ready.
wx.hideShareMenu()
......@@ -299,7 +308,7 @@ Page({
onTabItemTap(item) {},
subjectReviewTemplate () {
subjectReviewTemplate({
class_id: this.data.id
subject_id: this.data.tid
}).then((res) => {
const {code, data} = res;
if (code == 200) {
......@@ -1269,7 +1278,6 @@ Page({
})
if (this.data.wordEditType == 1) { // 新建
shortWordsStore({
class_id: this.data.id,
word: words,
school_id:this.data.sid
}).then((res) => {
......
business/pages/commenteditor/modifyscoretemp.js
View file @ 90e3d9e5
......@@ -41,10 +41,10 @@ Page({
},
onLoad: function (options) { // Do some initialize when page load.
const {
id,
tid,
} = options;
this.setData({
id,
tid,
})
wx.hideShareMenu()
this.subjectReviewTemplate();
......@@ -77,7 +77,7 @@ Page({
mask: true,
})
subjectReviewTemplate({
class_id: this.data.id,
subject_id: this.data.tid,
}).then((res) => {
const {code , data} = res;
wx.hideLoading()
......@@ -116,30 +116,30 @@ Page({
mask: true,
})
subjectReviewTemplateUpdate({
class_id: this.data.id,
subject_id: this.data.tid,
templates: JSON.stringify(tempArr),
}).then((res) => {
wx.hideLoading();
const { code, data } = res;
if (code == 200) {
if (useall == 0) {
wx.showToast({
title:' 保存成功',
})
this.goBack();
} else if (useall == 1) {
wx.showModal({
title: '提示',
content: '是否将该模板应用到该校区的所有班级',
success(res) {
if (res.confirm) {
that.tempApplyAllClass();
} else {
that.goBack();
}
}
})
}
wx.showToast({
title:' 保存成功',
})
this.goBack();
// if (useall == 0) {
// } else if (useall == 1) {
// wx.showModal({
// title: '提示',
// content: '是否将该模板应用到该校区的所有班级',
// success(res) {
// if (res.confirm) {
// that.tempApplyAllClass();
// } else {
// that.goBack();
// }
// }
// })
// }
}
}).catch(() => {
wx.hideLoading();
......@@ -160,19 +160,19 @@ Page({
delta: 1, // 回退前 delta(默认为1) 页面
})
},
tempApplyAllClass () {
tempApplyAllClass({
class_id: this.data.id
}).then((res) => {
const { code, data } = res;
if (code == 200) {
wx.showToast({
title:'应用成功',
})
this.goBack();
}
}).catch(() => {
// tempApplyAllClass () {
// tempApplyAllClass({
// class_id: this.data.id
// }).then((res) => {
// const { code, data } = res;
// if (code == 200) {
// wx.showToast({
// title:'应用成功',
// })
// this.goBack();
// }
// }).catch(() => {
})
}
// })
// }
})
\ No newline at end of file
business/pages/commenteditor/modifyscoretemp.wxml
View file @ 90e3d9e5
......@@ -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 " data-useall="1" 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/morethemeindex/index.js
View file @ 90e3d9e5
......@@ -196,25 +196,23 @@ Page({
this.clockListGet(this.data.oneSmallSort, 'up')
},
onShareAppMessage: function (option) { // return custom share data when user share.
// console.log(option)
const {
from,
target
} = option;
let shareObj = {
}
if (target.dataset.type == 'share_clock') {
this.newShare.onShareAppMessage()
return
}
if (from == 'menu') {
shareObj = this.data.shareObj;
shareObj = {
title: this.data.params.title,
path: `/src/pages/sharemoretheme/index?tid=${this.data.mid}&sid=${this.data.sid}`
}
} else if (from == 'button') {
if (!target.dataset.info) {
shareObj = {
title: `邀请您提交「${this.data.params.title}」作业`,
path: `/src/pages/themeindex/index?tid=${this.data.tid}&id=${this.data.id}&sid=${this.data.sid}`
title: this.data.params.title,
path: `/src/pages/sharemoretheme/index?tid=${this.data.mid}&sid=${this.data.sid}`
}
} else {
const {
......@@ -224,20 +222,35 @@ Page({
}
}
} = option;
shareObj = {
title: `${info.school_student.nickname}的打卡详情`,
path: `/src/pages/clockdetail/newindex?tid=${info.subject_id}&cid=${info.id}`
}
return {
title: shareObj.title,
path: shareObj.path,
imageUrl:'https://cdn.img.shangjiadao.cn/source/images/dakav4/morethemeindex/unlockindex1.png',
success: (res) => {
if (res.errMsg == 'shareAppMessage:ok') {
this.setData({
shareObj: this.data.initShareObj
})
}
},
}
}
}
return {
title: shareObj.title,
path: shareObj.path,
imageUrl: `${this.data.imageRoot}pageshare_cover/theme_share.png?${this.data.imageRoot}`,
imageUrl:'https://cdn.img.shangjiadao.cn/source/images/dakav4/morethemeindex/unlockindex.png',
success: (res) => {
// 转发成功之后的回调
if (res.errMsg == 'shareAppMessage:ok') {
this.data.shareObj = this.data.initShareObj
this.setData({
shareObj: this.data.initShareObj
})
}
},
}
......@@ -246,6 +259,7 @@ Page({
unlocksubjectdetail({
id: this.data.tid,
school_id:this.data.sid,
extra: 'subject_creator'
}).then((res) => {
const {code, data} = res;
if (code == 200) {
......
business/pages/morethemeindex/index.wxml
View file @ 90e3d9e5
......@@ -93,21 +93,15 @@
</view>
</view>
<!-- 底部按钮 -->
<view class="fixed-tabbar" style="background-image: url('{{imageRoot}}2b/themeindex/bottomTabbar.png?{{imageVersion}}')">
<!-- <view class="fixed-tabbar" style="background-image: url('{{imageRoot}}2b/themeindex/bottomTabbar.png?{{imageVersion}}')">
<view class="tabbar-list">
<view class="tabbar-item" bindtap="settingSubject" style="margin-left: 0">
<image class="tabbar-img" src="{{imageRoot}}2b/themeindex/tabbar_setting.png"></image>
<text class="tabbar-text">编辑关卡</text>
</view>
<!-- <view class="tabbar-item">
<button class="tabbar-share" open-type="share">分享</button>
</view>
<view class="tabbar-item" bindtap="goClock">
<image class="tabbar-img" src="{{imageRoot}}2b/themeindex/tabbar_data.png"></image>
<text class="tabbar-text">打卡数据</text>
</view> -->
</view>
</view>
</view> -->
<view class="form-fixbtn" bindtap="settingSubject">编辑关卡</view>
<!-- 详情弹框 -->
<view class="modal modal-themedetail {{detailModalClass? 'hide': ''}}" hidden="{{!detailModalShow}}">
<view class="mask" bindtap="closeDetailModal"></view>
......
business/pages/morethemeindex/index.wxss
View file @ 90e3d9e5
......@@ -37,6 +37,7 @@
padding: 15rpx 20rpx;
margin-top: 16rpx;
height: 140rpx;
position: relative;
}
.page-topbg .top-content .top-detail {
font-size: 22rpx;
......@@ -45,6 +46,10 @@
color: rgba(22, 176, 253, 1);
line-height: 32rpx;
text-align: right;
position: absolute;
bottom: 16rpx;
right: 20rpx;
line-height: 1;
}
.page-topbg .top-content .top-ask {
overflow: hidden;
......@@ -188,4 +193,14 @@
height: 400rpx;
position: relative;
}
.form-fixbtn {
width: 630rpx;
height: 90rpx;
border-radius: 49rpx;
background: rgba(22,176,253,1);
font-size: 32rpx;
bottom: 36rpx;
z-index: 7;
}
@import "../../style/themeindex.wxss";
business/pages/themeeditor/lockthemelist.js
View file @ 90e3d9e5
......@@ -21,6 +21,7 @@ Page({
classList: [],
page: 1,
subjectCount: 1,
initShareObj: {},
lockparams: {
title: '',
created_at: '',
......@@ -55,6 +56,28 @@ Page({
},
onUnload: function() { // Do something when page close.
},
onShareAppMessage: function (option) { // return custom share data when user share.
const {
from,
target
} = option;
let shareObj = {
}
return {
title: this.data.lockparams.title,
path: `/src/pages/sharemoretheme/index?tid=${this.data.tid}&sid=${this.data.sid}`,
imageUrl:'https://cdn.img.shangjiadao.cn/source/images/dakav4/morethemeindex/unlockindex.png',
success: (res) => {
// 转发成功之后的回调
if (res.errMsg == 'shareAppMessage:ok') {
this.setData({
shareObj: this.data.initShareObj
})
}
},
}
},
onPullDownRefresh() {
this.getUnlockSubject();
......
business/pages/themeeditor/lockthemelist.wxml
View file @ 90e3d9e5
......@@ -22,7 +22,7 @@
</view>
<view class="btnbox">
<view class="btn" bindtap="setting">高级设置</view>
<view class="btn share">分享</view>
<view class="btn share"><button class="sharebtn" open-type="share"></button>分享</view>
</view>
<view class="modal modal-setup {{settingModalClass? 'hide': ''}}" hidden="{{!settingModalShow}}">
<view class="mask" bindtap="closeSettingModal"></view>
......
business/pages/themeeditor/lockthemelist.wxss
View file @ 90e3d9e5
......@@ -74,6 +74,15 @@
font-size: 30rpx;
letter-spacing: 2rpx;
color: #666666;
position: relative;
}
.sharebtn {
position: absolute;
opacity: 0;
width: 100%;
height: 100%;
left: 0;
top: 0;
}
.btnbox .btn.share {
background-color: #16B0FD;
......
business/pages/themeeditor/subjecteditor.js
View file @ 90e3d9e5
......@@ -96,7 +96,7 @@ Page({
index,
currentSortIndex,
from,
clone,
clone: clone || 0,
// params: JSON.parse(decodeURIComponent(detail)),
})
if (this.data.id > 0) {
......
business/pages/themeindex/index.js
View file @ 90e3d9e5
......@@ -225,6 +225,7 @@ Page({
}
}
}
console.log(shareObj.path, 'shareObj.path');
return {
title: shareObj.title,
path: shareObj.path,
......@@ -241,7 +242,7 @@ Page({
themeDetail({
id: this.data.tid,
school_id:this.data.sid,
extra: 'land_content'
extra: 'land_content,subject_creator'
}).then((res) => {
const {code, data} = res;
if (code == 200) {
......
business/pages/themeindex/index.wxml
View file @ 90e3d9e5
......@@ -5,21 +5,15 @@
<view class="home-text">首页</view>
</view>
</btn-drag>
<view class="theme-index-container">
<view class="page-topbg">
<view class="top-title">{{params.title}}</view>
<view class="top-publish">{{params.created_at}}</view>
<view class="top-publish">{{params.subject_creator && params.subject_creator.nickname}} {{params.created_at}}发布</view>
<view class="top-content">
<view class="top-ask">
<text style="vertical-align: middle;">今日作业要求：</text>
<block wx:for='{{params.content}}' wx:key='content'>
<text class="text-block" wx:if='{{item.type=="text"}}'>{{item.value}}</text>
<text class="text-type" wx:if='{{item.type=="img"}}'>[图片]</text>
<text class="text-type" wx:if='{{item.type=="video"}}'>[视频]</text>
<text class="text-type" wx:if='{{item.type=="voice"}}'>[音频]</text>
<text class="text-block" wx:if='{{item.type=="text"}}'>{{item.value}}</text><text class="text-type" wx:if='{{item.type=="img"}}'>[图片]</text><text class="text-type" wx:if='{{item.type=="video"}}'>[视频]</text><text class="text-type" wx:if='{{item.type=="voice"}}'>[音频]</text>
</block>
</view>
<view class="top-detail" bindtap="goLoodDetail">查看详情</view>
......@@ -113,7 +107,7 @@
</view>
</view>
<expiredTip/>
<comment-editor-type-choose show="{{goCommentEditorInfo.show}}" classid="{{goCommentEditorInfo.info.id}}" tid="{{goCommentEditorInfo.info.tid}}" cid="{{goCommentEditorInfo.info.cid}}" sid="{{goCommentEditorInfo.info.sid}}" bind:hideChooseTypeDia="hideChooseTypeDia"
<comment-editor-type-choose show="{{goCommentEditorInfo.show}}" tid="{{goCommentEditorInfo.info.tid}}" cid="{{goCommentEditorInfo.info.cid}}" sid="{{goCommentEditorInfo.info.sid}}" bind:hideChooseTypeDia="hideChooseTypeDia"
/>
<view class="noticeDailog" wx:if="{{remindTips.show}}">
......
business/pages/themeindex/index.wxss
View file @ 90e3d9e5
......@@ -36,7 +36,8 @@
border-radius: 16rpx;
padding: 15rpx 20rpx;
margin-top: 16rpx;
height: 140rpx;
min-height: 140rpx;
position: relative;
}
.page-topbg .top-content .top-detail {
font-size: 22rpx;
......@@ -45,6 +46,10 @@
color: rgba(22, 176, 253, 1);
line-height: 32rpx;
text-align: right;
position: absolute;
bottom: 16rpx;
right: 20rpx;
line-height: 1;
}
.page-topbg .top-content .top-ask {
overflow: hidden;
......@@ -53,13 +58,15 @@
-webkit-box-orient: vertical;
word-break: break-all;
text-overflow: ellipsis;
/* word-wrap:break-word; */
word-wrap: normal;
}
.page-topbg .top-content .text-block {
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: 70%;
max-width: 100%;
vertical-align: middle;
}
.page-topbg .top-content .text-type {
......
components/sjdmediashow/index.wxss
View file @ 90e3d9e5
......@@ -28,6 +28,7 @@
width: 100%;
word-break: break-all;
display: block;
line-height: 1.4;
}
.sjd-media-show .media-content-box .media-box-item.media-img-item image {
width: 100%;
......
src/pages/clockdetail/shareclock.js
View file @ 90e3d9e5
......@@ -58,7 +58,7 @@ Page({
source_id: this.data.clockId,
source_type: 1,
}).then(() => {
this.initPost(`${clockId}_${tid}_${app.globalData.currentSchoolStudentId}`, 'src/pages/clockdetail/newindex', clockId,tid);
this.initPost(`t=${tid}&c=${clockId}&w=${app.globalData.currentSchoolStudentId}`, 'src/pages/clockdetail/newindex', clockId,tid);
this.clockDetail()
})
// this.initPost(`t=${tid}&c=${clockId}`, page, clockId,tid);
......@@ -114,7 +114,7 @@ Page({
const visitor = LocalStorage.getItem('visitor');
let shareObj = {
title: `${this.data.clockDetail.school_student.nickname}的打卡详情`,
path: `/src/pages/clockdetail/newindex?id=${this.data.clockDetail.class_id}&tid=${this.data.tid}&cid=${this.data.clockId}&w=${app.globalData.currentSchoolStudentId}`
path: `/src/pages/clockdetail/newindex?tid=${this.data.tid}&cid=${this.data.clockId}&w=${app.globalData.currentSchoolStudentId}`
}
app.setSharerLog({
......@@ -122,7 +122,7 @@ Page({
source_type_model: 4,
source_id: this.data.clockId,
param: JSON.stringify({
query: `id=${this.data.clockDetail.class_id}&tid=${this.data.tid}&cid=${this.data.clockId}&w=${app.globalData.currentSchoolStudentId}`
query: `tid=${this.data.tid}&cid=${this.data.clockId}&w=${app.globalData.currentSchoolStudentId}`
})
});
return {
......@@ -181,7 +181,6 @@ Page({
if (data) {
this.setData({
clockDetail:data,
id:data.class_id
})
activityLog({
type: 38,
......@@ -207,7 +206,6 @@ Page({
open_id: visitor && visitor.openid,
school_id: this.data.clockDetail.school_id,
remark: '',
class_id: this.data.id
})
wxGetImageInfo({
src: imgSrc
......@@ -297,7 +295,6 @@ Page({
open_id: visitor && visitor.openid,
school_id: this.data.clockDetail.school_id,
remark: '',
class_id: this.data.id
})
wx.downloadFile({
url: imgSrc,
......
src/pages/themeindex/landpage.wxml
View file @ 90e3d9e5
......@@ -58,7 +58,7 @@
<view class="title">他们也在({{signStudentsTotal}}人)</view>
<view class="sub-title">加入打卡跟他们一起养成好习惯</view>
<view class="list">
<view class="item" wx:for="{{signStudentsList}}" wx:key="item.id">
<view class="item" wx:for="{{signStudentsList}}" wx:key="id">
<image class="avatar" src="{{filter.imagify(item.school_student.avatar)}}" wx:if="{{item.school_student.avatar}}"></image>
<image class="avatar" src="{{imageRoot}}common/empty/avatar_user.png?{{imageVersion}}" wx:else></image>
<view class="nickname">{{item.school_student.nickname}}</view>
......
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