diff --git a/pages/clock/clock.vue b/pages/clock/clock.vue
index a95bf1c..3f7f6f8 100644
--- a/pages/clock/clock.vue
+++ b/pages/clock/clock.vue
@@ -17,8 +17,7 @@
返回今天
-
+
补卡
-
+
+ size="18">
回复
{{item.createTime}}
@@ -126,18 +126,21 @@
-
+
-
+
-
- {{item2.nickName?item2.nickName:'匿名用户'}}
- 回复了
- {{item2.puserNickName?item2.puserNickName:'匿名用户'}}
+
+ {{item2.nickName?item2.nickName:'匿名用户'}}
+ 回复了
+ {{item2.puserNickName?item2.puserNickName:'匿名用户'}}
-
-
-
- 回复
+
+
+
+ 回复
{{item2.createTime}}
-
+
-
-
+
+
@@ -190,15 +196,15 @@
placeholder-style="font-size:24rpx;color:#aaaaaa;" placeholder="请输入回复内容">
- 提交
+ 提交
-
+
-
+
@@ -267,8 +273,8 @@
export default {
data() {
return {
- opPinglun:{}, // 针对的评论对象
- pinglunShow:false,
+ opPinglun: {}, // 针对的评论对象
+ pinglunShow: false,
placeholder: '开始输入...',
dayCurrent: 0, // 载入页面时的显示页数
showBack: false,
@@ -328,10 +334,10 @@
}]
},
},
- recordPageSize:20,
- recordPage:1,
- secondPage:1,
-
+ recordPageSize: 20,
+ recordPage: 1,
+ secondPage: 1,
+
}
},
onLoad(e) {
@@ -342,7 +348,7 @@
console.log('下拉刷新了')
this.getBookInfo()
this.initDay()
- this.getmySign()
+ this.getmySign()
uni.stopPullDownRefresh();
},
onShow() {
@@ -363,7 +369,7 @@
// 回复评论
this.opPinglun = item
this.pinglunShow = true
- console.log('item45456', this.opPinglun)
+ console.log('item45456', this.opPinglun)
},
onEditorReady() {
// #ifdef MP-BAIDU
@@ -436,9 +442,9 @@
console.log(url)
uni.previewImage({
urls: [url],
- longPressActions:{
- itemList:['很抱歉，暂不支持保存图片到本地'],
- success:function(res){
+ longPressActions: {
+ itemList: ['很抱歉，暂不支持保存图片到本地'],
+ success: function(res) {
// console.log(res,'+++++')
}
}
@@ -491,7 +497,7 @@
this.$http
// .post('book/clockin/myinfolist?userid=' + this.userInfo.id + '&taskid=' + this.taskInfo.id +
// '&bookid=' + this.bookid)
-
+
.get('book/clockInForum/getChatList', data)
.then(res => {
console.log(res, '当天我的打卡内容')
@@ -530,15 +536,16 @@
// 获取某天的签到列表信息
getAllSign(val) {
console.log(val, '-----------')
- let param = {
- 'entryId': val.id,
- // 'userId': null,
- 'currentPage': this.recordPage,
- 'pageSize': this.recordPageSize,
+ let data = {
+ 'entryId': val.id
+ // 'bookid': this.bookid,
+ // 'limit': 5,
+ // 'page': this.page,
// 'taskid': val.id
- }
- this.$http
- .get('book/clockInForum/getChatList', param)
+ }
+ this.$http
+ // .post('book/clockin/applist', data)
+ .get('book/clockInForum/getChatList', data)
// .get('book/clockInForum/getChatList', data)
.then(res => {
if (res.code == 0) {
@@ -553,14 +560,14 @@
// console.log(pjstr,'pjstr')
//arr1 = arr[i].images.split(',')
// arr[i].images = arr1
- arr[i].phtml = pjstr
+ arr[i].phtml = pjstr
for (var j = 0; j < arr[i].subCommentList.length; j++) {
var subpjstr = ''
subpjstr = this.getHtmlComment(arr[i].subCommentList[j].content)
arr[i].subCommentList[j].phtml = subpjstr
}
}
- console.log(arr,'评论处理后的数据结构')
+ console.log(arr, '评论处理后的数据结构')
this.commentsList = arr
} else {
this.commentsList = []
@@ -604,7 +611,7 @@
},
// 补卡
buSign(day) {
- console.log('正在补卡', this.taskInfo,day)
+ console.log('正在补卡', this.taskInfo, day)
// return false
// if (!this.taskInfo.id) {
// uni.showToast({
@@ -615,29 +622,29 @@
// }
let param = {
'bookId': this.bookid,
- 'userId':this.userInfo.id,
- 'day':day
+ 'userId': this.userInfo.id,
+ 'day': day
}
- console.log(param, 'param')
- this.$http
- .get('/book/userClockIn/correctClockIn', param)
- .then(res => {
- if (res.code == 0) {
- //console.log(res, '快捷签到')
- uni.showToast({
- title: '补卡成功'
- })
- setTimeout(()=>{
- this.addTextShow = false
- this.formData.content = ''
- this.formData.images = []
- this.getmySign()
- // this.getAllSign(this.taskInfo)
- },2000)
-
- }
+ console.log(param, 'param')
+ this.$http
+ .get('/book/userClockIn/correctClockIn', param)
+ .then(res => {
+ if (res.code == 0) {
+ //console.log(res, '快捷签到')
+ uni.showToast({
+ title: '补卡成功'
+ })
+ setTimeout(() => {
+ this.addTextShow = false
+ this.formData.content = ''
+ this.formData.images = []
+ this.getmySign()
+ // this.getAllSign(this.taskInfo)
+ }, 2000)
- });
+ }
+
+ });
},
// 快捷签到
kuickSign() {
@@ -678,11 +685,11 @@
},
// 提交回复评论
- goToHuiFu(){
+ goToHuiFu() {
let myFid = null
- if(this.opPinglun.fid == 0){
+ if (this.opPinglun.fid == 0) {
myFid = this.opPinglun.id
- }else if (this.opPinglun.fid != 0){
+ } else if (this.opPinglun.fid != 0) {
myFid = this.opPinglun.fid
}
let data = {
@@ -708,7 +715,7 @@
'Content-Type': 'application/json'
},
}).then(res => {
-
+
if (res.code == 0) {
this.pinglunShow = false
this.opPinglun = {}
@@ -719,25 +726,25 @@
title: '回复成功',
icon: 'success'
})
- setTimeout(() => {
+ setTimeout(() => {
this.getmySign()
this.getTask(this.currentDay)
- },2000)
+ }, 2000)
}
-
+
});
},
// 说点什么
goToSign() {
// images数据处理
- if(this.formData.images.length > 0){
+ if (this.formData.images.length > 0) {
var imgs = []
imgs = this.formData.images.map(item => {
return item.url
})
}
- if(this.formData.content == ''){
+ if (this.formData.content == '') {
uni.showToast({
title: '请输入内容',
icon: 'none'
@@ -780,7 +787,7 @@
setTimeout(() => {
this.getmySign()
this.getTask(this.currentDay)
- },2000)
+ }, 2000)
}
@@ -911,7 +918,10 @@