Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/index/index.vue

@@ -818,7 +818,6 @@ export default {
 		    data: {},
 		  },
 		  (res) => {
-		    console.log(res, "PageType");
 		    uni.setStorageSync('UserPageType', res.data);
 		  }
 		);

pages/share-team/share-detail.vue

@@ -256,15 +256,22 @@
 		flex-direction: row;
 		align-items: center;
 	}
-	.u-node {
-	  width: 30rpx;
-	  height: 30rpx;
+	.cdetailStyle .u-node {
+	  width: 24rpx;
+	  height: 24rpx;
 	  border-radius: 100rpx;
 	  display: flex;
 	  justify-content: center;
 	  align-items: center;
 	  
 	}
+	.cdetailStyle .u-time-axis-node.data-v-dba4c432{
+		top:35rpx
+	}
+	.cdetailStyle .u-time-axis.data-v-bd98783e:before{
+		top: 32rpx;
+
+	}
 </style>
 <template>
 	<view class="cdetailStyle" :style="{'height':contentHeight}">
@@ -443,9 +450,9 @@
 								  >
 								</template>
 							    <template v-slot:content>
-									<view style="width: 100%;height: 10px;"></view>
 							      <view  class="time-l">
-							        <image :src="x.UserInfo.Photo" style="width:40px;height:40px;margin-left:10px;border-radius: 20px;"></image>
+									  <u-avatar :src="x.UserInfo.Photo" size="80" style='margin-left: 10px;'></u-avatar>
+							        
 									<view style="display: flex;flex-direction: column;margin-left: 10px;height: 35px;justify-content: space-between;">
 										<text style="font-size: 12px;color: #111111;font-weight: bold;max-width: 200px;
 											overflow: hidden;
@@ -453,7 +460,7 @@
 											text-overflow: ellipsis;
 											font-weight: bold;
 											font-family: aa;
-										">{{x.UserInfo.Name}}</text>
+										">{{x.UserInfo.Name==headData.Name?'(我)':''}}{{x.UserInfo.Name}}</text>
 										<text style="font-size: 11px;color: #999999;">{{x.UserInfo.CreateDate}}</text>
 									</view>		
 							      </view>