gdpao_up
This commit is contained in:
parent
cd0e8bbf9e
commit
9158f27afb
10
package-lock.json
generated
10
package-lock.json
generated
@ -6,13 +6,13 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"blueimp-md5": {
|
"blueimp-md5": {
|
||||||
"version": "2.17.0",
|
"version": "2.17.0",
|
||||||
"resolved": "https://registry.npm.taobao.org/blueimp-md5/download/blueimp-md5-2.17.0.tgz?cache=0&sync_timestamp=1595922448921&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fblueimp-md5%2Fdownload%2Fblueimp-md5-2.17.0.tgz",
|
"resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.17.0.tgz",
|
||||||
"integrity": "sha1-9PysCIsRX3tARfGfXaWenQGxu5Y="
|
"integrity": "sha512-x5PKJHY5rHQYaADj6NwPUR2QRCUVSggPzrUKkeENpj871o9l9IefJbO2jkT5UvYykeOK9dx0VmkIo6dZ+vThYw=="
|
||||||
},
|
},
|
||||||
"uview-ui": {
|
"uview-ui": {
|
||||||
"version": "1.5.0",
|
"version": "1.6.2",
|
||||||
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.0.tgz",
|
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.6.2.tgz",
|
||||||
"integrity": "sha512-1UdMUGJqWx60ALbXXXs3rQHKUNBARDIV5XHc06mKFxpccO/i0tzoSqS6RuPdmYwXU1q59wnIU+NLABvcU5u4vw=="
|
"integrity": "sha512-AvTXUk8A/AdJazxTziApw0NMv61jlE9cEO+Jxe84cTvcm2Ej7Ngf8zb3a6aSPVi6OVu81vTCC71R1wN7dZC3ig=="
|
||||||
},
|
},
|
||||||
"vuex": {
|
"vuex": {
|
||||||
"version": "3.5.1",
|
"version": "3.5.1",
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"blueimp-md5": "^2.17.0",
|
"blueimp-md5": "^2.17.0",
|
||||||
"uview-ui": "^1.5.0",
|
"uview-ui": "^1.6.2",
|
||||||
"vuex": "^3.5.1"
|
"vuex": "^3.5.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="child_content">{{ child.content }}</view>
|
<view class="child_content">{{ child.content }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="more-reply" v-if="item.reply_count && is_more" @click="getReplyList(item.id)">展开更多回复<u-icon name="arrow-down"></u-icon></view>
|
<view class="more-reply" v-if="item.reply_count" @click="getReplyList(item.id)">展开更多回复<u-icon name="arrow-down"></u-icon></view>
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
<view class="no-data" v-if="!commentList.length">还没有评论,快来评论吧!</view>
|
<view class="no-data" v-if="!commentList.length">还没有评论,快来评论吧!</view>
|
||||||
@ -292,6 +292,7 @@
|
|||||||
height: 90rpx;
|
height: 90rpx;
|
||||||
& > input {
|
& > input {
|
||||||
width: 80%;
|
width: 80%;
|
||||||
|
font-size: 24rpx;
|
||||||
padding: 4rpx 20rpx;
|
padding: 4rpx 20rpx;
|
||||||
border-radius: 20rpx;
|
border-radius: 20rpx;
|
||||||
}
|
}
|
||||||
@ -575,7 +576,6 @@ export default {
|
|||||||
})
|
})
|
||||||
if (!this.page_[id] === 0) {
|
if (!this.page_[id] === 0) {
|
||||||
}
|
}
|
||||||
console.log(this.page_[id]);
|
|
||||||
this.$u.post("article/articleReplyList", {id: id, page: this.page_[id]}).then(res => {
|
this.$u.post("article/articleReplyList", {id: id, page: this.page_[id]}).then(res => {
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
if (res.errCode == 0) {
|
if (res.errCode == 0) {
|
||||||
@ -583,10 +583,8 @@ export default {
|
|||||||
// this.is_more = false;
|
// this.is_more = false;
|
||||||
// }
|
// }
|
||||||
this.page_[id]++;
|
this.page_[id]++;
|
||||||
console.log(this.page_[id]);
|
this.allList[id] = res.data;
|
||||||
this.$nextTick(() => {
|
this.$forceUpdate();
|
||||||
this.allList[id] = res.data;
|
|
||||||
})
|
|
||||||
console.log(this.allList);
|
console.log(this.allList);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -77,9 +77,9 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="send-box">
|
<view class="send-box" @click="openKeyInput">
|
||||||
<input class="send-val" type="text" :placeholder="edit_text" placeholder-class="placeholder-class"
|
<input class="send-val" type="text" :placeholder="edit_text" placeholder-class="placeholder-class"
|
||||||
disabled="true" @blur="blue" @click="openKeyInput" value="" />
|
disabled="true" @click="openKeyInput" />
|
||||||
<text class="btn-send">发送</text>
|
<text class="btn-send">发送</text>
|
||||||
</view>
|
</view>
|
||||||
<loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
|
<loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
|
||||||
@ -89,13 +89,13 @@
|
|||||||
</scroller>
|
</scroller>
|
||||||
</cover-view>
|
</cover-view>
|
||||||
<!-- 评论框 -->
|
<!-- 评论框 -->
|
||||||
<cover-view class="edit-box" :style="videoSize" v-if="is_edit">
|
<cover-view class="edit-box" :style="videoSize" v-if="is_edit" @click="hideEdit">
|
||||||
<view class="input-main" :style="{ bottom: editTop }">
|
<view class="input-main">
|
||||||
<input class="edit-input" type="text" value="" :focus="is_focus" :placeholder=" edit_text_other ? edit_text_other : edit_text"
|
<input class="edit-input" type="text" :focus="is_focus" :placeholder=" edit_text_other ? edit_text_other : edit_text"
|
||||||
placeholder-class="placeholder-class" v-model="send_value" />
|
placeholder-class="placeholder-class" v-model="send_value" />
|
||||||
<text class="btn-send" @click="sendComment">发送</text>
|
<text class="btn-send" @click="sendComment">发送</text>
|
||||||
</view>
|
</view>
|
||||||
<view></view>
|
<!-- <view class="key-height" :style="{ height: editTop }"></view> -->
|
||||||
</cover-view>
|
</cover-view>
|
||||||
<!-- 购物车 -->
|
<!-- 购物车 -->
|
||||||
<cover-view class="cart-box" v-if="cart_type">
|
<cover-view class="cart-box" v-if="cart_type">
|
||||||
@ -124,9 +124,10 @@
|
|||||||
<cover-image class="close" @click="goBack" src="../../static/close.png">
|
<cover-image class="close" @click="goBack" src="../../static/close.png">
|
||||||
</cover-image>
|
</cover-image>
|
||||||
<!-- 暂停按钮 -->
|
<!-- 暂停按钮 -->
|
||||||
<cover-image class="pause" :style="{ top: fixTop + 100 }" @click="stoping" src="../../static/videoPlay.png"
|
<cover-view class="pause" :style="{ top: fixTop + 100 }">
|
||||||
v-if="!is_play">
|
<cover-image class="pause-img" src="../../static/videoPlay.png" @click="stoping" v-if="!is_play">
|
||||||
</cover-image>
|
</cover-image>
|
||||||
|
</cover-view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -242,9 +243,12 @@
|
|||||||
},
|
},
|
||||||
// 发布评论
|
// 发布评论
|
||||||
sendComment() {
|
sendComment() {
|
||||||
console.log(this.article_id,this.send_value,this.pid,this.reply_id);
|
console.log(this.article_id, this.send_value, this.pid, this.reply_id);
|
||||||
if (this.send_value.length == 0) {
|
if (this.send_value.length == 0) {
|
||||||
this.$u.toast("内容不能为空!");
|
uni.showToast({
|
||||||
|
title: "输入内容不能为空!",
|
||||||
|
icon: "none"
|
||||||
|
})
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
uni.request({
|
uni.request({
|
||||||
@ -266,7 +270,7 @@
|
|||||||
this.send_value = "";
|
this.send_value = "";
|
||||||
this.comment_num = res.data.num;
|
this.comment_num = res.data.num;
|
||||||
let p_id = res.data.data.data.pid;
|
let p_id = res.data.data.data.pid;
|
||||||
console.log(this.pid,this.reply_id,this.comment_id);
|
console.log(this.pid, this.reply_id, this.comment_id);
|
||||||
if (res.data.data.data.pid) {
|
if (res.data.data.data.pid) {
|
||||||
this.commentList[this.comment_id].reply_count = true;
|
this.commentList[this.comment_id].reply_count = true;
|
||||||
console.log(this.allList[p_id]);
|
console.log(this.allList[p_id]);
|
||||||
@ -305,8 +309,7 @@
|
|||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
title: "loading..."
|
title: "loading..."
|
||||||
})
|
})
|
||||||
if (!this.page_[id] === 0) {
|
if (!this.page_[id] === 0) {}
|
||||||
}
|
|
||||||
console.log(id);
|
console.log(id);
|
||||||
uni.request({
|
uni.request({
|
||||||
url: temp_url + "article/articleReplyList",
|
url: temp_url + "article/articleReplyList",
|
||||||
@ -325,11 +328,10 @@
|
|||||||
this.is_more = false;
|
this.is_more = false;
|
||||||
}
|
}
|
||||||
this.page_[id]++;
|
this.page_[id]++;
|
||||||
console.log(this.page_[id]);
|
this.allList[id] = res.data.data;
|
||||||
this.$nextTick(function(){
|
this.$forceUpdate();
|
||||||
this.allList[id] = res.data.data;
|
// console.log(this.page_[id]);
|
||||||
})
|
// console.log(this.allList);
|
||||||
console.log(this.allList);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -404,7 +406,7 @@
|
|||||||
},
|
},
|
||||||
// 打开评论输入
|
// 打开评论输入
|
||||||
openKeyInput(data, index) {
|
openKeyInput(data, index) {
|
||||||
console.log(data);
|
// console.log(data);
|
||||||
let me = this;
|
let me = this;
|
||||||
this.is_focus = true;
|
this.is_focus = true;
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
@ -416,7 +418,7 @@
|
|||||||
me.is_focus = false;
|
me.is_focus = false;
|
||||||
me.is_edit = false;
|
me.is_edit = false;
|
||||||
} else {
|
} else {
|
||||||
me.editTop = res.height;
|
me.editTop = res.height + "rpx";
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.comment_id = index;
|
this.comment_id = index;
|
||||||
@ -458,6 +460,8 @@
|
|||||||
url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
|
url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
// 收起键盘
|
||||||
|
hideEdit() {},
|
||||||
// stop
|
// stop
|
||||||
stopClick(event) {
|
stopClick(event) {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
@ -478,6 +482,7 @@
|
|||||||
|
|
||||||
/* 关闭 */
|
/* 关闭 */
|
||||||
.close {
|
.close {
|
||||||
|
z-index: 99;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 100rpx;
|
top: 100rpx;
|
||||||
right: 70rpx;
|
right: 70rpx;
|
||||||
@ -493,6 +498,11 @@
|
|||||||
width: 100rpx;
|
width: 100rpx;
|
||||||
height: 100rpx;
|
height: 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.pause-img {
|
||||||
|
width: 100rpx;
|
||||||
|
height: 100rpx;
|
||||||
|
}
|
||||||
|
|
||||||
/* 用户操作 */
|
/* 用户操作 */
|
||||||
.user-info {
|
.user-info {
|
||||||
@ -561,7 +571,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.mask {
|
.mask {
|
||||||
z-index: 999999;
|
z-index: 10000;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
@ -569,7 +579,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.content-box {
|
.content-box {
|
||||||
z-index: 99;
|
z-index: 999;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
@ -604,7 +614,7 @@
|
|||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
padding-left: 100rpx;
|
padding-left: 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.content-style {
|
.content-style {
|
||||||
width: 600rpx;
|
width: 600rpx;
|
||||||
@ -612,39 +622,37 @@
|
|||||||
color: #333;
|
color: #333;
|
||||||
lines: 2;
|
lines: 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.more-content-box {
|
.more-content-box {
|
||||||
margin-left: 100rpx;
|
margin-left: 100rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.child-box {
|
.child-box {}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
.child-info {
|
.child-info {
|
||||||
margin: 10rpx 0;
|
margin: 10rpx 0;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.child-avatar {
|
.child-avatar {
|
||||||
width: 30rpx;
|
width: 30rpx;
|
||||||
height: 30rpx;
|
height: 30rpx;
|
||||||
margin-right: 10rpx;
|
margin-right: 10rpx;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.child-name {
|
.child-name {
|
||||||
font-size: 22rpx;
|
font-size: 22rpx;
|
||||||
color: #333;
|
color: #333;
|
||||||
}
|
}
|
||||||
|
|
||||||
.child_content {
|
.child_content {
|
||||||
padding: 4rpx 0;
|
padding: 4rpx 0;
|
||||||
margin-left: 40rpx;
|
margin-left: 40rpx;
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.more-comment {
|
.more-comment {
|
||||||
margin: 10rpx 0;
|
margin: 10rpx 0;
|
||||||
font-size: 22rpx;
|
font-size: 22rpx;
|
||||||
@ -725,6 +733,7 @@
|
|||||||
.input-main {
|
.input-main {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
bottom: 0;
|
||||||
/* #ifdef H5 */
|
/* #ifdef H5 */
|
||||||
display: flex;
|
display: flex;
|
||||||
/* #endif */
|
/* #endif */
|
||||||
@ -735,6 +744,13 @@
|
|||||||
padding: 0 20rpx;
|
padding: 0 20rpx;
|
||||||
line-height: 80rpx;
|
line-height: 80rpx;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
|
border-top-right-radius: 10rpx;
|
||||||
|
border-top-left-radius: 10rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.key-height {
|
||||||
|
width: 750rpx;
|
||||||
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.edit-input {
|
.edit-input {
|
||||||
@ -746,7 +762,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.cart-box {
|
.cart-box {
|
||||||
z-index: 99;
|
z-index: 1000;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
@ -104,10 +104,7 @@
|
|||||||
{
|
{
|
||||||
"path" : "video/video",
|
"path" : "video/video",
|
||||||
"style" : {
|
"style" : {
|
||||||
"navigationStyle":"custom",
|
"navigationStyle":"custom"
|
||||||
"app-plus": {
|
|
||||||
"softinputMode": "adjustResize"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user