Merge remote-tracking branch 'origin/master'

pagesActivity/activityDetail.vue

@@ -230,12 +230,14 @@ export default {
               title: '报名成功！',
               icon: 'none'
             })
+            this.isApplication = true
             setTimeout(() => {
               this.show = false
               this.getUserInfo()
               this.getActivityDetail()
-            },500)
+            },200)
 					} else if(res.data.code !== 200){
+            this.isApplication = false
 						uni.showToast({
 							title: res.data.message,
 							icon: 'none'

pagesArticle/articleDetail.vue

 <template>
-  <view style="margin-bottom: 150rpx">
+  <view style="padding-bottom: 150rpx">
     <view>
       <ArticleItem @delete="deleteFn" :isTopicName="isTopicName" :info="articleInfo" @close="close" @open="open"/>
     </view>
@@ -13,32 +13,33 @@
         <text>点赞 {{articleInfo.likeCount}}</text>
       </view>
     </view>
-    <view class="comment" v-for="info in articleInfo.articleCommentVOList" :key="info.id">
-      <div class="c-left">
-        <image :src="info.avatarUrl"></image>
-      </div>
-      <div class="c-right" @click="()=>reply(info)">
-        <div class="c-name">
-          {{ info.memNickName }}
+    <view>
+      <view class="comment" v-for="info in articleInfo.articleCommentVOList" :key="info.id">
+        <div class="c-left">
+          <image :src="info.avatarUrl"></image>
         </div>
-        <div class="c-comment">{{ info.content }}</div>
-        <div class="c-actions">
-          <div class="c-time">{{ info.createDate }}</div>
-          <div class="action-item">
-            <image :src="baseUrl+'/article/104.png'" @click="btnComment(info)"></image>
-            <text>
-              {{ info.commentCount }}
-            </text>
+        <div class="c-right" @click="()=>reply(info)">
+          <div class="c-name">
+            {{ info.memNickName }}
           </div>
-          <div class="action-item">
-            <image @click="()=>praise(info)" :src="info.isLike == '0'? baseUrl+'/article/105.png': baseUrl+'/article/105-no.png'"></image>
-            {{ info.likeCount }}
+          <div class="c-comment">{{ info.content }}</div>
+          <div class="c-actions">
+            <div class="c-time">{{ info.createDate }}</div>
+            <div class="action-item">
+              <image :src="baseUrl+'/article/104.png'" @click="btnComment(info)"></image>
+              <text>
+                {{ info.commentCount }}
+              </text>
+            </div>
+            <div class="action-item">
+              <image @click="()=>praise(info)" :src="info.isLike == '0'? baseUrl+'/article/105.png': baseUrl+'/article/105-no.png'"></image>
+              {{ info.likeCount }}
+            </div>
+            <view v-if="articleInfo.createBy == userId || info.userId == userId" class="action-item">
+              <image @click="()=>handleLongPress(info)" :src=" baseUrl+'/article/commentDelete.png'"></image>
+            </view>
           </div>
-          <view v-if="articleInfo.createBy == userId || info.userId == userId" class="action-item">
-            <image @click="()=>handleLongPress(info)" :src=" baseUrl+'/article/commentDelete.png'"></image>
-          </view>
-        </div>
-        <view>
+          <view>
             <view
                 class="comment"
                 v-for="(children, index) in info.childrenCommentList"
@@ -60,11 +61,11 @@
                 <view class="c-actions">
                   <view class="c-time">{{ children.createDate }}</view>
                   <view class="action-item">
-<!--                    <image-->
-<!--                        :src="baseUrl+'/article/104.png'"-->
-<!--                        @click="btnComment(children)"-->
-<!--                    ></image>-->
-<!--                    {{ children.replyCount }}-->
+                    <!--                    <image-->
+                    <!--                        :src="baseUrl+'/article/104.png'"-->
+                    <!--                        @click="btnComment(children)"-->
+                    <!--                    ></image>-->
+                    <!--                    {{ children.replyCount }}-->
                   </view>
                   <view class="action-item">
                     <image @click="()=>praise(children)" :src="children.isLike == '0' ? baseUrl+'/article/105.png': baseUrl+'/article/105-no.png'"></image>
@@ -77,7 +78,8 @@
               </view>
             </view>
           </view>
-      </div>
+        </div>
+      </view>
     </view>
     <view class="bottom">
       <u--input
@@ -397,6 +399,10 @@ export default{
       deleteComment(params).then(res=>{
         if (res.data.code == 200){
           this.getArticleDetail()
+          uni.showToast({
+            title: '删除成功',
+            icon: 'none'
+          })
         } else {
           uni.showToast({
             title: res.data.message,

pagesUser/userInfo.vue

@@ -111,7 +111,7 @@
                 <view class="strs" v-if="userData.articleContent !== null">
                   {{userData.articleContent ? userData.articleContent : ''}}
                 </view>
-								<view :class="['imgs',articleUrl.length == 2 ? 'twoTemp':'']" v-if="articleUrl !== null && articleUrl.length">
+								<view class="imgs" v-if="articleUrl !== null && articleUrl.length">
 									<image v-for="item in articleUrl" :src="item"
 										mode="aspectFill">
 									</image>
@@ -400,12 +400,19 @@
             targetId: id,
           }
           addFollow(form).then(res => {
-            this.getIsFollowed();
-            this.animUrl = url;
-            this.showAnima = true;
-            setTimeout(() => {
-              this.showAnima = false;
-            }, 500)
+            if (res.data.code == 200){
+              this.getIsFollowed();
+              this.animUrl = url;
+              this.showAnima = true;
+              setTimeout(() => {
+                this.showAnima = false;
+              }, 500)
+            } else {
+              uni.showToast({
+                title: res.data.message,
+                icon: 'none'
+              })
+            }
           })
         }
 			},
@@ -1099,10 +1106,11 @@
 	}
 	.imgs{
 		display: flex;
-		justify-content: space-between;
+		justify-content: left;
 		padding: 30rpx 42rpx 30rpx 0rpx;
 		image{
 			width: calc(33% - 10rpx);
+      margin-left: 10rpx;
 			height: 198rpx;
 			border-radius: 12rpx;
 		}