From 6f546ef4c150d7ca00e36c2ea0b18ff1da95a53c Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Fri, 24 Nov 2023 17:55:27 +0800
Subject: [PATCH] 修改首页部分逻辑；修复部分已知问题；首页新增社区菜单；公告详情页面样式调整
---
subPackage/article/detail.vue | 140 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 123 insertions(+), 17 deletions(-)
diff --git a/subPackage/article/detail.vue b/subPackage/article/detail.vue
index ae0865e..a34eb5c 100644
--- a/subPackage/article/detail.vue
+++ b/subPackage/article/detail.vue
@@ -1,25 +1,88 @@
<template>
- <view class="container">
- <view class="f-32 fw">{{detailInfo.title}}</view>
- <view class="row flex j-c-s-b a-i-c c-99">
- <view class="flex">
- <!-- <view class="flex a-i-c mr-40">
+ <view class="">
+
+
+ <view class="container">
+ <view class="f-32 fw">{{detailInfo.title}}</view>
+ <view class="row flex j-c-s-b a-i-c c-99">
+ <view class="flex">
+ <!-- <view class="flex a-i-c mr-40">
<u-icon name="thumb-up-fill" color="#CECECE"></u-icon>
<text class="f-22 ml-10">120</text>
</view> -->
- <view class="flex a-i-c">
- <tag-cell :text="detailInfo.dictValue"></tag-cell>
- <view class="flex a-i-c ml-20">
- <u-icon name="eye-fill" color="#CECECE"></u-icon>
- <text class="f-22 ml-10">{{detailInfo.viewNumber}}</text>
+ <view class="flex a-i-c">
+ <tag-cell :text="detailInfo.dictValue"></tag-cell>
+ <view class="flex a-i-c ml-20">
+ <u-icon name="eye-fill" color="#CECECE"></u-icon>
+ <text class="f-22 ml-10">{{detailInfo.viewNumber}}</text>
+ </view>
+ </view>
+ </view>
+ <text class="f-24">{{detailInfo.createTime}}</text>
+ </view>
+ <view class="content f-28">
+ <u-parse :content="detailInfo.content"></u-parse>
+ </view>
+ </view>
+ <view class="" v-if="false">
+ <view class="explain-row c-main f-28">
+ 报名和投票先指定好房屋
+ </view>
+ <view class="select-row flex j-c-s-b a-i-c">
+ <text class="f-28">指定房屋</text>
+ <view class="select-row-content flex a-i-c">
+ <text class="f-26 c-99 mr-20"></text>
+ <u-icon name="arrow-right" color="#999"></u-icon>
+ </view>
+ </view>
+ <!-- <view class="apply">
+ <view class="flex f-d-c a-i-c">
+ <view class="flex mb-20">
+ <image class="apply-user" src="/static/icon/nav-02.png" mode=""></image>
+ <image class="apply-user" src="/static/icon/nav-02.png" mode=""></image>
+ <image class="apply-user" src="/static/icon/nav-02.png" mode=""></image>
+ </view>
+ <text class="f-28 c-99">共3人</text>
+ </view>
+ <button class="apply-btn bgc-main c-ff f-30">报名</button>
+ </view> -->
+
+ <view class="mt-20" >
+ <view class="explain-row c-main f-28">
+ 投票进行中
+ </view>
+ <view class="vote bgc-ff">
+ <view class="vote-title f-30 fw">
+ 是否同意安装充电桩
+ </view>
+ <view class="">
+ <u-radio-group
+ iconPlacement="right"
+ activeColor="#017BFC"
+ placement="column"
+ >
+ <view class="mb-20">
+ <u-radio label="同意" ></u-radio>
+ <view class="flex j-c-s-b a-i-c mt-10">
+ <uv-line-progress :percentage="30" height="10" ></uv-line-progress>
+ <text class="c-99 f-28">10</text>
+ </view>
+
+ </view>
+ <view class="">
+ <u-radio label="不同意" ></u-radio>
+ <view class="flex j-c-s-b a-i-c mt-10">
+ <uv-line-progress height="10" ></uv-line-progress>
+ <text class="c-99 f-28">10</text>
+ </view>
+ </view>
+ </u-radio-group>
</view>
</view>
</view>
- <text class="f-24">{{detailInfo.createTime}}</text>
+
</view>
- <view class="content f-28">
- <u-parse :content="detailInfo.content"></u-parse>
- </view>
+
<!-- <view class="action flex flex_base">
<view class="action-item flex_base bgc-main">
<u-icon name="thumb-up-fill" size="22" color="#fff"></u-icon>
@@ -37,7 +100,7 @@
} from '@/api/article/article.js'
import tagCell from '@/components/noticeList/tagCell.vue'
export default {
- components:{
+ components: {
tagCell
},
data() {
@@ -60,9 +123,13 @@
}
</script>
-<style>
+<style lang="scss">
+ page{
+ background-color: #f5f5f5;
+ }
.container {
padding: 0 30rpx;
+ background-color: #fff;
}
.row {
@@ -70,7 +137,7 @@
}
.content {
- margin-bottom: 90rpx;
+ padding-bottom:30rpx;
}
.action-item {
@@ -83,4 +150,43 @@
.bgc-gray {
background-color: #C4C4C4;
}
+
+ .explain-row {
+ background-color: rgb(236, 244, 255);
+ padding: 20rpx;
+ }
+ .select-row{
+ padding:30rpx;
+ background-color:#fff;
+ box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.2);
+ .select-row-content{
+ flex:1;
+ justify-content: flex-end;
+ }
+ }
+ .apply{
+ padding:30rpx;
+ .apply-user{
+ width:80rpx;
+ height:80rpx;
+ border-radius: 50%;
+ margin-right:-15rpx;
+ border:1px solid #fff;
+ }
+ .apply-btn{
+ width:100%;
+ height:80rpx;
+ line-height: 80rpx;
+ margin: 30rpx auto 0;
+ border:none;
+ border-radius: 40rpx;
+
+ }
+ }
+ .vote{
+ padding:0 40rpx 30rpx;
+ .vote-title{
+ padding:30rpx 0;
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3