Merge refs/remotes/origin/master into refs/heads/master

pages/topics/goodIdea/cell/index.wxml

@@ -24,7 +24,7 @@
           <view class="detail-userInfo">
             <view class="detail-userInfo-left">
               <view class="detail-user-icon">
-                <image src="{{itemData.topicGroupAvator}}"></image>
+                <image src="{{itemData.topicGroupAvator || '/images/topic/avatar.png'}}"></image>
               </view>
               <view class="detail-userName">{{itemData.topicAuthor}}</view>
               <view class="detail-time">{{itemData.topicGroupCreateTime}}</view>

pages/topics/goodIdea/cell/index.wxss

@@ -79,8 +79,6 @@ image{
 .detail-user-icon{
   width: 20px;
   height: 20px;
-  border-radius: 50%;
-  background-color: #EEEEEE;
 }
 .detail-userName{
   margin: 0 5px 0 5px;