From aa4c39774a171234f517c53e5c09205d50a463c8 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Fri, 4 Nov 2022 18:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=96=87=E7=AB=A0=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/author-info/author-info.vue   |   5 +-
 components/interact-bar/interact-bar.vue |  15 +-
 pages/my/myArticles.vue                  | 183 ++++++++++++-----------
 static/images/icon/bar-comment.png       | Bin 1398 -> 1359 bytes
 static/images/icon/bar-favorite.png      | Bin 1345 -> 1340 bytes
 static/images/icon/bar-praise.png        | Bin 1246 -> 1280 bytes
 static/images/icon/del.png               | Bin 0 -> 734 bytes
 static/images/icon/edit.png              | Bin 0 -> 852 bytes
 8 files changed, 108 insertions(+), 95 deletions(-)
 create mode 100644 static/images/icon/del.png
 create mode 100644 static/images/icon/edit.png

diff --git a/components/author-info/author-info.vue b/components/author-info/author-info.vue
index 3d68131..f1dc0eb 100644
--- a/components/author-info/author-info.vue
+++ b/components/author-info/author-info.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="item-author" style="display: flex;line-height: 25px;">
 		<view>
-			<u-avatar v-if="avatar && avatar!=''" shape="square" :size="25" :src="avatar" ></u-avatar>
+			<u-avatar v-if="avatar && avatar!=''" shape="circle" :size="20" :src="fileUrl+avatar" ></u-avatar>
 			<!-- <u-avatar v-else :size="25" icon="account" shape="square"></u-avatar> -->
 			<view  v-else>
 			   <view v-if="sex == null" class="peo"></view>
@@ -11,7 +11,7 @@
 			   </view>
 			 </view>
 		</view>
-		<view style="padding-left:10upx;padding-top: 4upx;font-size: 26rpx;color: #666666;">{{name}}</view>
+		<view style="padding-left:16upx;padding-top: 4upx;font-size: 28upx;color: #666666;">{{name}}</view>
 		<!-- <view v-if="showInfo && info!=''" style="padding-left: 10upx;padding-top: 10upx;">({{info}})</view> -->
 		<!-- ({{info}}) -->
 	</view>
@@ -47,6 +47,7 @@
 		},
 		data(){
 			return {
+				fileUrl:this.$config.fileUrl,
 				userAvatar:'',
 				 // sex:null,
 			}
diff --git a/components/interact-bar/interact-bar.vue b/components/interact-bar/interact-bar.vue
index 2547fbb..54effeb 100644
--- a/components/interact-bar/interact-bar.vue
+++ b/components/interact-bar/interact-bar.vue
@@ -2,19 +2,19 @@
 	<view class="interact-bar">
 		<view v-if="comments" class="interact-bar-item">
 			<image class="pto-img" src="../../static/images/icon/bar-comment.png" size="24"></image>
-			<text style="font-size: 15px;color: #969696;margin-left: 6upx;">{{data.comments}}</text>
+			<text style="font-size: 15px;color: #999999;margin-left: 8upx;">{{data.comments}}</text>
 		</view>
 		<view v-if="answers" class="interact-bar-item">
 			<image class="pto-img" src="../../static/images/icon/answers.png" size="24"></image>
-			<text style="font-size: 15px;color: #969696;margin-left: 6upx;">{{data.answers}}</text>
+			<text style="font-size: 15px;color: #999999;margin-left: 8upx;">{{data.answers}}</text>
 		</view>
 		<view v-if="praises" class="interact-bar-item">
 			<image class="pto-img" src="../../static/images/icon/bar-praise.png" size="24"></image>
-			<text style="font-size: 15px;color: #969696;margin-left: 6upx;">{{data.praises}}</text>
+			<text style="font-size: 15px;color: #999999;margin-left: 8upx;">{{data.praises}}</text>
 		</view>
 		<view v-if="favorites" class="interact-bar-item">
 			<image class="pto-img" src="../../static/images/icon/bar-favorite.png" size="24"></image>
-			<text style="font-size: 15px;color: #969696;margin-left: 6upx;">{{data.favorites}}</text>
+			<text style="font-size: 15px;color: #999999;margin-left: 8upx;">{{data.favorites}}</text>
 		</view>
 		<!-- <view v-if="views" class="interact-bar-item">
 			<u-icon name="eye" color="#969696" size="18"></u-icon>
@@ -92,10 +92,11 @@
 			display: flex;
             margin-right: 60upx;
 			.pto-img {
-			    margin-top: 18upx;
-			 	width: 12px;
-				height: 12px;
+			    margin-top: 12upx;
+			 	width: 18px;
+				height: 18px;
 				margin-right: 5upx;
+				// vertical-align: middle;
 			}
 			.interact-bar-icon {
 				margin: 0 0 0 10px;
diff --git a/pages/my/myArticles.vue b/pages/my/myArticles.vue
index d5f8363..9f6f69d 100644
--- a/pages/my/myArticles.vue
+++ b/pages/my/myArticles.vue
@@ -5,31 +5,32 @@
 		<page-title :showBack="true">我的文章</page-title>
 		<view class="top-filter">
 			<view class="top-content">
+				<view class="put-articles" @click="toAdd()">
+					去发表
+				</view>
+				
 				<view class="top-content-options">
-					<view style="margin-right: 20upx;">
-						<!-- <u-picker :show="statusSelectShow" @cancel="statusSelectShow = false" @confirm="chooseStatus" :columns="selectData" keyName="label"></u-picker> -->
-						<!-- <text class="textbtn" style="color:#666" @click="statusSelectShow = true">{{ statusBtn }}</text> -->
+					
+			<!-- 		<view style="margin-right: 20upx;">
 						<text class="textbtn" style="color:#666;font-size: 28upx;" @click="statusSelectShow = !statusSelectShow">状态</text>
-					</view>
+					</view> -->
 					<view class="input-search">
 						<u-search 
 						@search="findData(true)"
 						:showAction="false"
 						@clear="findData(true)"
 						:clearabled="true"
+						:height="36"
 						v-model="articleList.keyword" 
-						placeholder="搜索关键字"
-						shape="square"
-						bgColor="#ffffff"
-						>
+						placeholder="搜索">
 							<!-- <template slot="suffix">
 								<u-icon @click="findData(true)" name="search"></u-icon>
 							</template> -->
 						</u-search>
 					</view>
-					<view style="width: 70upx;">
+			<!-- 		<view style="width: 70upx;">
 						<view class="textbtn" @click="toAdd()"><u-icon name="plus" color="#2979ff" size="18"></u-icon></view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
@@ -43,53 +44,34 @@
 				<view class="article_one" v-for="(item, index) of articleList.list" :key="item.id">
 					<view >
 						<view class="article-center">
+							<author-info :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"></author-info>
 							<view class="article-status" @click="toDetail(item)">
-								<view style="" v-html="statusDisplay(item.status)"></view>
-								<view style="" v-html="$keywordActiveShow(item.title, articleList.keyword)" class="article-top"></view>
+								<!-- <view style="" v-html="statusDisplay(item.status)"></view> -->
+								<view v-html="$keywordActiveShow(item.title, articleList.keyword)" class="article-top"></view>
 							</view>
 							<view class="article-bot" @click="toDetail(item)">
 								<text class="article-wz" v-html="$keywordActiveShow(item.summary, articleList.keyword)"></text>
-								<img v-if="item.coverurl" :src="$config.fileUrl+item.coverurl" alt=""/>
-								<!-- <view class="article-tom">
-									<img class="imgs" :src="item.avatar" alt="" />
-									<text class="tom-wz">{{ item.name }}{{ item.orgInfo }}</text>
-								</view> -->
+								<view class="article-img">
+									<img style="width: 182upx;height:124upx" v-if="item.coverurl" :src="$config.fileUrl+item.coverurl" alt=""/>
+								</view>
 							</view>
 							<!--自己不需要显示作者信息呀-->
-							<!-- <author-info :avatar="item.avatar" :name="item.name" :info="item.orgInfo"></author-info> -->
-							
-							<view style="display: flex;justify-content: space-between;margin-top: 10upx;">
-								<view class="createTime">
-									{{item.sysCreateTime}}
-								</view>
+							<view style="display: flex;justify-content: space-between;">
 								<view style="display: flex;">
-									<view class="rowbtn rowbtn-primary">
-										<u-icon name="edit-pen" color="#3E7FFF" labelColor="#3E7FFF" @click="toEdit(item)" label="编辑" size="16" labelSize="12"></u-icon>
+									<view class="rowbtn" @click="toEdit(item)">
+										<image class="btn-img" src="../../static/images/icon/edit.png" size="24"></image><text class="btn-text">编辑</text>
 									</view>
-									<view class="rowbtn rowbtn-info" style="margin-left: 20px;">
-										<u-icon @click="del(item)" color="#767676" labelColor="#767676" name="trash" label="删除" size="16" labelSize="12"></u-icon>
+									<view class="rowbtn" style="margin-left: 12upx;" @click="del(item)">
+										<image class="btn-img" src="../../static/images/icon/del.png" size="24"></image><text class="btn-text">删除</text>
 									</view>
-									<!-- <u-icon name="more-dot-fill" @click="setEditId(item)" size="16" labelSize="16"></u-icon> -->
+								</view>
+								<view class="">
+									<interact-bar :views="false" :data="item"></interact-bar>
 								</view>
 							</view>
-							<!-- <view v-if="editId==item.id">
-								<view v-if="userInfo.aid==item.sysCreateAid" style="display: flex;justify-content: space-around;">
-									<view class="rowbtn rowbtn-primary">
-										<u-icon name="edit-pen" color="#2c7dc8" labelColor="#2c7dc8" @click="toEdit(item)" label="编辑" size="16" labelSize="12"></u-icon>
-									</view>
-									<view class="rowbtn rowbtn-info">
-										<u-icon @click="del(item)" color="#767676" labelColor="#767676" name="trash" label="删除" size="16" labelSize="12"></u-icon>
-									</view>
-								</view>
-							</view> -->
 							
 						</view>
 					</view>
-					<!-- <view class="article_action"> -->
-					<!-- 	<interact-bar :views="false" :data="item"></interact-bar> -->
-						<!-- v-if="userInfo.aid==detail.sysCreateAid" -->
-						
-					<!-- </view> -->
 				</view>
 			</view>
 		</view>
@@ -184,6 +166,7 @@ export default {
 							item.orgInfo = '';
 							item.code = '';
 							item.avatar = '';
+							item.sex = null;
 							this.articleList.list.push(item);
 							userIds.push(item.sysCreateAid);
 						});
@@ -205,17 +188,18 @@ export default {
 					list.forEach(item => {
 						res.result.some(author => {
 							if (author.aid == item.sysCreateAid) {
-								let { aid, avatar, name, orgInfo, code } = author;
-								if (!avatar) {
-									avatar = this.$config.fileUrl + avatar;
-								}else{
-									avatar='';
-								}
+								let { aid, avatar, name, orgInfo, code ,sex} = author;
+								// if (!avatar) {
+								// 	avatar = this.$config.fileUrl + avatar;
+								// }else{
+								// 	avatar='';
+								// }
 								item.name = name;
 								item.aid = aid;
 								item.orgInfo = orgInfo;
 								item.code = code;
 								item.avatar = avatar;
+								item.sex =sex;
 								return true;
 							}
 							return false;
@@ -330,19 +314,39 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+	.article{
+		background-color: #fff;
+		padding: 36upx;
+	}
 	.rowbtn{
-		padding: 5px 8px 0px 8px; 
+		padding: 5px 8px 0px 0; 
 		height: 20px;
 		border-radius: 10upx;
-	}
-	.rowbtn-primary{
-		background-color: #ebf3fe;
+		.btn-img{
+			width: 16px;
+			height: 18px;
+			vertical-align: middle;
+		}
+		.btn-text{
+			margin-left: 12upx;
+			font-size: 24upx;
+			color: #999999;
+		}
 	}
 	.rowbtn-info{
 		background-color: #f7f7f7;
 	}
 .top-filter {
 	.top-content {
+		position: relative;
+		.put-articles{
+			position: absolute;
+			right:0;
+			top:-60upx;
+			font-size: 32upx;
+			font-weight: 600;
+			color: #387DF7;
+		}
 		// padding: 5px 5px;
 		.top-content-options {
 			// height: 40px;
@@ -350,7 +354,7 @@ export default {
 			justify-content: space-between;
 			align-items: center;
 			line-height: 40px;
-			padding:20upx 30upx  0 30upx ;
+			// padding:20upx 30upx  0 30upx ;
 			// .textbtn {
 			// 	background-color: #ffffff;
 			// 	color: #4f4f4f;
@@ -370,7 +374,7 @@ export default {
 	}
 
 	.top-filter-result {
-		padding: 5px 10px;
+		// padding: 5px 10px;
 		font-size: 24upx;
 		color: #747474;
 	}
@@ -397,7 +401,7 @@ export default {
 .uni-list {
 	
 	.sea-show{
-		padding: 10rpx 30upx 0 30upx;
+		// padding: 10rpx 30upx 0 30upx;
 		// padding-top: 10upx;
 		line-height: 60upx;
 		.sea-active{
@@ -418,14 +422,13 @@ export default {
 		
 	}
 	.article_one{
-		padding: 20upx 30upx;
-		padding-top: 10upx;
-		margin-bottom: 20upx;
+		// padding: 20upx 30upx;
+		// padding-top: 10upx;
+		// margin-bottom: 20upx;
 		background-color: #ffffff;
-		
-		&:last-of-type{
-			margin-bottom: 0;
-		}
+		// &:last-of-type{
+		// 	margin-bottom: 0;
+		// }
 		// .article_action{
 		// 	display: flex;
 		// 	justify-content: space-between;
@@ -445,41 +448,49 @@ export default {
 	.article-center {
 		background: #ffffff;
 		//border-radius: 5px;
-		border-bottom: 4upx;
+		padding-top: 20upx;
+		padding-bottom: 40upx;
+		border-bottom: 20upx solid #F9F9F9;
 		.article-status{
-			display: flex;
-			font-weight: bold;
-			justify-content: flex-start;
-			align-items: center;
+			// display: flex;
+			// font-weight: bold;
+			// justify-content: flex-start;
+			// align-items: center;
 			font-size: 30rpx;
-			line-height: 60upx;
 			.article-top {
+				line-height: 50upx;
+				font-weight: 600;
 				overflow: hidden;
 				text-overflow: ellipsis;
-				white-space: nowrap;
-				color: #040404;
-				text-align: left;
-				flex-shrink: 10000;
-				margin-left: 4px;
+				-webkit-box-orient: vertical; 
+				display: -webkit-box;-webkit-line-clamp: 2; 
+				word-break:break-all;
+				color: #333333;
+				// text-align: left;
+				// flex-shrink: 10000;
+				// margin-left: 4px;
 			}
 		}
 		.article-bot {
 			display: flex;
 			justify-content: space-between;
 			.article-wz {
-				font-size: 28rpx;
-				color: #454545;
-				line-height: 39rpx;
-				display: -webkit-box;
-				overflow: hidden;
-				margin: 10upx 0px 15upx;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
-			}
-			img{
-				margin-left:43upx;
-				width: 137upx;
+				font-size: 28upx;
+				color: #666666;
 				height: 80upx;
+				line-height: 40upx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				-webkit-box-orient: vertical; 
+				display: -webkit-box;-webkit-line-clamp: 2; 
+				word-break:break-all;
+				margin: 16upx 0px 0;
+			}
+			.article-img{
+				margin-left:26upx;
+				width: 182upx;
+				height: 124upx;
+				border-radius: 8upx;
 			}
 		}
 		.item-author{
diff --git a/static/images/icon/bar-comment.png b/static/images/icon/bar-comment.png
index e5c5ae72b1dfa5e3ca11e19c63881661992e284f..714970989396565865057fef693abb6a7a99669b 100644
GIT binary patch
literal 1359
zcmV-V1+e;wP)<h;3K|Lk000e1NJLTq001Na001Tk1^@s6tjIZ&00001b5ch_0Itp)
z=>Px)2}wjjR9Hvtm|JX=MHI*XXLf71NF*CUBNvI51mhKv7fdigjh6?*Ev$r8pl;`U
z5fO<RG-?1NYVZZopv>&I1w$HSHGv3ed{9Y1Q6oMmF)E^>F$FJJOBAB*H^&V5T9@sX
zUgT3AJdfWubLKZ^&Ya5-&N891j0ZyoGR6#3N{uI?(IRpYfKC8yM0B{mzW&hk>C?N0
zve`ia8DmB&rDluBOcA*eKy9@}iRf1mX$7!7o6YXb<#Hzm3O692QmHh&qod<N=iEa8
zhI{2i6ahFOB5eQ;1E}%V0x(uYF6jm!qVEB$)LL&MBG(^Szd&Ia-sYU!BqA5aAgv-&
z%49M-7cN|QwAuoNLcs&gaL(NYU~)WWe>$C>o6qOJI33h!fvmL;0C-kJQUKmbr_;;x
z`TTqR?Xvs7h)|(Wm@6Vr1E>ekkxHfJH8nN8(U*=sfvmM_L}WP;34j&Myn3J@mE%gK
zQeAs{`$hnF#z#G$nM+muui8gz?IID`NJM`En8(c9h6+<Y&lt1H`xAf@N~vjD>yIk+
z_Oej1Sez0?(YqpYj#BDwt+n6T853*m1`!Fov)9(vPO9|7UO?7b4|6>ctz+h8XN)9P
zWQ_5*@huUVMnr3w+52gaoC0KwnF+uj&yl*ix(N#wEcpFQ19^R67+x7g(Z@v8RZ~+l
zv9Yo7P*0esIAedNlZogaX5NqlOt(&J?M4w<1mLA02p0DO3d3-G6h)r21Hh;t2z)9?
zOpGyC0r<oRRc0O&-{!w_nK5Q5fOSN)g_-9kMpCBO81of?OO;Ynwbt+ZUp+o#t=%pn
zGn7*Ewbony4Ipdnb0Ts-5k1Px&r|~K6OrqbQd6qMha>>4wTne$JrTXg%=exGWQ_4i
z(w7mVgCOw9GI1%p)!Tz0m{n<^KYTFEX0x@qT+T=6#HCOuOmoidCZaved_z?WrPJv#
z`F!46D{-;b&JmH<h-e!#&;HMSs5`e2(Hdrcq|!n@LeC_k24-$a+&loRwZ68x9Y8J!
zf>$dobf1Vk4`6E$1oM&xDwRs9_V)H)0GwCuCOvV;7;`azZvh<3X0xM`cI;xYIJK**
zYcCNUVCIRvQiuOwjQJ426s6P>t@ZjOtz@lTAtFx@(F@G%v&2a`CEJH#ct;dPuLJlo
zo6Xkea=G7<f-=Uu;w#9?nyXqpv^%a<dZK3%P{x>b0G2AHp3+)BUe!YWV;F|lI_LI^
zNQQ`*nF~n(S!-_<5nt?o&CC;eW&83)3xz_1b8fTmM&mG0wIKf|pdzBIwZ7aLr<A%$
zYyEaFAF6;_?VNioCVx_Ey{dZ`g9X{OYghW<!Gm+0b63Qz(5F!p?IR+eT)ksAGjsm5
zK=G|x0$?qGG=L9MsnqhOrl#G40gBVZnz%2kocc3>kwo+pGhfgzkRM>Jy&1sEBI4U*
z-$K7BB3qSGJG9n6RD)}7ZXVa!**S}d@*;9|JmzyE+6iD7fJp$Z5s`Caou4uD<pTnW
zE#+T2mO1Ah_K`JS!1w9j5K)`&@5!I1$oT*+12Cox^oUYw<%kg@in(0QzXzNY-_;h2
zMIVgEW-^)m4Gj&)1`O1#q@|@Ld;Iuu|MD?IL~a34*T?bso_~*0YO`~0$6)I7ejgk9
z@|V`u*4nnVwsG;>kbff*rPR?>D)n7sW8;^D@w4)=Lk1e^g8j|=AE-YI{RQ`?F-0B3
R8ZrO?002ovPDHLkV1hfVclZDR

literal 1398
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m^Cs(B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T
z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAddqG<*}2
zGxI=#nqXbNzE+-j#U+V($*G<$wn{*A^fEJ3tc)$4oD2+%Eu36TT@4Lgot+#l-JDD<
zT%1f@4Gc_;jA43R@{>z*Q}aq-dQ%X3Eph4vC5YStpv^9+MVV!(DQ-pixe8#9TV-N%
zi-nn)iJOrrPV=C8Q?R)OqSp+kUVWfr^g+>!6x}c(U>X83;fWW>fhYgeJYbqH0w!*j
zU0xat42(}aT^vIyZta<NQropq<aqu2w04nyOx4aBm-{wNSa>7i#tlwwXPq}W5jSsn
zwgrep2A<eZ?a#T?BdpEny!88@bFNq3$@@O*-tK*0EBD|2x%cz$dk^Q_-`nV+l9VJB
z&mq|!v_ML0p};1E$mjDONHlF=>Gs{q+JDTMk$*AIi$*aIQ~S%zJckw9!q0i0R$VB^
zx8S$9n%jSEOZGVhf6Lu!4Y+4Mdq3$;<e6VFy)!0keretryno%#OqT^y5)Y`vG4I;O
z*>jftXpVGIul=pY8gK9G`ofE|!@B|(e~j-<3VCMqk!SU-DSmGc&-4BhSbS&JwlkOV
zwrleo4Oo|a!_1ud<^<-;eRG7QLW{g)EEnmVUOGK5F}(ljnf1BFvjqapaz4(!5t{Vu
zOlMfRkbU`tH11{2`aKSt7gt6n`u5(+Exfs@N;7r)oEM8He7g5&!IkGp9p5gTvJbht
zNuu}F+7I5FzI7ZuZ2c(VlKWyq8@^=G>#Wo5X3TLsetcQiV@qe|Jt`NT$YmwzAMBS?
z+Hfvlsjc98zlBYv&T;y7FDLG@@Li_BKY4-ej3*!8{a+iG$k#T9Enae`=9;OJ*J7Xe
zZl5Xqmuu477m~u~S?iKSuB=}eVDtU*uOvUS>t-5V*N?pJS~6LEfv}!X=<D}PJPblM
W-4&CLJ^2nQ2|Zo?T-G@yGywptl?ML+

diff --git a/static/images/icon/bar-favorite.png b/static/images/icon/bar-favorite.png
index a0eb88c93e9b2792cdef1e0f7a6d38e326f59792..405908ae5ef2775b08e99641bd2157340e871591 100644
GIT binary patch
literal 1340
zcmV-C1;hG@P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px(_DMuRR9HvNmu-lYRTRhn=gwqXW{y$N2N%rR#Uv_<?B$DzVrAJv=9Gntv%Al^
zfmv2s8f9crnwFLc-TTb$*or2j1*Ta^q1K09q^Jm!owQ*6AQU-d)|NB(#I+gNU3cA?
zXBYE)ni=jr|KC05+;h(m&M>1hj0Zykl+9*`<@5P_h=@jx9JwKxOctXabVz`#wOd4F
zMhW6gt@WJ$4JZu58=P~W0r<THalTUO#vlkjj{-I52pMDE2XHG9J?{ZT<S76jXsvHM
z?LgMr>qO*BB08#+8sh<+b3cp72qK!m%zLYa8dQX=wcAAG4gkxv){DKkG3G@8i->4D
zGfzKlK*pGB0DMJ6$3$d|*80~H(1k?gqcj}AwOZ@1tAUCXArVp5+MNI<16ZN8e!RP=
zG3F%z3juu0%u|WTRSH!#kcg1A_7wp0iRia@JU*_esp*&Qf^BVW7ZnPH{UUM!fYr?W
zC=p2|Py+&afJ`Pcx>zjMiHI-aW&m|WR3xH%gCN+_mrxjncZ<j-5s3lF5m74<?Ty7^
zxl}53s6W7yfULDQ0ch}|BI1QF6Oo!;qKB1I4+KH5^;D-0!?3|Q_XdEAd#(EmzyTu4
zc~}6unc26Go==A{=0N~!`Vcu>+PojYo<t(CHJMEQQArB2+3b1weBK{$B7kxJkbMAp
zSM#*iulI<MG3G-6QvtlElv+<j9YpkFb93|2O2jK&)7siPLPUJz>z#A60o)E?r`GzG
z9zbCjE_BZM8}cU+H8Ar>m5M}JXRVzgB0lZsDy4J~1hxl|FW@i?jfez9)CJ(Ka&Dst
zo@$S^);}%p`1&NGFbD$e3;m>`E?sM1M{|kj9{@9%`Q4!evew=SV6%t}1F)8v=ap|=
zzt`UP8WDK}z;Pm)#msLH1(daRhKRfc;4C6q<$F|jzo+a&*4kwv@&tea5lvy{J%fR=
z)=m@=Uzc$rTF%Uidixu&F<NU^i^#)7bSRNXT$)TKeHyE_(o}gsL`D<QtIRyVFDC;6
zWwY6HjvP7iJ%F*L)NQJo20$2wvz&7q0UR7PYSb0UWYRaslWagBzrz^w7=V>Tw1$}<
ziUMS<eN9B>0a&25ez`v%6#-dmXNyQX5v^n9R79YRh|D3PMrK|=SfIrs@&Xa9WM)5B
zRBhJU6(X{Lh@NC-Kg9KE6-CGxvjM<;N~xwG2r^aE{8vLM=Uf|rjauvb2L)uU{Z>S-
zj5;TK@pL*pp;#<_K}6p%^Hq_7cJ0~~&*gH*d?Tx=sTtAO*yul>uuLXXQz#S~opb)g
z<4Zs9Q%Y@!$K&m(RLVa;C#=1_eRx+_mw%*>*VWYxpEPMwA<``i!|-zF+&&`uiJ8ZG
zCmyn+qr(^IGrq6%>6qw{h&)?gU%##_Zmm5iB9|zo#s@+0LnI($%uE1T0Na?kA)QVq
zopaCm0nR%lqHjcGZ7des?Y|d`#hZy}u83S+63i*3o^EMr$y#gu%kKY)B(>I?BLRhB
zINv$9iio^mqAXOJm6mv+-s7l$pgp*VEcG)_85}@fL_F{!W?mi%D4kAEE*6X3=b}yk
zOS`9{zXC0%7Qhk!wdHk0G@Y5ZM*{Mjj4>^xN%E80+S+j1v}u1=bM<%Z*l~7eXJ-?D
y>y=WU20_po`Ic29JQQmyYK%i6RH=_M4(MMT>^(#EK=s-H0000<MNUMnLSTYz+-ckZ

literal 1345
zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)p!3HGt@7X1QI3=zTCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m^Cs(B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T
z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAddqG<*}2
zGxI=#nqXbNzE+-j#U+V($*G<$wn{*A^fEJ3tc;zEOkG@DO`Tj!T@4Lgot+#l-JDD<
zT%1f@4Gc_;jA43R@{>z*Q}aq-dQ%X3&2Z`kC5YStpv^9+MVV!(DQ-pixe8#9TV-N%
zi=~s3fq{t;PV=C8Q*gV*1gBnopkwqw(Tfz_Fd<+X0x{u<7s!Dp|I|ESnlAz-?r;4M
zRxvOzuJ?3t45_%aW!iadmPCo;>5+V!w#nS&c&f1f)G<d*_C+e@s-2(YEeZr~-I=nZ
zcu`DXk?NW&d0n3#J4~Ch=!rwbn)AE&w%^Sy+mn2+^3~@1Gi&cx?*DD`d5`gHPZgoI
ztTlOV+!L59Z&}^A{bgBIZeOCl(*+IAn>#Noo+WsbW#Zx~^52<tQ$#POwRp-2weIR!
zD9n*0c0F_#r?9Z#SA%t`%9~a?_9@z*p5mXOu)4cGy`@tkew%^elN*!ftez(*&N9Kw
z(>g?Z+IOxpmFg4;Z{w(&9a9#>YIcW9R5?k!<qE#>?NcGw(YAjY?TRNiugJbpV9(bY
zxZk4S;u9IRNoO6He^}mZk2<T?f59jDj!N{TX7MG?Wqs>@G}t9h+SdQ$5#!62YF{_y
zHIim`H}J$L-(BP_GwaNTYqOqCZsc5a_qwc<?kc+`FIlOdA-$($q(oOqvBsDu`Tsnl
zW@Y;6)|qFb&mM9gTcB~;X1~|VGw=Lk%7Rp5Em<G+drmc}4bN=bZ}dy-D$B+nxyQ^Z
zgdzi9v6e`+DPH$`ne^%F9@fb^6=|i$68oLq4CgqfFJ#v<e*TxsfFZr5!SHKFqz0%^
N^K|udS?83{1OSf);GF;f

diff --git a/static/images/icon/bar-praise.png b/static/images/icon/bar-praise.png
index 2b2c035bf03315431af8293e97c8a721871e29fa..318cb1300e3b3f070b8005f200a4be3c44f8591c 100644
GIT binary patch
literal 1280
zcmV+b1^@bqP)<h;3K|Lk000e1NJLTq001Tc001Ni1^@s6<@HFV00001b5ch_0Itp)
z=>Px(x=BPqR9HvNm|JXARTPH*bq*6iG@dGgAVnkufd_pM6Ac$NA>J=h;soQRw4Jjy
zF$Q@M67&HziiwaY@d5WfZE8y@(h!Uo1vEyyAP-<nFi{>LO0WT<*wIudwVvPXrZi<b
zLtE%n*VE4Iwa@y_+Uu;#2>z!c!@-p#Nj1skBxj092Y~MZG{te;AR@dF8y5}coO_aF
zQ!(QrvLlM3Y&M&1A1d5%fPGH#b^xm@D=Xh<ZEc-Q@(uuNNlp}z4XV20zW{3^8D%n=
z2{kn}zn%rK*3JTOKtzJkqeoAys;W9U6u67>Sdt_Y(=<H}pv@R_MWJEm+)k2rg<*J4
zE|=RmVqn(VI|1wxkv*z9zX;eylFLLyRW%t&u-5^s6p{6+y0Qq^7Lr*Jc|=v;9}zHX
zZ3e&*0F%NnoS)0(_7obn*6sr^S48Hi>Ng_-=A3($<eNTc8DnlJG}_YA66W*yc9LTN
zM8=pu$_`dnS2rU~(|!JH41(akIF3IqG@2yI>@-b(5Rso$b^1`CyzY>{%BH5K2^}3B
zyGhO#k*%uwXfdPCxy2;60{GAv^I%!QoO3e)d_;1Fh#ZKbXkMwTo+QchX_~$YV4X2$
zRawA#;w1*Kp5!<Y@z;2-G3K{Y2Ay+nlQbgo3d!aIy<-E#T)(TVtE;<~<ZUF!i%3Xv
zD#`l+OzXaTkxfw)Jv~tUbIxrhxuir5CCNh~vaVEq>jfhjBuTOsz$%i(V(*lQ98%RA
z2Xigf+7|(=@l^r9iGnke09=0dMOF2w!e{mZSZkL9*dQXEK4?Yc1j#NDIhv;FK@s`H
zw=}9cb}(QqEiIR}wY4qHWHKMr)YKg9d&a+bk|Yn1d<Q^<h&-mM@AcK`1#`}|lAJ6e
zcdP2IzDf-Z4P!bxJ5LV<Y%uWF+A07Z?lWV|qJCi3TJP3;sbX9%u;%9GiuU&Q-;3Gp
z_L#MHJOJOaoHWMx^*K^5up~*Qq-lCoM1E1#%3>b71i)VaP8(zVdPKmSbIV9>6p`(!
z`cOZxo?!gPZ^UsN7WV1o@|bgOFUeZ~JZ_A6w`lNNYrV(3x5gP`PL(_O>+9>U@9OG0
z2;k3(ii)eV+3e|3U_Qotd|g$T(aYg6=bWDjRs*Or#`vmoj`YoAzPFkhhT*haF6Y<1
zGTdN2$@~b(DF7B2W4=Bg*pC2a1wk+;j$^+r8<=x$5y?*h95%+xD3<g3CfNNXZwi87
zZXCzomJ`fcy9vM(BC<wRUmghTOOgwMAXpg3@mJ*ntFN!WtgEZ*xQL9+WHQsMtE+z=
z2&{Y5DtAe8&ef2t7m?kn>IdVZ()TL2k$gA^g2izhZ!4F_thHYNSSTXZs_N_HfM9Qt
zd`3i8sOpAtfF((C9m&H0PDN4Vb63g#H2QjM3CYdAJB^~~)@(N0T?xDlSGsV{bq~M*
z8jUeaOL@!x-V5gYr+hyDT~9y1JqUsqYHMr#l#^a8SYu=3HD}J8SwZqS0Dp&JI476O
z9U2svS8~qXOmYW+E6;c6Lia?(--3@VpDxZT{aWar@$4m%3w^=`5DfH?LF^v`uy@p`
qQLok3*6tsK{?O;j!8~+0bp8dd|FJ`#$+{2#0000<MNUMnLSTXm$W}H0

literal 1246
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m^Cs(B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T
z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAddqG<*}2
zGxI=#nqXbNzE+-j#U+V($*G<$wn{*A^fEJ3tSn57oGdNeOq^UyT?`Ffot+#l-JDD<
zT%1f@4Gc_;jA43R@{>z*Q}aq-dQ*UUjV;W~Oxz5efqGrB>IEf;+ybD@E~!PCWvMA{
zMftf3V2@j6;&zJ>Znr@6reJXk)E~w;_38s1qYsK+r09kT0n-qO2~WI04m|m%<^j`u
z5ioHxCG7gcz`*F^>EaktaVzQ1|Nr)fC;6sJcCgeq>=Eer+wenHz@O>SHVOO3`*)Za
z7*1fj)nLJ}%AciUcEb+&`D{VD9}X)`W9DJx&5Ag{ePmO_5y^%77TsXVwkg_mWy1o2
zei`$nVn>)aO3VGcKPBP;%aP3-D=PcEn^?W1or6!*E8Jr^BEH}epTi#3j+-1239LSz
z+!KDxZ>Z2WsLx4>+4Iqd$K>;Yn$P?l%8eDG0`@FPmTaFKrB5`aJG80HI#R1(#`Ner
z&y>dXJ`p_ZjIM0282D-?p7CVm&U>`EVJ?^0oRp*mx)!e4+!?Q$*E`hAY;6;hVNcs)
zzvat8!6Gf0paY6dVt<w&C<urw;Ym9fuEXUZ`ir~fr~%^!8Hs=PiDEtn7bO@8{8w2t
z;~3jNhL0{!9_<q9n7=^uy77WfKQA=t^L3au&Y0Tpu)lGK#EW0A4Hz33m>K>~^U7=3
S8~OlL;&{6HxvX<aXaWHK7p5%$

diff --git a/static/images/icon/del.png b/static/images/icon/del.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f00071406c169fa50df47d8171a35c79644c1a4
GIT binary patch
literal 734
zcmV<40wMj0P)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px%m`OxIR9Hvtmp^C}K@`T{H|r9Tz@bSYsHlz6Ld3#e3$-wff`}S85^~v{l~fjD
zrD$hiAtF1oNpq4zL6S<8U=gsfO{(Nl8Hhqe44x-?a63=-xP|<8OfDSAO|!GJ-+b>k
zZ)SIAKus=aa(uD^7#kbQl*{F5OW0W{Wv`{y4xmsd>?@T@-)u|)%t$Fu+h`MwRR)+@
zjE;^Tu`v}wR0anJKig=n0c_2-qqEAuc8qQNG#@}IHP6fj04LPU%=LOwt+gfhe`{Z<
zt=ptN>pas~045QJVJ%2A3V`QON*!}uS5&LjWSEzj`7sf_aUAE45TZ6kaU3J5r`OHe
zS87vz(w5c%j5G6oA;dLiUUFS`Y1JBtqUd@Y$1jNJWe@~68l4rT)B-afc3t;qE|*(a
z_ZqeUY%-v=erk;A%49ObeSLk)=`@95c!h|rI*v2pdEWR&)7OwGP)aQ_^Fbmy6a>Mi
zG>}s29y31x@K8#5zXj0BKq~{S4D4D4q9{6VjA?IcYkM~^Fz`DK6h%>wG3K}sqUd?v
z{H_7)<PX`9Px1c^ptbHb#=HjbUP^g(C!<~4cWP>C&)nQxiHO==*X_>ba<zlbsvVKm
z`h+oN7QheR_xA!Yje-~%897z0R%eK4IS7KT)OX#sTq#v#<{lx$u<!fN8U+xBVS$Kl
z5>Y+~g8oebwAL4mF_Qp(643=I<%gX@D5WGbhXB4ij&pKoXlQX$faHNvN;9(uASR+G
z%skQA**TrfW)mo@lF#S6E0xL_V@wkKa(#E)@B4m!rNM?Lqh!Gpi^aP{l<aa`tB6~O
z0DJ{-%lG|PYh_y=&FTy1HW8fzaNr+dei6|}0B<`wIv!=S*)JP0HvMe)2Qg=|@04c)
Q$^ZZW07*qoM6N<$g2t~x7ytkO

literal 0
HcmV?d00001

diff --git a/static/images/icon/edit.png b/static/images/icon/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a1c29535e7b4df862e16bad13ab9d320aa4342c
GIT binary patch
literal 852
zcmV-a1FQUrP)<h;3K|Lk000e1NJLTq001BW001Hg1^@s6KC;{Y00001b5ch_0Itp)
z=>Px&4oO5oR9HvtSj$T~Q5Zeb`)z?#22n`02sf#?v4>?rn>H={Pg{i+J&+)36S)!5
zRlcf4MQSz1xj)A4Ofw^s)8Yr+<#_M+o$q{am1eWqgvoh-e>eMV`;DS{dwXr~)a!Nh
z_xHE%C^CSzw>K0D1(eHWyu7?XRaGd8;t0t2_&7qL5W2g&zrA~SctARx#^T~4mX?;p
z?=1jNPfs{GIYFgTL0?}VYPFgp#X^{(psTA3i9`Z}gM+&FlzV)9j7FmYkH>@E-Cgwb
z^!x)r%TuWoip8Qp?)UpKF)<;8S$N149Pjeo)YO!YxyQ#xB$G+JzP@5)WCUAVTLMIj
z0n*M3^xyXOHheyxW9zLRRI61S9UTcq$HvAGkH-ZF?Fa@gFE5eJW`*L7jSbh7+gaWM
zpsH%~{QMmGd>+fo%LoR8t^jCfxembT>8XhRKp=pXm6eVGXqJ=q;o)IHJLxw&3K?({
z!2SKb2xu#x8$q}V!02<?a;D$i-5tDMuVBS>7qqiHlgZ%X;zGn(Boc8K04p46H_LNP
z)78}#Zf|cfJ3EW@_4QVruyg^73MnOZW@mJCR8Yy1eQ<Cf?(rMzh)l8e_WJr7H#aw!
zo14Sh+FE-6Ov}T=L(@vg3dx$kzrQc!lUkPASS)54?T!IZ;Mv)kh-PC$B0DoPGr|&r
z`S|z%yQkdcjI22ZKmqKAR=vQi+u0S69|7pNB1r=NPXKl<uwqA>2|A7eyCAeu&UhIb
z8p7u0=C^Ec>;k(qY-j!6-X10=Cw12x187%>tUxdoStE?8>llEW89-To0R9-TW#Bi4
zQezNn^T7Q4JfhL)S38!+^6BYm(Ncfoa4X{Cv#_v$a5(%m5fOmAnC$HAfI!?lRLt3e
z8yM$A4kfLbP+QHo8I?+<j#e`nGz$@X38$)DE+=LNu51J#Z_v8slmiGs{B$`rV{Kqy
zK#XftzPh?9#x@;Lc|GS;!ydr({Q3D=3?ok0b4|GRmU|%k0)vm+u<_{rACQ0i$sZJE
e445gE?|lNOb<nv^a3bRX0000<MNUMnLSTYHos|v%

literal 0
HcmV?d00001