Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 评论组件修改 #2032

Merged
merged 73 commits into from
Jan 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
ab6f3ef
fix: popover
yangxiaolu1993 Dec 29, 2022
26b9127
Merge branch 'v4' of https://github.com/yangxiaolu1993/nutui into v4
yangxiaolu1993 Dec 29, 2022
3c88d05
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Dec 29, 2022
5df22d8
fix: 代码回退
yangxiaolu1993 Dec 29, 2022
44bcc64
Merge branch 'v4' of https://github.com/yangxiaolu1993/nutui into v4
yangxiaolu1993 Dec 29, 2022
88194df
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Dec 29, 2022
ece1dbf
Merge branch 'v4' of https://github.com/yangxiaolu1993/nutui into v4
yangxiaolu1993 Dec 29, 2022
d053da6
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Dec 30, 2022
e6d8cbe
feat: 文档修改
yangxiaolu1993 Dec 30, 2022
526afd0
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Dec 30, 2022
80e2187
feat: 修改Imagepreview
yangxiaolu1993 Dec 30, 2022
a71f1e4
feat: 合并
yangxiaolu1993 Jan 3, 2023
06c6f26
feat: imagepreview文案修改
yangxiaolu1993 Jan 3, 2023
ccb622f
feat: noticebar文案修改
yangxiaolu1993 Jan 3, 2023
23a09a3
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 3, 2023
bf84540
fix: noticebar小程序不能运行问题修改
yangxiaolu1993 Jan 3, 2023
e377031
fix: noticebar小程序不能运行修改
yangxiaolu1993 Jan 3, 2023
0d84f10
feat: 组件文档修改picker
yangxiaolu1993 Jan 3, 2023
76c4a15
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 3, 2023
5632e0e
docs: 文案修改
yangxiaolu1993 Jan 3, 2023
bb67f2d
docs: countdown
yangxiaolu1993 Jan 3, 2023
8687a50
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 3, 2023
0d4dce4
feat: image
yangxiaolu1993 Jan 3, 2023
ab50128
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 3, 2023
6b0f2a4
docs: 文本修改
yangxiaolu1993 Jan 3, 2023
665ec58
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 3, 2023
81fdcce
Merge branch 'v4' of https://github.com/yangxiaolu1993/nutui into v4
yangxiaolu1993 Jan 3, 2023
e7622aa
fix: imagepreview
yangxiaolu1993 Jan 3, 2023
00ebf17
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 3, 2023
7c26513
Merge branch 'v4' of https://github.com/yangxiaolu1993/nutui into v4
yangxiaolu1993 Jan 3, 2023
079f723
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 4, 2023
35f8d22
docs: 单位修改
yangxiaolu1993 Jan 4, 2023
336fd6e
docs: 文档修噶
yangxiaolu1993 Jan 4, 2023
49fa488
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 4, 2023
3b5b47a
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 4, 2023
1e38f96
docs: actionsheet文档修改
yangxiaolu1993 Jan 4, 2023
a5e006b
docs: 文档修改
yangxiaolu1993 Jan 4, 2023
2ef97a9
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 5, 2023
13d385e
fix: drag使用公共函数
yangxiaolu1993 Jan 5, 2023
058576e
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 5, 2023
0575665
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 5, 2023
ddde2fa
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 6, 2023
919c02e
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 7, 2023
7587257
docs: 文案更新
yangxiaolu1993 Jan 7, 2023
631689d
feat: 文档修改
yangxiaolu1993 Jan 7, 2023
420b14c
feat: 文案修改
yangxiaolu1993 Jan 7, 2023
ad11e30
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 7, 2023
ceae1b2
Merge branch 'v4' of https://github.com/yangxiaolu1993/nutui into v4
yangxiaolu1993 Jan 7, 2023
9eed975
feat: picker文案修改
yangxiaolu1993 Jan 7, 2023
102d1eb
feat: picker
yangxiaolu1993 Jan 7, 2023
e8a9373
feat: 文案修改
yangxiaolu1993 Jan 8, 2023
08b71cb
docs: 修复
yangxiaolu1993 Jan 9, 2023
366f053
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 9, 2023
7d113e3
fix: 多余Props删除
yangxiaolu1993 Jan 9, 2023
bb5d4a7
feat: 多余文件删除
yangxiaolu1993 Jan 9, 2023
4bd4228
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 9, 2023
da12a1c
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 9, 2023
b212683
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 9, 2023
d915cac
feat: 文档修改
yangxiaolu1993 Jan 9, 2023
5567819
Merge branch 'v4' of https://github.com/yangxiaolu1993/nutui into v4
yangxiaolu1993 Jan 9, 2023
80f9441
feat: docs修改
yangxiaolu1993 Jan 9, 2023
3ae3fb2
fix: picker修改
yangxiaolu1993 Jan 9, 2023
850c834
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 9, 2023
ce3b837
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 10, 2023
9821056
feat: comment修改
yangxiaolu1993 Jan 10, 2023
196a31a
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 10, 2023
ad52575
feat: 文案修改
yangxiaolu1993 Jan 10, 2023
805ac30
Merge branch 'v4' of https://github.com/yangxiaolu1993/nutui into v4
yangxiaolu1993 Jan 10, 2023
52e46dc
feat: 评论修改
yangxiaolu1993 Jan 10, 2023
0dc66e8
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 10, 2023
5f688de
feat: 评论修改
yangxiaolu1993 Jan 10, 2023
5b8f232
feat: 评论修改
yangxiaolu1993 Jan 10, 2023
5480544
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/packages/__VUE/comment/components/CmtBottom.taro.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<view class="nut-comment-bottom">
<view @click="handleClick" class="nut-comment-bottom__lable">
<span v-if="type != 'complex'">{{ info.size }}</span></view
<span v-if="type != 'complex'" style="display: inline">{{ info.size }}</span></view
>

<view class="nut-comment-bottom__cpx">
Expand Down
4 changes: 2 additions & 2 deletions src/packages/__VUE/comment/components/CmtHeader.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</view>

<view class="nut-comment-header__user-score">
<nut-rate v-model="info.score" size="15" spacing="5" readonly :disabled="true" @change="handleClick" />
<nut-rate v-model="info.score" size="12" spacing="5" readonly :disabled="true" @change="handleClick" />
</view>
</view>

Expand All @@ -25,7 +25,7 @@
<view class="nut-comment-header__time" v-if="info.time">{{ info.time }}</view>
</view>
<view :class="[`nut-comment-header__${type}-score`]" v-if="type == 'complex'">
<nut-rate v-model="info.score" size="15" spacing="3" readonly :disabled="true" />
<nut-rate v-model="info.score" size="12" spacing="3" readonly :disabled="true" />
<i :class="[`nut-comment-header__${type}-score-i`]"></i>
<view :class="[`nut-comment-header__${type}-score-size`]">{{ info.size }}</view>
</view>
Expand Down
4 changes: 2 additions & 2 deletions src/packages/__VUE/comment/components/CmtHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</view>

<view class="nut-comment-header__user-score">
<nut-rate v-model="info.score" size="15" spacing="5" readonly :touchable="false" @change="handleClick" />
<nut-rate v-model="info.score" size="12" spacing="5" readonly @change="handleClick" />
</view>
</view>

Expand All @@ -25,7 +25,7 @@
<view class="nut-comment-header__time" v-if="info.time">{{ info.time }}</view>
</view>
<view :class="[`nut-comment-header__${type}-score`]" v-if="type == 'complex'">
<nut-rate v-model="info.score" size="15" spacing="3" readonly :touchable="false" />
<nut-rate v-model="info.score" size="12" spacing="3" readonly />
<i :class="[`nut-comment-header__${type}-score-i`]"></i>
<view :class="[`nut-comment-header__${type}-score-size`]">{{ info.size }}</view>
</view>
Expand Down
2 changes: 1 addition & 1 deletion src/packages/__VUE/comment/components/CmtImages.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
v-if="type == 'multi' && totalImages.length > 9 && videos.length + index > 7"
>
<span>共 {{ totalImages.length }} 张</span>
<Right style="width: 12px"></Right>
<Right size="12px"></Right>
</view>
</view>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/packages/__VUE/comment/doc.taro.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export default {

<template #comment-shop-reply>
<div class="nut-comment-shop">
<span>京东美妆国际:</span
<span style="display:inline-block">京东美妆国际:</span
>尊敬的客户您好,非常抱歉给您带来不愉快的购物体验,关于过敏,什么成分都不存在个别性和普遍性。
</div>
</template>
Expand Down
8 changes: 4 additions & 4 deletions src/packages/__VUE/comment/index.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<view class="nut-comment__follow-title">购买{{ follow.days }}天后追评</view>
<view class="nut-comment__follow-com">{{ follow.content }}</view>
<view class="nut-comment__follow-img" v-if="follow.images && follow.images.length > 0"
>{{ follow.images.length }} 张追评图片 <Right width="12px"></Right
>{{ follow.images.length }} 张追评图片 <Right size="12px"></Right
></view>
</view>

Expand All @@ -42,9 +42,9 @@ import { ref, onMounted, computed, PropType } from 'vue';
import { createComponent } from '@/packages/utils/create';
const { componentName, create } = createComponent('comment');
import { Right } from '@nutui/icons-vue-taro';
import CommentHeader from './components/CmtHeader.vue';
import CommentImages from './components/CmtImages.vue';
import CommentBottom from './components/CmtBottom.vue';
import CommentHeader from './components/CmtHeader.taro.vue';
import CommentImages from './components/CmtImages.taro.vue';
import CommentBottom from './components/CmtBottom.taro.vue';

interface VideosType {
id: number | string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

<template #comment-shop-reply>
<div class="nut-comment-shop">
<span>京东美妆国际:</span
<span style="display: inline">京东美妆国际:</span
>尊敬的客户您好,非常抱歉给您带来不愉快的购物体验,关于过敏,什么成分都不存在个别性和普遍性。
</div>
</template>
Expand Down