diff --git a/pages/index/components/chat-input-bar/chat-input-bar.vue b/pages/index/components/chat-input-bar/chat-input-bar.vue
index 023832c..e5f2cd5 100644
--- a/pages/index/components/chat-input-bar/chat-input-bar.vue
+++ b/pages/index/components/chat-input-bar/chat-input-bar.vue
@@ -78,7 +78,7 @@
borderRadius: 50, //评论框圆角大小
emojiShow: false, //表情显示
autoFocus: false, //自动焦点
- focus: false,
+ focus: true,
disabled: false,
open: true,
more: false,
diff --git a/pages/index/detail.vue b/pages/index/detail.vue
index e610862..7cac483 100644
--- a/pages/index/detail.vue
+++ b/pages/index/detail.vue
@@ -113,11 +113,11 @@
{{ item.nickname }}
-
-
@@ -180,56 +180,78 @@
-
-
-
+
+
+
+
-
+
+
+
+ {{detailObj.replyNum||0}}
+
+
+
+
+ {{detailObj.collectNum||0}}
+
+
+
+
+ {{detailObj.likeNum||0}}
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+ |
+ {{item}}
+ |
+
-
-
+
+
+
+
+
+ {{item}}
+
+
+
+
- {{detailObj.replyNum||0}}
-
-
-
-
-
-
-
-
-
-
- {{detailObj.collectNum||0}}
-
-
-
-
-
-
-
-
-
-
-
- {{detailObj.likeNum||0}}
-
-
-
-
+
@@ -321,25 +343,17 @@
-
-
+
-
-
-
-
-
-
-
+ -->
+
举报
- 回复
+ 回复
复制
@@ -368,13 +382,13 @@
{{ itemObj.nickname }}
-
+
-
+
-
+
{{ itemObj.content }}
@@ -413,7 +427,7 @@
-
+
回复
{{ele.reviewUid !==0 ? ele.reviewUserNickname : itemObj.nickname}} :
@@ -448,7 +462,52 @@
- 发表评论
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item}}
+ |
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
@@ -541,6 +600,7 @@
borderRadius: 50,//评论框圆角大小
autoFocus:false,//自动焦点
focus:false,
+ focusPop:false,
emoicon: [
"😁", "😋", "😜", "😉", "😌", "😅", "😳", "😊", "😝", "😰", "😠", "😩", "😲", "😞", "😭", "😍",
"😖", "😱", "😡", "😚", "😤", "🐼", "🐲", "😺", "😸", "😹", "😽", "🙀", "🐴", "🐮", "🍺", "🔥",
@@ -570,6 +630,7 @@
// more
showMore: false,
moreItem:{},
+ moreNum:2,
// 判断小手
IsLike: false,
// 评论弹层
@@ -596,17 +657,28 @@
myInfo:{},
// 添加评论
replyAddData:{
- authorUserId: null,
- content: '',
- noteId: null,
- replyId: 0,
- userId: null,
- image:''
+ authorUserId: null, // 帖子的作者的用户ID，移动端不传值
+ content: '', // 评论/回复内容
+ noteId: null, // 笔记ID
+ replyId: 0, // 评论ID，一级评论传0
+ userId: null, // 用户ID，移动端不传值
+ image:'' // 评论图片
},
//type==2 问答，话题
type: 1,
shareItem:{},
- showNavImg:false
+ showNavImg:false,
+ //选择当前的聊天
+ actPData: {},
+ //回复类型
+ replyType: 2,
+ //监听滚动条滑动
+ headerFFlag: true,
+ //评论框长度
+ textareaFlag: false,
+ contentValue: '',
+ //输入框高度
+ inputHeight:0
}
},
@@ -660,6 +732,49 @@
}
},
methods: {
+ //表情按钮
+ openExpression(){
+ uni.hideKeyboard();
+ },
+ //键盘高度
+ keyboardheightchangeFn(e) {
+ console.log('键盘收起打开',e.detail.height);
+ this.inputHeight=e.detail.height
+ if (e.detail.height == 0) {
+ this.$refs.textarea.blur();
+ this.replyType = 2
+ }else{
+ this.emojiShow=false
+ }
+ },
+
+ //评论框聚焦
+ textareaFocusFn(e) {
+ console.log(e,'评论框聚焦')
+ this.textareaFlag = true
+ if(this.emojiShow){
+ uni.hideKeyboard();
+ this.emojiShow=false;
+ this.$nextTick(()=>{
+ // uni.openm
+ this.$refs.textarea.focus();
+ })
+ }
+ // console.log('焦点', this.replyType, e);
+ // if(this.replyType==2){
+ // this.replyAddData.noteId = this.noteId
+ // }
+ },
+ textareaFocusFnPop(e){
+ if(this.emojiShow){
+ uni.hideKeyboard();
+ this.emojiShow=false;
+ this.$nextTick(()=>{
+ // uni.openm
+ this.$refs.textarea.focus();
+ })
+ }
+ },
//监听
scrollFn(e) {
// console.log(e,'1111');
@@ -869,6 +984,10 @@
this.itemObj=item
this.itemObj.countStart=formatNumber(item.countStart)
this.replyListLength=item.replyList.length
+ this.replyAddData.replyId=item.id
+ this.replyAddData.userId=this.myInfo.id
+ this.replyAddData.noteId=this.detailObj.id
+ this.replyAddData.authorUserId=this.detailObj.authorId
},
// 去举报页
toReportPages() {
@@ -877,9 +996,10 @@
})
},
// 更多
- moreBtn(item) {
+ moreBtn(item,num) {
this.showMore = true
this.moreItem=item
+ this.moreNum=num
},
// nav上的三个点按钮
dropBtn() {
@@ -971,36 +1091,77 @@
}
});
},
- // 回复评论
- replyToComments(ele,num){
- // console.log(ele,'数据数据',num,'数字1或2');
- if(num==2){
- this.placeholderReply='回复'+' '+ ele.nickname +' ' + ':'
+ replyToCommentsCopy(){
+ if(this.moreNum==2){
this.showMore = false
- this.showReply=true
- this.replyAddData.replyId=ele.id
+ this.focus=true
+ this.replyAddData.replyId=this.moreItem.id
this.replyAddData.userId=this.myInfo.id
this.getDetail(this.noteId)
}else{
this.showMore = false
- this.showReply=true
- this.replyAddData.replyId=0
+ this.focusPop=true
+ this.replyAddData.replyId=this.moreItem.id
this.replyAddData.userId=this.myInfo.id
this.getDetail(this.noteId)
}
},
+ // 回复评论
+ replyToComments(ele,num){
+ // this.focus=false
+ // this.focusPop=false
+ console.log(ele,'数据数据',num,'数字1或2')
+ // this.$refs.textarea.focus()
+ if(num==3){
+ console.log('pop里面的');
+ this.focusPop=true
+ this.focus=false
+ this.showMore = false
+ this.placeholderReply='回复'+' '+ ele.nickname +' ' + ':'
+ // this.showReply=true
+ this.replyAddData.replyId=ele.id
+ this.replyAddData.userId=this.myInfo.id
+ this.getDetail(this.noteId)
+ }else if(num==2){
+ console.log('外面的的');
+ if (this.focus==true) this.focus=false
+ this.focus=true
+ this.focusPop=false
+ this.showMore = false
+ // this.showReply=true
+ this.replyAddData.replyId=ele.id
+ this.replyAddData.userId=this.myInfo.id
+ this.getDetail(this.noteId)
+ }else{
+ console.log('哪都不是');
+ this.focus=false
+ this.focusPop=false
+ // this.focus=true
+ // this.showMore = false
+ // // this.showReply=true
+ // this.replyAddData.replyId=0
+ // this.replyAddData.userId=this.myInfo.id
+ // this.getDetail(this.noteId)
+ }
+ },
+ // 发送
sendSMS(e){
// console.log(e,'评论1111212213');
- this.replyAddData.content=e.msg
+ // this.replyAddData.content=e.msg
replyAddAPI(this.replyAddData).then(res=>{
+ console.log(res.data.replyId,'res.replyId');
this.replyListAll.forEach(item => {
- if (this.replyAddData.replyId == item.id) {
- item.replyList.push(res.data)
+ console.log(item,'item.id');
+ if (res.data.replyId == item.id) {
+ item.replyList.unshift(res.data)
}
})
this.$refs.paging.reload()
this.resetData()
})
+ this.resetData()
+ this.focus=false
+ this.focusPop=false
this.showReply=false
// this.placeholder='友善评论、文明发言'
// this.placeholderReply='友善评论、文明发言'
@@ -1665,36 +1826,29 @@
}
}
.bottom_up {
- border: 1px solid red;
+ // border: 1px solid red;
border-top: 1rpx solid #EDEDED;
width: 100%;
position: fixed;
bottom: 0;
padding: 30rpx 32rpx 58rpx;
- display: flex;
- justify-content: space-between;
- align-items: center;
+ // display: flex;
+ // justify-content: space-between;
+ // align-items: center;
background-color: #fff;
z-index: 999;
- .bottom_l {
- width: 100%;
- }
-
.bottom_r {
+ // border: 1px solid red;
+ width: 350rpx;
display: flex;
- // align-items: center;
justify-content: space-around;
.r_img_txt {
- // border: 1px solid red;
- margin-left: 40rpx;
display: flex;
- // flex-direction: column;
align-items: center;
.txt {
- // width: 64rpx;
font-size: 28rpx;
font-weight: 400;
color: #666666;
@@ -1709,6 +1863,29 @@
}
}
}
+
+ }
+
+ .bottom_l {
+ // border: 1px solid red;
+ height: 72rpx;
+ background: #f2f0f4;
+ border-radius: 50rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 32rpx;
+ // width: 100%;
+ // height: 90rpx;
+ }
+
+ .bottom_send {
+ // border: 1px solid red;
+ display: flex;
+ // flex-direction: row;
+ align-items: center;
+ justify-content: space-around;
+ flex: 1;
}
.bottom {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index dd32515..61f2b27 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -660,7 +660,7 @@
item.high = uni.$u.getPx(`${item.high}rpx`) * num + 'rpx'
} else {
// if (item.wide > 686) {
- let num = 454 / uni.$u.getPx(`${item.wide}rpx`)
+ let num = 300 / uni.$u.getPx(`${item.wide}rpx`)
item.wide = uni.$u.getPx(`${item.wide}rpx`) * num + 'rpx'
item.high = uni.$u.getPx(`${item.high}rpx`) * num + 'rpx'
// } else {
@@ -705,7 +705,7 @@
item.high = uni.$u.getPx(`${item.high}rpx`) * num + 'rpx'
} else {
// if (item.wide > 686) {
- let num = 454 / uni.$u.getPx(`${item.wide}rpx`)
+ let num = 300 / uni.$u.getPx(`${item.wide}rpx`)
item.wide = uni.$u.getPx(`${item.wide}rpx`) * num + 'rpx'
item.high = uni.$u.getPx(`${item.high}rpx`) * num + 'rpx'
// } else {
@@ -755,7 +755,7 @@
item.high = uni.$u.getPx(`${item.high}rpx`) * num + 'rpx'
} else {
// if (item.wide > 686) {
- let num = 454 / uni.$u.getPx(`${item.wide}rpx`)
+ let num = 300 / uni.$u.getPx(`${item.wide}rpx`)
item.wide = uni.$u.getPx(`${item.wide}rpx`) * num + 'rpx'
item.high = uni.$u.getPx(`${item.high}rpx`) * num + 'rpx'
// } else {
diff --git a/pages/mine/personal_center/personal_center.vue b/pages/mine/personal_center/personal_center.vue
index e73f6fe..b39f8a6 100644
--- a/pages/mine/personal_center/personal_center.vue
+++ b/pages/mine/personal_center/personal_center.vue
@@ -11,7 +11,7 @@
-->
-
+
@@ -597,7 +597,7 @@
.img-bgc {
// border: 1px solid blue;
- height: 524rpx;
+ height: 700rpx;
position: absolute;
top: 0;
left: 0;
@@ -605,7 +605,6 @@
}
.nav-btn {
- // border: 1px solid red;
width: 100%;
}
@@ -716,6 +715,7 @@
}
.data-list-tab {
+ // border: 1px solid blue;
background: #fff;
padding: 32rpx 0 14rpx 0;
@@ -739,16 +739,16 @@
}
.personal-number {
+ // border: 1px solid red;
z-index: 99;
width: calc(100%);
- margin-top: 56rpx;
+ margin-top: 46rpx;
padding: 32rpx 24rpx;
background: #fff;
border-radius: 32rpx 24rpx 0 0;
.personal-number-attention {
margin-top: 32rpx;
-
view {
width: 327rpx;
height: 76rpx;
@@ -796,7 +796,8 @@
}
.personal-header {
- margin: 56rpx 0 0 24rpx;
+ // border: 1px solid red;
+ margin: 100rpx 0 0 24rpx;
.personal-header-name {
font-size: 32rpx;
diff --git a/pages/showroom/carRental/index.vue b/pages/showroom/carRental/index.vue
index 2af9dd7..f8455f1 100644
--- a/pages/showroom/carRental/index.vue
+++ b/pages/showroom/carRental/index.vue
@@ -77,7 +77,7 @@
- 优惠政策/优惠活动/纯文字展示
+ {{item.event}}
diff --git a/uni_modules/uview-ui/components/u-picker/u-picker.vue b/uni_modules/uview-ui/components/u-picker/u-picker.vue
index 8885917..ee9217e 100644
--- a/uni_modules/uview-ui/components/u-picker/u-picker.vue
+++ b/uni_modules/uview-ui/components/u-picker/u-picker.vue
@@ -2,6 +2,9 @@