Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

Lou

2023-12-15 4ba70811948b3e5f9cd9f7150192ddc8b2a42799

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

 components/noticeList/noticeList.vue

@@ -3,7 +3,7 @@
        <view class="notice-list" @click="navToDetail(item.id,item.eventType,item.pdId)" v-for="(item,index) in data" :key="index">
            <view v-if="item.url" class="notice-inner flex j-c-s-b">
                <view class="notice-list-left flex f-d-c j-c-s-b">
                    <text class="notice-title f-28">{{item.title}}</text>
                    <text class="notice-title f-26">{{item.title}}</text>
                    <view class="flex j-c-s-b a-i-c">
                        <view class="flex a-i-c">
                            <tag-cell  v-if="item.dictValue" :text="item.dictValue" />
@@ -18,7 +18,7 @@
                <u-image :src="setUrl(item.url)" width="200rpx" height="140rpx"></u-image>
            </view>
            <view v-else class="notice-inner flex f-d-c j-c-s-b">
                <text class="notice-title f-28">{{item.title}}</text>
                <text class="notice-title f-26">{{item.title}}</text>
                <view class="flex j-c-s-b a-i-c">
                    <view class="flex a-i-c">
                        <tag-cell :text="item.dictValue" />

 components/noticeList/tagCell.vue

@@ -1,6 +1,6 @@
<template>
    <view class="">
        <view class="tag-cell f-20 c-main">
        <view class="tag-cell f-18 c-main">
            {{text}}
        </view>
    </view>
@@ -18,8 +18,8 @@

<style scoped>
    .tag-cell{
        padding:2rpx 5rpx;
        border-radius:30rpx;
        padding:2rpx 8rpx;
        border-radius: 8rpx;
        background-color: rgb(236,244,255);
        border:1px solid currentColor;
        margin-right:15rpx;

 static/base.css

@@ -55,6 +55,11 @@
.fw{
    font-weight: bold;
}

.f-18{
    font-size:18rpx;
}

.f-20{
    font-size:20rpx;
}

 subPackage/article/comment.vue

@@ -22,6 +22,7 @@
        methods:{
            submitInfo(){
                if(!this.content)return 
                console.log(this,555)
                addComment({
                    content:this.content,
                    articleId:this.articleId

 subPackage/article/detail.vue

@@ -20,7 +20,7 @@
                <text class="f-24">{{detailInfo.createTime}}</text>
            </view>
            <view class="content f-28">
                <u-parse :content="detailInfo.content"></u-parse>
                <u-parse :content="detailInfo.content" :tagStyle="UParseStyle"></u-parse>
            </view>
        </view>

@@ -182,7 +182,10 @@
                isSubmit: false, // 是否已提交投票
                commentList: [],
                isEnd: false, //是否结束
                isComplete: false // 是否完成全部投票
                isComplete: false ,// 是否完成全部投票
                UParseStyle: {
                    img: 'width: 100%; float: left;'
                }
            }
        },
        onLoad(option) {
@@ -244,6 +247,7 @@
                    size: 20,
                    articleId: this.params.id
                }).then(res => {
                    console.log(res, 969999)
                    this.commentList = res.data.records;
                })
            },