Merge refs/remotes/origin/dev into refs/heads/dev

pages/data/data.wxml

@@ -30,7 +30,8 @@
   <view class="center">
     <view class="center_text">{{article.body}}</view>
     <view class="center_image">
-      <image wx:if="{{article.image!=null&&article.image!=''}}" src="{{article.image}}" mode='widthFix' bindtap="bigImage" data-imgsrc="{{article.image}}"></image>
+      <image wx:if="{{article.image!=null&&article.image!=''}}" src="{{article.image}}" mode='widthFix'
+        bindtap="bigImage" data-imgsrc="{{article.image}}"></image>
       <image wx:if="{{article.image==null||article.image==''}}" src="/images/nome.png" mode='widthFix'></image>
     </view>
   </view>
@@ -39,22 +40,31 @@
   <text class="tail_text">全部回复</text>
   <!-- 评论用户信息 -->
   <view class="tail" wx:for="{{comment}}" wx:key="index" bindtap="rollBACK">
-    <view class="tail_left"> <!-- 头像 -->
-      <image src="{{item.user.avatarUrl}}" bindtap="toggleDialogtwo" data-imgs="{{item.user.avatarUrl}}" data-names="{{item.user.nickName}}" data-userid="{{item.user.id}}"></image>
+    <view class="tail_left">
+      <!-- 头像 -->
+      <image class="toux" src="{{item.user.avatarUrl}}" bindtap="toggleDialogtwo" data-imgs="{{item.user.avatarUrl}}"
+        data-names="{{item.user.nickName}}" data-userid="{{item.user.id}}"></image>
+      <view class="tailSign">
+        <!-- id 时间 -->
+        <view class="tail_name" bindtap="toggleDialogtwo" data-imgs="{{item.user.avatarUrl}}"
+          data-names="{{item.user.nickName}}" data-userid="{{item.user.id}}">{{item.user.nickName}}</view> <!-- id -->
+        <view class="tail_time">{{item.deliverTime}}</view> <!-- 评论时间 -->
+      </view>
+      <image class="tailImageTo" src="/images/lajitong.png" bindtap='deleteComment' id="{{item.id}}">
+      </image>
     </view>
-    <view class="tail_name" bindtap="toggleDialogtwo" data-imgs="{{item.user.avatarUrl}}" data-names="{{item.user.nickName}}" data-userid="{{item.user.id}}">{{item.user.nickName}}</view> <!-- id -->
-    <view class="tail_time">{{item.deliverTime}}</view> <!-- 评论时间 -->
-    <image class="tailImageTo" src="/images/lajitong.png" bindtap='deleteComment' id="{{item.id}}">
-    </image>
+
+
 
     <view class="tail_center">
-      <text class="tail_center_text" catchtap="clickComment" data-touserid="{{item.user.id}}" data-nickname="{{item.user.nickName}}" 
-      data-fuid="{{item.id}}" wx:key="key">{{item.content}}</text>
-      <view class="hr"></view>
+      <!-- 父评论 -->
+      <text class="tail_center_text" catchtap="clickComment" data-touserid="{{item.user.id}}"
+        data-nickname="{{item.user.nickName}}" data-fuid="{{item.id}}" wx:key="key">{{item.content}}</text>
+      <!-- <view class="hr"></view> -->
 
-      <view class="father" wx:for="{{item.comments}}" wx:key="this"  wx:for-item="cell">
-        <text catchtap="clickComment" wx:key="key1" data-touserid="{{cell.user.id}}" data-nickname="{{cell.user.nickName}}" 
-      data-fuid="{{item.id}}">{{cell.user.nickName}} 回复 {{cell.toUser.nickName}} : {{cell.content}}</text>
+      <view class="father" wx:for="{{item.comments}}" wx:key="this" wx:for-item="cell">
+        <text catchtap="clickComment" wx:key="key1" data-touserid="{{cell.user.id}}"
+          data-nickname="{{cell.user.nickName}}" data-fuid="{{item.id}}">{{cell.user.nickName}} 回复 {{cell.toUser.nickName}} : {{cell.content}}</text>
       </view>
     </view>
   </view>
@@ -62,10 +72,10 @@
   <!-- 评论输入框 -->
   <form class="one" bindreset="cleanInput">
     <view class="shuru">
-      <input id="comment" name="comment" auto-height placeholder="{{commentOne}}" class="thuru_input" bindinput="bindMessage"
-        wx:if="{{hasLogin}}" />
-      <input id="comment" name="comment" auto-height placeholder="{{noSignIn}}" class="thuru_input" bindinput="bindMessage"
-        wx:if="{{!hasLogin}}" />
+      <input id="comment" name="comment" auto-height placeholder="{{commentOne}}" class="thuru_input"
+        bindinput="bindMessage" wx:if="{{hasLogin}}" />
+      <input id="comment" name="comment" auto-height placeholder="{{noSignIn}}" class="thuru_input"
+        bindinput="bindMessage" wx:if="{{!hasLogin}}" />
     </view>
 
     <button id='sand' bindtap="goToLogin" wx:if="{{!hasLogin}}">前往</button>
@@ -82,7 +92,7 @@
       <!-- 吧主信息：头像、名字 -->
       <image src="{{article.user.avatarUrl}}"></image>
       <text class="head_Name">{{article.user.nickName}}</text>
-      <view class="information" data-userid="{{article.user.id}}"  bindtap="fasixin">发私信</view>
+      <view class="information" data-userid="{{article.user.id}}" bindtap="fasixin">发私信</view>
     </view>
   </view>
 </view>
@@ -94,7 +104,7 @@
       <!-- 吧主信息：头像、名字 -->
       <image src="{{imgs}}"></image>
       <text class="head_Name">{{names}}</text>
-      <view class="information" bindtap="fasixin" data-userid="{{userid}}" >发私信</view>
+      <view class="information" bindtap="fasixin" data-userid="{{userid}}">发私信</view>
     </view>
   </view>
-</view>
+</view>
\ No newline at end of file

pages/data/data.wxss

@@ -106,6 +106,7 @@
   background-color: #fff;
   border-radius: 10rpx;
   padding: 20rpx;
+  padding-bottom: 0;
   margin-bottom: 20rpx;
   /* padding-bottom: 0; */
 }
@@ -116,28 +117,36 @@
 }
 
 .tail_left {
-  margin: 10rpx 10rpx 10rpx 0rpx;
+  display: flex;
+  position: relative;
+  /* margin: 10rpx 10rpx 10rpx 0rpx; */
 }
 
-.tail_left image {
+.tail_left .toux {
   width: 80rpx;
   height: 80rpx;
   border-radius: 50%;
+  float: left;
+}
+.tailSign{
+  margin-left: 20rpx;
+  padding-top: 10rpx;
 }
-
 .tail_name {
+  /* width: 50vw; */
   font-size: 28rpx;
-  position: relative;
+  /* position: relative;
   top: -95rpx;
-  left: 100rpx;
+  left: 100rpx; */
 }
 
 .tail_time {
+  /* width: 50vw; */
   font-size: 20rpx;
   color: #999999;
-  position: relative;
+  /* position: relative;
   top: -80rpx;
-  left: 98rpx;
+  left: 98rpx; */
 }
 
 .tail_right {
@@ -161,32 +170,41 @@
   top: -10rpx;
 }
 .tail_center{
-  position: relative;
+  display: flex;
   display: inline-block;
-  top: -90rpx;
-  left: -16rpx;
   padding-bottom: 30rpx;
   padding-left: 80rpx;
 }
 .tail_center .tail_center_text {
-  
-  width: 478rpx;
+  width: 468rpx;
   word-wrap: break-word;
-  text-indent: 0.5em;
-  font-size: 26rpx;
+  /* text-indent: 0.5em; */
+  font-size: 30rpx;
+  background-color: rgb(246, 246, 246);
+  /* background-color: rgb(246, 246, 246); */
+  display: block;
+  padding: 10rpx;
+  padding-left: 20rpx;
+  margin-top: 33rpx;
+  border-radius: 10rpx;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  word-wrap:break-word;
 }
 
 .tailImageTo {
+  /* display: block; */
   width: 44rpx;
   height: 47rpx;
-  position: relative;
-  top: -119rpx;
-  left: 430rpx;
+  /* float: left; */
+  position: absolute;
+  top: 20rpx;
+  right: 14rpx;
 }
 
 .hr {
   width: 84%;
-  border-top: 1rpx dashed rgba(153, 153, 153, 0.4);
+  /* border-top: 1rpx dashed rgba(153, 153, 153, 0.4); */
   /* margin: -65rpx 0rpx 30rpx 10rpx; */
   margin: 10rpx 0;
 }
@@ -250,8 +268,17 @@
 }
 /* 评论回复 */
 .father{
-  width: 530rpx;
-  background-color: rgb(246, 246, 246);
+  width: 468rpx;
+  padding: 10rpx;
+  padding-left: 20rpx;
+  /* margin-left: 10rpx; */
+  margin-top: 10rpx;
+  background: rgba(231,231,231,0.7);
+  border-radius: 10rpx;
+  font-size: 26rpx;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  word-wrap:break-word;
 }
 /* 头像弹窗 */
 .zan-dialog__mask {

pages/letterList/letterList.wxss

 .single{
+  width: 90vw;
+
   padding: 20rpx 20rpx;
   /* border-bottom: 1rpx solid #ccc; */
   display: flex;
   position: relative;
   background: #fff;
-  margin: 10rpx 0;
+  margin: 10rpx auto;
   border-radius: 10rpx;
 }
 .marks{
@@ -50,7 +52,7 @@
 }
 .rightEnd{
   position: absolute;
-  right: 0rpx;
+  right: 16rpx;
   top: -8rpx;
   padding: 10rpx;
 }