Commit 5d539709 authored by 罗林杰's avatar 罗林杰

修改bug

parent b3e6ce01
...@@ -117,6 +117,10 @@ ...@@ -117,6 +117,10 @@
info: { info: {
type: Object, type: Object,
default: () => {} default: () => {}
},
articleType: {
type: String,
default: ''
} }
}, },
mounted() { mounted() {
...@@ -156,9 +160,15 @@ ...@@ -156,9 +160,15 @@
}, },
//查看动态详情 //查看动态详情
gotoDetail(item) { gotoDetail(item) {
uni.navigateTo({ if(this.articleType == '0'){
url: '/pagesArticle/articleDetail?articleId=' + item.businessId uni.navigateTo({
}) url: '/pagesArticle/articleDetail?articleId=' + item.businessId +'&type=my'
})
} else {
uni.navigateTo({
url: '/pagesArticle/articleDetail?articleId=' + item.businessId
})
}
}, },
//查看用户详情 //查看用户详情
gotoUserInfo(item) { gotoUserInfo(item) {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</u-tabs> </u-tabs>
</view> </view>
<view v-for="(item,index) in dataList" :key="item.id"> <view v-for="(item,index) in dataList" :key="item.id">
<ItemVue :info="item" @praise="praise" @refresh="refresh"/> <ItemVue :info="item" @praise="praise" :articleType="articleType" @refresh="refresh"/>
</view> </view>
<empty v-if="firstLoaded && !dataList.length"/> <empty v-if="firstLoaded && !dataList.length"/>
</z-paging> </z-paging>
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</view> </view>
<template #bottom> <template #bottom>
<view class="submit-layout"> <view class="submit-layout">
<input class="submit-input" placeholder="点击输入,开始聊天吧" v-model="inputTemp" @input="bindKeyInput"/> <u-textarea class="submit-input" placeholder="点击输入,开始聊天吧" v-model="inputTemp" @input="bindKeyInput"/>
<view class="submit-submit" type="submit" size="mini" @tap="submitTo">发送</view> <view class="submit-submit" type="submit" size="mini" @tap="submitTo">发送</view>
</view> </view>
</template> </template>
...@@ -86,6 +86,7 @@ import {addBlack, addMessage, getWeChatTask, telMessage, wantWeChatTask} from ". ...@@ -86,6 +86,7 @@ import {addBlack, addMessage, getWeChatTask, telMessage, wantWeChatTask} from ".
import {getOssUrl} from "../../api/article"; import {getOssUrl} from "../../api/article";
import {getDict} from "../../api/system/dict/data"; import {getDict} from "../../api/system/dict/data";
import ELM from '@/components/elm-toast/index.vue'; import ELM from '@/components/elm-toast/index.vue';
import UTextarea from "../../uni_modules/uview-ui/components/u--textarea/u--textarea.vue";
export default { export default {
name: "info", name: "info",
data() { data() {
...@@ -123,6 +124,7 @@ export default { ...@@ -123,6 +124,7 @@ export default {
} }
}, },
components: { components: {
UTextarea,
ELM ELM
}, },
onLoad(options) { onLoad(options) {
...@@ -597,6 +599,7 @@ export default { ...@@ -597,6 +599,7 @@ export default {
color: #999; color: #999;
border-radius: 10rpx; border-radius: 10rpx;
margin: 5rpx 0 0 5rpx; margin: 5rpx 0 0 5rpx;
justify-content: flex-end;
} }
.chat-inner-msg-left { .chat-inner-msg-left {
...@@ -609,6 +612,7 @@ export default { ...@@ -609,6 +612,7 @@ export default {
background: white; background: white;
padding: 15rpx 5rpx 15rpx 15rpx; padding: 15rpx 5rpx 15rpx 15rpx;
margin-left: 12rpx; margin-left: 12rpx;
margin-right: 180rpx;
} }
.chat-inner-msg-right { .chat-inner-msg-right {
...@@ -619,6 +623,7 @@ export default { ...@@ -619,6 +623,7 @@ export default {
background: #87EE5F; background: #87EE5F;
padding: 15rpx 5rpx 15rpx 15rpx; padding: 15rpx 5rpx 15rpx 15rpx;
margin-right: 12rpx; margin-right: 12rpx;
margin-left: 180rpx;
} }
.chat-inner-msg-left, .chat-inner-msg-right { .chat-inner-msg-left, .chat-inner-msg-right {
...@@ -644,6 +649,7 @@ export default { ...@@ -644,6 +649,7 @@ export default {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
height: 140rpx;
} }
.submit-input { .submit-input {
......
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