Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/mobile into stat

components/comments/comments.vue

@@ -5,7 +5,7 @@
 			<view v-if="showTop" class="comments-top">
 				<view>
 					<text style="font-size: 30upx;font-weight: 500;">评论 </text>
-					<text style="font-size: 30upx;padding-left: 6upx;color: #000000;"> ( {{total}} 条)</text></view>
+					<text style="font-size: 30upx;padding-left: 6upx;color: #000000;"> ( {{total}} )</text></view>
 				<view>
 				<!-- <view v-if="showShare" class="share-btn" @click="addShare">
 					<view class="share-btn-icon"><img src="/static/images/icon/share.png" alt=""></view> 

components/interact-fixed/interact-fixed.vue

@@ -7,7 +7,7 @@
 					<slot>
 						<view class="field" @click="openInput()">
 							<u-icon name="edit-pen-fill" size="18" class="field-icon"></u-icon>
-							<text class="wenz">说点什么..</text>
+							<text class="wenz">写评论</text>
 						</view>
 					</slot>
 				</view>

pages/my/myArticles.vue

@@ -32,7 +32,7 @@
 					</view>
 					<view class="addition">
 						<view class="textbtn" style="color:#666;font-size: 28upx;" @click="statusSelectShow = !statusSelectShow">
-							<text>状态</text> 
+							<text>筛选</text> 
 							<u-icon style="margin-left: 18upx;" name="arrow-down"></u-icon>
 						</view>
 						<view class="sea-show" v-show="statusSelectShow">

pages/my/myQa.vue

@@ -414,6 +414,16 @@
 </script>
 
 <style scoped lang="scss">
+	
+	.qa-solve{
+	  color: #333333;
+	  margin-left:-7px;
+	}
+	.qa-unSolve{
+	  margin-left:-7px;
+	  color:#387DF7;
+	}
+	
 	.my-qa-page{
 		padding: 36upx;
 		background-color: #fff;

pages/resource/articeDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<!--文章详细页面-->
 	<view><watermark></watermark><u-toast ref="articleToast"></u-toast>
-		<page-title :showBack="true">文章详细信息</page-title>
+		<page-title :showBack="true">文章详情</page-title>
 		<view class="adetail content">
 			<!--文章内容-->
 			<view class="adetail-title">{{ detail.title }}</view>