perf: 根据设计优化ui

circlePages/addShare.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="template-edit tn-safe-area-inset-bottom">
+	<view class="template-edit tn-safe-area-inset-bottom" style="background: #f7f7f7;min-height: 100vh;">
 		<!-- 顶部自定义导航 -->
 		<tn-nav-bar fixed customBack>
 			<view slot="back" class='tn-custom-nav-bar__back' @click="goBack">
@@ -10,15 +10,33 @@
 					<text :style="{fontSize:(wxFontSize)+'px'}">发布供应</text>
 				</view>
 				<view>
-					<button v-if="canSave" plain="true" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#1d60b1;border-color:#1d60b1;" @click="saveForm(1)"  :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
-					<button v-if="!canSave" :disabled="!canSave"  plain="true" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#0003;border-color:#0003;" @click="saveForm(1)"  :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
+					<button v-if="canSave" plain="true" style="margin-right: 4px;border-radius: 8px;;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#1d60b1;border-color:#1d60b1;" @click="saveForm(1)"  :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
+					<button v-if="!canSave" :disabled="!canSave"  plain="true" style="margin-right: 4px;border-radius: 8px;;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#0003;border-color:#0003;" @click="saveForm(1)"  :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
 				</view>
 			</view>
 		</tn-nav-bar>
 
 		<view class="tn-safe-area-inset-bottom" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 
-			<tn-steps style="pointer-events:none;" :list="selectValue=='个人'?stepList:stepList2" :current="stepIndex" mode="dotIcon" :fontSize="(wxFontSize-3)+'px'"></tn-steps>
+			<view style="display: flex;padding: 16px 36px;">
+				<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'}">{{selectValue=='个人'?'填写个人信息':'填写公司'}}</view>
+				</view>
+				<view style="flex:1;height: 0px;border: 1px dashed #005DA6;align-self: center;"></view>
+				<view style="position: relative;">
+				<image v-if="stepIndex==1" style="width: 48px;height: 48px;margin-left: 8px;margin-right: 8px;" src="../static/tu/step2.png"></image>
+				<image v-if="stepIndex!=1" style="width: 48px;height: 48px;margin-left: 8px;margin-right: 8px;" src="../static/tu/step22.png"></image>
+				<view style="position: absolute;width: max-content;margin-left: -25%;" :style="{color:stepIndex==1?'#777':'#333'}">填写供应信息</view>
+				</view>
+				<view style="flex:1;height: 0px;border: 1px dashed #005DA6;align-self: center;" :style="{borderColor:stepIndex==3?'#005DA6':'#333'}"></view>
+				<view style="position: relative;">
+				<image v-if="stepIndex!=3" style="width: 48px;height: 48px;margin-left: 8px;" src="../static/tu/step3.png"></image>
+				<image v-if="stepIndex==3" style="width: 48px;height: 48px;margin-left: 8px;" src="../static/tu/step32.png"></image>
+				<view style="position: absolute;width: max-content;margin-left: -25%;" :style="{color:stepIndex==1?'#777':'#333'}">上传附件</view>
+				</view>
+			</view>
+			<!-- <tn-steps style="pointer-events:none;" :list="selectValue=='个人'?stepList:stepList2" :current="stepIndex" mode="dotIcon" :fontSize="(wxFontSize-3)+'px'"></tn-steps> -->
 			<view v-show="stepIndex==1">
 
 				<view style="padding: 16px">
@@ -82,15 +100,9 @@
 
 				<!-- 悬浮按钮-->
 				<view class="tn-flex tn-footerfixed">
-					<!-- <view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-						<button type="default" plain="true" style="border-radius: 24px;"
-							@click="preStep()">
-							 上一步 
-						</button>
-						 
-					</view> -->
+					 
 					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-						<button type="default" plain="true" style="border-radius: 24px;"
+						<button type="default" plain="true" style="border-radius: 8px 8px 8px 8px;background: #005DA6;color: #f7f7f7;border: none;"
 							@click="nextStep()" :style="{fontSize:(wxFontSize-2)+'px'}">
 							 下一步 
 						</button>
@@ -197,25 +209,18 @@
 					 <view v-if="selectValue2=='服务'&&stepIndex==2" style="padding: 16px;padding-bottom: 0;margin-bottom: -30rpx;">
 					    <text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>服务介绍:</text>
 					 </view>
-					<view v-if="selectValue2=='服务'&&stepIndex==2" class="tn-margin tn-bg-gray--light tn-padding"
-						style="border-radius: 10rpx;">
+					<view v-if="selectValue2=='服务'&&stepIndex==2" class="tn-margin tn-padding"
+						style="border-radius: 10rpx;background: #fff;">
 						
 						<textarea maxlength="500" v-model="content" placeholder="请输入服务介绍"
-							placeholder-style="color:#AAAAAA" :style="{fontSize:(wxFontSize-3)+'px'}" :placeholder-style="styleString"></textarea>
+							placeholder-style="color:#AAAAAA" :style="{fontSize:(wxFontSize-3)+'px',width:'100%'}" :placeholder-style="styleString"></textarea>
 					</view>
 
 					<view class="tn-flex tn-flex-row-between tn-flex-col-center  tn-margin" style="margin-bottom: 0;" v-if="stepIndex==3">
-						<view class="tn-flex justify-content-item">
-							<view class="tn-text-center"
-								style="border-radius: 100rpx;margin-right: 8rpx;width: 45rpx;height: 45rpx;line-height: 45rpx;">
-								<text class="tn-icon-image" style="font-size: 20px;" :style="{fontSize:(wxFontSize+3)+'px'}"></text>
-							</view>
-							<view class="tn-padding-right-xs tn-text-bold" style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">上传图片（选填）</view>
-						</view>
-						<!-- <view class="justify-content-item tn-text-df tn-color-grey" @tap="clear">
-					 					<text class="tn-padding-xs">清空上传</text>
-					 					<text class="tn-icon-delete"></text>
-					 				</view> -->
+						<view style="padding: 16px 0;color:#333;"  :style="{fontSize:(wxFontSize-1)+'px'}">
+							 上传图片（选填）
+						</view> 
+						 
 					</view>
 
 
@@ -230,30 +235,35 @@
 
 						</uni-file-picker>
 						<view style="margin-top: 8px;">
-							<text style="color: #999;font-size: 12px;" :style="{fontSize:(wxFontSize-5)+'px'}">一次只能上传六张图片</text>
+							<text style="color: #999;font-size: 12px;" :style="{fontSize:(wxFontSize-5)+'px'}">一次只能上传<text style="color: #E18730;display: inline;">六张图片</text></text>
 						</view>
 						 
 
 					</view>
 
 					<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin tn-padding-top-xs" style="margin-top:32px;margin-bottom: 0;" v-if="stepIndex==3">
-						<view class="tn-flex justify-content-item">
-							<view class="tn-text-center"
-								style="border-radius: 100rpx;margin-right: 8rpx;width: 45rpx;height: 45rpx;line-height: 45rpx;">
-								<text class="tn-icon-link" style="font-size: 20px;" :style="{fontSize:(wxFontSize+3)+'px'}"></text>
-							</view>
-							<view class="tn-padding-right-xs tn-text-bold"  style="font-size: 16px;"  :style="{fontSize:(wxFontSize-1)+'px'}">上传相关文件（选填）</view>
-						</view>
-						<!-- <view class="justify-content-item tn-text-df tn-color-grey" @tap="clear">
-					 					<text class="tn-padding-xs">清空上传</text>
-					 					<text class="tn-icon-delete"></text>
-					 				</view> -->
+						 
+						<view style="padding: 16px 0;color:#333;"  :style="{fontSize:(wxFontSize-1)+'px'}">
+							 上传相关文件（选填）
+						</view> 
+						 
 					</view>
 
-					<view class="tn-margin-left tn-padding-top-xs"  v-show="stepIndex==3">
+					<view class="tn-margin-left tn-padding-top-xs" style="background: #fff;margin-left: 16px;margin-right: 16px;padding: 12px;border-radius: 6px;" v-show="stepIndex==3">
 						<uni-file-picker v-model="fileList" :limit="3" mode="grid" file-mediatype="all"
 							file-extname="pdf,docx,doc,xls,xlsx" :auto-upload="false" @select="select" @success="success" @delete="deleteFile">
 							<view style="text-align: left;">
+								<button size="mini" style="color:#fff;background-color:#005DA6;border: none;" plain="true" :style="{fontSize:(wxFontSize-5)+'px'}">
+									<image src="../static/tu/up.png" style="width: 20px;height: 20px;vertical-align: middle;margin-right: 4px;"></image>
+									上传文件</button>
+							</view>
+							<!-- <tn-button shadow shape="round" fontColor="tn-color-white" size="lg" backgroundColor="tn-bg-blue" :fontSize="24" height="auto" padding="20rpx 36rpx">上传文件</tn-button>
+							 -->
+							</uni-file-picker>
+							<view style="margin-top: 4px;">
+								<text style="color: #999;font-size: 12px;" :style="{fontSize:(wxFontSize-5)+'px'}">一次只能上传<text style="color: #E18730;">三个</text>文件，支持格式<text style="color: #E18730;"> pdf .doc .xls</text>，不超过<text style="color: #E18730;">5MB</text>。</text>
+							</view>
+							<!-- <view style="text-align: left;">
 								<button size="mini" style="color:#1d60b1;border-color:#1d60b1;display: inline-block;" plain="true"  :style="{fontSize:(wxFontSize-5)+'px'}">上传文件</button>
 							</view>
 							
@@ -261,7 +271,7 @@
 						</uni-file-picker>
 						<view style="margin-top: 4px;">
 							<text style="color: #999;font-size: 12px;" :style="{fontSize:(wxFontSize-5)+'px'}">一次只能上传三个文件，支持格式 pdf .doc .xls，不超过5MB。</text>
-						</view>
+						</view> -->
 						 
 						 
 						<view style="margin-top:6px" v-if="selectValue2=='产品'">
@@ -285,13 +295,13 @@
 				<!-- 悬浮按钮-->
 				<view class="tn-flex tn-footerfixed" >
 					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-						<button type="default" plain="true" style="border-radius: 24px;"
+						<button type="default" plain="true" style="border-radius: 8px;;"
 							@click="preStep()" :style="{fontSize:(wxFontSize-2)+'px'}">
 							 上一步 
 						</button>
 					</view>
 					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-						<button type="default" plain="true" style="border-radius: 24px;"
+						<button type="default" plain="true" style="border-radius: 8px;;"
 							@click="nextStep()" :style="{fontSize:(wxFontSize-2)+'px'}">
 							 下一步 
 						</button>
@@ -304,21 +314,21 @@
 
 				<view class="tn-flex tn-footerfixed"  v-if="(stepIndex==3)">
 					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-						<button type="default" plain="true" style="border-radius: 24px;"
+						<button type="default" plain="true" style="border-radius: 8px;;"
 							@click="preStep()" :style="{fontSize:(wxFontSize-2)+'px'}" :disabled="!canSave||!canNext">
 							 上一步 
 						</button>
 						 
 					</view>
 					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center" v-if="canSave&&canNext">
-						<button type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
+						<button type="primary" style="background-color:#1d60b1;border-radius: 8px;" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
 						<!-- <tn-button backgroundColor="#3668FC" padding="40rpx 0" width="60%" shadow fontBold
 							@click="saveForm()">
 							<text class="tn-color-white">提交审核</text>
 						</tn-button> -->
 					</view>
 					<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center" v-if="!canSave||!canNext">
-						<button type="primary" :disabled="!canSave||!canNext" style="background-color:#0003;border-radius: 23px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
+						<button type="primary" :disabled="!canSave||!canNext" style="background-color:#0003;border-radius: 8px;" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
 						<!-- <tn-button backgroundColor="#3668FC" padding="40rpx 0" width="60%" shadow fontBold
 							@click="saveForm()">
 							<text class="tn-color-white">提交审核</text>
@@ -704,7 +714,7 @@
 					uni.navigateBack()
 					return;
 				}else{
-					uni.navigateTo({
+					uni.reLaunch({
 						url: '/pages/index/index'
 					})
 				}
@@ -1070,7 +1080,7 @@
 		bottom: calc(env(safe-area-inset-bottom));
 		z-index: 1024;
 		box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);
-		background: #fff;
+		background: #f7f7f7;
 	}
 
 	/* 底部悬浮按钮 end*/

circlePages/circle.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="template-edit tn-safe-area-inset-bottom">
+	<view class="template-edit tn-safe-area-inset-bottom" style="background: #f7f7f7;min-height: 100vh;">
 		<!-- 顶部自定义导航 -->
 		<tn-nav-bar fixed customBack>
 			<view slot="back" class='tn-custom-nav-bar__back' @click="goBack">
@@ -11,24 +11,24 @@
 					<text :style="{fontSize:(wxFontSize)+'px'}">发布需求</text>
 				</view>
 				<view>
-					<button v-if="!canSave" :disabled="!canSave"  plain="true" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#0003;border-color:#0003;" @click="saveForm(1)"  :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
-					<button v-if="canSave" plain="true" :disabled="!canSave" style="margin-right: 4px;border-radius: 24px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#1d60b1;border-color:#1d60b1;" @click="saveForm(1)" :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
+					<button v-if="!canSave" :disabled="!canSave"  plain="true" style="margin-right: 4px;border-radius: 8px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#0003;border-color:#0003;" @click="saveForm(1)"  :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
+					<button v-if="canSave" plain="true" :disabled="!canSave" style="margin-right: 4px;border-radius: 8px;height:32px;line-height: 32px;font-size:15px;margin-top:4px;color:#1d60b1;border-color:#1d60b1;" @click="saveForm(1)" :style="{fontSize:(wxFontSize-3)+'px'}">暂存</button>
 				</view>
 			</view>
 		</tn-nav-bar>
 
-		<view class="tn-safe-area-inset-bottom" style="background: #f7f7f7;" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+		<view class="tn-safe-area-inset-bottom" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 
 			<view style="display: flex;padding: 16px 80px;">
 				<view style="position: relative;">
-					<image style="width: 40px;height: 40px;" src="../static/tu/step1.png"></image>
-					<view style="position: absolute;width: max-content;margin-left: -50%;" :style="{color:stepIndex==1?'#333':'#777'}">填写需求</view>
+					<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>
 				<view style="flex:1;height: 0px;border: 1px dashed #005DA6;align-self: center;"></view>
 				<view style="position: relative;">
-				<image v-if="stepIndex==1" style="width: 40px;height: 40px;" src="../static/tu/step2.png"></image>
-				<image v-if="stepIndex==2" style="width: 40px;height: 40px;" src="../static/tu/step22.png"></image>
-				<view style="position: absolute;width: max-content;margin-left: -50%;" :style="{color:stepIndex==1?'#777':'#333'}">填写联系方式</view>
+				<image v-if="stepIndex==1" style="width: 48px;height: 48px;margin-left: 8px;" src="../static/tu/step2.png"></image>
+				<image v-if="stepIndex==2" style="width: 48px;height: 48px;margin-left: 8px;" src="../static/tu/step22.png"></image>
+				<view style="position: absolute;width: max-content;margin-left: -25%;" :style="{color:stepIndex==1?'#777':'#333'}">填写联系方式</view>
 				</view>
 			</view>
 			
@@ -45,33 +45,20 @@
 					<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;"  :style="{fontSize:(fontSize-1)+'px'}">
+			<view style="padding: 16px;color:#333;"  :style="{fontSize:(wxFontSize-1)+'px'}">
 				 需求
 			</view>
 			<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 class="tn-flex tn-flex-row-between tn-flex-col-center  tn-margin" style="margin-top:40px;margin-bottom: 0;">
-				<view class="tn-flex justify-content-item">
-					<view class=" tn-text-center"
-						style="border-radius: 100rpx;margin-right: 8rpx;width: 45rpx;height: 45rpx;line-height: 45rpx;">
-						<text class="tn-icon-image" style="font-size: 20px;" :style="{fontSize:(wxFontSize+3)+'px'}"></text>
-					</view>
-					<view class="tn-padding-right-xs tn-text-bold"  style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">上传图片</view>
-				</view>
-			</view> -->
-				<!-- <view class="justify-content-item tn-text-df tn-color-grey" @tap="clear">
-					<text class="tn-padding-xs">清空上传</text>
-					<text class="tn-icon-delete"></text>
-				</view> -->
-			
+			 
 			
 			
 
 
 
-			<view style="padding: 16px;color:#333;"  :style="{fontSize:(fontSize-1)+'px'}">
+			<view style="padding: 16px;color:#333;"  :style="{fontSize:(wxFontSize-1)+'px'}">
 				 上传图片
 			</view>
 			<view class="tn-margin-left tn-padding-top-xs">
@@ -83,7 +70,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;"  :style="{fontSize:(fontSize-1)+'px'}">
+			<view style="padding: 16px;color:#333;"  :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;">
@@ -116,8 +103,8 @@
 			
 			</view>
 			
-			<view style="margin-top:20px;padding: 16px">
-				<view style="padding: 16px 0;color:#333;"  :style="{fontSize:(fontSize-1)+'px'}">
+			<view style="padding: 16px">
+				<view style="padding: 16px 0;color:#333;"  :style="{fontSize:(wxFontSize-1)+'px'}">
 					 需求有效期
 				</view>
 				 
@@ -187,14 +174,14 @@
 	
 	<view class="tn-flex tn-footerfixed">
 		<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-			<button type="default" plain="true" style="border-radius: 24px;"
+			<button type="default" plain="true" style="border-radius: 8px;"
 				@click="preStep()" :disabled="!canSave" :style="{fontSize:(wxFontSize-2)+'px'}">
 				 上一步 
 			</button>
 		</view>
 		<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
-			<button v-if="canSave&&canNext" type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
-			<button v-if="!canSave||!canNext" type="primary" :disabled="!canSave||!canNext" style="background-color:#0003;border-radius: 23px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
+			<button v-if="canSave&&canNext" type="primary" style="background-color:#1d60b1;border-radius: 8px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
+			<button v-if="!canSave||!canNext" type="primary" :disabled="!canSave||!canNext" style="background-color:#0003;border-radius: 8px" @click="saveForm()" :style="{fontSize:(wxFontSize-2)+'px'}">提交审核</button>
 		</view>
 	</view>
 </view>
@@ -688,7 +675,7 @@
 					uni.navigateBack()
 					return;
 				}else{
-					uni.navigateTo({
+					uni.reLaunch({
 						url: '/pages/index/index'
 					})
 				}
@@ -752,7 +739,7 @@
 		bottom: calc(env(safe-area-inset-bottom));
 		z-index: 1024;
 		box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);
-		background: #fff;
+		background: #f7f7f7;
 	}
 
 	/* 底部悬浮按钮 end*/

components/basic-table/basic-table.scss

@@ -1,142 +0,0 @@
-$bg-base-color: #ffffff;
-$header-color: #909399;
-$footer-bg-color: #f5f7fa;
-$table-border: #edeeee;
-$table-stripe-color: #fafafa;
-
-.base-table {
-	overflow: auto;
-	box-sizing: content-box;
-	&.is-border {
-		border: 1px solid $table-border;
-		border-bottom: none;
-		.b-th,
-		.b-td {
-			border-right: 1px solid $table-border;
-			&:last-of-type {
-				border-right: none;
-			}
-		}
-	}
-	&.no-data {
-		.base-table-body {
-			border-bottom: 1px solid $table-border;
-		}
-	}
-	.base-table-inner {
-		display: flex;
-		height: 100%;
-		flex-direction: column;
-		.base-table-header,
-		.base-table-footer {
-			width: 100%;
-			flex-shrink: 0;
-			position: sticky;
-			z-index: 3;
-		}
-		.base-table-header {
-			top: 0;
-			.b-td {
-				background-color: $bg-base-color;
-			}
-		}
-		.base-table-footer {
-			bottom: 0;
-			.b-tr {
-				background-color: $footer-bg-color !important;
-			}
-			.b-td {
-				border-top: 1px solid $table-border;
-				background-color: $footer-bg-color !important;
-			}
-		}
-		.base-table-body {
-			position: relative;
-			flex: 1;
-		}
-
-		.b-table {
-			table-layout: fixed;
-			display: table;
-			.b-thead {
-				color: $header-color;
-				table-layout: fixed;
-				display: table-header-group;
-				vertical-align: middle;
-				font-weight: bold;
-				
-			}
-			.b-tbody {
-				display: table-row-group;
-				vertical-align: middle;
-				table-layout: fixed;
-			}
-			.b-tr {
-				background-color: $bg-base-color;
-				display: table-row;
-				&.is-stripe {
-					.b-td {
-						background-color: $table-stripe-color;
-					}
-				}
-			}
-			.b-th,
-			.b-td {
-				font-size: 14px;
-				display: table-cell;
-				border-bottom: 1px solid $table-border;
-				padding: 8px 0;
-				box-sizing: border-box;
-				text-overflow: ellipsis;
-				position: relative;
-				vertical-align: middle;
-				text-align: left;
-				z-index: 1;
-				.b-cell {
-					box-sizing: border-box;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: normal;
-					word-break: break-all;
-					line-height: 23px;
-					padding: 0 8px;
-				}
-				&.fixed {
-					position: sticky !important;
-					z-index: 2;
-					background: $bg-base-color;
-					border-right: 0;
-					&::before {
-						content: '';
-						position: absolute;
-						top: 0px;
-						width: 10px;
-						bottom: -1px;
-					}
-				}
-				&.fixed-left {
-					left: 0;
-					&::before {
-						right: -10px;
-						box-shadow: inset 10px 0 10px -10px rgba(0, 0, 0, 0.15);
-					}
-				}
-				&.fixed-right {
-					right: 0;
-					&::before {
-						left: -10px;
-						box-shadow: inset -10px 0 10px -10px rgba(0, 0, 0, 0.15);
-					}
-				}
-			}
-			.base-table-empty {
-				min-height: 60px;
-				line-height: 60px;
-				width: 100%;
-				text-align: center;
-				color: $header-color;
-				font-size: 24rpx;
-			}
-		}
-	}
-}

components/basic-table/basic-table.vue

@@ -1,367 +0,0 @@
-<template>
-	<view class="base-table" :style="[getTableStyle]" :class="{ 'is-border': border, 'no-data': data.length === 0 }">
-		<view class="base-table-inner">
-			<view class="base-table-header" v-if="showHeader">
-				<view class="b-table" :style="[tableBodyStyle]">
-					<view class="b-thead">
-						<view class="b-tr" :class="getHeaderClass" :style="getHeaderStyle" @click="handleHeaderClick">
-							<view class="b-th" v-if="indexShow" :style="[getIndexColStyle]"><view class="b-cell">序号</view></view>
-							<view class="b-th" v-for="item in columns" :key="item.fieldName" :class="[getCellProps(item).class]" :style="[getCellProps(item).style]">
-								<view class="b-cell" :style="{fontSize:fontSize+'px'}">{{ item.fieldDesc }}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="base-table-body">
-				<view class="b-table" :style="[tableBodyStyle]">
-					<view class="b-tbody" v-if="data.length > 0">
-						<view
-							class="b-tr"
-							v-for="(scope, index) in data"
-							:key="index"
-							:class="[getBodyClass(scope, index)]"
-							:style="[getBodyStyle(scope, index)]"
-							@click="handleRowClick(scope, index)"
-						>
-							<view class="b-td" v-if="indexShow" :style="[getIndexColStyle]">
-								<view class="b-cell" :style="{fontSize:fontSize+'px'}">{{ getIndexMethod(index) }}</view>
-							</view>
-							<view class="b-td" v-for="column in columns" :key="column.fieldName" :class="[getCellProps(column).class]" :style="[getCellProps(column).style]">
-								<view class="b-cell" @click.stop="handleCellClick(scope, column, index)">
-									<slot name="item" :scope="scope" :column="column" v-if="column.fieldType === 'slot'"></slot>
-									<view v-else :style="{fontSize:fontSize+'px'}">{{ scope[column.fieldName] }}</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="base-table-empty" v-else>
-						<view class="mt20" v-if="!$slots.empty">{{ emptyText }}</view>
-						<slot name="empty"></slot>
-					</view>
-				</view>
-			</view>
-			<view class="base-table-footer" v-if="showFooter">
-				<view class="b-table" :style="[tableBodyStyle]">
-					<view class="b-tbody">
-						<view class="b-tr">
-							<view class="b-td" v-if="indexShow" :style="[getIndexColStyle]">
-								<view class="b-cell">{{ footerText }}</view>
-							</view>
-							<view
-								class="b-td"
-								v-for="(item, index) in sumList"
-								:key="index"
-								:class="[getCellProps(columns[index]).class]"
-								:style="[getCellProps(columns[index]).style]"
-							>
-								<view class="b-cell">{{ item }}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	props: {
-		columns: {
-			type: Array,
-			default: () => []
-		},
-		data: {
-			type: Array,
-			default: () => []
-		},
-		align: {
-			type: String,
-			default: 'left'
-		},
-		height: {
-			type: String
-		},
-		maxHeight: {
-			type: String
-		},
-		width: {
-			type: String,
-			default: '100%'
-		},
-		emptyText: {
-			type: String,
-			default: '暂无数据'
-		},
-		border: {
-			type: Boolean,
-			default: false
-		},
-		stripe: {
-			type: Boolean,
-			default: false
-		},
-		showHeader: {
-			type: Boolean,
-			default: true
-		},
-		showFooter: {
-			type: Boolean,
-			default: false
-		},
-		footerMethod: {
-			type: Function
-		},
-		footerText: {
-			type: String,
-			default: '合计'
-		},
-		indexShow: {
-			type: Boolean,
-			default: false
-		},
-		minItemWidth: {
-			type: Number,
-			default: 80
-		},
-		rowClassName: {
-			type: [Function, String]
-		},
-		rowStyle: {
-			type: [Function, Object]
-		},
-		indexMethod: {
-			type: Function
-		},
-		headerRowClassName: {
-			type: String
-		},
-		headerRowStyle: {
-			type: Object
-		},
-		fontSize:{
-			type: Number,
-			default: 15
-		},
-		indexWidth: {
-			type: String,
-			default: '60px'
-		}
-	},
-	data() {
-		return {
-			sumList: [],
-			tableWidth: 0
-		};
-	},
-	mounted() {
-		const query = uni.createSelectorQuery().in(this).select('.base-table');
-		query.boundingClientRect(data => {
-				this.tableWidth = data.width;
-		}).exec();
-	},
-	computed: {
-		getTableStyle() {
-			const { width, height, maxHeight } = this;
-			const styleObj = {};
-			if (width) {
-				styleObj.width = width;
-			}
-			if (height) {
-				styleObj.height = height;
-			}
-			if (maxHeight) {
-				styleObj.maxHeight = maxHeight;
-			}
-			return styleObj;
-		},
-		tableBodyStyle() {
-			if (!this.tableWidth) return {};
-			const clienWidth = this.tableWidth;
-			const flexColumn = this.columns.filter(item => !item.width);
-			//set min width
-			const minWidth = this.minItemWidth;
-
-			let bodyMinWidth = this.columns.reduce((t, c) => {
-				c.width = c.width || minWidth;
-				return t + parseFloat(c.width);
-			}, 0);
-			if(this.indexShow){
-				bodyMinWidth+=parseFloat(this.indexWidth)
-			}
-			if (flexColumn.length > 0 && bodyMinWidth < clienWidth) {
-				const flexWidth = clienWidth - bodyMinWidth;
-				if (flexColumn.length === 1) {
-					flexColumn[0].width = minWidth + flexWidth;
-				} else {
-					const scaleWidth = flexWidth / flexColumn.length;
-					flexColumn.forEach(item => {
-						item.width = minWidth + Math.floor(scaleWidth);
-					});
-				}
-			}
-			bodyMinWidth = Math.max(bodyMinWidth, clienWidth);
-			return {
-				width: `${bodyMinWidth}px`
-			};
-		},
-		showXScroll() {
-			const clienWidth = this.tableWidth;
-			return clienWidth < parseFloat(this.tableBodyStyle?.width || 0);
-		},
-		isEmpty() {
-			return this.data.length === 0;
-		},
-		getHeaderClass() {
-			const headerClass = [];
-			if (this.headerRowClassName) {
-				headerClass.push(this.headerRowClassName);
-			}
-			return headerClass;
-		},
-		getHeaderStyle() {
-			const headerStyle = [];
-			if (typeof this.headerRowStyle === 'object') {
-				if (this.headerRowStyle) {
-					headerStyle.push(this.headerRowStyle);
-				}
-			}
-			return headerStyle;
-		},
-		getIndexColStyle() {
-			return {
-				textAlign: this.align,
-				width: this.indexWidth
-			};
-		}
-	},
-	methods: {
-		init() {
-			this.sumList = [];
-			if (this.showFooter && this.data.length > 0) {
-				const { columns, data, footerText } = this;
-				if (typeof this.footerMethod === 'function') {
-					this.sumList = this.footerMethod({ columns, data });
-				} else {
-					columns.forEach((column, index) => {
-						if (!this.indexShow && index === 0) {
-							this.sumList[index] = footerText;
-							return;
-						}
-						const values = data.map(item => Number(item[column.fieldName]));
-						const precisions = [];
-						let notNumber = true;
-						values.forEach(value => {
-							if (!Number.isNaN(+value)) {
-								notNumber = false;
-								const decimal = `${value}`.split('.')[1];
-								precisions.push(decimal ? decimal.length : 0);
-							}
-						});
-						const precision = Math.max.apply(null, precisions);
-						if (!notNumber) {
-							this.sumList[index] = values.reduce((prev, curr) => {
-								const value = Number(curr);
-								if (!Number.isNaN(+value)) {
-									return Number.parseFloat((prev + curr).toFixed(Math.min(precision, 20)));
-								} else {
-									return prev;
-								}
-							}, 0);
-						} else {
-							this.sumList[index] = '';
-						}
-					});
-				}
-			}
-		},
-
-		getBodyClass(scope, index) {
-			const bodyClass = [];
-			if (this.stripe) {
-				bodyClass.push({ 'is-stripe': index % 2 === 1 });
-			}
-			if (typeof this.rowClassName === 'function') {
-				const rowClass = this.rowClassName?.(scope, index);
-				if (rowClass) {
-					bodyClass.push(rowClass);
-				}
-			} else if (typeof this.rowClassName === 'string') {
-				if (this.rowClassName) {
-					bodyClass.push(this.rowClassName);
-				}
-			}
-			return bodyClass;
-		},
-
-		getBodyStyle(scope, index) {
-			const bodyStyle = [];
-			if (typeof this.rowStyle === 'function') {
-				const rowStyle = this.rowStyle?.(scope, index);
-				if (rowStyle) {
-					bodyStyle.push(rowStyle);
-				}
-			} else if (typeof this.rowStyle === 'object') {
-				if (this.rowStyle) {
-					bodyStyle.push(this.rowStyle);
-				}
-			}
-			return bodyStyle;
-		},
-
-		getIndexMethod(index) {
-			let curIndex = index + 1;
-			if (typeof this.indexMethod === 'function') {
-				curIndex = this.indexMethod?.(index);
-			}
-			return curIndex;
-		},
-
-		getCellProps(row) {
-			const classList = [];
-			if (this.showXScroll && row.fixed) {
-				classList.push('fixed');
-				if (row.fixed === 'left') {
-					classList.push('fixed-left');
-				} else {
-					classList.push('fixed-right');
-				}
-			}
-			return {
-				class: classList,
-				style: {
-					width: `${row.width}px`,
-					textAlign: this.align,
-					minWidth: `${this.minItemWidth}px`
-				}
-			};
-		},
-
-		handleHeaderClick() {
-			this.$emit('header-click');
-		},
-
-		handleRowClick(scope, index) {
-			this.$emit('row-click', scope, index);
-		},
-
-		handleCellClick(scope, column, index) {
-			this.$emit('cell-click', { scope, column, index });
-		},
-	},
-	watch: {
-		data: {
-			handler() {
-				this.init();
-			},
-			immediate: true,
-			deep: true
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import './basic-table.scss';
-</style>

minePages/set.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="template-set">
+  <view class="template-set"  style="background: #f7f7f7;min-height: 100vh;">
     <!-- 顶部自定义导航 -->
     <tn-nav-bar fixed alpha customBack>
       <view slot="back" class='tn-custom-nav-bar__back'
@@ -44,7 +44,7 @@
 				</uni-forms-item>
 	  			 
 	  		</uni-forms>
-	  		<button shape="round" style="background-color: #1d60b1;border-radius: 30px;" type="primary" @click="saveForm">保存修改</button>
+	  		<button shape="round" style="background-color: #1d60b1;border-radius: 8px;" type="primary" @click="saveForm">保存修改</button>
 	  	</view>
        
       

pages.json

@@ -8,19 +8,8 @@
 		{
 		  "path": "pages/index/index",
 		  "style": {
-		    "mp-weixin": {
-		      "disableScroll": true
-		    },
-		    "app-plus": {
-		      "bounce": "none"
-		    },
-		    "mp-alipay": {
-		      "allowsBounceVertical": "NO"
-		    },
-		    "mp-baidu": {
-		      "disableScroll": true
-		    }
-		  }
+		     "navigationBarTitleText" : "速立保"
+		   }
 		},
 		{
 			"path" : "pages/index/auth",
@@ -121,6 +110,36 @@
 			{
 				"navigationBarTitleText" : "账号登录"
 			}
+		},
+		{
+			"path" : "pages/discovery/discovery",
+			"style" : 
+			{
+				"navigationBarTitleText" : "速立保"
+			}
+		},
+		{
+			"path" : "pages/home/home",
+			"style" : 
+			{
+				"navigationBarTitleText" : "我要什么"
+			}
+		},
+		
+		{
+			"path" : "pages/mine/mine",
+			"style" : 
+			{
+				"navigationBarTitleText" : "我的"
+				 
+			}
+		},
+		{
+			"path" : "pages/comm/comm",
+			"style" : 
+			{
+				"navigationBarTitleText" : "我有什么"
+			}
 		}
 		 
 	],
@@ -154,11 +173,39 @@
       }
     ]
   }],
+  "tabBar": {
+	"color": "#868585",
+  	"selectedColor": "#005DA6",
+  	"list": [{
+  			"pagePath": "pages/index/index",
+  			"text": "供需发布平台",
+  			"iconPath": "static/ui/home.png",
+  			"selectedIconPath": "static/ui/home1.png"
+  		},
+		{
+			"pagePath": "pages/home/home",
+			"text": "我要什么",
+			"iconPath": "static/ui/need.png",
+			"selectedIconPath": "static/ui/need1.png"
+		},
+		{
+			"pagePath": "pages/comm/comm",
+			"text": "我有什么",
+			"iconPath": "static/ui/share.png",
+			"selectedIconPath": "static/ui/share1.png"
+		} ,
+		{
+			"pagePath": "pages/mine/mine",
+			"text": "我的",
+			"iconPath": "static/ui/me.png",
+			"selectedIconPath": "static/ui/me1.png"
+		}  
+  	]},
 	"globalStyle": {
 	  "navigationStyle": "custom",
 	  "navigationBarTextStyle": "black",
 	  "navigationBarTitleText": "速立保",
-	  "navigationBarBackgroundColor": "#F8F8F8",
+	  "navigationBarBackgroundColor": "#fff",
 	  "backgroundColor": "#F8F8F8"
 	}
 }

pages/comm/comm.vue

@@ -1,48 +1,59 @@
 <template>
-	<view class="circle tn-safe-area-inset-bottom">
+	<view class="circle tn-safe-area-inset-bottom" style="background: #f7f7f7;">
+		<tn-nav-bar customBack>
+			<view slot="back" class='tn-custom-nav-bar__back'>
+				<image style="width: 28px;height: 28px;margin-left:4px"  @click="reFetchData()" src="../../static/tu/reload.png"></image>
+				<image style="width: 28px;height: 28px;margin-left:12px"  @click="addButton()" src="../../static/tu/add.png"></image>		 
+			</view>
+		
+			<view slot="default" style="display: flex;">
+				<view style="flex:1;">
+					<text :style="{fontSize:(wxFontSize)+'px'}">我有什么</text>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<scroll-view class="custom-tabbar-page" style="height: 100vh;" :style="{marginTop: vuex_custom_bar_height + 'px'}" scroll-y :refresher-enabled="true" :refresher-triggered="triggered" lower-threshold="60" @refresherrestore="onRestore" @refresherrefresh="onRefresh"  @refresherpulling="onPulling" enable-back-to-top @scrolltolower="tabbarPageScrollLower">
+			
 		
-
 		<!-- 发现 -->
 		<view class="" v-if="current==0" >
-			<uv-sticky   bgColor="#ffffff">
+			 
+			<uv-sticky   bgColor="#f7f7f7">
 				<view style="width: 100%;" v-if="currentTab==0">
-					<view style="display: flex; padding: 10px 12px;">
+					<view style="display: flex; padding: 16px;">
 						<view
-							style="flex:1;background-color: #f8f8f8;border-radius: 18px;color: #bbb;line-height: 35px;"
+							style="flex:1;background-color: #fff;border-radius: 18px;color: #999;line-height: 36px;"
 							@click="showSearch">
 							<view>
-								<uni-icons type="search" color="#bbbbbb" :size="wxFontSize+1" style="margin: 8px;"></uni-icons>
+								<image src="../../static/tu/search.png" style="width: 26px;height: 26px;vertical-align: middle; margin-left:8px; margin-right: 12px;margin-top: -2px;"></image>
 								<text :style="{fontSize:(wxFontSize-2)+'px'}" v-if="!searchProdValue">产品名称/品牌/产品型号</text>
 								<text :style="{fontSize:(wxFontSize-2)+'px'}" v-if="searchProdValue">{{searchProdValue}}</text>
 							</view>
 						</view>
-						<view v-if="searchProdValue" @click="clearProd" style="line-height: 36px;margin-left: 10px;" :style="{fontSize:(wxFontSize-2)+'px'}">取消
+						<view v-if="searchProdValue" @click="clearProd" style="line-height: 36px;margin-left: 10px;color: #333;" :style="{fontSize:(wxFontSize-2)+'px'}">取消
 						</view>
 					</view>
 				</view>
 				<view style="width: 100%;" v-if="currentTab==1">
-					<view style="display: flex; padding: 10px 12px;">
+					<view style="display: flex; padding: 16px;">
 						<view
-							style="flex:1;background-color: #f8f8f8;border-radius: 18px;color: #bbb;line-height: 35px;"
+							style="flex:1;background-color: #fff;border-radius: 18px;color: #999;line-height: 36px;"
 							@click="showSearch2">
 							<view>
-								<uni-icons type="search" color="#bbbbbb" :size="wxFontSize+1" style="margin: 8px;"></uni-icons>
+								<image src="../../static/tu/search.png" style="width: 26px;height: 26px;vertical-align: middle; margin-left:8px;margin-right: 12px;margin-top: -2px;"></image>
 								<text v-if="!searchProdValue2" :style="{fontSize:(wxFontSize-2)+'px'}">品牌/服务内容</text>
 								<text v-if="searchProdValue2" :style="{fontSize:(wxFontSize-2)+'px'}">{{searchProdValue2}}</text>
 							</view>
 						</view>
-						<view v-if="searchProdValue2" @click="clearProd2" style="line-height: 36px;margin-left: 10px;"  :style="{fontSize:(wxFontSize-2)+'px'}">取消
+						<view v-if="searchProdValue2" @click="clearProd2" style="line-height: 36px;margin-left: 10px;color: #333;"  :style="{fontSize:(wxFontSize-2)+'px'}">取消
 						</view>
 					</view>
 				</view>
 
-				<!-- <uni-search-bar radius="15" placeholder="搜索" v-if="currentTab==1" @confirm="search"
-					v-model="searchValue" @blur="search" @cancel="cancel" @clear="clear" cancelButton="auto"
-					clearButton="auto">
-				</uni-search-bar> -->
+				 
 
-				<tn-tabs-swiper :list="tabList" :isScroll="false" :fontSize="(wxFontSize+12)" :barWidth="wxFontSize+50" :current="currentTab" name="tab-name"
-					@change="changeTab" style="border-bottom: 1rpx solid #f1f1f1cc;">
+				<tn-tabs-swiper :list="tabList" :isScroll="false" :fontSize="(wxFontSize+12)" :barWidth="wxFontSize+50" :current="currentTab" name="tab-name" activeColor="#005DA6" inactiveColor="#333"
+					@change="changeTab">
 				</tn-tabs-swiper>
 			</uv-sticky>
 			 
@@ -50,24 +61,17 @@
 
 				<!-- 图文信息 -->
 				<block v-for="(item,index) in content" :key="item.id">
-					<view class="blogger__item" :key="index">
+					<view class="blogger__item" style="border-radius: 12px;margin: 12px 16px 12px 16px; background-color: #fff;" :key="index">
 						<view class="blogger__author tn-flex tn-flex-row-between tn-flex-col-center">
-							<view class="justify__author__info" @click="tn('')">
+							<view class="justify__author__info">
 								<view class="tn-flex tn-flex-row-center">
 									<view class="tn-flex tn-flex-row-center tn-flex-col-center">
-										<!-- <view class="">
-										  <tn-avatar
-											class=""
-											shape="circle"
-											:src="item.userAvatar"
-											size="lg">
-										  </tn-avatar>
-										</view> -->
+										 <view class="" style="width: 5px;height: 5px;background: #E18730;border-radius: 50%;margin-right: 4px;">
+										 </view>
 										<view class="tn-padding-right">
-											<view class="tn-color-grey tn-text-lg"  :style="{fontSize:(wxFontSize)+'px'}">
+											<view class="tn-color-grey tn-text-lg" style="color:#333" :style="{fontSize:(wxFontSize)+'px'}">
 												{{ item.company||(item.contactNickName||item.contactPerson) }}
 											</view>
-											<!-- <view class="tn-padding-right tn-padding-left-sm tn-padding-top-xs tn-color-gray">{{ item.date }}</view> -->
 										</view>
 									</view>
 								</view>
@@ -77,32 +81,35 @@
 						<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" @click="showBrand('品牌：'+item.brand)">{{ item.brand }}</tn-tag>
-							<tn-tag margin="-4px 4px 0 0" backgroundColor="#3a96d733" v-if="!item.company"
-								fontColor="#3a96d7" shape="circle" :fontSize="wxFontSize+11" @click="showBrand('个人发布')">个人</tn-tag>
-
-							<text v-if="item.content"
-								class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
-
+							<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>
+							<tn-tag margin="-4px 4px 0 0" backgroundColor="#005da61a" v-if="!item.company"
+								fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+11" @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>
 
+						<view  v-if="item.content" style="padding: 12px 12px 5px 5px;"> 
+							<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 v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
 							:id="`blogger__content--${index}`">
-
-							<basic-table header-row-class-name="basic-table-header" :columns="columns" :border="true" :fontSize="(wxFontSize-3)"
-								:stripe="true" :data="item.shareExt">
-								<template #item="{column,scope,index}">
-									 <view v-if="column.fieldName==='prodDesc'">
-										<tn-read-more openText="查看全部" :closeBtn="true" closeText="收起" :showHeight="125">
-											<text :style="{fontSize:(scope.fontSize-3)+'px'}">{{scope.prodDesc||''}}</text>
-										</tn-read-more>
-									 </view>
-							    </template>
-							</basic-table>
+							
+							<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'}">
+									 {{sitem.prodName}}
+								</view>
+								<view style="padding: 8px 8px 0 5px;color:#333;display: flex;"  :style="{fontSize:(wxFontSize-3)+'px'}">
+									 <text style="color: #777;white-space: nowrap;">产品型号：</text>{{sitem.prodSpec}}
+								</view>
+								<view v-if="sitem.prodDesc" style="padding: 8px 8px 0 5px;color:#333;display: flex;"  :style="{fontSize:(wxFontSize-3)+'px'}">
+									 <text style="color: #777;white-space: nowrap;">产品介绍：</text><text>{{sitem.prodDesc}}</text>
+								</view>
+							</view>
+ 
 						</view>
 
 						<block v-if="item.imgList">
@@ -135,27 +142,60 @@
 						</block>
 
 						
-						<view v-for="file in item.fileDetailList" :key="file.id" v-if="!isImage(file.fileName)">
-							<view style="margin-top:10px">
-								<text class="tn-icon-link" :style="{fontSize:(wxFontSize-4)+'px'}"></text>
-								<view style="display: inline;margin-left:8px;" @click="clickLink(file.ftpUrl,file.fileName)" :style="{fontSize:(wxFontSize-3)+'px'}">
+						<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>
+								<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'}">
 									{{file.fileName}}</view>
-
 							</view>
 						</view>
 
 						<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-top-xs">
 							<view class="justify-content-item tn-color-gray tn-text-center">
-								<view class="tn-padding-right   tn-padding-top-xs tn-color-gray" :style="{fontSize:(wxFontSize-3)+'px'}">
+								<view class="tn-padding-right   tn-padding-top-xs" :style="{fontSize:(wxFontSize-3)+'px',color:'#777'}">
 									{{ item.createTime|formatDate }}
 								</view>
 
 							</view>
+							
 							<view class="justify-content-item tn-flex tn-flex-col-center" style="position: relative">
-								<text class="tn-icon-more-vertical tn-color-gray tn-text-bold tn-text-xxl"
-									@click="showActionSheet(item)"></text>
+								<image style="width: 30px;height:30px;" @click="showActionSheet(item)" src="../../static/tu/more.png"></image>
 									
-									<view v-if="curItem.id==item.id&&showSheet" style="position: absolute;
+									<view v-if="curItem.id==item.id&&showSheet" class="pop-dia" style="position: absolute;background: #E4F1FB;display: block;right: 10px;top: 24px;border-radius: 6px;z-index: 900;">
+									 
+										<view class="content" style="padding: 8px;font-size: 16px;line-height: 24px; width: 180px;border-radius: 6px;"
+											v-if="!showContact">
+											<button @click="linkTel()" style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);">
+												 <image src="../../static/tu/call.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;"> 联系供方</button>
+											<!-- <view>联系我们帮助对接</view> -->
+											<button v-if="!collStatus" @click="addColl"
+												style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);" type="default" plain="true">
+												<image src="../../static/tu/coll.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;">
+												收&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;藏</button>
+											<button v-if="collStatus" @click="delColl"
+												style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);" type="default" plain="true">
+												<image src="../../static/tu/coll.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;"> 取消收藏</button>
+											<button open-type="share"
+												style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;" type="default" plain="true" :data-coupon="curItem">
+												<image src="../../static/tu/share.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;">
+												转&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发</button>
+										</view>
+										<view class="content " style="position: relative;background: linear-gradient( 180deg, #DAECFA 0%, #FFFFFF 27%, #FFFFFF 100%);padding: 24px 40px;padding-bottom: 32px;font-size: 16px;width: calc(100vw - 80px);line-height: 24px;border-radius: 12px;"
+											v-if="showContact">
+											<view><text style="font-size: 19px;font-weight: bold;color: #333;" v-if="curContact.company">{{curContact.company}}</text></view>
+											<view style="margin-top:10px;font-size: 17px;text-align: center;color:#333">
+												<image src="../../static/tu/person.png" style="width: 24px;height: 24px;vertical-align: sub;">
+											<text style="margin-left: 6px;">{{curContact.contactPerson}}</text> </view>
+											<view style="margin-top:10px;font-size: 17px;text-align: center;color:#333" @click="showTel(curContact.contactMethod)">
+												<image src="../../static/tu/tel.png" style="width: 24px;height: 24px;vertical-align: middle;">
+												<text style="margin-left: 4px;">{{curContact.contactMethod}}</text> 
+											</view>
+											
+											<image src="../../static/tu/close.png" style="width: 40px;height: 40px;position: absolute; left: calc(50vw - 60px);bottom: -64px;" @click="hideSheet()"></image>
+										</view>
+										<view style="position: fixed;top: 0;left: 0;height: 100000vh;width: 100%;background: rgb(0 0 0 / 0.5);z-index: -1;" @click="hideSheet()" v-if="showContact"></view>
+									</view>
+									<!-- <view v-if="curItem.id==item.id&&showSheet" style="position: absolute;
 									background: #ddd;
 									display: block;
 									right: 10px;
@@ -166,7 +206,7 @@
 													v-if="!showContact">
 													<button @click="linkTel()" style="border-radius:30px;color:#fff;background-color: #1d60b1;"><text
 															class="tn-icon-service" style="margin-right: 12px;"></text> 联系供方</button>
-													<!-- <view>联系我们帮助对接</view> -->
+													 
 													<button v-if="!collStatus" @click="addColl"
 														style="margin-top:10px;border-radius:30px;" type="default" plain="true"><text
 															class="tn-icon-star" style="margin-right: 12px;"></text>
@@ -189,13 +229,13 @@
 									<text style="margin-left: 4px;">{{curContact.contactMethod}}</text> </view>
 												</view>
 									
-									</view>
+									</view> -->
 							</view>
 						</view>
 					</view>
 
 					<!-- 边距间隔 -->
-					<view class="tn-strip-bottom" v-if="index != content.length - 1"></view>
+					<!-- <view class="tn-strip-bottom" v-if="index != content.length - 1"></view> -->
 				</block>
 
 
@@ -208,10 +248,10 @@
 				</view>
 				<!-- 广告 -->
 				<!-- 结尾 -->
-				<view v-if="content.length==totalSize&&totalSize!=0&&currentTab==0" style="background-color: #f1f1f1cc;padding: 16px 0;"  :style="{paddingTop:showSheet?'216px':'16px'}">
+				<view v-if="content.length==totalSize&&totalSize!=0&&currentTab==0" style="background-color: #f7f7f7;padding: 16px 0;"  :style="{paddingTop:showSheet?'166px':'16px'}">
 					<tn-load-more status="nomore" :loadText="loadText" :fontSize="(wxFontSize+11)"></tn-load-more>
 				</view>
-				<view v-if="content.length==totalSize&&totalSize!=0&&currentTab==1" style="background-color: #f1f1f1cc;padding: 16px 0;"  :style="{paddingTop:showSheet?'216px':'16px'}">
+				<view v-if="content.length==totalSize&&totalSize!=0&&currentTab==1" style="background-color: #f7f7f7;padding: 16px 0;"  :style="{paddingTop:showSheet?'166px':'16px'}">
 					<tn-load-more status="nomore" :loadText="loadText2" :fontSize="(wxFontSize+11)"></tn-load-more>
 				</view>
 				 
@@ -224,36 +264,8 @@
 		</view>
 
 		 
-		<tn-popup v-model="showSheet2" mode="center" closeBtn="true" borderRadius="16">
-			<view class="content" style="padding: 24px 36px;font-size: 16px;line-height: 24px; width: 320px;"
-				v-if="!showContact">
-				<button @click="linkTel()" style="border-radius:30px;color:#fff;background-color: #1d60b1;"><text
-						class="tn-icon-service" style="margin-right: 12px;"></text> 联系供方</button>
-				<!-- <view>联系我们帮助对接</view> -->
-				<button v-if="!collStatus" @click="addColl"
-					style="margin-top:10px;border-radius:30px;" type="default" plain="true"><text
-						class="tn-icon-star" style="margin-right: 12px;"></text>
-					收&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;藏</button>
-				<button v-if="collStatus" @click="delColl"
-					style="margin-top:10px;border-radius:30px;" type="default" plain="true"><text
-						class="tn-icon-star-fill" style="margin-right: 12px;"></text> 取消收藏</button>
-				<button open-type="share"
-					style="margin-top:10px;border-radius:30px;" type="default" plain="true" :data-coupon="curItem"><text
-						class="tn-icon-send" style="margin-right: 12px;"></text>
-					转&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发</button>
-			</view>
-			<view class="content bg-content" style="padding: 50px 36px;padding-bottom: 32px;font-size: 16px;width:320px;line-height: 24px;"
-							v-if="showContact">
-							<view><text style="font-size: 20px;font-weight: bold;" v-if="curContact.company">{{curContact.company}}</text></view>
-							<view style="margin-top:20px;
-			   font-weight: bold;
-			   font-size: 20px;"><text class="tn-icon-my-formal"></text><text style="margin-left: 6px;">{{curContact.contactPerson}}</text> </view>
-							<view style="margin-top:20px;font-size: 20px;font-weight: bold;" @click="showTel(curContact.contactMethod)"><text class="tn-icon-tel"></text>
-			<text style="margin-left: 4px;">{{curContact.contactMethod}}</text> </view>
-						</view>
-
-		</tn-popup>
-		 <tn-toast ref="toast"></tn-toast>
+		 </scroll-view>
+		 
 	</view>
 </template>
 
@@ -308,7 +320,10 @@
 				content: [],
 				totalSize: 0,
 				curIndex: 1,
-				wxFontSize:17
+				wxFontSize:17,
+				triggered: false,
+				_freshing: false,
+				shareData:{}
 			}
 		},
 		onReady() {
@@ -350,6 +365,77 @@
 
 		},
 		methods: {
+			// 瀑布流导航页面滚动到底部
+			tabbarPageScrollLower(e) {
+				this.loadMore();
+			},
+			onPulling(e) {
+				console.log("onpulling", e);
+				if(e.detail.deltaY<0){
+					return
+				}
+				this.triggered = true
+			}, 
+			onRefresh(){
+				if (this._freshing) return;
+				this._freshing = true;
+				this.reFetchData();
+				setTimeout(() => {
+					this.triggered = false;
+					this._freshing = false;
+				}, 2000)
+			},
+			onRestore() {
+				this.triggered = false; // 需要重置
+			},
+			addLog(shareData){
+				const that = this;
+				let params= {
+					bisNo:shareData.bisNo,
+					bisType:'2',
+					userNo:uni.getStorageSync('userNo')
+				};
+				
+				request.post('/slbForward/add',{slbForward:JSON.stringify(params)},{
+							  headers: {
+							  	'Content-Type': 'application/json', // 默认值
+							  },
+				}).then(res=>{
+							 
+				})
+			},
+			sleep(time) {
+			    return new Promise((resolve) => setTimeout(resolve, time));
+			},
+			onShareAppMessage: function(option) {
+				if(option.from=="button"){
+					
+					this.hideSheet();
+					this.shareData=option.target.dataset.coupon;
+					this.addLog(this.shareData);
+					 const promise = new Promise(async (resolve) => {
+					
+					      await this.sleep(500);
+					      resolve({
+					        // title: `速立保`,
+					        path: `/pages/index/detail/detail?id=`+this.shareData.bisNo+'&isNeed=0',
+					        // imageUrl: url,
+					      });
+					    });
+					    // 默认参数
+					    return {
+					      // title: `速立保`,
+					      path: `/pages/index/detail/detail?id=`+this.shareData.bisNo+'&isNeed=0',
+					      promise,
+					    };
+					 
+				}else{
+					return {
+						// title: '速立保',
+						path: '/pages/index/index',
+					};
+				}
+			},
 			showSearch(item) {
 				 
 				// 或者可以直接设置body的tabindex属性为-1，然后移除焦点
@@ -1294,14 +1380,4 @@
 		transform: rotateX(90deg) rotateZ(90deg)
 	}
 
-	/deep/ .basic-table-header {
-		background-color: #edeeee;
-	}
-	
-	.bg-content{
-		color: #fff;
-		background-image: url(./../../static/bg.png);
-		background-size: cover;
-	}
-
 </style>

pages/comm/search.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view style="background-color: #f7f7f7;min-height: 100vh;">
 		<tn-nav-bar fixed alpha customBack>
 		  <view slot="back" class='tn-custom-nav-bar__back'
 		    @click="goBack">
@@ -13,23 +13,23 @@
 		  </view>
 		</tn-nav-bar>
 		
-		<view style="width: 100%;padding:16px"  :style="{paddingTop: vuex_custom_bar_height + 'px'}">
-			<uni-search-bar radius="30" :focus="true" :fontSize="(wxFontSize-2)" v-model="prodName"  placeholder="请输入您感兴趣的产品名称(选填)" cancelButton="none">
+		<view style="width: 100%;"  :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<uni-search-bar radius="30" bgColor="#fff"  :focus="true" :fontSize="(wxFontSize-2)" v-model="prodName"  placeholder="请输入您感兴趣的产品名称(选填)" cancelButton="none">
 				<template v-slot:searchIcon>
-						 
+						 <image src="../../static/tu/search.png" style="width: 26px;height: 26px"></image>
 					</template>
 			</uni-search-bar>
-			<uni-search-bar radius="30"  v-model="brand"  :fontSize="(wxFontSize-2)" placeholder="请输入您感兴趣的产品品牌(选填)" cancelButton="none">
+			<uni-search-bar radius="30" bgColor="#fff"   v-model="brand"  :fontSize="(wxFontSize-2)" placeholder="请输入您感兴趣的产品品牌(选填)" cancelButton="none">
 				<template v-slot:searchIcon>
-						 
+						 <image src="../../static/tu/search.png" style="width: 26px;height: 26px"></image>
 					</template>
 			</uni-search-bar>
-			<uni-search-bar radius="30" v-model="prodSpec" :fontSize="(wxFontSize-2)" placeholder="请输入您感兴趣的产品型号(选填)" cancelButton="none">
+			<uni-search-bar radius="30" bgColor="#fff"  v-model="prodSpec" :fontSize="(wxFontSize-2)" placeholder="请输入您感兴趣的产品型号(选填)" cancelButton="none">
 				<template v-slot:searchIcon>
-						 
+						 <image src="../../static/tu/search.png" style="width: 26px;height: 26px"></image>
 					</template>
 			</uni-search-bar>
-			<button type="primary" style="background-color:#1d60b1;border-radius: 23px" :style="{fontSize:(wxFontSize-2)+'px'}" @click="searchProd">搜索</button>
+			<button type="primary" style="background-color:#005DA6;border-radius: 8px;margin: 16px;" :style="{fontSize:(wxFontSize-2)+'px'}" @click="searchProd">搜索</button>
 			<!-- <button type="primary" style="border-radius:30px;background-color: #3a96d7;" radius @click="searchProd">搜索</button> -->
 		</view>
 	</view>

pages/comm/search2.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view style="background-color: #f7f7f7;min-height: 100vh;">
 		<tn-nav-bar fixed alpha customBack>
 		  <view slot="back" class='tn-custom-nav-bar__back'
 		    @click="goBack">
@@ -13,19 +13,19 @@
 		  </view>
 		</tn-nav-bar>
 		
-		<view style="width: 100%;padding:16px"  :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+		<view style="width: 100%;"  :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 			 
-			<uni-search-bar radius="30" :focus="true" v-model="brand" :fontSize="(wxFontSize-2)" placeholder="请输入您感兴趣的产品品牌(选填)" cancelButton="none">
+			<uni-search-bar radius="30" :focus="true"  bgColor="#fff" v-model="brand" :fontSize="(wxFontSize-2)" placeholder="请输入您感兴趣的产品品牌(选填)" cancelButton="none">
 				<template v-slot:searchIcon>
-						 
+						 <image src="../../static/tu/search.png" style="width: 26px;height: 26px"></image>
 					</template>
 			</uni-search-bar>
-			<uni-search-bar radius="30" v-model="content" :fontSize="(wxFontSize-2)" placeholder="请输入您感兴趣的服务内容(选填)" cancelButton="none">
+			<uni-search-bar radius="30" v-model="content" bgColor="#fff" :fontSize="(wxFontSize-2)" placeholder="请输入您感兴趣的服务内容(选填)" cancelButton="none">
 				<template v-slot:searchIcon>
-						 
+						 <image src="../../static/tu/search.png" style="width: 26px;height: 26px"></image>
 					</template>
 			</uni-search-bar>
-			<button type="primary" style="background-color:#1d60b1;border-radius: 23px" :style="{fontSize:(wxFontSize-2)+'px'}" @click="searchProd">搜索</button>
+			<button type="primary" style="background-color:#005DA6;border-radius: 8px;margin: 16px;" :style="{fontSize:(wxFontSize-2)+'px'}" @click="searchProd">搜索</button>
 			<!-- <button type="primary" style="border-radius:30px;background-color: #3a96d7;" radius @click="searchProd">搜索</button> -->
 		</view>
 	</view>

pages/discovery/discovery.vue

@@ -35,7 +35,7 @@
 		<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"  v-if="!hideComps">
 			<swiper-item v-for="(item,index) of companyList" :key="item.id" style="position:relative">
 				<text class="tn-icon-close" @click="closeComps" style="position: absolute;right: 0px;color: #fff;background: #00000066;border-top-right-radius: 0;padding: 4px;font-size: 13px;border-bottom-left-radius: 8px;"></text>
-				<image :src="item.picUrl?item.picUrl:'../../static/bg.png'" @click="showImgs(index,companyList)"  mode="aspectFill" style="width: 100%;height: 100%;"></image>
+				<image :src="item.picUrl?item.picUrl:'../../static/tu/needbg.png'" @click="showImgs(index,companyList)"  mode="aspectFill" style="width: 100%;height: 100%;"></image>
 			</swiper-item>
 		</swiper>
 		<view v-if="hideComps" style="height: 200px;display: flex;align-items: center;justify-content: center;color: #2196f36e;">
@@ -47,7 +47,7 @@
 		<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"  v-if="!hideProds">
 			<swiper-item v-for="(item,index) of prodList" :key="item.id">
 				<text class="tn-icon-close" @click="closeProds" style="position: absolute;right: 0px;color: #fff;background: #00000066;border-top-right-radius: 0;padding: 4px;font-size: 13px;border-bottom-left-radius: 8px;"></text>
-				<image :src="item.picUrl?item.picUrl:'../../static/bg.png'" @click="showImgs(index,prodList)" style="width: 100%;height: 100%;"  mode="aspectFill"></image>
+				<image :src="item.picUrl?item.picUrl:'../../static/tu/needbg.png'" @click="showImgs(index,prodList)" style="width: 100%;height: 100%;"  mode="aspectFill"></image>
 			</swiper-item>
 			 
 		</swiper>

pages/home/home.vue

@@ -1,15 +1,31 @@
 <template>
-	<view class="index tn-safe-area-inset-bottom">
-
+	<view class="index tn-safe-area-inset-bottom" style="background: #f7f7f7;min-height: 100vh;">
+
+		<tn-nav-bar customBack>
+			<view slot="back" class='tn-custom-nav-bar__back' >
+				 
+				<image style="width: 28px;height: 28px;margin-left:4px"  @click="reFetchData()" src="../../static/tu/reload.png"></image>
+				<image style="width: 28px;height: 28px;margin-left:12px"  @click="addButton()" src="../../static/tu/add.png"></image>
+				 
+			</view>
+		
+			<view slot="default" style="display: flex;">
+				<view style="flex:1;">
+					<text :style="{fontSize:(wxFontSize)+'px'}">我要什么</text>
+				</view>
+				 
+			</view>
+		</tn-nav-bar>
 		
+		<scroll-view :style="{paddingTop: vuex_custom_bar_height + 'px'}" style="height: 100vh;" class="custom-tabbar-page" lower-threshold="60"  scroll-y :refresher-enabled="true" :refresher-triggered="triggered" @refresherpulling="onPulling" @refresherrestore="onRestore" @refresherrefresh="onRefresh" enable-back-to-top @scrolltolower="tabbarPageScrollLower">
 
-		<view  style="background: #f7f7f7;">
+		<view >
 			<uv-sticky bgColor="#ffffff">
 				<uni-search-bar radius="15" placeholder="搜索" @confirm="search" v-model="searchValue" @blur="search"
 					@cancel="cancel" @clear="clear" cancelButton="auto"  bgColor="#fff" clearButton="auto" :fontSize="(wxFontSize-2)"
 					style="background: #f7f7f7;">
 					<template v-slot:searchIcon>
-							<image src="../../static/tu/search.png" style="width: 28px;height: 28px"></image>
+							<image src="../../static/tu/search.png" style="width: 26px;height: 26px"></image>
 						</template>
 				</uni-search-bar></uv-sticky>
 
@@ -22,7 +38,6 @@
 							<view class="tn-flex tn-flex-row-center">
 								<view class="tn-flex tn-flex-row-center tn-flex-col-center">
 									<view class="" style="width: 5px;height: 5px;background: #E18730;border-radius: 50%;margin-right: 4px;">
-										 
 									</view>
 									<view class="tn-padding-right">
 										<view class="tn-padding-right tn-text-lg" style="color:#333" :style="{fontSize:(wxFontSize)+'px'}">
@@ -35,13 +50,11 @@
 						</view>
 						<view v-if="item.validDate"
 							class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-							<text class="" style="background: #E6E8F4;font-size: 12px;word-break: keep-all;
-    padding: 8px;
-    color: #8383F7;
-    border-radius: 24px;
-    border-top-right-radius: 0;" :style="{fontSize:(wxFontSize-6)+'px'}" @click="showValid(item.validDate)">{{item.validDate}}</text>
+							<text class="" style="background: #E6E8F4;font-size: 12px;word-break: keep-all;padding: 8px;color: #8383F7;border-radius: 24px;border-top-right-radius: 0;" :style="{fontSize:(wxFontSize-6)+'px'}" @click="showValid(item.validDate)">{{item.validDate}}</text>
 						</view>
 					</view>
+					<view style="margin-top: 20rpx;border-radius: 0px 0px 0px 0px;width:calc(100% + 32px);margin-left:-16px;border-bottom: 1px solid #E6E6E6;"></view>
+					
 
 					<view
 						class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
@@ -82,10 +95,10 @@
 							</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)">
+					<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>
 							<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'}" @click="clickLink(file.ftpUrl,file.fileName)">
+							<view style="display: inline;margin-left:8px;color:#005DA6;" :style="{fontSize:(wxFontSize-3)+'px'}">
 								{{file.fileName}}</view>
 						</view>
 					</view>
@@ -104,42 +117,40 @@
 							<!-- <text class="tn-icon-more-vertical tn-text-bold tn-text-xxl" style="color: #005DA6;transform: rotate(90deg);"
 								@click="showActionSheet(item)"></text> -->
 								
-							<view v-if="curItem.id==item.id&&showSheet" class="pop-dia" style="position: absolute;
-    background: #E4F1FB;
-    display: block;
-    right: 10px;
-    top: 24px;border-radius: 6px;z-index: 900;">
-	 
-	<view class="content" style="padding: 8px;font-size: 16px;line-height: 24px; width: 180px;border-radius: 6px;"
-					v-if="!showContact">
-					<button @click="linkTel()" style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);">
-						 <image src="../../static/tu/call.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;"> 联系需方</button>
-					<!-- <view>联系我们帮助对接</view> -->
-					<button v-if="!collStatus" @click="addColl"
-						style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);" type="default" plain="true">
-						<image src="../../static/tu/coll.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;">
-						收&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;藏</button>
-					<button v-if="collStatus" @click="delColl"
-						style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);" type="default" plain="true">
-						<image src="../../static/tu/coll.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;"> 取消收藏</button>
-					<button open-type="share"
-						style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;" type="default" plain="true" :data-coupon="curItem">
-						<image src="../../static/tu/share.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;">
-						转&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发</button>
-				</view>
-				<view class="content " style="background: linear-gradient( 180deg, #DAECFA 0%, #FFFFFF 27%, #FFFFFF 100%);padding: 24px 40px;padding-bottom: 32px;font-size: 16px;width: calc(100vw - 80px);line-height: 24px;border-radius: 12px;"
-					v-if="showContact">
-					<view><text style="font-size: 20px;" v-if="curContact.company">{{curContact.company}}</text></view>
-					<view style="margin-top:10px;font-size: 20px;text-align: center">
-						<image src="../../static/tu/person.png" style="width: 25px;height: 25px;vertical-align: middle;">
-					<text style="margin-left: 6px;">{{curContact.contactPerson}}</text> </view>
-					<view style="margin-top:10px;font-size: 20px;text-align: center" @click="showTel(curContact.contactMethod)">
-						<image src="../../static/tu/tel.png" style="width: 25px;height: 25px;vertical-align: middle;">
-						<text style="margin-left: 4px;">{{curContact.contactMethod}}</text> 
-					</view>
-				</view>
-	
-	</view>
+							<view v-if="curItem.id==item.id&&showSheet" class="pop-dia" style="position: absolute;background: #E4F1FB;display: block;right: 10px;top: 24px;border-radius: 6px;z-index: 900;">
+							 
+								<view class="content" style="padding: 8px;font-size: 16px;line-height: 24px; width: 180px;border-radius: 6px;z-index: -1;"
+									v-if="!showContact">
+									<button @click="linkTel()" style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);">
+										 <image src="../../static/tu/call.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;"> 联系需方</button>
+									<!-- <view>联系我们帮助对接</view> -->
+									<button v-if="!collStatus" @click="addColl"
+										style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);" type="default" plain="true">
+										<image src="../../static/tu/coll.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;">
+										收&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;藏</button>
+									<button v-if="collStatus" @click="delColl"
+										style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);" type="default" plain="true">
+										<image src="../../static/tu/coll.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;"> 取消收藏</button>
+									<button open-type="share"
+										style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;" type="default" plain="true" :data-coupon="curItem">
+										<image src="../../static/tu/share.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;">
+										转&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发</button>
+								</view>
+								<view class="content " style="position: relative;background: linear-gradient( 180deg, #DAECFA 0%, #FFFFFF 27%, #FFFFFF 100%);padding: 24px 40px;padding-bottom: 32px;font-size: 16px;width: calc(100vw - 80px);line-height: 24px;border-radius: 12px;"
+									v-if="showContact">
+									<view><text style="font-size: 19px;font-weight: bold;color: #333;" v-if="curContact.company">{{curContact.company}}</text></view>
+									<view style="margin-top:10px;font-size: 17px;text-align: center;color:#333">
+										<image src="../../static/tu/person.png" style="width: 24px;height: 24px;vertical-align: sub;">
+									<text style="margin-left: 6px;">{{curContact.contactPerson}}</text> </view>
+									<view style="margin-top:10px;font-size: 17px;text-align: center;color:#333" @click="showTel(curContact.contactMethod)">
+										<image src="../../static/tu/tel.png" style="width: 24px;height: 24px;vertical-align: middle;">
+										<text style="margin-left: 4px;">{{curContact.contactMethod}}</text> 
+									</view>
+									
+									<image src="../../static/tu/close.png" style="width: 40px;height: 40px;position: absolute; left: calc(50vw - 60px);bottom: -64px;" @click="hideSheet()"></image>
+								</view>
+								<view style="position: fixed;top: 0;left: 0;height: 100000vh;width: 100%;background: rgb(0 0 0 / 0.5);z-index: -1;" @click="hideSheet()" v-if="showContact"></view>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -151,46 +162,14 @@
 				<tn-empty mode="list"></tn-empty>
 			</view>
 			<!-- 结尾 -->
-			<view v-if="content.length==totalSize&&totalSize!=0" style="background-color: #f7f7f7;padding: 16px 0;" :style="{paddingTop:showSheet?'216px':'16px'}">
+			<view v-if="content.length==totalSize&&totalSize!=0" style="background-color: #f7f7f7;padding: 16px 0;" :style="{paddingTop:showSheet?'166px':'16px'}">
 				<tn-load-more status="nomore" :loadText="loadText" :fontSize="(wxFontSize+11)"></tn-load-more>
 			</view>
 
 
 		</view>
+		</scroll-view>
 
-		<view class='tn-tabbar-height' :style="{marginTop: vuex_custom_bar_height + 'px'}"></view>
-		
-		<!-- <view v-if="curItem.id" style="position: fixed;background-color: red;width: 100vw;height: 100%;top:0"><view>1234</view></view> -->
-		<tn-popup v-model="showSheet2"  mode="center" closeBtn="true" borderRadius="16">
-			<view class="content" style="padding: 24px 36px;font-size: 16px;line-height: 24px; width: 320px;"
-				v-if="!showContact">
-				<button @click="linkTel()" style="border-radius:30px;color:#fff;background-color: #1d60b1;"><text
-						class="tn-icon-service" style="margin-right: 12px;"></text> 联系需方</button>
-				<!-- <view>联系我们帮助对接</view> -->
-				<button v-if="!collStatus" @click="addColl"
-					style="margin-top:10px;border-radius:30px;" type="default" plain="true"><text
-						class="tn-icon-star" style="margin-right: 12px;"></text>
-					收&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;藏</button>
-				<button v-if="collStatus" @click="delColl"
-					style="margin-top:10px;border-radius:30px;" type="default" plain="true"><text
-						class="tn-icon-star-fill" style="margin-right: 12px;"></text> 取消收藏</button>
-				<button open-type="share"
-					style="margin-top:10px;border-radius:30px;" type="default" plain="true" :data-coupon="curItem"><text
-						class="tn-icon-send" style="margin-right: 12px;"></text>
-					转&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发</button>
-			</view>
-			<view class="content bg-content" style="padding: 50px 36px;padding-bottom: 32px;font-size: 16px;width:320px;line-height: 24px;"
-				v-if="showContact">
-				<view><text style="font-size: 20px;font-weight: bold;" v-if="curContact.company">{{curContact.company}}</text></view>
-				<view style="margin-top:20px;
-    font-weight: bold;
-    font-size: 20px;"><text class="tn-icon-my-formal"></text><text style="margin-left: 6px;">{{curContact.contactPerson}}</text> </view>
-				<view style="margin-top:20px;font-size: 20px;font-weight: bold;" @click="showTel(curContact.contactMethod)"><text class="tn-icon-tel"></text>
- <text style="margin-left: 4px;">{{curContact.contactMethod}}</text> </view>
-			</view>
-
-		</tn-popup>
-		<tn-toast ref="toast"></tn-toast>
 	</view>
 </template>
 
@@ -222,6 +201,9 @@
 				content: [],
 				showEmpty:false,
 				wxFontSize:17,
+				triggered: false,
+				_freshing: false,
+				shareData:{},
 			}
 		},
 		filters: {
@@ -260,6 +242,80 @@
 			
 		},
 		methods: {
+			// 瀑布流导航页面滚动到底部
+			tabbarPageScrollLower(e) {
+				this.loadMore();
+			},
+			onPulling(e) {
+				console.log("onpulling", e);
+				if(e.detail.deltaY<0){
+					return
+				}
+				this.triggered = true
+			}, 
+			onRefresh(){
+				if (this._freshing) return;
+				this._freshing = true;
+				
+				
+					this.reFetchData();
+				
+				setTimeout(() => {
+					this.triggered = false;
+					this._freshing = false;
+				}, 2000)
+			},
+			onRestore() {
+				this.triggered = false; // 需要重置
+			},
+			addLog(shareData){
+				const that = this;
+				let params= {
+					bisNo:shareData.bisNo,
+					bisType:'1',
+					userNo:uni.getStorageSync('userNo')
+				};
+				
+				request.post('/slbForward/add',{slbForward:JSON.stringify(params)},{
+							  headers: {
+							  	'Content-Type': 'application/json', // 默认值
+							  },
+				}).then(res=>{
+							 
+				})
+			},
+			sleep(time) {
+			    return new Promise((resolve) => setTimeout(resolve, time));
+			},
+			onShareAppMessage: function(option) {
+				if(option.from=="button"){
+					
+					this.hideSheet();
+					this.shareData=option.target.dataset.coupon;
+					this.addLog(this.shareData);
+					 const promise = new Promise(async (resolve) => {
+					
+					      await this.sleep(500);
+					      resolve({
+					        // title: `速立保`,
+					        path: `/pages/index/detail/detail?id=`+this.shareData.bisNo+'&isNeed=1',
+					        // imageUrl: url,
+					      });
+					    });
+					    // 默认参数
+					    return {
+					      // title: `速立保`,
+					      path: `/pages/index/detail/detail?id=`+this.shareData.bisNo+'&isNeed=1',
+					      promise,
+					    };
+					 
+				}else{
+					return {
+						// title: '速立保',
+						path: '/pages/index/index',
+					};
+				}
+			},
 			clickLink(url,fileName) {
 				// uni.navigateTo({
 				// 	url:'/pages/webview/web-view?url='+encodeURIComponent('https://slb-m.lx-device.com/webview?title='+fileName+'&url='+ url),
@@ -1443,14 +1499,4 @@
 	.hx-k6 {
 		transform: rotateX(90deg) rotateZ(90deg)
 	}
-
-	/deep/ .tn-toast {
-		background-color: #000c !important;
-	}
-	
-	.bg-content{
-		color: #fff;
-		background-image: url(./../../static/bg.png);
-		background-size: cover;
-	}
 </style>

pages/index/auth.vue

@@ -18,24 +18,9 @@
 			}
 		},
 		created() {		
-			uni.redirectTo({
+			uni.reLaunch({
 				url:'/pages/index/index'
 			})
-			// let that = this;
-			// uni.login({
-			// 	success(res) {
-			// 		 console.error(res);
-			// 		 that.loginByCode(res.code);
-			// 	},
-			// 	fail(res) {
-			// 		//登录失效，
-			// 		uni.hideLoading();
-			// 		uni.redirectTo({
-			// 			url:'/pages/index/index'
-			// 		})
-			// 	}
-			// });
-		
 		},
 		methods: {
 			loginByCode(frontId) {
@@ -67,7 +52,7 @@
 							uni.removeStorageSync('userMap');
 							uni.removeStorageSync('userNo');
 							uni.removeStorageSync('userInfo');
-							uni.redirectTo({
+							uni.reLaunch({
 								url:'/pages/index/index'
 							})
 							//登录失败,
@@ -101,11 +86,11 @@
 							  if(res&&res.success){
 								  that.personInfo = res.resultMap.userInfo||{};
 								  uni.setStorageSync('userInfo', JSON.stringify(res.resultMap.userInfo));
-								  uni.redirectTo({
+								  uni.reLaunch({
 								  	url:'/pages/index/index'
 								  })
 							  }else{
-								  uni.redirectTo({
+								  uni.reLaunch({
 								  	url:'/pages/index/index'
 								  })
 							  }

pages/index/detail/detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="index tn-safe-area-inset-bottom">
+	<view class="index tn-safe-area-inset-bottom"  style="background: #f7f7f7;min-height: 100vh;">
 
 		<tn-nav-bar customBack>
 			<view slot="back" class='tn-custom-nav-bar__back' @click="goBack()">
@@ -20,21 +20,15 @@
 				
 							<!-- 图文信息 -->
 							<block v-for="(item,index) in content" :key="item.id">
-								<view class="blogger__item" :key="index">
+								<view class="blogger__item" style="border-radius: 12px;margin: 12px 16px 12px 16px; background-color: #fff;"  :key="index">
 									<view class="blogger__author tn-flex tn-flex-row-between tn-flex-col-center">
 										<view class="justify__author__info">
 											<view class="tn-flex tn-flex-row-center">
 												<view class="tn-flex tn-flex-row-center tn-flex-col-center">
-													<!-- <view class="">
-													  <tn-avatar
-														class=""
-														shape="circle"
-														:src="item.userAvatar"
-														size="lg">
-													  </tn-avatar>
-													</view> -->
+													<view class="" style="width: 5px;height: 5px;background: #E18730;border-radius: 50%;margin-right: 4px;">
+													</view> 
 													<view class="tn-padding-right">
-														<view class="tn-padding-right tn-color-grey tn-text-lg"  :style="{fontSize:(wxFontSize)+'px'}">
+														<view class="tn-padding-right tn-text-lg" style="color:#333"  :style="{fontSize:(wxFontSize)+'px'}">
 															{{ item.company||(item.contactNickName||item.contactPerson) }}
 														</view>
 														<!-- <view class="tn-padding-right tn-padding-left-sm tn-padding-top-xs tn-color-gray">{{ item.date }}</view> -->
@@ -44,39 +38,41 @@
 										</view>
 										<view v-if="isNeed==1&&item.validDate"
 											class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-											<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
-											  padding: 8px;
-											  color: #0000FF;
-											  border-radius: 24px;
-											  border-top-right-radius: 0;" :style="{fontSize:(wxFontSize-6)+'px'}">{{item.validDate}}</text>
-										</view>
-				
-									 
+											<text class="" style="background: #E6E8F4;font-size: 12px;word-break: keep-all;padding: 8px;color: #8383F7;border-radius: 24px;border-top-right-radius: 0;" :style="{fontSize:(wxFontSize-6)+'px'}">{{item.validDate}}</text>
+										</view>		 
 									</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 v-if="item.content"
-											class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
-				
+										<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>
+										<tn-tag margin="-4px 4px 0 0" backgroundColor="#005da61a" v-if="!item.company"
+											fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+11" @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>
+									
+									<view v-if="item.content" style="padding: 12px 12px 5px 5px;"> 
+										<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 v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
 										:id="`blogger__content--${index}`">
-				
-										<basic-table header-row-class-name="basic-table-header" :columns="columns" :border="true"  :fontSize="(wxFontSize-3)"
-											:stripe="true" :data="item.shareExt">
-				
-										</basic-table>
+										
+										<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'}">
+												 {{sitem.prodName}}
+											</view>
+											<view style="padding: 8px 8px 0 5px;color:#333;display: flex;"  :style="{fontSize:(wxFontSize-3)+'px'}">
+												 <text style="color: #777;white-space: nowrap;">产品型号：</text>{{sitem.prodSpec}}
+											</view>
+											<view v-if="sitem.prodDesc" style="padding: 8px 8px 0 5px;color:#333;display: flex;"  :style="{fontSize:(wxFontSize-3)+'px'}">
+												 <text style="color: #777;white-space: nowrap;">产品介绍：</text><text>{{sitem.prodDesc}}</text>
+											</view>
+										</view>
+									 
 									</view>
 				
 									<block v-if="item.imgList">
@@ -109,25 +105,58 @@
 									</block>
 				
 									
-									<view v-for="file in item.fileDetailList" :key="file.id" v-if="!isImage(file.fileName)">
-										<view style="margin-top:10px">
-											<text class="tn-icon-link"></text>
-											<view style="display: inline;margin-left:8px;" @click="clickLink(file.ftpUrl,file.fileName)" :style="{fontSize:(wxFontSize-3)+'px'}">
+									<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>
+											<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'}">
 												{{file.fileName}}</view>
-				
 										</view>
 									</view>
-				
+									
 									<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-top-xs">
 										<view class="justify-content-item tn-color-gray tn-text-center">
-											<view class="tn-padding-right   tn-padding-top-xs tn-color-gray" :style="{fontSize:(wxFontSize-3)+'px'}">
+											<view class="tn-padding-right   tn-padding-top-xs" :style="{fontSize:(wxFontSize-3)+'px',color:'#777'}">
 												{{ item.createTime|formatDate }}
 											</view>
-				
+										
 										</view>
-										<view class="justify-content-item tn-flex tn-flex-col-center">
-											<text class="tn-icon-more-vertical tn-color-gray tn-text-bold tn-text-xxl"
-												@click="showActionSheet(item)"></text>
+										<view class="justify-content-item tn-flex tn-flex-col-center" style="position: relative">
+											<image style="width: 30px;height:30px;" @click="showActionSheet(item)" src="../../../static/tu/more.png"></image>
+									
+											<view v-if="curItem.id==item.id&&showSheet" class="pop-dia" style="position: absolute;background: #E4F1FB;display: block;right: 10px;top: 24px;border-radius: 6px;z-index: 900;">
+											 
+												<view class="content" style="padding: 8px;font-size: 16px;line-height: 24px; width: 180px;border-radius: 6px;z-index: -1;"
+													v-if="!showContact">
+													<button @click="linkTel()" style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);">
+														 <image src="../../../static/tu/call.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;"> {{isNeed==1?'联系需方':'联系供方'}}</button>
+													<!-- <view>联系我们帮助对接</view> -->
+													<button v-if="!collStatus" @click="addColl"
+														style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);" type="default" plain="true">
+														<image src="../../../static/tu/coll.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;">
+														收&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;藏</button>
+													<button v-if="collStatus" @click="delColl"
+														style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);" type="default" plain="true">
+														<image src="../../../static/tu/coll.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;"> 取消收藏</button>
+													<button open-type="share"
+														style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;" type="default" plain="true" :data-coupon="curItem">
+														<image src="../../../static/tu/share.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;">
+														转&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发</button>
+												</view>
+												<view class="content " style="position: relative;background: linear-gradient( 180deg, #DAECFA 0%, #FFFFFF 27%, #FFFFFF 100%);padding: 24px 40px;padding-bottom: 32px;font-size: 16px;width: calc(100vw - 80px);line-height: 24px;border-radius: 12px;"
+													v-if="showContact">
+													<view><text style="font-size: 19px;font-weight: bold;color: #333;" v-if="curContact.company">{{curContact.company}}</text></view>
+													<view style="margin-top:10px;font-size: 17px;text-align: center;color:#333">
+														<image src="../../../static/tu/person.png" style="width: 24px;height: 24px;vertical-align: sub;">
+													<text style="margin-left: 6px;">{{curContact.contactPerson}}</text> </view>
+													<view style="margin-top:10px;font-size: 17px;text-align: center;color:#333" @click="showTel(curContact.contactMethod)">
+														<image src="../../../static/tu/tel.png" style="width: 24px;height: 24px;vertical-align: middle;">
+														<text style="margin-left: 4px;">{{curContact.contactMethod}}</text> 
+													</view>
+													
+													<image src="../../../static/tu/close.png" style="width: 40px;height: 40px;position: absolute; left: calc(50vw - 60px);bottom: -64px;" @click="hideSheet()"></image>
+												</view>
+												<view style="position: fixed;top: 0;left: 0;height: 100000vh;width: 100%;background: rgb(0 0 0 / 0.5);z-index: -1;" @click="hideSheet()" v-if="showContact"></view>
+											</view>
 										</view>
 									</view>
 								</view>
@@ -154,34 +183,7 @@
 						</view> 
 				 
 		</view> 
-		<tn-popup v-model="showSheet" mode="center" closeBtn="true" borderRadius="16">
-			<view class="content" style="padding: 24px 36px;font-size: 16px;line-height: 24px; width: 320px;"
-				v-if="!showContact">
-				<button @click="linkTel()" style="border-radius:30px;color:#fff;background-color: #1d60b1;"><text
-						class="tn-icon-service" style="margin-right: 12px;"></text> {{isNeed==1?'联系需方':'联系供方'}}</button>
-				<!-- <view>联系我们帮助对接</view> -->
-				<button v-if="!collStatus" @click="addColl"
-					style="margin-top:10px;border-radius:30px;" type="default" plain="true"><text
-						class="tn-icon-star" style="margin-right: 12px;"></text>
-					收&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;藏</button>
-				<button v-if="collStatus" @click="delColl"
-					style="margin-top:10px;border-radius:30px;" type="default" plain="true"><text
-						class="tn-icon-star-fill" style="margin-right: 12px;"></text> 取消收藏</button>
-				<button open-type="share" @click="hideSheet"
-					style="margin-top:10px;border-radius:30px;" type="default" plain="true" :data-coupon="curItem"><text
-						class="tn-icon-send" style="margin-right: 12px;"></text>
-					转&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发</button>
-			</view>
-			<view class="content bg-content" style="padding: 50px 36px;padding-bottom: 32px;font-size: 16px;width:320px;line-height: 24px;"
-				v-if="showContact">
-				<view><text style="font-size: 20px;font-weight: bold;" v-if="curContact.company">{{curContact.company}}</text></view>
-				<view style="margin-top:20px;
-    font-weight: bold;
-    font-size: 20px;"><text class="tn-icon-my-formal"></text><text style="margin-left: 6px;">{{curContact.contactPerson}}</text> </view>
-				<view style="margin-top:20px;font-size: 20px;font-weight: bold;" @click="showTel(curContact.contactMethod)"><text class="tn-icon-tel"></text>
- <text style="margin-left: 4px;">{{curContact.contactMethod}}</text> </view>
-			</view>
-		</tn-popup>
+		 
 	</view>
 </template>
 
@@ -254,6 +256,12 @@
 			// })
 		},
 		methods: {
+			showBrand(text){
+				uni.showToast({
+					title: text,
+					icon: 'none'
+				})
+			},
 			 showHis(){
 				uni.navigateTo({
 					url:'/pages/mine/feedback'
@@ -261,10 +269,16 @@
 			 },
 			 
 			goBack() {
-				uni.navigateBack();
-				uni.navigateTo({
-					url:'/pages/index/index'
-				}) 
+				const pages = getCurrentPages()
+				// 有可返回的页面则直接返回，uni.navigateBack 默认返回失败之后会自动刷新页面 ，无法继续返回
+				if (pages.length > 1) {
+					uni.navigateBack()
+					return;
+				}else{
+					uni.reLaunch({
+						url: '/pages/index/index'
+					})
+				}
 			},
 			isImage(fileName) {
 				const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'ico']
@@ -687,9 +701,4 @@
 			}
 		}
 	}
-	.bg-content{
-		color: #fff;
-		background-image: url(./../../../static/bg.png);
-		background-size: cover;
-	}
 </style>

pages/index/index.vue

@@ -1,57 +1,84 @@
 <template>
-	<view class="start-index">
-		<view v-if="tabberPageLoadFlag[1]" :style="{display: currentIndex === 1 ? '' : 'none'}">
-			<tn-nav-bar customBack>
-				<view slot="back" class='tn-custom-nav-bar__back' >
-					 
-					<image style="width: 28px;height: 28px;margin-left:4px"  @click="reFetchData()" src="../../static/tu/reload.png"></image>
-					<image style="width: 28px;height: 28px;margin-left:12px"  @click="addButton()" src="../../static/tu/add.png"></image>
-					 
-				</view>
-			
-				<view slot="default" style="display: flex;">
-					<view style="flex:1;">
-						<text :style="{fontSize:(wxFontSize)+'px'}">我要什么</text>
-					</view>
-					 
-				</view>
-			</tn-nav-bar>
-			<scroll-view class="custom-tabbar-page"  :style="{marginTop: vuex_custom_bar_height + 'px'}" lower-threshold="60"  scroll-y :refresher-enabled="true" :refresher-triggered="triggered" @refresherpulling="onPulling" @refresherrestore="onRestore" @refresherrefresh="onRefresh" enable-back-to-top @scrolltolower="tabbarPageScrollLower">
-				<Home ref="home"></Home>
-				
-			</scroll-view>
-		</view>
-		<view v-if="tabberPageLoadFlag[2]" :style="{display: currentIndex === 2 ? '' : 'none'}">
-			<tn-nav-bar customBack>
-				<view slot="back" class='tn-custom-nav-bar__back'>
-					<image style="width: 28px;height: 28px;margin-left:4px"  @click="reFetchData()" src="../../static/tu/reload.png"></image>
-					<image style="width: 28px;height: 28px;margin-left:12px"  @click="addButton()" src="../../static/tu/add.png"></image>		 
-				</view>
-			
-				<view slot="default" style="display: flex;">
-					<view style="flex:1;">
-						<text :style="{fontSize:(wxFontSize)+'px'}">我有什么</text>
-					</view>
-				</view>
-			</tn-nav-bar>
-			<scroll-view class="custom-tabbar-page" :style="{marginTop: vuex_custom_bar_height + 'px'}" scroll-y :refresher-enabled="true" :refresher-triggered="triggered" lower-threshold="60" @refresherrestore="onRestore" @refresherrefresh="onRefresh"  @refresherpulling="onPulling" enable-back-to-top @scrolltolower="tabbarPageScrollLower">
-				<Comm ref="comm"></Comm>
-			</scroll-view>
-		</view>
-		<view v-if="tabberPageLoadFlag[0]" :style="{display: currentIndex === 0 ? '' : 'none'}">
-			<scroll-view class="custom-tabbar-page" scroll-y enable-back-to-top @scrolltolower="tabbarPageScrollLower">
-				<Discovery ref="discovery"></Discovery>
-			</scroll-view>
-		</view>
-		<view v-if="tabberPageLoadFlag[3]" :style="{display: currentIndex === 3 ? '' : 'none'}">
-			<scroll-view class="custom-tabbar-page" scroll-y enable-back-to-top @scrolltolower="tabbarPageScrollLower">
-				<Mine ref="mine"></Mine>
-			</scroll-view>
-		</view>
-		<Auth ref="authRef"></Auth>
-		<tn-tabbar v-model="currentIndex" :iconSize="wxFontSize+23" :fontSize="wxFontSize+6" :list="tabbarList" activeColor="#1d60b1" inactiveColor="#AAAAAA"
-			activeIconColor="#1d60b1" :animation="true" :safeAreaInsetBottom="true" @change="switchTabbar"></tn-tabbar>
-			<canvas type="2d" id="myCanvas" style="width: 450px; height: 450px;left:9000px;position:fixed;"></canvas>
+	<view style="background-color: #f7f7f7;">
+		 <view class="discovery tn-safe-area-inset-bottom"  >
+		 <tn-nav-bar customBack>
+		 	<view slot="back" class='tn-custom-nav-bar__back' >
+		 		 
+		 		<image style="width: 30px;height: 28px;margin-left:4px"  @click="reFetchData()" src="../../static/logo.png"></image>
+		 		 
+		 	</view>
+		 
+		 	<view slot="default" style="display: flex;">
+		 		<view style="flex:1;">
+		 			<text :style="{fontSize:(wxFontSize)+'px'}">速立保</text>
+		 		</view>
+		 		 
+		 	</view>
+		 </tn-nav-bar>	
+		 
+		 <view :style="{paddingTop: vuex_custom_bar_height + 'px'}" >
+		 	<view style="width: 100%;padding-bottom: 0;background-color: #fff;">
+		 		<view style="display: flex;width: 100%;">
+		 			 
+		 			<view style="flex:1; margin:16px; text-align: center;border-radius: 47px;" class="bg-slogan">
+		 				 
+		 				<text style="margin-top:12px;color:#fff;font-size:17px;margin: 16px;" :style="{fontSize:(fontSize)+'px'}">生物制药产业一站式产品资源供需平台</text>
+		 			</view>
+		 		</view>
+		 		
+		 		
+		 	</view>
+		 	
+		 	<view style="padding: 16px;color:#333;" :style="{fontSize:(fontSize-1)+'px'}">
+		 		 优质入驻企业
+		 	</view>
+		 	
+		 	<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"  v-if="!hideComps">
+		 		<swiper-item v-for="(item,index) of companyList" :key="item.id" style="position:relative">
+		 			<text class="tn-icon-close" @click="closeComps" style="position: absolute;right: 0px;color: #fff;background: #00000066;border-top-right-radius: 0;padding: 4px;font-size: 13px;border-bottom-left-radius: 8px;"></text>
+		 			<image :src="item.picUrl?item.picUrl:'../../static/tu/needbg.png'" @click="showImgs(index,companyList)"  mode="aspectFill" style="width: 100%;height: 100%;"></image>
+		 		</swiper-item>
+		 	</swiper>
+		 	<view v-if="hideComps" style="height: 200px;display: flex;align-items: center;justify-content: center;color: #2196f36e;">
+		 		<text @click="showComps()">〈恢复展示〉</text>
+		 	</view>
+		 	<view style="padding: 16px;color:#333;"  :style="{fontSize:(fontSize-1)+'px'}">
+		 		 优质供应
+		 	</view>
+		 	<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"  v-if="!hideProds">
+		 		<swiper-item v-for="(item,index) of prodList" :key="item.id">
+		 			<text class="tn-icon-close" @click="closeProds" style="position: absolute;right: 0px;color: #fff;background: #00000066;border-top-right-radius: 0;padding: 4px;font-size: 13px;border-bottom-left-radius: 8px;"></text>
+		 			<image :src="item.picUrl?item.picUrl:'../../static/tu/needbg.png'" @click="showImgs(index,prodList)" style="width: 100%;height: 100%;"  mode="aspectFill"></image>
+		 		</swiper-item>
+		 		 
+		 	</swiper>
+		 	<view v-if="hideProds" style="height: 200px;display: flex;align-items: center;justify-content: center;color: #2196f36e;">
+		 		<text @click="showProds()">〈恢复展示〉</text>
+		 	</view>
+		 	<!-- <image style="width: 180px;height: 150px" src="../../static/logo.png"></image>
+		 	
+		 	
+		 	<view style="margin-top:24px"><text style="font-size:30px;">生物制药产业</text></view>
+		 	<view><text style="font-size:30px">国际产品展示中心</text></view>
+		 	<view style="margin-top:24px"><text style="font-size:20px;">生物制药产业一站式产品资源供需平台</text></view> -->
+		 	 
+		 	<view style="display: flex;margin-top:32px;margin: 24px 16px;">
+		 		<view style="flex: 1;padding: 0 0 0 16px;" class="bg01" @click="showAdd">
+		 			<image src="../../static/tu/needi.png" style="width: 36px;height: 36px; vertical-align: middle;margin-top: -6px;margin-right: 8px;"></image>
+		 			<text style="line-height: 72px;font-size: 18px;" :style="{fontSize:(fontSize+1)+'px'}">我要什么</text>
+		 			
+		 		</view>
+		 		<view style="flex: 1;padding: 0 0 0 16px;" class="bg02" @click="showAdd2">
+		 			<image src="../../static/tu/sharei.png" style="width: 36px;height: 36px; vertical-align: middle;margin-top: -6px;margin-right: 8px;"></image>
+		 			<text style="line-height: 72px;font-size: 18px;" :style="{fontSize:(fontSize+1)+'px'}">我有什么</text>
+		 		</view>
+		 	</view>
+		 	
+		 	<view class='tn-tabbar-height'></view>
+		 	
+		 </view>
+		 <Auth ref="authRef"></Auth>
+		 </view>
 		
 	</view>
 </template>
@@ -73,75 +100,24 @@
 		},
 		data() {
 			return {
-				triggered: false,
-				_freshing: false,
-				// 底部tabbar菜单数据
-				tabbarList: [
-					{
-						title: '供需发布平台',
-						activeIcon: 'add-fill',
-						inactiveIcon: 'add-circle',
-						// count: 12
-					},
-					{
-						title: '我要什么',
-						activeIcon: 'trust-fill',
-						inactiveIcon: 'trust'
-					},
-					{
-						title: '我有什么',
-						activeIcon: 'team-fill',
-						inactiveIcon: 'team'
-					},
-					{
-						title: '我的',
-						activeIcon: 'my-fill',
-						inactiveIcon: 'my'
-					}
-				],
-				// tabbar当前被选中的序号
-				currentIndex: 0,
-				// 自定义底栏对应页面的加载情况
-				tabberPageLoadFlag: [],
-				shareData:{},
-				wxFontSize:17
+				indicatorDots: true,
+				autoplay: false,
+				companyList:[],
+				prodList:[],
+				hideComps: false,
+				hideProds: false,
+				fontSize:17
 			}
 		},
-		onLoad(options) {
+		onReady() {
 			const appBaseInfo = wx.getAppBaseInfo();
-			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
-			
-			const index = Number(options.index || 0)
-			// 根据底部tabbar菜单列表设置对应页面的加载情况
-			this.tabberPageLoadFlag = this.tabbarList.map((item, tabbar_index) => {
-				return index === tabbar_index
+			this.fontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+			this.$nextTick(() => {
+				this.loadData()
+				this.loadData2()
 			})
-			this._freshing = false;
-			this.switchTabbar(index);
-			let that = this;
-			uni.hideShareMenu();	
 		},
 		onShow(options){
-			if (this.currentIndex === 3&&this.$refs.mine) {
-				this.$refs.mine.fetchData();
-			}
-			if (this.currentIndex === 2&&this.$refs.comm) {
-				this.$refs.comm.fetchData();
-			}
-			if (this.currentIndex === 0&&this.$refs.discovery) {
-				this.$refs.discovery.fetchData();
-			}
-			if(uni.getStorageSync('lastTime')){	
-				//5*60s过期
-				if(new Date().getTime()-uni.getStorageSync('lastTime')>5*60*1000||!uni.getStorageSync('userNo')){
-					uni.setStorageSync('lastTime',new Date().getTime());
-					if(this.$refs.authRef&&!uni.getStorageSync('loginOut')){
-						// this.$refs.authRef.reLogin();
-					}
-				}
-			}else{
-				uni.setStorageSync('lastTime',new Date().getTime())
-			}
 			if(uni.getStorageSync('nextPage')&&uni.getStorageSync('userNo')){
 				let nextPage = uni.getStorageSync('nextPage')
 				uni.removeStorageSync('nextPage');
@@ -169,11 +145,6 @@
 				  })
 			
 				  updateManager.onUpdateFailed(() => {
-				//     uni.showModal({
-				//       title: '已有新版本上线',
-				//       content: '小程序自动更新失败，请删除该小程序后重新搜索打开哟~~~',
-				// showCancel: false
-				//     })
 					uni.reLaunch({
 						url:'/pages/index/index'
 					})
@@ -185,231 +156,97 @@
 			}
 		},
 		methods: {
-			// 切换导航
-			switchTabbar(index) {
-				this._switchTabbarPage(index)
+			//关闭banner1
+			closeComps(){
+				this.hideComps = true;
 			},
-			// 瀑布流导航页面滚动到底部
-			tabbarPageScrollLower(e) {
-				if (this.currentIndex === 1) {
-					this.$refs.home.loadMore();
-				}
-				if (this.currentIndex === 2) {
-					this.$refs.comm.loadMore();
-				}
+			//关闭banner2
+			closeProds(){
+				this.hideProds = true;
 			},
-			onPulling(e) {
-				console.log("onpulling", e);
-				if(e.detail.deltaY<0){
-					return
-				}
-				this.triggered = true
-			}, 
-			onRefresh(){
-				if (this._freshing) return;
-				this._freshing = true;
-				if (this.currentIndex === 1) {
-					this.$refs.home.reFetchData();
-				}
-				if (this.currentIndex === 2) {
-					this.$refs.comm.reFetchData();
-				}
-				setTimeout(() => {
-					this.triggered = false;
-					this._freshing = false;
-				}, 2000)
+			//显示banner2
+			showProds(){
+				this.hideProds = false;
 			},
-			onRestore() {
-				this.triggered = false; // 需要重置
+			//显示banner1
+			showComps(){
+				this.hideComps = false;
 			},
-			
-			addButton() {
+			fetchData(){
+				this.loadData()
+				this.loadData2()
+			},
+			loadData() {
+				let that = this;
+				request.post('/slbTopad/premiumCompanies', {
+					 
+				}).then(res => {
+					if (res&&res.success) {
+						let dataList = res.list||[];
+						let newList = [];
+						for(let i=0;i<dataList.length;i++){
+							 if(dataList[i].showFlag=='是'){
+								 newList.push(dataList[i]);
+							 }
+						}
+						that.companyList = newList; 
+					}  
+				})
+			},
+			loadData2() {
+				let that = this;
+				request.post('/slbTopad/premiumShareCompanies', {
+					 
+				}).then(res => {
+					if (res&&res.success) {
+						 let dataList = res.list||[];
+						 let newList = [];
+						 for(let i=0;i<dataList.length;i++){
+							 if(dataList[i].showFlag=='是'){
+								 newList.push(dataList[i]);
+							 }
+						 }
+						 that.prodList = newList;
+					}  
+				})
+			},
+			showImgs(index, list){
+				let urls = [];
+				for(let i=0;i<list.length;i++){
+					urls.push(list[i].picUrl);
+				}
 				
-				if (!uni.getStorageSync('userNo')) {
-					uni.showToast({
-						title: '请登录',
-						icon:'none'
-					})
-					uni.setStorageSync('nextPage',this.currentIndex === 1?'/circlePages/circle':'/circlePages/addShare');
+				// 预览图片
+				uni.previewImage({
+					urls: urls,
+					current: index,
+				});
+			},
+			showAdd(){
+				if(uni.getStorageSync('userNo')){
 					uni.navigateTo({
-						url: '/pages/login/login'
+						url:'/circlePages/circle'
 					})
-					return false;
-				} else {
+				}else{
+					uni.setStorageSync('nextPage','/circlePages/circle');
 					uni.navigateTo({
-						url: this.currentIndex === 1?'/circlePages/circle':'/circlePages/addShare'
+						url:'/pages/login/login'
 					})
 				}
-				//未登录，去登录
-				//已登录，去新增第一步
-			},
-			reFetchData() {
-				if (this.currentIndex === 1) {
-					console.error('this');
-					this.$refs.home.reFetchData();
-				}
-				if (this.currentIndex === 2) {
-					console.error('this');
-					this.$refs.comm.reFetchData();
-				}
-			},
-
-			// 切换导航页面
-			_switchTabbarPage(index) {
-				const selectPageFlag = this.tabberPageLoadFlag[index]
-				if (selectPageFlag === undefined) {
-					return
-				}
-				if (selectPageFlag === false) {
-					this.tabberPageLoadFlag[index] = true
-				}
-				this.currentIndex = index
-				if (this.currentIndex === 0&&this.$refs.discovery) {
-					this.$refs.discovery.fetchData();
-				}
-				if (this.currentIndex === 3&&this.$refs.mine) {
-					this.$refs.mine.fetchData();
-				}
-			},
-			// 获取canvas实例和ctx画笔
-			  getMyCanvasAndCtx(id) {
-			    //id  canvas 2d的id
-			    return new Promise((resolve) => {
-			
-			      const query = wx.createSelectorQuery();
-			
-			      query
-			
-			        .select(`#${id}`)
-			
-			        .fields({
-			
-			          node: true,
-			
-			          size: true,
-			
-			        })
-			
-			        .exec((res) => {
-			
-			          const canvas = res[0].node;
-			
-			          const ctx = canvas.getContext("2d");
-			
-			          const dpr = wx.getSystemInfoSync().pixelRatio;
-			
-			          canvas.width = res[0].width * dpr;
-			
-			          canvas.height = res[0].height * dpr;
-			
-			          ctx.scale(dpr, dpr);
-			
-			          const data = {
-			
-			            canvas,
-			
-			            ctx,
-			
-			          };
-			
-			          resolve(data);
-			
-			        });
-			
-			    });
-			
-			  },
-			
-			 sleep(time) {
-			     return new Promise((resolve) => setTimeout(resolve, time));
-			 },
-			async initCanvas(){
-				 // 保存画布
-				   const { ctx, canvas } = await this.getMyCanvasAndCtx("myCanvas");
-				    ctx.save();
-				  
-				    ctx.font = "24px";
-				    // ctx.textAlign = "center";
-				    ctx.fillText(this.shareData.company||this.shareData.contactPerson, 0, 32);
-
-					// ctx.textAlign = "center";
-					ctx.fillText(this.shareData.content, 0, 72);
-					
-				    // sleep 500毫秒，等待图片加载完成 不然有可能圆形头像没有加载出来
-				
-				    await this.sleep(500);
-				
-				    let url = null;
-				    
-				    // 需要自行封装 canvasToTempFilePath
-				
-				    const res = await wx.canvasToTempFilePath({ canvas });
-				
-				    url = res.tempFilePath;
 				
-				    return url;
-				 
 			},
-			addLog(shareData){
-				const that = this;
-				let params= {
-					bisNo:shareData.bisNo,
-					bisType:this.currentIndex === 1?'1':'2',
-					userNo:uni.getStorageSync('userNo')
-				};
-				
-				request.post('/slbForward/add',{slbForward:JSON.stringify(params)},{
-							  headers: {
-							  	'Content-Type': 'application/json', // 默认值
-							  },
-				}).then(res=>{
-							 
-				})
-			},
-			onShareAppMessage: function(option) {
-				if(option.from=="button"){
-					if (this.currentIndex === 1) {
-						this.$refs.home.hideSheet();
-					}
-					if (this.currentIndex === 2) {
-						this.$refs.comm.hideSheet();
-					}
-					
-					
-					
-					this.shareData=option.target.dataset.coupon;
-					this.addLog(this.shareData);
-					 const promise = new Promise(async (resolve) => {
-					
-					      const url = await this.initCanvas();
-					
-					      resolve({
-					
-					        // title: `速立保`,
-					
-					        path: `/pages/index/detail/detail?id=`+this.shareData.bisNo+'&isNeed='+(this.shareData.isNeed?1:0),
-					
-					        // imageUrl: url,
-					
-					      });
-					
-					    });
-					    
-					    // 默认参数
-					    return {
-					      // title: `速立保`,
-					      path: `/pages/index/detail/detail?id=`+this.shareData.bisNo+'&isNeed='+(this.shareData.isNeed?1:0),
-					      promise,
-					    };
-					 
+			showAdd2(){
+				if(uni.getStorageSync('userNo')){
+					uni.navigateTo({
+						url:'/circlePages/addShare'
+					})
 				}else{
-					return {
-						// title: '速立保',
-						path: '/pages/index/index',
-					};
+					uni.setStorageSync('nextPage','/circlePages/addShare');
+					uni.navigateTo({
+						url:'/pages/login/login'
+					})
 				}
 				
-				
 			}
 		}
 	}

pages/login/loginByCode.vue

@@ -108,7 +108,7 @@
 					uni.navigateBack()
 					return;
 				}else{
-					uni.navigateTo({
+					uni.reLaunch({
 						url: '/pages/index/index'
 					})
 				}

pages/mine/addFeed.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="index tn-safe-area-inset-bottom">
+	<view class="index tn-safe-area-inset-bottom" style="background-color: #f7f7f7;min-height: 100vh;">
 
 		<tn-nav-bar customBack>
 			<view slot="back" class='tn-custom-nav-bar__back' @click="goBack()">
@@ -28,11 +28,11 @@
 
 			</view>
 
-			 
+			 <view class="tn-margin  tn-padding" style="border-radius: 10rpx;background: #fff;margin-top: 0;">
+			 	<textarea maxlength="500" v-model="contentValue" placeholder="请描述您遇到的问题..." :style="{fontSize:(wxFontSize-3)+'px',width:'100%'}"  :placeholder-style="styleString"></textarea>
+			 </view>
 				 
-				 <view class="tn-margin tn-bg-gray--light tn-padding" style="border-radius: 10rpx;">
-				 	<textarea maxlength="500" v-model="contentValue" placeholder="请描述您遇到的问题..." placeholder-style="color:#AAAAAA"></textarea>
-				 </view>
+				  
 				 
 				 <view class="tn-margin-left tn-padding-top-xs">
 				 	<uni-file-picker
@@ -95,7 +95,8 @@
 					},
 				],
 				showEmpty: false,
-				wxFontSize:17
+				wxFontSize:17,
+				styleString:'font-size:'+14+'px',
 			}
 		},
 		filters: {

pages/mine/coll.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view style="background-color: #f7f7f7;min-height: 100vh;">
 		<tn-nav-bar fixed customBack>
 			<view slot="back" class='tn-custom-nav-bar__back' @click="goBack">
 				<text class='icon tn-icon-left'></text>
@@ -11,25 +11,23 @@
 		</tn-nav-bar>
 
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
-			<uv-sticky  :offsetTop="vuex_custom_bar_height + 'px'" bgColor="#ffffff">
-			<tn-tabs-swiper :list="list" :isScroll="false" :fontSize="(wxFontSize+12)" :barWidth="wxFontSize+50" :current="current" name="tab-name" @change="change" style="border-bottom: 1rpx solid #f1f1f1cc;"></tn-tabs-swiper>
+			<uv-sticky  :offsetTop="vuex_custom_bar_height + 'px'" bgColor="#f7f7f7">
+			<tn-tabs-swiper :list="list" :isScroll="false" :fontSize="(wxFontSize+12)" :barWidth="wxFontSize+50" :current="current" name="tab-name" @change="change" activeColor="#005DA6" inactiveColor="#333"></tn-tabs-swiper>
 			</uv-sticky>
 		
 
 			<view>
 				<!-- 图文信息 -->
 				<block v-for="(item,index) in content" :key="index">
-					<view class="blogger__item">
+					<view class="blogger__item" style="border-radius: 12px;margin: 12px 16px 12px 16px; background-color: #fff;">
 						<view class="blogger__author tn-flex tn-flex-row-between tn-flex-col-center">
-							<view class="justify__author__info" @click="tn('')">
+							<view class="justify__author__info">
 								<view class="tn-flex tn-flex-row-center">
 									<view class="tn-flex tn-flex-row-center tn-flex-col-center">
-										<!-- <view class="">
-													<tn-avatar class="" shape="circle" :src="item.userAvatar" size="lg">
-													</tn-avatar>
-												</view> -->
+										<view class="" style="width: 5px;height: 5px;background: #E18730;border-radius: 50%;margin-right: 4px;">
+										</view> 
 										<view class="tn-padding-right">
-											<view class="tn-padding-right tn-text-bold tn-text-lg"  :style="{fontSize:(wxFontSize)+'px'}">
+											<view class="tn-padding-right tn-text-bold tn-text-lg"  style="color:#333" :style="{fontSize:(wxFontSize)+'px'}">
 												{{ item.company||(item.contactNickName||item.contactPerson) }}
 											</view>
 
@@ -39,36 +37,54 @@
 							</view>
 							<view v-if="item.validDate&&current==0"
 								class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-								<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
-				padding: 8px;
-				color: #0000FF;
-				border-radius: 24px;
-				border-top-right-radius: 0;" :style="{fontSize:(wxFontSize-6)+'px'}">{{item.validDate}}</text>
+								<text class="" style="background: #E6E8F4;font-size: 12px;word-break: keep-all;padding: 8px;color: #8383F7;border-radius: 24px;border-top-right-radius: 0;" :style="{fontSize:(wxFontSize-6)+'px'}" @click="showValid(item.validDate)">{{item.validDate}}</text>
 							</view>
 						</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="#005da61a" v-if="item.brand"
+								fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+11" @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>
+						</view>
+						<view style="border-radius: 0px 0px 0px 0px;width:calc(100% + 32px);margin-left:-16px;border-bottom: 1px solid #E6E6E6;"></view>
+
+						<view  v-if="item.content" style="padding: 12px 12px 5px 5px;"> 
+							<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> -->
 
 						
 					<!-- 内容太多疲劳了-->
 					<view v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
 						:id="`blogger__content--${index}`">
-					
-						<basic-table header-row-class-name="basic-table-header" :columns="columns" :border="true"  :fontSize="(wxFontSize-3)"
-							:stripe="true" :data="item.shareExt">
-					
-						</basic-table>
+						
+						<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'}">
+								 {{sitem.prodName}}
+							</view>
+							<view style="padding: 8px 8px 0 5px;color:#333;display: flex;"  :style="{fontSize:(wxFontSize-3)+'px'}">
+								 <text style="color: #777;white-space: nowrap;">产品型号：</text>{{sitem.prodSpec}}
+							</view>
+							<view v-if="sitem.prodDesc" style="padding: 8px 8px 0 5px;color:#333;display: flex;"  :style="{fontSize:(wxFontSize-3)+'px'}">
+								 <text style="color: #777;white-space: nowrap;">产品介绍：</text><text>{{sitem.prodDesc}}</text>
+							</view>
+						</view>
+					 
 					</view>
 					
 
@@ -102,117 +118,71 @@ aspectFill		:src="image_item.ftpUrl" mode="aspectFill" @click="showImg(item.imgL
 						</block>
 						
 						
-						<view v-for="file in item.fileDetailList" :key="file.id" v-if="!isImage(file.fileName)">
+						<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>
-								<text class="tn-icon-link" :style="{fontSize:(wxFontSize-4)+'px'}"></text>
-								<view style="display: inline;margin-left:8px" @click="clickLink(file.ftpUrl,file.fileName)" :style="{fontSize:(wxFontSize-3)+'px'}">
-									{{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'}">
+									{{file.fileName}}</view>
 							</view>
 						</view>
 
 
 						<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-top-xs">
 							<view class="justify-content-item tn-color-gray tn-text-center">
-								<view class="tn-padding-right   tn-padding-top-xs tn-color-gray" :style="{fontSize:(wxFontSize-3)+'px'}">
+								<view class="tn-padding-right   tn-padding-top-xs tn-color-gray" :style="{fontSize:(wxFontSize-3)+'px',color:'#777'}">
 									{{ item.createTime2|formatDate }}
 								</view>
 
 							</view>
 							<view class="justify-content-item tn-flex tn-flex-col-center" style="position: relative;">
-								<button type="warn" plain="true" style="height: 26px;line-height: 26px" size="mini" @click="delColl(item)"><text style="font-size: 18px;" class="tn-icon-delete"></text></button>
+								<button type="warn" plain="true" style="height: 26px;line-height: 26px;color:#EF2121;border-color:#EF2121;" size="mini" @click="delColl(item)"><text style="font-size: 18px;" class="tn-icon-delete"></text></button>
 								
-								<text class="tn-icon-more-vertical tn-color-gray tn-text-bold tn-text-xxl"
-									@click="showActionSheet(item)" style="margin-left: 12px;"></text>
+								<image style="width: 30px;height:30px;margin-left:8px" @click="showActionSheet(item)" src="../../static/tu/more.png"></image>
 								
-								 <view v-if="curItem.id==item.id&&showSheet" style="position: absolute;
-									background: #ddd;
-									display: block;
-									right: 10px;
-									top: 30px;border-radius: 16px;z-index: 900;border-top-right-radius: 0">
-									<text  class="tn-icon-close" style="float: right;padding:8px;color:#333" @click="hideSheet()"></text>
-									<view class="content" style="padding: 24px 36px;font-size: 16px;line-height: 24px; width: calc(100vw - 52px);    border-radius: 16px;
-	 border-top-right-radius: 0;"
-													v-if="!showContact">
-													<button @click="linkTel()" style="border-radius:30px;color:#fff;background-color: #1d60b1;"><text
-															class="tn-icon-service" style="margin-right: 12px;"></text> {{current==0?'联系需方':'联系供方'}}</button>
-													<!-- <view>联系我们帮助对接</view> -->
-													<!-- <button v-if="!collStatus" @click="addColl"
-														style="margin-top:10px;border-radius:30px;color:#3a96d7;background-color: #d3e3fd;"><text
-															class="tn-icon-star" style="margin-right: 12px;"></text>
-														收&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;藏</button>
-													<button v-if="collStatus" @click="delColl"
-														style="margin-top:10px;border-radius:30px;color:#3a96d7;background-color: #d3e3fd;"><text
-															class="tn-icon-star-fill" style="margin-right: 12px;"></text> 取消收藏</button> -->
-													<button open-type="share"
-														style="margin-top:10px;border-radius:30px;" type="default" plain="true"><text
-															class="tn-icon-send" style="margin-right: 12px;"></text>
-														转&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发</button>
-												</view>
-												<view class="content bg-content" style="padding: 50px 36px;padding-bottom: 32px;font-size: 16px;width: calc(100vw - 52px);line-height: 24px;border-radius: 16px;border-top-right-radius: 0;"
-													v-if="showContact">
-													<view><text style="font-size: 20px;font-weight: bold;" v-if="curContact.company">{{curContact.company}}</text></view>
-																	<view style="margin-top:20px;
-													   font-weight: bold;
-													   font-size: 20px;"><text class="tn-icon-my-formal"></text><text style="margin-left: 6px;">{{curContact.contactPerson}}</text> </view>
-																	<view style="font-size: 20px;font-weight: bold;margin-top:20px" @click="showTel(curContact.contactMethod)"><text class="tn-icon-tel"></text>
-													<text style="margin-left: 4px;">{{curContact.contactMethod}}</text> </view>
-												</view>
-									
+								<view v-if="curItem.id==item.id&&showSheet" class="pop-dia" style="position: absolute;background: #E4F1FB;display: block;right: 10px;top: 24px;border-radius: 6px;z-index: 900;">
+								 
+									<view class="content" style="padding: 8px;font-size: 16px;line-height: 24px; width: 180px;border-radius: 6px;z-index: -1;"
+										v-if="!showContact">
+										<button @click="linkTel()" style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;border-bottom: 1px solid rgb(0 93 166 / 0.2);">
+											 <image src="../../static/tu/call.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;"> {{current==0?'联系需方':'联系供方'}}</button>
+										<!-- <view>联系我们帮助对接</view> -->
+									 
+										<button open-type="share"
+											style="border: none;border-radius: 0;color: #333333;background-color: #E4F1FB;" type="default" plain="true" :data-coupon="curItem">
+											<image src="../../static/tu/share.png" style="width: 26px;height: 26px;margin-right:10px;vertical-align: middle;">
+											转&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发</button>
+									</view>
+									<view class="content " style="position: relative;background: linear-gradient( 180deg, #DAECFA 0%, #FFFFFF 27%, #FFFFFF 100%);padding: 24px 40px;padding-bottom: 32px;font-size: 16px;width: calc(100vw - 80px);line-height: 24px;border-radius: 12px;"
+										v-if="showContact">
+										<view><text style="font-size: 19px;font-weight: bold;color: #333;" v-if="curContact.company">{{curContact.company}}</text></view>
+										<view style="margin-top:10px;font-size: 17px;text-align: center;color:#333">
+											<image src="../../static/tu/person.png" style="width: 24px;height: 24px;vertical-align: sub;">
+										<text style="margin-left: 6px;">{{curContact.contactPerson}}</text> </view>
+										<view style="margin-top:10px;font-size: 17px;text-align: center;color:#333" @click="showTel(curContact.contactMethod)">
+											<image src="../../static/tu/tel.png" style="width: 24px;height: 24px;vertical-align: middle;">
+											<text style="margin-left: 4px;">{{curContact.contactMethod}}</text> 
+										</view>
+										
+										<image src="../../static/tu/close.png" style="width: 40px;height: 40px;position: absolute; left: calc(50vw - 60px);bottom: -64px;" @click="hideSheet()"></image>
 									</view>
+									<view style="position: fixed;top: 0;left: 0;height: 100000vh;width: 100%;background: rgb(0 0 0 / 0.5);z-index: -1;" @click="hideSheet()" v-if="showContact"></view>
+								</view>   
 								 
 							</view>
 						</view>
 					</view>
 
 					<!-- 边距间隔 -->
-					<view class="tn-strip-bottom" v-if="index != content.length - 1"></view>
+					<!-- <view class="tn-strip-bottom" v-if="index != content.length - 1"></view> -->
 				</block>
 			</view>
 
 			<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>
-
-
-		<!-- 提示窗示例 -->
-		<uni-popup ref="alertDialog" type="dialog">
-			<uni-popup-dialog type="info" cancelText="关闭" confirmText="确认" title=" " content="确定取消收藏吗？" @confirm="dialogConfirm"
-				@close="dialogClose"></uni-popup-dialog>
-		</uni-popup>
-		
-	    <tn-popup v-model="showSheet2" mode="center" closeBtn="true" borderRadius="16">
-			<view class="content" style="padding: 24px 36px;font-size: 16px;line-height: 24px; width: 320px;"
-				v-if="!showContact">
-				
-				<button @click="linkTel()" style="border-radius:30px;color:#fff;background-color: #1d60b1;"><text
-						class="tn-icon-service" style="margin-right: 12px;"></text> {{current==0?'联系需方':'联系供方'}}</button>
-				<!-- <view>联系我们帮助对接</view> -->
-				<!-- <button v-if="!collStatus" @click="addColl"
-					style="margin-top:10px;border-radius:30px;color:#3a96d7;background-color: #d3e3fd;"><text
-						class="tn-icon-star" style="margin-right: 12px;"></text>
-					收&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;藏</button>
-				<button v-if="collStatus" @click="delColl"
-					style="margin-top:10px;border-radius:30px;color:#3a96d7;background-color: #d3e3fd;"><text
-						class="tn-icon-star-fill" style="margin-right: 12px;"></text> 取消收藏</button> -->
-				<button open-type="share"
-					style="margin-top:10px;border-radius:30px;" type="default" plain="true"><text
-						class="tn-icon-send" style="margin-right: 12px;"></text>
-					转&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发</button>
-			</view>
-			<view class="content bg-content" style="padding: 50px 36px;padding-bottom: 32px;font-size: 16px;width:320px;line-height: 24px;"
-							v-if="showContact">
-							<view><text style="font-size: 20px;font-weight: bold;" v-if="curContact.company">{{curContact.company}}</text></view>
-							<view style="margin-top:20px;
-			   font-weight: bold;
-			   font-size: 20px;"><text class="tn-icon-my-formal"></text><text style="margin-left: 6px;">{{curContact.contactPerson}}</text> </view>
-							<view style="font-size: 20px;font-weight: bold;margin-top:20px" @click="showTel(curContact.contactMethod)"><text class="tn-icon-tel"></text>
-			<text style="margin-left: 4px;">{{curContact.contactMethod}}</text> </view>
-						</view>
-		</tn-popup>
+	     
 
 
 	</view>
@@ -251,7 +221,8 @@ import {
 					fieldDesc: '产品介绍',
 				
 				}],
-				wxFontSize:17
+				wxFontSize:17,
+				shareData:{}
 			}
 		},
 		filters: {
@@ -282,8 +253,6 @@ import {
 		onLoad(){
 			const appBaseInfo = wx.getAppBaseInfo();
 			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
-		},
-		onShow() {
 			if(!uni.getStorageSync('userNo')){
 				//去登录
 				uni.navigateTo({
@@ -292,8 +261,71 @@ import {
 				return false;
 			}
 			this.loadData();
+		},
+		onShow() {
+			
 		},
 		methods: {
+			addLog(shareData){
+				const that = this;
+				let params= {
+					bisNo:shareData.bisNo,
+					bisType:this.current==0?'1':'2',
+					userNo:uni.getStorageSync('userNo')
+				};
+				
+				request.post('/slbForward/add',{slbForward:JSON.stringify(params)},{
+							  headers: {
+							  	'Content-Type': 'application/json', // 默认值
+							  },
+				}).then(res=>{
+							 
+				})
+			},
+			sleep(time) {
+			    return new Promise((resolve) => setTimeout(resolve, time));
+			},
+			onShareAppMessage: function(option) {
+				if(option.from=="button"){
+					
+					this.hideSheet();
+					this.shareData=option.target.dataset.coupon;
+					this.addLog(this.shareData);
+					 const promise = new Promise(async (resolve) => {
+					
+					      await this.sleep(500);
+					      resolve({
+					        // title: `速立保`,
+					        path: `/pages/index/detail/detail?id=`+this.shareData.bisNo+'&isNeed='+(this.current==0?'1':'0'),
+					        // imageUrl: url,
+					      });
+					    });
+					    // 默认参数
+					    return {
+					      // title: `速立保`,
+					      path: `/pages/index/detail/detail?id=`+this.shareData.bisNo+'&isNeed='+(this.current==0?'1':'0'),
+					      promise,
+					    };
+					 
+				}else{
+					return {
+						// title: '速立保',
+						path: '/pages/index/index',
+					};
+				}
+			},
+			showBrand(text){
+				uni.showToast({
+					title: text,
+					icon: 'none'
+				})
+			},
+			showValid(text){
+				uni.showToast({
+					title: '有效期：'+text,
+					icon: 'none'
+				})
+			},
 			goBack() {
 				const pages = getCurrentPages()
 				// 有可返回的页面则直接返回，uni.navigateBack 默认返回失败之后会自动刷新页面 ，无法继续返回
@@ -301,7 +333,7 @@ import {
 					uni.navigateBack()
 					return;
 				}else{
-					uni.navigateTo({
+					uni.reLaunch({
 						url: '/pages/index/index'
 					})
 				}
@@ -383,7 +415,6 @@ import {
 			delColl(item) {
 				this.curItem = item;
 				let that = this;
-				// this.$refs.alertDialog.open()
 				uniShowModal('确定取消收藏吗？', '', {
 					showCancel: true,
 					confirmText:'确定',
@@ -683,8 +714,16 @@ import {
 	}
 	.bg-content{
 		color: #fff;
-		background-image: url(./../../static/bg.png);
+		background-image: url(./../../static/tu/needbg.png);
 		background-size: cover;
 	}
 	/* 间隔线 end*/
+	
+	
+	/* 底部安全边距 start*/
+	.tn-tabbar-height {
+		min-height: 120rpx;
+		height: calc(140rpx + env(safe-area-inset-bottom) / 2);
+		height: calc(140rpx + constant(safe-area-inset-bottom));
+	}
 </style>

pages/mine/feedback.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="index tn-safe-area-inset-bottom">
+	<view class="index tn-safe-area-inset-bottom" style="background-color: #f7f7f7;min-height: 100vh;">
 
 		<tn-nav-bar customBack>
 			<view slot="back" class='tn-custom-nav-bar__back' @click="goBack()">
@@ -20,7 +20,7 @@
 
 			<!-- 图文信息 -->
 			<block v-for="(item,index) in content" :key="index">
-				<view class="blogger__item">
+				<view class="blogger__item" style="border-radius: 12px;margin: 12px 16px 12px 16px; background-color: #fff;">
 					<view class="blogger__author tn-flex tn-flex-row-between tn-flex-col-center">
 						<view class="justify__author__info">
 							<view class="tn-flex tn-flex-row-center">
@@ -35,13 +35,13 @@
 						</view>
 						<view 
 							class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center" >
-							<text class="" v-if="item.status==1" style="background: #3F51B542;font-size: 12px;
+							<text class="" v-if="item.status==1" style="background: #fce9e9;font-size: 12px;
 			padding: 8px;
-			color: red;
+			color: #EF2121;
 			border-radius: 24px;
-			 " :style="{fontSize:(wxFontSize-6)+'px'}">已处理</text><text class="" v-if="item.status==0" style="background: #3F51B542;font-size: 12px;
+			 " :style="{fontSize:(wxFontSize-6)+'px'}">已处理</text><text class="" v-if="item.status==0" style="background: #e6e6e6;font-size: 12px;
 			padding: 8px;
-			color: #333333;
+			color: #999;
 			border-radius: 24px;
 			 " :style="{fontSize:(wxFontSize-6)+'px'}">未处理</text>
 						</view>

pages/mine/mine.vue

@@ -37,9 +37,9 @@
       </view>
 	  
 	  <view class="about-shadow tn-margin-top-lg tn-padding-top-sm tn-padding-bottom-sm tn-bg-white" v-if="!showLogin">
-	    <view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding-sm"  @click="tn('/minePages/set')">
+	    <view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding-sm"  style="margin: 0 16px;border-bottom: 1px solid #e6e6e6;"  @click="tn('/minePages/set')">
 	      <view class="justify-content-item">
-	        <view class="" style="font-size: 16px;" :style="{fontSize:(wxFontSize)+'px'}">
+	        <view class="" style="font-size: 16px;color:#333" :style="{fontSize:(wxFontSize)+'px'}">
 	          个人信息
 	        </view>
 	        
@@ -51,9 +51,9 @@
 	     
 	      </view>
 	    </view>
-		<view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding-sm">
+		<view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding-sm" style="margin: 0 16px;border-bottom: 1px solid #e6e6e6;">
 		  <view class="justify-content-item">
-		    <view class="" style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">
+		    <view class="" style="font-size: 16px;;color:#333" :style="{fontSize:(wxFontSize-1)+'px'}">
 		      用户名
 		    </view>
 		    
@@ -65,9 +65,9 @@
  
 		  </view>
 		</view>
-		<view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding-sm" @click="showModal1">
+		<view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding-sm"  style="border-bottom: 1px solid #e6e6e6;margin: 0 16px;">
 		  <view class="justify-content-item">
-		    <view class="" style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">
+		    <view class="" style="font-size: 16px;;color:#333" :style="{fontSize:(wxFontSize-1)+'px'}">
 		      联系方式
 		    </view>
 		    
@@ -80,9 +80,9 @@
 		  </view>
 		</view>
 		
-		<view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding-sm" @click="showModal1">
+		<view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding-sm" style="margin: 0 16px;">
 		  <view class="justify-content-item">
-		    <view class="" style="font-size: 16px;" :style="{fontSize:(wxFontSize-1)+'px'}">
+		    <view class="" style="font-size: 16px;color:#333" :style="{fontSize:(wxFontSize-1)+'px'}">
 		      手机号
 		    </view>
 		    
@@ -95,21 +95,7 @@
 		  </view>
 		</view>
 		
-		<!-- <view class="tn-flex tn-flex-row-between tn-strip-bottom-min tn-padding" @click="showModal1">
-		  <view class="justify-content-item">
-		    <view class="tn-text-bold tn-text-lg">
-		      所属公司
-		    </view>
-		    
-		  </view>
-		  <view class="justify-content-item tn-text-lg tn-color-grey">
-		    <view class="tn-color-gray tn-padding-top-xs">
-		      未绑定
-		    </view>
 		 
-		  </view>
-		</view> -->
-		
 		
 		 
 	  </view>
@@ -118,7 +104,7 @@
       
       <!-- 方式15 start-->
       <view class="tn-flex tn-flex-row-between tn-bg-white about-shadow tn-margin-top-xl" style="padding-left: 12px;padding-right: 12px;">
-        <view class="tn-padding-sm" @click="tn('/pages/mine/need')">
+        <view class="tn-padding" @click="tn('/pages/mine/need')">
           <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
             <!-- <view class="icon15__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur" style="background-color: #F3F2F7;color: #7C8191;position: relative;"> -->
               <!-- <tn-badge absolute="true" v-if="needNum>0">
@@ -133,14 +119,14 @@
 			<!--  <view class="tn-icon-like"></view>
             </view>  -->
 			<view>
-				<img style="width:38px;height: 38px;  margin-bottom: 10px;" src='/static/Group_1890181704.png'/>
+				<img style="width:38px;height: 38px;  margin-bottom: 7px;" src='/static/Group_1890181704.png'/>
 			</view>
             <view class="tn-text-center">
               <text class="tn-text-ellipsis" :style="{fontSize:(wxFontSize-1)+'px'}">我的需求</text>
             </view>
           </view>
         </view>
-        <view class="tn-padding-sm" @click="tn('/pages/mine/share')">
+        <view class="tn-padding" @click="tn('/pages/mine/share')">
           <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
             <!-- <view class="icon15__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur" style="background-color: #F3F2F7;color: #7C8191;position: relative;"> -->
               <!-- <tn-badge absolute="true" v-if="shareNum>0">
@@ -155,20 +141,20 @@
 			<!--  <view class="tn-icon-share-triangle"></view>
             </view>  -->
 			<view>
-				<img style="width:38px;height: 38px;  margin-bottom: 10px;" src='/static/Group_1890181703.png'/>
+				<img style="width:38px;height: 38px;  margin-bottom: 7px;" src='/static/Group_1890181703.png'/>
 			</view>
             <view class="tn-text-center">
               <text class="tn-text-ellipsis" :style="{fontSize:(wxFontSize-1)+'px'}">我的供应</text>
             </view>
           </view>
         </view>
-        <view class="tn-padding-sm" @click="tn('/pages/mine/coll')">
+        <view class="tn-padding" @click="tn('/pages/mine/coll')">
           <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
         <!--    <view class="icon15__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur" style="background-color: #F3F2F7;color: #7C8191;">
               <view class="tn-icon-star"></view>
             </view>  -->
 			<view>
-				<img style="width:38px;height: 38px;  margin-bottom: 10px;" src='/static/Group_1890181702.png'/>
+				<img style="width:38px;height: 38px;  margin-bottom: 7px;" src='/static/Group_1890181702.png'/>
 			</view>
             <view class="tn-text-center">
               <text class="tn-text-ellipsis" :style="{fontSize:(wxFontSize-1)+'px'}">我的收藏</text>
@@ -186,11 +172,11 @@
 		 
 		
         <tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30">
-          <button class="tn-flex tn-flex-col-center tn-button--clear-style" @click="showFeedback">
+          <button class="tn-flex tn-flex-col-center tn-button--clear-style" @click="showFeedback" style="border-bottom: 1px solid #E6E6E6;line-height: 50px;border-radius: 0;">
             <view
               class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
             <!--  <view class="tn-icon-message-fill" :style="{fontSize:(wxFontSize+1)+'px'}"></view> -->
-			<img style="width:18px;height: 18px;  margin-bottom: 0px;" src='/static/Group_890181710.png'/>
+			<img style="width:40rpx;height: 40rpx;  margin-bottom: 0px;" src='/static/Group_890181710.png'/>
             </view>
             <view class="tn-flex tn-flex-row-between" style="width: 100%;">
               <view class="tn-margin-left-sm" :style="{fontSize:(wxFontSize-1)+'px'}">我有问题</view>
@@ -199,54 +185,65 @@
           </button>
         </tn-list-cell>
 		<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" @click="showInfo()">
-		  <view class="tn-flex tn-flex-col-center">
+		  <view class="tn-flex tn-flex-col-center" style="border-bottom: 1px solid #E6E6E6;line-height: 50px;border-radius: 0;">
 		    <view
 		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
 		     <!-- <view class="tn-icon-safe-fill" :style="{fontSize:(wxFontSize+1)+'px'}"></view> -->
-			 <img style="width:18px;height: 18px;  margin-bottom: 0px;" src='/static/Group_1890181709.png'/>
+			 <img style="width:40rpx;height: 40rpx;  margin-bottom: 0px;" src='/static/Group_1890181709.png'/>
 		    </view>
 		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">用户声明</view>
 		    <view class="tn-color-gray tn-icon-right"></view>
 		  </view>
 		</tn-list-cell>
 		<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" @click="showInfo2()">
-		  <view class="tn-flex tn-flex-col-center">
+		  <view class="tn-flex tn-flex-col-center" style="border-bottom: 1px solid #E6E6E6;line-height: 50px;border-radius: 0;">
 		    <view
 		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
 		      <!-- <view class="tn-icon-lock" :style="{fontSize:(wxFontSize+1)+'px'}"></view> -->
-			  <img style="width:18px;height: 18px;  margin-bottom: 0px;" src='/static/Group_1890181708.png'/>
+			  <img style="width:40rpx;height: 40rpx;  margin-bottom: 0px;" src='/static/Group_1890181708.png'/>
 		    </view>
 		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">隐私协议</view>
 		    <view class="tn-color-gray tn-icon-right"></view>
 		  </view>
 		</tn-list-cell>
-		<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" @click=showAbout()>
-		  <view class="tn-flex tn-flex-col-center">
+		<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" @click="showAbout()">
+		  <view class="tn-flex tn-flex-col-center" style="border-bottom: 1px solid #E6E6E6;line-height: 50px;border-radius: 0;">
 		    <view
 		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
 		      <!-- <view class="tn-icon-help" :style="{fontSize:(wxFontSize+1)+'px'}"></view> -->
-			  <img style="width:18px;height: 18px;  margin-bottom: 0px;" src='/static/Group_1890181707.png'/>
+			  <img style="width:40rpx;height: 40rpx;  margin-bottom: 0px;" src='/static/Group_1890181707.png'/>
 		    </view>
 		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">了解速立保</view>
 		    <view class="tn-color-gray tn-icon-right"></view>
 		  </view>
 		</tn-list-cell>
-		<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" @click=showFont()>
-		  <view class="tn-flex tn-flex-col-center">
+		<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" @click="showFont()" v-if="showLogin">
+		  <view class="tn-flex tn-flex-col-center" style="line-height: 50px;border-radius: 0;">
+		    <view
+		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
+		      <!-- <view class="tn-icon-font" :style="{fontSize:(wxFontSize+1)+'px'}"></view> -->
+			  <img style="width:40rpx;height: 40rpx;  margin-bottom: 0px;" src='/static/Group_1890181706.png'/>
+		    </view>
+		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">字体大小</view>
+		    <view class="tn-color-gray tn-icon-right"></view>
+		  </view>
+		</tn-list-cell>
+		<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" @click="showFont()" v-if="!showLogin">
+		  <view class="tn-flex tn-flex-col-center" style="border-bottom: 1px solid #E6E6E6;line-height: 50px;border-radius: 0;">
 		    <view
 		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
 		      <!-- <view class="tn-icon-font" :style="{fontSize:(wxFontSize+1)+'px'}"></view> -->
-			  <img style="width:18px;height: 18px;  margin-bottom: 0px;" src='/static/Group_1890181706.png'/>
+			  <img style="width:40rpx;height: 40rpx;  margin-bottom: 0px;" src='/static/Group_1890181706.png'/>
 		    </view>
 		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">字体大小</view>
 		    <view class="tn-color-gray tn-icon-right"></view>
 		  </view>
 		</tn-list-cell>
 		<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" v-if="!showLogin" >
-		  <view class="tn-flex tn-flex-col-center">
+		  <view class="tn-flex tn-flex-col-center" style="border-bottom: 1px solid #E6E6E6;line-height: 50px;border-radius: 0;">
 		    <view
 		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
-		      <view class="tn-icon-message" style="color: #333;" :style="{fontSize:(wxFontSize+1)+'px'}"></view>
+		      <view class="tn-icon-message" style="color: #333;" :style="{fontSize:(wxFontSize+2)+'px'}"></view>
 			  <!-- <img style="width:18px;height: 18px;  margin-bottom: 0px;" src='/static/Group_1890181705.png'/> -->
 		    </view>
 		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">接收通知</view>
@@ -257,11 +254,11 @@
 		</tn-list-cell>
 		 
 		<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" v-if="!showLogin" @click="showLog()">
-		  <view class="tn-flex tn-flex-col-center">
+		  <view class="tn-flex tn-flex-col-center" style="line-height: 50px;border-radius: 0;">
 		    <view
 		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
 		      <!-- <view class="tn-icon-my-reduce" :style="{fontSize:(wxFontSize+1)+'px'}"></view> -->
-			  <img style="width:18px;height: 18px;  margin-bottom: 0px;" src='/static/Group_1890181705.png'/>
+			  <img style="width:40rpx;height: 40rpx;  margin-bottom: 0px;" src='/static/Group_1890181705.png'/>
 		    </view>
 		    <view class="tn-margin-left-sm tn-flex-1" :style="{fontSize:(wxFontSize-1)+'px'}">注销账户</view>
 		    <view class="tn-color-gray tn-icon-right"></view>
@@ -298,12 +295,13 @@
 			@close="dialogClose"></uni-popup-dialog>
 	</uni-popup>
     <view class='tn-tabbar-height'></view>
-
+    
   </view>
 </template>
 
 <script>
   import request from '../../utils/request'
+   
   import {
   	uniShowModal
   } from '../../utils/uni_api'
@@ -519,9 +517,6 @@
 					 that.shareNum = 0;
 					 that.needNum = 0;
 					 that.personInfo = {};
-					 // uni.reLaunch({
-					 // 	url:'/pages/index/index'
-					 // })
 				}
 		 		
 		 	}
@@ -564,7 +559,8 @@
 
 <style lang="scss" scoped>
   .mine{
-    max-height: 100vh;
+    min-height: 100vh;
+	background-color: #f7f7f7;
   }
   /* 底部安全边距 start*/
   .tn-tabbar-height {
@@ -624,7 +620,6 @@
   /* 页面 start*/
   .about-shadow {
     border-radius: 15rpx;
-    box-shadow: 0rpx 0rpx 50rpx 0rpx rgba(0, 0, 0, 0.07);
   }
 
   .about {
@@ -638,45 +633,7 @@
 
   /* 页面 end*/
   
-  /* 图标容器15 start */
-  .icon15 {
-    &__item {
-      width: 30%;
-      background-color: #FFFFFF;
-      border-radius: 10rpx;
-      padding: 30rpx;
-      margin: 20rpx 10rpx;
-      transform: scale(1);
-      transition: transform 0.3s linear;
-      transform-origin: center center;
-      
-      &--icon {
-        width: 100rpx;
-        height: 100rpx;
-        font-size: 60rpx;
-        border-radius: 50%;
-        margin-bottom: 18rpx;
-        position: relative;
-        z-index: 1;
-        
-        &::after {
-          content: " ";
-          position: absolute;
-          z-index: -1;
-          width: 100%;
-          height: 100%;
-          left: 0;
-          bottom: 0;
-          border-radius: inherit;
-          opacity: 1;
-          transform: scale(1, 1);
-          background-size: 100% 100%;
-  
-            
-        }
-      }
-    }
-  }
+   
   
   /* 图标容器12 start */
   .tn-three{
@@ -688,70 +645,8 @@
       transform: translate(-38rpx, -16rpx) rotateX(30deg) rotateY(20deg) rotateZ(-30deg);
       text-shadow: -1rpx 2rpx 0 #f0f0f0, -2rpx 4rpx 0 #f0f0f0, -10rpx 20rpx 30rpx rgba(0, 0, 0, 0.2);
   }
-  .icon20 {
-    &__item {
-      width: 30%;
-      background-color: #FFFFFF;
-      border-radius: 10rpx;
-      padding: 30rpx;
-      margin: 20rpx 10rpx;
-      transform: scale(1);
-      transition: transform 0.3s linear;
-      transform-origin: center center;
-      
-      &--icon {
-        width: 100rpx;
-        height: 100rpx;
-        font-size: 60rpx;
-        border-radius: 50%;
-        margin-bottom: 18rpx;
-        position: relative;
-        z-index: 1;
-        
-        &::after {
-          content: " ";
-          position: absolute;
-          z-index: -1;
-          width: 100%;
-          height: 100%;
-          left: 0;
-          bottom: 0;
-          border-radius: inherit;
-          opacity: 1;
-          transform: scale(1, 1);
-          background-size: 100% 100%;
-          background-image: url(https://resource.tuniaokj.com/images/cool_bg_image/icon_bg.png);
-        }
-      }
-    }
-  }
-  
 
 
-  .button-vip {
-    width: 100%;
-    height: 150rpx;
-    border-radius: 15rpx;
-    position: relative;
-    z-index: 1;
-    
-    &::after {
-      content: " ";
-      position: absolute;
-      z-index: -1;
-      width: 100%;
-      height: 100%;
-      left: 0;
-      bottom: 0;
-      border-radius: inherit;
-      opacity: 1;
-      transform: scale(1, 1);
-      background-size: 100% 100%;
-      background-image: url(https://resource.tuniaokj.com/images/cool_bg_image/icon_bg.png);
-    }    
-  }
-  
-
   /* 图标容器12 start */
   .icon12 {
     &__item {
@@ -823,7 +718,7 @@
           opacity: 1;
           transform: scale(1, 1);
           background-size: 100% 100%;
-          background-image: url(https://resource.tuniaokj.com/images/cool_bg_image/icon_bg.png);
+           
         }
       }
     }
@@ -845,6 +740,11 @@
   }
   
   /* 顶部背景图 end */
-
+/deep/ .tn-list-cell{
+	padding-top:0 !important;
+	padding-bottom:0 !important;
+	border-radius: 0 !important;
+}
+  
 
 </style>

pages/mine/need.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view style="background-color: #f7f7f7;min-height: 100vh;">
 		<tn-nav-bar fixed customBack>
 			<view slot="back" class='tn-custom-nav-bar__back' @click="goBack">
 				<text class='icon tn-icon-left'></text>
@@ -10,25 +10,22 @@
 			</view>
 		</tn-nav-bar>
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
-			<uv-sticky :offsetTop="vuex_custom_bar_height + 'px'" bgColor="#ffffff">
+			<uv-sticky :offsetTop="vuex_custom_bar_height + 'px'" bgColor="#f7f7f7">
 				<tn-tabs-swiper :list="list" :isScroll="false" :current="current" name="tab-name" @change="tabChange"
-					style="border-bottom: 1rpx solid #f1f1f1cc;" :fontSize="(wxFontSize+12)" :barWidth="wxFontSize+50"></tn-tabs-swiper>
+				 :fontSize="(wxFontSize+12)" :barWidth="wxFontSize+50" activeColor="#005DA6" inactiveColor="#333"></tn-tabs-swiper>
 			</uv-sticky>
 
-
 			<!-- 图文信息 -->
 			<block v-for="(item,index) in content" :key="index">
-				<view class="blogger__item">
+				<view class="blogger__item" style="border-radius: 12px;margin: 12px 16px 12px 16px; background-color: #fff;position: relative;">
 					<view class="blogger__author tn-flex tn-flex-row-between tn-flex-col-center">
 						<view class="justify__author__info">
 							<view class="tn-flex tn-flex-row-center">
 								<view class="tn-flex tn-flex-row-center tn-flex-col-center">
-									<!-- <view class="">
-											<tn-avatar class="" shape="circle" :src="item.userAvatar" size="lg">
-											</tn-avatar>
-										</view> -->
+									<view class="" style="width: 5px;height: 5px;background: #E18730;border-radius: 50%;margin-right: 4px;">
+									</view>  
 									<view class="tn-padding-right">
-										<view class="tn-padding-right tn-text-bold tn-text-lg" :style="{fontSize:(wxFontSize)+'px'}">
+										<view class="tn-padding-right tn-text-bold tn-text-lg" style="color:#333" :style="{fontSize:(wxFontSize)+'px'}">
 											{{ item.company }}
 										</view>
 
@@ -38,60 +35,78 @@
 						</view>
 						<view v-if="item.status=='4'&&item.showFlag=='否'"
 							class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-							<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
+							<text class="" style="background: #e6e6e6;font-size: 12px;word-break: keep-all;
 		padding: 8px;
-		color: #333333;
-		border-radius: 24px;
+		color: #999;
+		border-radius: 10px;
+		border-top-left-radius: 0;
+		border-bottom-right-radius: 0;
+		position: absolute;
+		top: 0;
+		right: 0;
 		 " :style="{fontSize:(wxFontSize-6)+'px'}">需求已结束</text>
 						</view>
 						<!-- 状态(1:暂存,2:待处理,3:审核中,4:已通过,9:已拒绝,10:已取消) -->
 						<view v-if="item.status=='1'"
 							class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-							<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
+							<text class="" style="background: #e6e6e6;font-size: 12px;word-break: keep-all;
 					padding: 8px;
-					color: #333333;
-					border-radius: 24px;
+					color: #999;
+					border-radius: 10px;
+					border-top-left-radius: 0;
+					border-bottom-right-radius: 0;
+					position: absolute;
+					top: 0;
+					right: 0;
 					 " :style="{fontSize:(wxFontSize-6)+'px'}">暂存</text>
 						</view>
 						<view v-if="item.status=='3'"
 								class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-								<text class="" style="background: #3f51b56b;font-size: 12px;word-break: keep-all;
+								<text class="" style="background: #fbf3ea;font-size: 12px;word-break: keep-all;
 						padding: 8px;
-						color: #ff0;
-						border-radius: 24px;
+						color: #E18730;
+						border-radius: 10px;
+						border-top-left-radius: 0;
+						border-bottom-right-radius: 0;
+						position: absolute;
+						top: 0;
+						right: 0;
 						 " :style="{fontSize:(wxFontSize-6)+'px'}">审核中</text>
 							</view>
 						<view v-if="item.status=='4'&&item.showFlag!='否'"
 								class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-								<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
+								<text class="" style="background: #ecf8e9;font-size: 12px;word-break: keep-all;
 						padding: 8px;
-						color: #007000;
-						border-radius: 24px;
+						color: #2FB120;
+						border-radius: 10px;
+						border-top-left-radius: 0;
+						border-bottom-right-radius: 0;
+						position: absolute;
+						top: 0;
+						right: 0;
 						 " :style="{fontSize:(wxFontSize-6)+'px'}">已通过</text>
 							</view>
 						<view v-if="item.status=='9'"
 								class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-								<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
+								<text class="" style="background: #fce9e9;font-size: 12px;word-break: keep-all;
 						padding: 8px;
-						color: #d23920;
-						border-radius: 24px;
+						color: #EF2121;
+						border-radius: 10px;
+						border-top-left-radius: 0;
+						border-bottom-right-radius: 0;
+						position: absolute;
+						top: 0;
+						right: 0;
 						 "  @click="showTips(item)" :style="{fontSize:(wxFontSize-6)+'px'}">已拒绝</text>
 							</view>
-							<view v-if="item.status=='10'"
-									class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-									<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
-							padding: 8px;
-							color: #333333;
-							border-radius: 24px;
-							 " :style="{fontSize:(wxFontSize-6)+'px'}">已取消</text>
-								</view>
+							 
 					</view>
 
 					<view
 						class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
 						 >
 						<text
-							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</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>
 
 					<block v-if="item.imgList">
@@ -124,15 +139,14 @@
 							</tn-grid>
 						</view>
 					</block>
-					<view v-for="file in item.fileDetailList" :key="file.id" v-if="!isImage(file.fileName)">
+					<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>
-							<text class="tn-icon-link" :style="{fontSize:(wxFontSize-4)+'px'}"></text>
-							<view style="display: inline;margin-left:8px" @click="clickLink(file.ftpUrl,file.fileName)" :style="{fontSize:(wxFontSize-3)+'px'}">
-								{{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'}">
+								{{file.fileName}}</view>
 						</view>
 					</view>
+					 
 					
 					 
 
@@ -148,19 +162,14 @@
 
 						</view>
 						<view class="justify-content-item tn-flex tn-flex-col-center" v-if="item.status==4&&item.showFlag!='否'">
-							<button type="warn" plain="true" size="mini" @click="finishItem(item)" :style="{fontSize:(wxFontSize-4)+'px'}">结束需求</button>
-							<!-- <tn-button shadow shape="round" fontColor="tn-color-white" backgroundColor="tn-bg-blue"
-								:fontSize="24" height="auto" padding="10rpx 18rpx"
-								@click="finishItem(item)">结束需求</tn-button> -->
+							<button type="warn" plain="true" size="mini" @click="finishItem(item)" style="color:#EF2121;border-color:#EF2121;"  :style="{fontSize:(wxFontSize-4)+'px'}">结束需求</button>
 
 						</view>
 						<view class="justify-content-item tn-flex tn-flex-col-center" style="flex: none;" v-if="item.status==1||item.status==9||(item.status==4&&item.showFlag=='否')">
-							<button type="warn" plain="true" size="mini" @click="editItem(item)" :style="{fontSize:(wxFontSize-4)+'px'}">编辑</button>
+							<button type="warn" plain="true" size="mini" @click="editItem(item)" style="color:#E18730;border-color:#E18730;" :style="{fontSize:(wxFontSize-4)+'px'}">编辑</button>
+							
+							<button v-if="item.status==4&&item.showFlag=='否'" style="border-color: #2FB120;color:#2FB120;margin-left:12px" type="warn" plain="true" size="mini" @click="reOpen(item)" :style="{fontSize:(wxFontSize-4)+'px'}">恢复</button>
 							
-							<button v-if="item.status==4&&item.showFlag=='否'" style="border-color: #007000;color:#007000;margin-left:12px" type="warn" plain="true" size="mini" @click="reOpen(item)" :style="{fontSize:(wxFontSize-4)+'px'}">恢复</button>
-							<!-- <tn-button shadow shape="round" fontColor="tn-color-white" backgroundColor="tn-bg-blue"
-								:fontSize="24" height="auto" padding="10rpx 18rpx"
-								@click="finishItem(item)">结束需求</tn-button> -->
 						
 						</view>
 					</view>
@@ -174,10 +183,8 @@
 				<tn-empty mode="data"></tn-empty>
 			</view>
 		</view>
-		<uni-popup ref="alertDialog" type="dialog">
-			<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="结束确认" content="确定结束需求吗"
-				@confirm="dialogConfirm"></uni-popup-dialog>
-		</uni-popup>
+		
+		<view class='tn-tabbar-height' :style="{marginTop: vuex_custom_bar_height + 'px'}"></view>
 	</view>
 
 
@@ -261,7 +268,7 @@
 					uni.navigateBack()
 					return;
 				}else{
-					uni.navigateTo({
+					uni.reLaunch({
 						url: '/pages/index/index'
 					})
 				}
@@ -635,4 +642,11 @@
 	}
 
 	/* 间隔线 end*/
+	
+	/* 底部安全边距 start*/
+	.tn-tabbar-height {
+		min-height: 120rpx;
+		height: calc(140rpx + env(safe-area-inset-bottom) / 2);
+		height: calc(140rpx + constant(safe-area-inset-bottom));
+	}
 </style>

pages/mine/share.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view style="background-color: #f7f7f7;min-height: 100vh;">
 		<tn-nav-bar fixed customBack>
 			<view slot="back" class='tn-custom-nav-bar__back' @click="goBack">
 				<text class='icon tn-icon-left'></text>
@@ -10,22 +10,23 @@
 			</view>
 		</tn-nav-bar>
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
-			<uv-sticky  :offsetTop="vuex_custom_bar_height + 'px'" bgColor="#ffffff">
+			<uv-sticky  :offsetTop="vuex_custom_bar_height + 'px'" bgColor="#f7f7f7">
 			<tn-tabs-swiper :list="list" :isScroll="false" :current="current" name="tab-name"
-				@change="change"  style="border-bottom: 1rpx solid #f1f1f1cc;" :fontSize="(wxFontSize+12)" :barWidth="wxFontSize+50"></tn-tabs-swiper>
+				@change="change"  activeColor="#005DA6" inactiveColor="#333" :fontSize="(wxFontSize+12)" :barWidth="wxFontSize+50"></tn-tabs-swiper>
 		</uv-sticky>
 		<view class="tn-flex tn-flex-direction-column  tn-margin-top-sm tn-margin-bottom">
 
 			<!-- 图文信息 -->
 			<block v-for="(item,index) in content">
-				<view class="blogger__item" :key="index">
+				<view class="blogger__item" :key="index"  style="border-radius: 12px;margin: 12px 16px 12px 16px; background-color: #fff;position: relative;">
 					<view class="blogger__author tn-flex tn-flex-row-between tn-flex-col-center">
 						<view class="justify__author__info" @click="tn('')">
 							<view class="tn-flex tn-flex-row-center">
 								<view class="tn-flex tn-flex-row-center tn-flex-col-center">
-									 
+									 <view class="" style="width: 5px;height: 5px;background: #E18730;border-radius: 50%;margin-right: 4px;">
+									 </view>  
 									<view class="tn-padding-right">
-										<view class="tn-padding-right  tn-text-bold tn-text-lg"  :style="{fontSize:(wxFontSize)+'px'}">
+										<view class="tn-padding-right  tn-text-bold tn-text-lg" style="color:#333" :style="{fontSize:(wxFontSize)+'px'}">
 											{{ item.company||(item.contactNickName||item.contactPerson)}} </view>
 									</view>
 								</view>
@@ -35,51 +36,69 @@
 										<!-- 状态(1:暂存,2:待处理,3:审核中,4:已通过,9:已拒绝,10:已取消) -->
 										<view v-if="item.status=='1'"
 											class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-											<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
+											<text class="" style="background: #e6e6e6;font-size: 12px;word-break: keep-all;
 									padding: 8px;
-									color: #333333;
-									border-radius: 24px;
+									color: #999;
+									border-radius: 10px;
+									border-top-left-radius: 0;
+									border-bottom-right-radius: 0;
+									position: absolute;
+									top: 0;
+									right: 0;
 									 " :style="{fontSize:(wxFontSize-6)+'px'}">暂存</text>
 										</view>
 										<view v-if="item.status=='3'"
 												class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-												<text class="" style="background: #3f51b56b;font-size: 12px;word-break: keep-all;
+												<text class="" style="background: #fbf3ea;font-size: 12px;word-break: keep-all;
 										padding: 8px;
-										color: #ff0;
-										border-radius: 24px;
+										color: #E18730;
+										border-radius: 10px;
+										border-top-left-radius: 0;
+										border-bottom-right-radius: 0;
+										position: absolute;
+										top: 0;
+										right: 0;
 										 " :style="{fontSize:(wxFontSize-6)+'px'}">审核中</text>
 											</view>
 										<view v-if="item.status=='4'&&item.showFlag!='否'"
 												class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-												<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
+												<text class="" style="background: #ecf8e9;font-size: 12px;word-break: keep-all;
 										padding: 8px;
-										color: #007000;
-										border-radius: 24px;
+										color: #2FB120;
+										border-radius: 10px;
+										border-top-left-radius: 0;
+										border-bottom-right-radius: 0;
+										position: absolute;
+										top: 0;
+										right: 0;
 										 " :style="{fontSize:(wxFontSize-6)+'px'}">已通过</text>
 											</view>
 										<view v-if="item.status=='9'"
 												class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-												<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
+												<text class="" style="background: #fce9e9;font-size: 12px;word-break: keep-all;
 										padding: 8px;
-										color: #d23920;
-										border-radius: 24px;
+										color: #EF2121;
+										border-radius: 10px;
+										border-top-left-radius: 0;
+										border-bottom-right-radius: 0;
+										position: absolute;
+										top: 0;
+										right: 0;
 										 "  @click="showTips(item)" :style="{fontSize:(wxFontSize-6)+'px'}">已拒绝</text>
 											</view>
-											<view v-if="item.status=='10'"
-													class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-													<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
-											padding: 8px;
-											color: #333333;
-											border-radius: 24px;
-											 " :style="{fontSize:(wxFontSize-6)+'px'}">已取消</text>
-												</view>
+											 
 									 
 						<view v-if="item.status=='4'&&item.showFlag=='否'"
 										class="blogger__author__btn justify-content-item tn-flex-col-center tn-flex-row-center">
-										<text class="" style="background: #3F51B542;font-size: 12px;word-break: keep-all;
+										<text class="" style="background: #e6e6e6;font-size: 12px;word-break: keep-all;
 						padding: 8px;
-						color: #333333;
-						border-radius: 24px;
+						color: #999;
+						border-radius: 10px;
+						border-top-left-radius: 0;
+						border-bottom-right-radius: 0;
+						position: absolute;
+						top: 0;
+						right: 0;
 						 " :style="{fontSize:(wxFontSize-6)+'px'}">已下架</text>
 									</view>
 
@@ -87,26 +106,36 @@
 
 					<view
 						class="blogger__desc tn-margin-top-sm tn-margin-bottom-sm tn-text-justify tn-flex-col-center tn-flex-row-left"
-						@click="tn('')">
-						
-				      <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 v-if="item.content"
-							class="blogger__desc__content tn-flex-1 tn-text-justify tn-text-df" :style="{fontSize:(wxFontSize-2)+'px'}">{{ item.content }}</text>
+						>
+						<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>
+						<tn-tag margin="-4px 4px 0 0" backgroundColor="#005da61a" v-if="!item.company"
+							fontColor="#005DA6" shape="circle" :fontSize="wxFontSize+11" @click="showBrand('个人发布')">个人</tn-tag>
 					</view>
-
-					<!-- 内容太多疲劳了-->
-					<view v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
-						:id="`blogger__content--${index}`">
-					
-						<basic-table header-row-class-name="basic-table-header" :columns="columns" :border="true"  :fontSize="(wxFontSize-3)"
-							:stripe="true" :data="item.shareExt">
+					<view style="border-radius: 0px 0px 0px 0px;width:calc(100% + 32px);margin-left:-16px;border-bottom: 1px solid #E6E6E6;"></view>
 					
-						</basic-table>
+					<view  v-if="item.content" style="padding: 12px 12px 5px 5px;"> 
+						<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 v-if="item.shareExt&&item.shareExt.length>0" class="blogger__content"
+					 	: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'}">
+					 			 {{sitem.prodName}}
+					 		</view>
+					 		<view style="padding: 8px 8px 0 5px;color:#333;display: flex;"  :style="{fontSize:(wxFontSize-3)+'px'}">
+					 			 <text style="color: #777;white-space: nowrap;">产品型号：</text>{{sitem.prodSpec}}
+					 		</view>
+					 		<view v-if="sitem.prodDesc" style="padding: 8px 8px 0 5px;color:#333;display: flex;"  :style="{fontSize:(wxFontSize-3)+'px'}">
+					 			 <text style="color: #777;white-space: nowrap;">产品介绍：</text><text>{{sitem.prodDesc}}</text>
+					 		</view>
+					 	</view>
+					  
+					 </view>
 					 
 
 					<block v-if="item.imgList">
@@ -137,15 +166,14 @@
 							</tn-grid>
 						</view>
 					</block>
-					<view v-for="file in item.fileDetailList" :key="file.id" v-if="!isImage(file.fileName)">
+				 
+					<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>
-							<text class="tn-icon-link" :style="{fontSize:(wxFontSize-4)+'px'}"></text>
-							<view style="display: inline;margin-left:8px" @click="clickLink(file.ftpUrl,file.fileName)" :style="{fontSize:(wxFontSize-3)+'px'}">
+							<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'}">
 								{{file.fileName}}</view>
-
 						</view>
 					</view>
-					
 					 
 
 					<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-top-xs">
@@ -161,11 +189,11 @@
 						<view class="justify-content-item tn-flex tn-flex-col-center">
 							<view class="justify-content-item tn-flex tn-flex-col-center" v-if="item.status==4&&item.showFlag!='否'">
 								<!-- <tn-button shadow shape="round" fontColor="tn-color-white" backgroundColor="tn-bg-blue" :fontSize="24" height="auto" padding="10rpx 18rpx" @click="finishItem(item)">下架</tn-button> -->
-								<button type="warn" plain="true" size="mini" @click="finishItem(item)" :style="{fontSize:(wxFontSize-4)+'px'}">下架供应</button>
+								<button type="warn" plain="true" size="mini" style="color:#EF2121;border-color:#EF2121;" @click="finishItem(item)" :style="{fontSize:(wxFontSize-4)+'px'}">下架供应</button>
 							</view>
 							<view class="justify-content-item tn-flex tn-flex-col-center" style="flex:none" v-if="item.status==1||item.status==9||(item.status==4&&item.showFlag=='否')">
-								<button type="warn" plain="true" size="mini" @click="editItem(item)" :style="{fontSize:(wxFontSize-4)+'px'}">编辑</button>
-								<button v-if="item.status==4&&item.showFlag=='否'" style="border-color: #007000;color:#007000;margin-left:12px" type="warn" plain="true" size="mini" @click="reOpen(item)" :style="{fontSize:(wxFontSize-4)+'px'}">恢复</button>
+								<button type="warn" plain="true" size="mini" style="color:#E18730;border-color:#E18730;" @click="editItem(item)" :style="{fontSize:(wxFontSize-4)+'px'}">编辑</button>
+								<button v-if="item.status==4&&item.showFlag=='否'" style="border-color: #2FB120;color:#2FB120;margin-left:12px" type="warn" plain="true" size="mini" @click="reOpen(item)" :style="{fontSize:(wxFontSize-4)+'px'}">恢复</button>
 								<!-- <tn-button shadow shape="round" fontColor="tn-color-white" backgroundColor="tn-bg-blue"
 									:fontSize="24" height="auto" padding="10rpx 18rpx"
 									@click="finishItem(item)">结束需求</tn-button> -->
@@ -288,6 +316,12 @@
 			this.loadData();
 		},
 		methods: {
+			showBrand(text){
+				uni.showToast({
+					title: text,
+					icon: 'none'
+				})
+			},
 			goBack() {
 				const pages = getCurrentPages()
 				// 有可返回的页面则直接返回，uni.navigateBack 默认返回失败之后会自动刷新页面 ，无法继续返回
@@ -295,7 +329,7 @@
 					uni.navigateBack()
 					return;
 				}else{
-					uni.navigateTo({
+					uni.reLaunch({
 						url: '/pages/index/index'
 					})
 				}
@@ -680,4 +714,11 @@
 	}
 	
 	/* 间隔线 end*/
+	
+	/* 底部安全边距 start*/
+	.tn-tabbar-height {
+		min-height: 120rpx;
+		height: calc(140rpx + env(safe-area-inset-bottom) / 2);
+		height: calc(140rpx + constant(safe-area-inset-bottom));
+	}
 </style>

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

@@ -142,7 +142,7 @@
           permission: '无权限',
           history: '历史记录为空',
           message: '暂无消息',
-          list: '列表为空',
+          list: '暂无数据',
           data: '暂无数据',
           comment: '暂无评论'
         }

tuniao-ui/components/tn-nav-bar/tn-nav-bar.vue

@@ -304,7 +304,7 @@
       }
       
       &--bottom-shadow {
-        box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.05);
+         
       }
       
       &__action {

tuniao-ui/theme.scss

@@ -122,7 +122,7 @@ $tn-color-brown-dark: #743F23;
 $tn-color-brown-disabled: #C8A795;
 $tn-color-brown-light: #E9DCD5;
 
-$tn-color-grey: #78909C;
+$tn-color-grey: #777;
 $tn-color-grey-dark: #5F7E8B;
 $tn-color-grey-disabled: #C6D1D8;
 $tn-color-grey-light: #E4E9EC;

uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue

@@ -547,7 +547,7 @@
 		overflow: hidden;
 		flex: 1;
 		line-height: 1;
-
+		background-color: #fff;
 		height: 35px;
 		// min-height: 36px;
 

uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue

@@ -296,7 +296,7 @@
 
 	.uni-searchbar__text-placeholder {
 		font-size: 14px;
-		color: #B3B3B3;
+		color: #999;
 		margin-left: 5px;
 		text-align: left;
 	}

unpackage/dist/dev/mp-weixin/app.json

@@ -14,7 +14,11 @@
     "pages/mine/about",
     "pages/comm/search2",
     "pages/index/detail/detail",
-    "pages/login/loginByCode"
+    "pages/login/loginByCode",
+    "pages/discovery/discovery",
+    "pages/home/home",
+    "pages/mine/mine",
+    "pages/comm/comm"
   ],
   "subPackages": [
     {
@@ -35,9 +39,39 @@
     "navigationStyle": "custom",
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "速立保",
-    "navigationBarBackgroundColor": "#F8F8F8",
+    "navigationBarBackgroundColor": "#fff",
     "backgroundColor": "#F8F8F8"
   },
+  "tabBar": {
+    "color": "#868585",
+    "selectedColor": "#005DA6",
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "text": "供需发布平台",
+        "iconPath": "static/ui/home.png",
+        "selectedIconPath": "static/ui/home1.png"
+      },
+      {
+        "pagePath": "pages/home/home",
+        "text": "我要什么",
+        "iconPath": "static/ui/need.png",
+        "selectedIconPath": "static/ui/need1.png"
+      },
+      {
+        "pagePath": "pages/comm/comm",
+        "text": "我有什么",
+        "iconPath": "static/ui/share.png",
+        "selectedIconPath": "static/ui/share1.png"
+      },
+      {
+        "pagePath": "pages/mine/mine",
+        "text": "我的",
+        "iconPath": "static/ui/me.png",
+        "selectedIconPath": "static/ui/me1.png"
+      }
+    ]
+  },
   "requiredPrivateInfos": [
     "chooseAddress"
   ],

unpackage/dist/dev/mp-weixin/circlePages/addShare.json

@@ -2,7 +2,6 @@
   "navigationBarTitleText": "发布供应",
   "usingComponents": {
     "tn-nav-bar": "/tuniao-ui/components/tn-nav-bar/tn-nav-bar",
-    "tn-steps": "/tuniao-ui/components/tn-steps/tn-steps",
     "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",

unpackage/dist/dev/mp-weixin/circlePages/addShare.wxss

@@ -52,7 +52,7 @@
   bottom: calc(env(safe-area-inset-bottom));
   z-index: 1024;
   box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);
-  background: #fff;
+  background: #f7f7f7;
 }
 /* 底部悬浮按钮 end*/
 /* 标签内容 start*/

unpackage/dist/dev/mp-weixin/circlePages/circle.wxss

@@ -52,7 +52,7 @@
   bottom: calc(env(safe-area-inset-bottom));
   z-index: 1024;
   box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);
-  background: #fff;
+  background: #f7f7f7;
 }
 /* 底部悬浮按钮 end*/
 /* 标签内容 start*/

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

@@ -3515,7 +3515,7 @@ button::after {
   color: #C8A795 !important;
 }
 .tn-color-grey {
-  color: #78909C !important;
+  color: #777 !important;
 }
 .tn-color-grey--light {
   color: #E4E9EC !important;
@@ -3751,7 +3751,7 @@ button::after {
   border-color: #C8A795 !important;
 }
 .tn-border-grey {
-  border-color: #78909C !important;
+  border-color: #777 !important;
 }
 .tn-border-grey--light {
   border-color: #E4E9EC !important;
@@ -4004,7 +4004,7 @@ button::after {
   background-color: #C8A795 !important;
 }
 .tn-bg-grey {
-  background-color: #78909C !important;
+  background-color: #777 !important;
   color: #080808;
 }
 .tn-bg-grey--light {

unpackage/dist/dev/mp-weixin/components/basic-table/basic-table.json

@@ -1,7 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true,
-  "componentGenerics": {
-    "scoped-slots-item": true
-  }
-}

unpackage/dist/dev/mp-weixin/components/basic-table/basic-table.wxss

@@ -1,147 +0,0 @@
-@charset "UTF-8";
-/**
- * 下方引入的为Tuniao UI的集成样式文件，为scss预处理器，其中包含了一些"tn-"开头的自定义变量
- * 使用的时候，请将下面的一行复制到您的uniapp项目根目录的uni.scss中即可
- * Tuniao UI自定义的css类名和scss变量，均以"tn-"开头，不会造成冲突，请放心使用 
- */
-.base-table.data-v-201e5038 {
-  overflow: auto;
-  box-sizing: content-box;
-}
-.base-table.is-border.data-v-201e5038 {
-  border: 1px solid #edeeee;
-  border-bottom: none;
-}
-.base-table.is-border .b-th.data-v-201e5038,
-.base-table.is-border .b-td.data-v-201e5038 {
-  border-right: 1px solid #edeeee;
-}
-.base-table.is-border .b-th.data-v-201e5038:last-of-type,
-.base-table.is-border .b-td.data-v-201e5038:last-of-type {
-  border-right: none;
-}
-.base-table.no-data .base-table-body.data-v-201e5038 {
-  border-bottom: 1px solid #edeeee;
-}
-.base-table .base-table-inner.data-v-201e5038 {
-  display: flex;
-  height: 100%;
-  flex-direction: column;
-}
-.base-table .base-table-inner .base-table-header.data-v-201e5038,
-.base-table .base-table-inner .base-table-footer.data-v-201e5038 {
-  width: 100%;
-  flex-shrink: 0;
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 3;
-}
-.base-table .base-table-inner .base-table-header.data-v-201e5038 {
-  top: 0;
-}
-.base-table .base-table-inner .base-table-header .b-td.data-v-201e5038 {
-  background-color: #ffffff;
-}
-.base-table .base-table-inner .base-table-footer.data-v-201e5038 {
-  bottom: 0;
-}
-.base-table .base-table-inner .base-table-footer .b-tr.data-v-201e5038 {
-  background-color: #f5f7fa !important;
-}
-.base-table .base-table-inner .base-table-footer .b-td.data-v-201e5038 {
-  border-top: 1px solid #edeeee;
-  background-color: #f5f7fa !important;
-}
-.base-table .base-table-inner .base-table-body.data-v-201e5038 {
-  position: relative;
-  flex: 1;
-}
-.base-table .base-table-inner .b-table.data-v-201e5038 {
-  table-layout: fixed;
-  display: table;
-}
-.base-table .base-table-inner .b-table .b-thead.data-v-201e5038 {
-  color: #909399;
-  table-layout: fixed;
-  display: table-header-group;
-  vertical-align: middle;
-  font-weight: bold;
-}
-.base-table .base-table-inner .b-table .b-tbody.data-v-201e5038 {
-  display: table-row-group;
-  vertical-align: middle;
-  table-layout: fixed;
-}
-.base-table .base-table-inner .b-table .b-tr.data-v-201e5038 {
-  background-color: #ffffff;
-  display: table-row;
-}
-.base-table .base-table-inner .b-table .b-tr.is-stripe .b-td.data-v-201e5038 {
-  background-color: #fafafa;
-}
-.base-table .base-table-inner .b-table .b-th.data-v-201e5038,
-.base-table .base-table-inner .b-table .b-td.data-v-201e5038 {
-  font-size: 14px;
-  display: table-cell;
-  border-bottom: 1px solid #edeeee;
-  padding: 8px 0;
-  box-sizing: border-box;
-  text-overflow: ellipsis;
-  position: relative;
-  vertical-align: middle;
-  text-align: left;
-  z-index: 1;
-}
-.base-table .base-table-inner .b-table .b-th .b-cell.data-v-201e5038,
-.base-table .base-table-inner .b-table .b-td .b-cell.data-v-201e5038 {
-  box-sizing: border-box;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: normal;
-  word-break: break-all;
-  line-height: 23px;
-  padding: 0 8px;
-}
-.base-table .base-table-inner .b-table .b-th.fixed.data-v-201e5038,
-.base-table .base-table-inner .b-table .b-td.fixed.data-v-201e5038 {
-  position: -webkit-sticky !important;
-  position: sticky !important;
-  z-index: 2;
-  background: #ffffff;
-  border-right: 0;
-}
-.base-table .base-table-inner .b-table .b-th.fixed.data-v-201e5038::before,
-.base-table .base-table-inner .b-table .b-td.fixed.data-v-201e5038::before {
-  content: '';
-  position: absolute;
-  top: 0px;
-  width: 10px;
-  bottom: -1px;
-}
-.base-table .base-table-inner .b-table .b-th.fixed-left.data-v-201e5038,
-.base-table .base-table-inner .b-table .b-td.fixed-left.data-v-201e5038 {
-  left: 0;
-}
-.base-table .base-table-inner .b-table .b-th.fixed-left.data-v-201e5038::before,
-.base-table .base-table-inner .b-table .b-td.fixed-left.data-v-201e5038::before {
-  right: -10px;
-  box-shadow: inset 10px 0 10px -10px rgba(0, 0, 0, 0.15);
-}
-.base-table .base-table-inner .b-table .b-th.fixed-right.data-v-201e5038,
-.base-table .base-table-inner .b-table .b-td.fixed-right.data-v-201e5038 {
-  right: 0;
-}
-.base-table .base-table-inner .b-table .b-th.fixed-right.data-v-201e5038::before,
-.base-table .base-table-inner .b-table .b-td.fixed-right.data-v-201e5038::before {
-  left: -10px;
-  box-shadow: inset -10px 0 10px -10px rgba(0, 0, 0, 0.15);
-}
-.base-table .base-table-inner .b-table .base-table-empty.data-v-201e5038 {
-  min-height: 60px;
-  line-height: 60px;
-  width: 100%;
-  text-align: center;
-  color: #909399;
-  font-size: 24rpx;
-}
-

unpackage/dist/dev/mp-weixin/pages/comm/comm.json

@@ -1,18 +1,13 @@
 {
+  "navigationBarTitleText": "我有什么",
   "usingComponents": {
-    "comm-basic-table-item": "/pages/comm/comm-basic-table-item",
+    "tn-nav-bar": "/tuniao-ui/components/tn-nav-bar/tn-nav-bar",
     "uv-sticky": "/uni_modules/uv-sticky/components/uv-sticky/uv-sticky",
-    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "tn-tabs-swiper": "/tuniao-ui/components/tn-tabs-swiper/tn-tabs-swiper",
     "tn-tag": "/tuniao-ui/components/tn-tag/tn-tag",
-    "basic-table": "/components/basic-table/basic-table",
-    "tn-read-more": "/tuniao-ui/components/tn-read-more/tn-read-more",
     "tn-grid": "/tuniao-ui/components/tn-grid/tn-grid",
     "tn-grid-item": "/tuniao-ui/components/tn-grid-item/tn-grid-item",
     "tn-empty": "/tuniao-ui/components/tn-empty/tn-empty",
-    "tn-load-more": "/tuniao-ui/components/tn-load-more/tn-load-more",
-    "tn-popup": "/tuniao-ui/components/tn-popup/tn-popup",
-    "tn-toast": "/tuniao-ui/components/tn-toast/tn-toast"
-  },
-  "component": true
+    "tn-load-more": "/tuniao-ui/components/tn-load-more/tn-load-more"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/discovery/discovery.json

@@ -1,5 +1,5 @@
 {
-  "component": true,
+  "navigationBarTitleText": "速立保",
   "usingComponents": {
     "tn-nav-bar": "/tuniao-ui/components/tn-nav-bar/tn-nav-bar"
   }

unpackage/dist/dev/mp-weixin/pages/home/home.json

@@ -1,13 +1,12 @@
 {
-  "component": true,
+  "navigationBarTitleText": "我要什么",
   "usingComponents": {
+    "tn-nav-bar": "/tuniao-ui/components/tn-nav-bar/tn-nav-bar",
     "uv-sticky": "/uni_modules/uv-sticky/components/uv-sticky/uv-sticky",
     "uni-search-bar": "/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar",
     "tn-grid": "/tuniao-ui/components/tn-grid/tn-grid",
     "tn-grid-item": "/tuniao-ui/components/tn-grid-item/tn-grid-item",
     "tn-empty": "/tuniao-ui/components/tn-empty/tn-empty",
-    "tn-load-more": "/tuniao-ui/components/tn-load-more/tn-load-more",
-    "tn-popup": "/tuniao-ui/components/tn-popup/tn-popup",
-    "tn-toast": "/tuniao-ui/components/tn-toast/tn-toast"
+    "tn-load-more": "/tuniao-ui/components/tn-load-more/tn-load-more"
   }
 }

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,8 +1,7 @@
 {
-  "disableScroll": true,
+  "navigationBarTitleText": "速立保",
   "usingComponents": {
     "tn-nav-bar": "/tuniao-ui/components/tn-nav-bar/tn-nav-bar",
-    "tn-tabbar": "/tuniao-ui/components/tn-tabbar/tn-tabbar",
     "auth": "/pages/index/autoLogin",
     "home": "/pages/home/home",
     "comm": "/pages/comm/comm",