perf: 优化table查看全部，反馈

circlePages/circle.vue

@@ -214,8 +214,8 @@
 				selectValue: '',
 				//非常紧急/两周/一月/长期
 				selectList: [{
-						value: '非常紧急',
-						text: '非常紧急'
+						value: '一周',
+						text: '一周'
 					},
 					{
 						value: '两周',
@@ -224,10 +224,6 @@
 					{
 						value: '一月',
 						text: '一月'
-					},
-					{
-						value: '长期',
-						text: '长期'
 					}
 				],
 				content:'',

pages/comm/comm.vue

@@ -125,8 +125,9 @@
 								 
 									 <view v-if="column.fieldName==='prodDesc'">
 										 
-										<tn-read-more :showHeight="120" openText="查看全部">
-										  <rich-text :nodes="scope.prodDesc"></rich-text>
+										<tn-read-more openText="查看全部" :closeBtn="true" closeText="收起" :showHeight="125">
+											<text>{{scope.prodDesc}}</text>
+										  
 										</tn-read-more>
 									 </view>
 							    </template>
@@ -490,6 +491,7 @@
 			fetchData(curIndex = 1) {
 				let that = this;
 				that.showEmpty = false;
+				this.curIndex = curIndex;
 				if (uni.getStorageSync('searchProdValue')) {
 					that.searchProdValue = uni.getStorageSync('searchProdValue');
 				}

pages/home/home.vue

@@ -1,22 +1,7 @@
 <template>
 	<view class="index tn-safe-area-inset-bottom">
 
-		<tn-nav-bar customBack>
-			<view slot="back" class='tn-custom-nav-bar__back' @click="reFetchData()">
-				<text v-if="!loading" class="tn-icon-circle-arrow" style="font-size: 50rpx;"></text>
-				<view style="margin-top:6px" v-if="loading"><tn-loading :size="46"></tn-loading></view>
-			</view>
-
-			<view slot="default" style="display: flex;">
-				<view style="flex:1;margin-left:25px;">
-					<text>我要什么</text>
-				</view>
-				<view>
-					<text class="tn-icon-add-fill" style="font-size: 30px;margin-right: 4px;"
-						@click="addButton()"></text>
-				</view>
-			</view>
-		</tn-nav-bar>
+		
 
 		<view class="" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 			<uv-sticky :offsetTop="vuex_custom_bar_height + 'px'" bgColor="#ffffff">
@@ -101,7 +86,7 @@
 							</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="margin-bottom: 4px;" :key="file.id" v-if="!isImage(file.fileName)">
 						<view>
 							<text class="tn-icon-link"></text>
 							<view style="display: inline-block;margin-left:8px" @click="clickLink(file.ftpUrl,file.fileName)">
@@ -270,6 +255,7 @@
 			fetchData(curIndex = 1) {
 				let that = this;
 				that.showEmpty = false;
+				this.curIndex = curIndex;
 				request.post('/slbResourceDemand/query', {
 					index: curIndex,
 					limit: 10,

pages/index/index.vue

@@ -1,12 +1,28 @@
 <template>
 	<view class="start-index">
 		<view v-if="tabberPageLoadFlag[0]" :style="{display: currentIndex === 0 ? '' : 'none'}">
-			<scroll-view class="custom-tabbar-page" scroll-y enable-back-to-top @scrolltolower="tabbarPageScrollLower">
+			<tn-nav-bar customBack>
+				<view slot="back" class='tn-custom-nav-bar__back' @click="reFetchData()">
+					<text v-if="!loading" class="tn-icon-circle-arrow" style="font-size: 50rpx;"></text>
+					<view style="margin-top:6px" v-if="loading"><tn-loading :size="46"></tn-loading></view>
+				</view>
+			
+				<view slot="default" style="display: flex;">
+					<view style="flex:1;margin-left:25px;">
+						<text>我要什么</text>
+					</view>
+					<view>
+						<text class="tn-icon-add-fill" style="font-size: 30px;margin-right: 4px;"
+							@click="addButton()"></text>
+					</view>
+				</view>
+			</tn-nav-bar>
+			<scroll-view class="custom-tabbar-page" scroll-y :refresher-enabled="isTop" @scroll="handleScroll" :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[1]" :style="{display: currentIndex === 1 ? '' : 'none'}">
-			<scroll-view class="custom-tabbar-page" scroll-y enable-back-to-top @scrolltolower="tabbarPageScrollLower">
+			<scroll-view class="custom-tabbar-page" scroll-y :refresher-enabled="isTop" :refresher-triggered="triggered" @refresherrestore="onRestore" @refresherrefresh="onRefresh" enable-back-to-top @scrolltolower="tabbarPageScrollLower">
 				<Comm ref="comm"></Comm>
 			</scroll-view>
 		</view>
@@ -47,6 +63,9 @@
 		},
 		data() {
 			return {
+				isTop: true,
+				triggered: false,
+				_freshing: false,
 				// 底部tabbar菜单数据
 				tabbarList: [{
 						title: '我要什么',
@@ -92,6 +111,7 @@
 			this.tabberPageLoadFlag = this.tabbarList.map((item, tabbar_index) => {
 				return index === tabbar_index
 			})
+			this._freshing = false;
 			this.switchTabbar(index);
 			let that = this;
 			 
@@ -123,6 +143,20 @@
 					this.$refs?.commRef?.stopAllVideo()
 				}
 			},
+			handleScroll(e){
+				console.error('eee');
+				console.error(e);
+				console.error(e.detail.scrollTop);
+				if(e.detail.scrollTop<1){
+					console.error('11111111111111111');
+					
+					this.isTop = true;
+				}else{
+					this.isTop = false;
+				}
+				console.error(this.isTop,'11111111111111111');
+				
+			},
 			//获取openId,unionid
 			getOpenId(code) {
 				const that = this;
@@ -248,6 +282,31 @@
 					this.$refs.discovery.getRandomData && this.$refs.discovery.getRandomData()
 				}
 			},
+			 onPulling(e) {
+			                console.log("onpulling", e);
+			            }, 
+			onRefresh(){
+				if (this._freshing) return;
+				this._freshing = true;
+				if (this.currentIndex === 0) {
+					console.error('this');
+					this.$refs.home.reFetchData();
+				}
+				if (this.currentIndex === 1) {
+					console.error('this');
+					this.$refs.comm.reFetchData();
+				}
+				setTimeout(() => {
+					console.error(11112222);
+					this.triggered = false;
+					this._freshing = false;
+					this.isTop = false;
+				}, 2000)
+			},
+			onRestore() {
+				this.triggered = false; // 需要重置
+				console.error("onRestore");
+			},
 
 			// 切换导航页面
 			_switchTabbarPage(index) {

pages/mine/need.vue

@@ -151,6 +151,14 @@
 
 						</view>
 					</view>
+					
+					<view  v-if="item.status==9&&item.feedback">
+						<view>
+							<view>
+								反馈意见:{{item.feedback||'--'}}
+							</view>
+						</view>
+					</view>
 
 
 					<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-top-xs">

pages/mine/share.vue

@@ -130,6 +130,14 @@
 
 						</view>
 					</view>
+					
+					<view  v-if="item.status==9&&item.feedback">
+						<view>
+							<view>
+								反馈意见:{{item.feedback||'--'}}
+							</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">

tuniao-ui/components/tn-read-more/tn-read-more.vue

@@ -91,7 +91,7 @@
           if (!this.initHeight) {
             style.height = 'auto'
           } else {
-            style.height = `${this.contentHeight}px`
+            style.height = `auto`
           }
         }
         
@@ -187,8 +187,9 @@
       color: $tn-font-color;
       line-height: 1.8;
       text-align: left;
-      overflow: hidden;
+      overflow: auto;
       transition: all 0.3s linear;
+	 
     }
     
     &__show-more {
@@ -216,6 +217,7 @@
       
       &--icon {
         margin-left: 14rpx;
+		 
       }
     }
   }

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

@@ -1,8 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "tn-nav-bar": "/tuniao-ui/components/tn-nav-bar/tn-nav-bar",
-    "tn-loading": "/tuniao-ui/components/tn-loading/tn-loading",
     "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",

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

@@ -1,6 +1,8 @@
 {
   "disableScroll": true,
   "usingComponents": {
+    "tn-nav-bar": "/tuniao-ui/components/tn-nav-bar/tn-nav-bar",
+    "tn-loading": "/tuniao-ui/components/tn-loading/tn-loading",
     "tn-tabbar": "/tuniao-ui/components/tn-tabbar/tn-tabbar",
     "home": "/pages/home/home",
     "comm": "/pages/comm/comm",