perf: 优化标签和上传显示

circlePages/addShare.vue

@@ -217,7 +217,7 @@
 					</view>
 
 					<view class="tn-flex tn-flex-row-between tn-flex-col-center  tn-margin" style="margin-bottom: 0;" v-if="stepIndex==3">
-						<view style="padding: 16px 0;color:#333;font-weight: 600;"  :style="{fontSize:(wxFontSize-1)+'px'}">
+						<view style="padding: 16px 0;padding-bottom:8px; color:#333;font-weight: 600;"  :style="{fontSize:(wxFontSize-1)+'px'}">
 							 上传图片（选填）
 						</view> 
 						 
@@ -238,7 +238,7 @@
 
 					<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin" style="margin-top:0;margin-bottom: 0;" v-if="stepIndex==3">
 						 
-						<view style="padding: 16px 0;color:#333;font-weight: 600;"  :style="{fontSize:(wxFontSize-1)+'px'}">
+						<view style="padding: 16px 0;padding-top:24px;padding-bottom:8px;color:#333;font-weight: 600;"  :style="{fontSize:(wxFontSize-1)+'px'}">
 							 上传相关文件（选填）
 						</view> 
 						 

circlePages/circle.vue

@@ -22,7 +22,7 @@
 			<view style="display: flex;padding: 16px 80px;">
 				<view style="position: relative;">
 					<image style="width: 48px;height: 48px;margin-right: 8px;" src="../static/tu/step1.png"></image>
-					<view style="position: absolute;width: max-content;" :style="{color:stepIndex==1?'#333':'#777'}">填写需求</view>
+					<view style="position: absolute;width: max-content;margin-left: -8px;" :style="{color:stepIndex==1?'#333':'#777'}">填写需求</view>
 				</view>
 				<view style="flex:1;height: 0px;border: 1px dashed #005DA6;align-self: center;"></view>
 				<view style="position: relative;">
@@ -45,15 +45,15 @@
 					<view class="tn-text-lg tn-padding-right-xs tn-text-bold" style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">以下三种方式可任选其一，若有可都输入</view>
 				</view>
 			</view> -->
-			<view style="padding: 16px;color:#333;font-weight: bold;"  :style="{fontSize:(wxFontSize-1)+'px'}">
+			<view style="padding: 16px;color:#333;font-weight: bold;padding-bottom: 8px;"  :style="{fontSize:(wxFontSize-1)+'px'}">
 				 需求
 			</view>
-			<view class="tn-margin  tn-padding" style="border-radius: 10rpx;background: #fff;margin-top: 0;">
+			<view class="tn-margin tn-padding" style="border-radius: 10rpx;background: #fff;margin-top: 0;">
 				<textarea maxlength="500" v-model="content" placeholder="请描述您的需求..." :style="{fontSize:(wxFontSize-3)+'px',width:'100%'}"  :placeholder-style="styleString"></textarea>
 			</view>
 
 
-			<view style="padding: 16px;color:#333;padding-top: 0;font-weight: bold;"  :style="{fontSize:(wxFontSize-1)+'px'}">
+			<view style="padding: 16px;color:#333;padding-top: 8px;padding-bottom: 8px;font-weight: bold;"  :style="{fontSize:(wxFontSize-1)+'px'}">
 				 上传图片
 			</view>
 			<view class="tn-margin-left tn-padding-top-xs">
@@ -65,7 +65,7 @@
 					<text style="color: #aaa;font-size: 12px;" :style="{fontSize:(wxFontSize-5)+'px'}">一次只能上传<text style="color: #E18730;display: inline;">六张图片</text></text>
 				</view>
 			</view>
-			<view style="padding: 16px;color:#333;font-weight: bold;"  :style="{fontSize:(wxFontSize-1)+'px'}">
+			<view style="padding: 16px;color:#333;font-weight: bold;padding-top: 24px;padding-bottom: 8px;"  :style="{fontSize:(wxFontSize-1)+'px'}">
 				 上传文件
 			</view>
 			<!-- <view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top-xl tn-margin" style="margin-bottom: 0;">

pages/comm/comm.vue

@@ -82,9 +82,9 @@
 							class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
 							>
 							<tn-tag margin="-4px 4px 0 0" backgroundColor="#005da61a" v-if="item.brand"
-								fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+11" @click="showBrand('品牌：'+item.brand)">{{ item.brand }}</tn-tag>
+								fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+8" @click="showBrand('品牌：'+item.brand)">{{ item.brand }}</tn-tag>
 							<tn-tag margin="-4px 4px 0 0" backgroundColor="#005da61a" v-if="!item.company"
-								fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+11" @click="showBrand('个人发布')">个人</tn-tag>
+								fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+8" @click="showBrand('个人发布')">个人</tn-tag>
 						</view>
 						<view style="border-radius: 0px 0px 0px 0px;width:calc(100% + 32px);margin-left:-16px;border-bottom: 1px solid #E6E6E6;"></view>
 
@@ -95,8 +95,7 @@
 						
 						
 						<!-- 内容太多疲劳了-->
-						<view v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
-							:id="`blogger__content--${index}`">
+						<view v-if="item.shareExt&&item.shareExt.length>0" :id="`blogger__content--${index}`">
 							
 							<view v-for="(sitem,index) in item.shareExt" :key="sitem.id">
 								<view style="padding: 12px 0 8px 5px;color:#005DA6;"  :style="{fontSize:(wxFontSize-3)+'px'}">
@@ -112,9 +111,8 @@
  
 						</view>
 
-						<block v-if="item.imgList">
-							<view v-if="[1,2,4].indexOf(item.imgList.length) != -1" class="tn-padding-top-xs"
-								>
+						<block v-if="item.imgList&&item.imgList.length>0">
+							<view v-if="[1,2,4].indexOf(item.imgList.length) != -1" class="tn-padding-top-xs">
 								<image v-for="(image_item,image_index) in item.imgList" :key="image_index"
 									class="blogger__main-image" :class="{
               'blogger__main-image--1 tn-margin-bottom-sm': item.imgList.length === 1,
@@ -142,7 +140,7 @@
 						</block>
 
 						
-						<view v-for="file in item.fileDetailList" style="background-color:#005da60d ;margin-bottom: 4px;padding: 4px 8px;border-radius: 4px;" :key="file.id" v-if="!isImage(file.fileName)"  @click="clickLink(file.ftpUrl,file.fileName)">
+						<view v-for="(file,fIndex) in item.fileDetailList" :style="{marginTop:item.imgList&&item.imgList.length==0&&fIndex==0?'8px':'0'}" style="background-color:#005da60d ;margin-bottom: 4px;padding: 4px 8px;border-radius: 4px;" :key="file.id" v-if="!isImage(file.fileName)"  @click="clickLink(file.ftpUrl,file.fileName)">
 							<view>
 								<image src="../../static/tu/link.png" style="width: 18px;height: 18px;vertical-align: bottom;"></image>
 								<view style="display: inline;margin-left:8px;color:#005DA6;" :style="{fontSize:(wxFontSize-3)+'px'}">

pages/home/home.vue

@@ -66,7 +66,7 @@
 
 
 
-					<block v-if="item.imgList">
+					<block v-if="item.imgList&&item.imgList.length>0">
 						<view v-if="[1,2,4].indexOf(item.imgList.length) != -1" class="tn-padding-top-xs">
 							<image v-for="(image_item,image_index) in item.imgList" :key="image_index"
 								class="blogger__main-image" :class="{
@@ -95,7 +95,7 @@
 							</tn-grid>
 						</view>
 					</block>
-					<view v-for="file in item.fileDetailList" style="background-color:#005da60d ;margin-bottom: 4px;padding: 4px 8px;border-radius: 4px;" :key="file.id" v-if="!isImage(file.fileName)"  @click="clickLink(file.ftpUrl,file.fileName)">
+					<view v-for="(file,fIndex) in item.fileDetailList" :style="{marginTop:item.imgList&&item.imgList.length==0&&fIndex==0?'8px':'0'}" style="background-color:#005da60d ;margin-bottom: 4px;padding: 4px 8px;border-radius: 4px;" :key="file.id" v-if="!isImage(file.fileName)"  @click="clickLink(file.ftpUrl,file.fileName)">
 						<view>
 							<image src="../../static/tu/link.png" style="width: 18px;height: 18px;vertical-align: bottom;"></image>
 							<view style="display: inline;margin-left:8px;color:#005DA6;" :style="{fontSize:(wxFontSize-3)+'px'}">

pages/index/detail/detail.vue

@@ -46,9 +46,9 @@
 										class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
 										>
 										<tn-tag margin="-4px 4px 0 0" backgroundColor="#005da61a" v-if="item.brand"
-											fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+11" @click="showBrand('品牌：'+item.brand)">{{ item.brand }}</tn-tag>
+											fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+8" @click="showBrand('品牌：'+item.brand)">{{ item.brand }}</tn-tag>
 										<tn-tag margin="-4px 4px 0 0" backgroundColor="#005da61a" v-if="!item.company"
-											fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+11" @click="showBrand('个人发布')">个人</tn-tag>
+											fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+8" @click="showBrand('个人发布')">个人</tn-tag>
 									</view>
 									<view style="border-radius: 0px 0px 0px 0px;width:calc(100% + 32px);margin-left:-16px;border-bottom: 1px solid #E6E6E6;"></view>
 									
@@ -58,8 +58,7 @@
 									</view>
 				
 									<!-- 内容太多疲劳了-->
-									<view v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
-										:id="`blogger__content--${index}`">
+									<view v-if="item.shareExt&&item.shareExt.length>0" :id="`blogger__content--${index}`">
 										
 										<view v-for="(sitem,index) in item.shareExt" :key="sitem.id">
 											<view style="padding: 12px 0 8px 5px;color:#005DA6;"  :style="{fontSize:(wxFontSize-3)+'px'}">
@@ -75,7 +74,7 @@
 									 
 									</view>
 				
-									<block v-if="item.imgList">
+									<block v-if="item.imgList&&item.imgList.length>0">
 										<view v-if="[1,2,4].indexOf(item.imgList.length) != -1" class="tn-padding-top-xs"
 											>
 											<image v-for="(image_item,image_index) in item.imgList" :key="image_index"
@@ -105,7 +104,7 @@
 									</block>
 				
 									
-									<view v-for="file in item.fileDetailList" style="background-color:#005da60d ;margin-bottom: 4px;padding: 4px 8px;border-radius: 4px;"  @click="clickLink(file.ftpUrl,file.fileName)" :key="file.id" v-if="!isImage(file.fileName)">
+									<view v-for="(file,fIndex) in item.fileDetailList" :style="{marginTop:item.imgList&&item.imgList.length==0&&fIndex==0?'8px':'0'}" style="background-color:#005da60d ;margin-bottom: 4px;padding: 4px 8px;border-radius: 4px;"  @click="clickLink(file.ftpUrl,file.fileName)" :key="file.id" v-if="!isImage(file.fileName)">
 										<view>
 											<image src="../../../static/tu/link.png" style="width: 18px;height: 18px;vertical-align: bottom;"></image>
 											<view style="display: inline;margin-left:8px;color:#005DA6;" :style="{fontSize:(wxFontSize-3)+'px'}">

pages/mine/coll.vue

@@ -45,9 +45,9 @@
 							class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
 							>
 							<tn-tag margin="-4px 4px 0 0" backgroundColor="#005da61a" v-if="item.brand"
-								fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+11" @click="showBrand('品牌：'+item.brand)">{{ item.brand }}</tn-tag>
+								fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+8" @click="showBrand('品牌：'+item.brand)">{{ item.brand }}</tn-tag>
 							<tn-tag margin="-4px 4px 0 0" backgroundColor="#005da61a" v-if="!item.company"
-								fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+11" @click="showBrand('个人发布')">个人</tn-tag>
+								fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+8" @click="showBrand('个人发布')">个人</tn-tag>
 						</view>
 						<view style="border-radius: 0px 0px 0px 0px;width:calc(100% + 32px);margin-left:-16px;border-bottom: 1px solid #E6E6E6;"></view>
 
@@ -55,23 +55,11 @@
 							<text
 								class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" style="color:#747E87" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
 						</view>
-						<!-- <view
-							class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
-							 >
-						
-							 
-							<tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="item.brand" fontColor="#3a96d7" shape="circle"  :fontSize="wxFontSize+11">{{ item.brand }}</tn-tag>
-							 
-							<tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="!item.company"
-								fontColor="#3a96d7" shape="circle"  :fontSize="wxFontSize+11">个人</tn-tag> 				
-							<text
-								class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
-						</view> -->
+					 
 
 						
 					<!-- 内容太多疲劳了-->
-					<view v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
-						:id="`blogger__content--${index}`">
+					<view v-if="item.shareExt&&item.shareExt.length>0" :id="`blogger__content--${index}`">
 						
 						<view v-for="(sitem,index) in item.shareExt" :key="sitem.id">
 							<view style="padding: 12px 0 8px 5px;color:#005DA6;"  :style="{fontSize:(wxFontSize-3)+'px'}">
@@ -88,7 +76,7 @@
 					</view>
 					
 
-						<block v-if="item.imgList">
+						<block v-if="item.imgList&&item.imgList.length>0">
 							<view v-if="[1,2,4].indexOf(item.imgList.length) != -1" class="tn-padding-top-xs"
 								@click="tn('')">
 								<image v-for="(image_item,image_index) in item.imgList" :key="image_index"
@@ -118,7 +106,7 @@ aspectFill		:src="image_item.ftpUrl" mode="aspectFill" @click="showImg(item.imgL
 						</block>
 						
 						
-						<view v-for="file in item.fileDetailList" style="background-color:#005da60d ;margin-bottom: 4px;padding: 4px 8px;border-radius: 4px;" :key="file.id" v-if="!isImage(file.fileName)" @click="clickLink(file.ftpUrl,file.fileName)">
+						<view v-for="(file,fIndex) in item.fileDetailList" :style="{marginTop:item.imgList&&item.imgList.length==0&&fIndex==0?'8px':'0'}" style="background-color:#005da60d ;margin-bottom: 4px;padding: 4px 8px;border-radius: 4px;" :key="file.id" v-if="!isImage(file.fileName)" @click="clickLink(file.ftpUrl,file.fileName)">
 							<view>
 								<image src="../../static/tu/link.png" style="width: 18px;height: 18px;vertical-align: bottom;"></image>
 								<view style="display: inline;margin-left:8px;color:#005DA6;" :style="{fontSize:(wxFontSize-3)+'px'}">
@@ -180,7 +168,7 @@ aspectFill		:src="image_item.ftpUrl" mode="aspectFill" @click="showImg(item.imgL
 			<view v-if="showEmpty" style="margin-top: 32vh;">
 				<tn-empty mode="data"></tn-empty>
 			</view>
-			<view class='tn-tabbar-height' :style="{marginTop: vuex_custom_bar_height + 'px'}"></view>
+			<view class='tn-tabbar-height'></view>
 		</view>
 	     
 

pages/mine/need.vue

@@ -109,7 +109,7 @@
 							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" style="color:#747E87" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
 					</view>
 
-					<block v-if="item.imgList">
+					<block v-if="item.imgList&&item.imgList.length>0">
 						<view v-if="[1,2,4].indexOf(item.imgList.length) != -1" class="tn-padding-top-xs"
 							 >
 							<image v-for="(image_item,image_index) in item.imgList" :key="image_index"
@@ -139,7 +139,7 @@
 							</tn-grid>
 						</view>
 					</block>
-					<view v-for="file in item.fileDetailList" style="background-color:#005da60d ;margin-bottom: 4px;padding: 4px 8px;border-radius: 4px;" :key="file.id"  @click="clickLink(file.ftpUrl,file.fileName)" v-if="!isImage(file.fileName)">
+					<view v-for="(file,fIndex) in item.fileDetailList" :style="{marginTop:item.imgList&&item.imgList.length==0&&fIndex==0?'8px':'0'}" style="background-color:#005da60d ;margin-bottom: 4px;padding: 4px 8px;border-radius: 4px;" :key="file.id"  @click="clickLink(file.ftpUrl,file.fileName)" v-if="!isImage(file.fileName)">
 						<view>
 							<image src="../../static/tu/link.png" style="width: 18px;height: 18px;vertical-align: bottom;"></image>
 							<view style="display: inline;margin-left:8px;color:#005DA6;" :style="{fontSize:(wxFontSize-3)+'px'}">

pages/mine/share.vue

@@ -108,9 +108,9 @@
 						class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
 						>
 						<tn-tag margin="-4px 4px 0 0" backgroundColor="#005da61a" v-if="item.brand"
-							fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+11" @click="showBrand('品牌：'+item.brand)">{{ item.brand }}</tn-tag>
+							fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+8" @click="showBrand('品牌：'+item.brand)">{{ item.brand }}</tn-tag>
 						<tn-tag margin="-4px 4px 0 0" backgroundColor="#005da61a" v-if="!item.company"
-							fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+11" @click="showBrand('个人发布')">个人</tn-tag>
+							fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+8" @click="showBrand('个人发布')">个人</tn-tag>
 					</view>
 					<view style="border-radius: 0px 0px 0px 0px;width:calc(100% + 32px);margin-left:-16px;border-bottom: 1px solid #E6E6E6;"></view>
 					
@@ -120,8 +120,7 @@
 					</view>
 
 					 <!-- 内容太多疲劳了-->
-					 <view v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
-					 	:id="`blogger__content--${index}`">
+					 <view v-if="item.shareExt&&item.shareExt.length>0" :id="`blogger__content--${index}`">
 					 	
 					 	<view v-for="(sitem,index) in item.shareExt" :key="sitem.id">
 					 		<view style="padding: 12px 0 8px 5px;color:#005DA6;"  :style="{fontSize:(wxFontSize-3)+'px'}">
@@ -138,7 +137,7 @@
 					 </view>
 					 
 
-					<block v-if="item.imgList">
+					<block v-if="item.imgList&&item.imgList.length>0">
 						<view v-if="[1,2,4].indexOf(item.imgList.length) != -1" class="tn-padding-top-xs"
 							@click="tn('')">
 							<image v-for="(image_item,image_index) in item.imgList" :key="image_index"
@@ -167,7 +166,7 @@
 						</view>
 					</block>
 				 
-					<view v-for="file in item.fileDetailList" style="background-color:#005da60d ;margin-bottom: 4px;padding: 4px 8px;border-radius: 4px;" :key="file.id" v-if="!isImage(file.fileName)" @click="clickLink(file.ftpUrl,file.fileName)">
+					<view v-for="(file,fIndex) in item.fileDetailList" :style="{marginTop:item.imgList&&item.imgList.length==0&&fIndex==0?'8px':'0'}" style="background-color:#005da60d ;margin-bottom: 4px;padding: 4px 8px;border-radius: 4px;" :key="file.id" v-if="!isImage(file.fileName)" @click="clickLink(file.ftpUrl,file.fileName)">
 						<view>
 							<image src="../../static/tu/link.png" style="width: 18px;height: 18px;vertical-align: bottom;"></image>
 							<view style="display: inline;margin-left:8px;color:#005DA6;" :style="{fontSize:(wxFontSize-3)+'px'}">

tuniao-ui/components/tn-tag/tn-tag.vue

@@ -83,7 +83,7 @@
             clazz += ' tn-radius'
             break
           case 'circle':
-            clazz += ' tn-round'
+            clazz += ' tn-round-tag'
             break
           case 'circleLeft':
             clazz += ' tn-tag--fillet-left'

tuniao-ui/libs/css/main.scss

@@ -34,6 +34,10 @@ button::after {
 	border-radius: 5000rpx !important;
 }
 
+.tn-round-tag {
+	border-radius: 5px;
+}
+
 .tn-radius {
 	border-radius: 6rpx;
 }

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -2549,6 +2549,9 @@ button::after {
 .tn-round {
   border-radius: 5000rpx !important;
 }
+.tn-round-tag {
+  border-radius: 5px;
+}
 .tn-radius {
   border-radius: 6rpx;
 }