perf: 优化反馈、文案

circlePages/addShare.vue

@@ -67,7 +67,7 @@
 						<uni-forms-item label="" name="realName" label-width="0">
 							<uni-easyinput type="text" :clearable="false" v-model="formInfo.jobTitle" placeholder="请输入您的职称" />
 						</uni-forms-item>
-						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>联系姓名:</text>
+						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>联系人姓名:</text>
 						<uni-forms-item label="联系人姓名" name="contactMethod">
 							<uni-easyinput type="text" :clearable="false" v-model="formInfo.contactPerson" placeholder="请输入联系人姓名" />
 						</uni-forms-item>
@@ -794,7 +794,7 @@
 						contactNickName: this.formInfo.contactNickName,
 						content: that.content,
 						userNo: uni.getStorageSync('userNo'),
-						status: status==1?status:undefined,
+						status: status==1?status:3,
 						brand: that.brand,
 						id: that.isEdit?that.editItem.id:undefined,
 						bisNo: that.isEdit?that.editItem.bisNo:undefined,
@@ -850,7 +850,7 @@
 					that.canSave = true;
 					if (res.success) {
 						uni.showToast({
-							title: status==1?'暂存成功':'发布已提交，请在我的供应中查看进度',
+							title: status==1?'信息已暂存，请在我的供应中查看暂存信息':'发布已提交，请在我的供应中查看进度',
 							icon: 'none',
 							success: () => {
 								setTimeout(() => {

circlePages/circle.vue

@@ -166,7 +166,7 @@
 			<uni-forms-item label="" name="realName" label-width="0">
 				 <uni-easyinput type="text" v-model="formInfo.jobTitle" :clearable="false" placeholder="请输入您的职称" />
 			</uni-forms-item>
-			<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>联系姓名:</text>
+			<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>联系人姓名:</text>
 			<uni-forms-item label="联系人姓名" name="contactMethod">
 				 <uni-easyinput type="text" v-model="formInfo.contactPerson" :clearable="false" placeholder="请输入联系人姓名" />
 			</uni-forms-item>
@@ -408,7 +408,7 @@
 				}
 				if(status!=1&&this.formInfo.contactPerson.length<1){
 					uni.showToast({
-						title: '请输入联系姓名',
+						title: '请输入联系人姓名',
 						duration: 2000,
 						icon:'none'
 					});
@@ -447,7 +447,7 @@
 					content:that.content,
 					userNo:uni.getStorageSync('userNo'),
 					validDate:this.selectValue,
-					status: status==1?status:undefined,
+					status: status==1?status:3,
 					id: that.isEdit?that.editItem.id:undefined,
 					bisNo: that.isEdit?that.editItem.bisNo:undefined,
 					version: that.isEdit?that.editItem.version:undefined
@@ -485,7 +485,7 @@
 				    that.canSave = true;
 					if(res.success){
 						uni.showToast({
-							title:status==1?'暂存成功':'发布已提交，请在我的需求中查看进度',
+							title:status==1?'信息已暂存，请在我的需求中查看暂存信息':'发布已提交，请在我的需求中查看进度',
 							icon:'none',
 							success:()=>{
 								setTimeout(()=>{

components/w-select/w-select.vue

@@ -29,7 +29,7 @@
 		  :disabled="!filterable"
 		  :style="!filterable ? 'pointer-events: none' : ''"
 		  :value="inputData"
-		  style="font-size: 13px;"
+		  style="font-size: 14px;font-weight: bold;"
 		>
 		<!-- #ifdef VUE2 -->
 		<view
@@ -179,7 +179,7 @@
 	  // 默认显示的内容
 	  defaultValue: {
 		type: String,
-		default: '请输入所在公司名称，4个字及以上'
+		default: '请输入所在公司名称，至少四个字'
 	  },
 	  // 显示的内容
 	  valueName: {

pages/comm/comm.vue

@@ -633,7 +633,7 @@
 					if (res.success) {
 						uni.showToast({
 							title: '信息已收藏，请在我的收藏里查看阅读',
-							duration: 2000,
+							duration:2500,
 							icon: 'none'
 						});
 						that.showSheet = false;
@@ -652,7 +652,9 @@
 				}).then(res => {
 					if (res.success) {
 						uni.showToast({
-							title: '取消成功'
+							title: '此供应信息将不会保存在我的收藏里',
+							icon:'none',
+							duration:2500
 						})
 						that.showSheet = false;
 					} else {

pages/home/home.vue

@@ -376,7 +376,7 @@
 					if (res.success) {
 						uni.showToast({
 							title: '信息已收藏，请在我的收藏里查看阅读',
-							duration: 2000,
+							duration: 2500,
 							icon: 'none'
 						});
 						that.showSheet = false;
@@ -395,7 +395,9 @@
 				}).then(res => {
 					if (res.success) {
 						uni.showToast({
-							title: '取消成功'
+							title: '此需求信息将不会保存在我的收藏里',
+							icon:'none',
+							duration:2500
 						})
 						that.showSheet = false;
 					} else {

pages/index/detail/detail.vue

@@ -380,14 +380,14 @@
 				let params = {};
 				params.slbCollect = JSON.stringify({
 					fkBisNo: that.curItem.bisNo,
-					bisType: '1',
+					bisType: that.isNeed==1?'1':'2',
 					userNo: uni.getStorageSync('userNo'),
 				});
 				request.post('/slbCollect/add', params).then(res => {
 					if (res.success) {
 						uni.showToast({
 							title: '信息已收藏，请在我的收藏里查看阅读',
-							duration: 2000,
+							duration:2500,
 							icon: 'none'
 						});
 						that.showSheet = false;
@@ -406,7 +406,9 @@
 				}).then(res => {
 					if (res.success) {
 						uni.showToast({
-							title: '取消成功'
+							title: '此'+(that.isNeed==1?'需求':'供应')+'信息将不会保存在我的收藏里',
+							icon:'none',
+							duration:2500
 						})
 						that.showSheet = false;
 					} else {

pages/index/index.vue

@@ -3,7 +3,7 @@
 		<view v-if="tabberPageLoadFlag[0]" :style="{display: currentIndex === 0 ? '' : 'none'}">
 			<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>
+					<text v-if="!loading" class="tn-icon-circle-arrow" style="font-size: 30px;"></text>
 					<view style="margin-top:6px" v-if="loading"><tn-loading :size="46"></tn-loading></view>
 				</view>
 			
@@ -17,7 +17,7 @@
 					</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" @scroll="handleScroll" :refresher-triggered="triggered" @refresherpulling="onPulling" @refresherrestore="onRestore" @refresherrefresh="onRefresh" enable-back-to-top @scrolltolower="tabbarPageScrollLower">
+			<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>
@@ -25,7 +25,7 @@
 		<view v-if="tabberPageLoadFlag[1]" :style="{display: currentIndex === 1 ? '' : 'none'}">
 			<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>
+					<text v-if="!loading" class="tn-icon-circle-arrow" style="font-size: 30px;"></text>
 					<view style="margin-top:6px" v-if="loading" ><tn-loading :size="46"></tn-loading></view>
 				</view>
 			
@@ -83,7 +83,6 @@
 		},
 		data() {
 			return {
-				isTop: true,
 				triggered: false,
 				_freshing: false,
 				// 底部tabbar菜单数据
@@ -166,20 +165,6 @@
 					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;
@@ -324,10 +309,8 @@
 					this.$refs.comm.reFetchData();
 				}
 				setTimeout(() => {
-					console.error(11112222);
 					this.triggered = false;
 					this._freshing = false;
-					this.isTop = false;
 				}, 2000)
 			},
 			onRestore() {

pages/mine/about.vue

@@ -26,7 +26,7 @@
 			 
 			 <view style="margin-top:16px;text-align: center;" @click="showImg"><image style="width: 100%;object-fit: contain;"  src="https://test-oss.lx-device.com/userFeedback/1733822395232q39.png"></image></view>
 			  
-		 	<view style="margin-top:16px;text-align: center;"><image style="width: 180px; margin-top: 30px;" src="../../static/callus.png"></image></view>
+		 	<view style="margin-top:16px;text-align: center;"><image style="width: 200px; margin-top: 30px;" @click="showImg2" src="https://test-oss.lx-device.com/userFeedback/17339018364342jV.png"></image></view>
 		 	 
 		 </view>
 		</view>
@@ -45,19 +45,23 @@
 				uni.navigateBack();
 			},
 			showImg(){
-				 
-					let urls = [];
-					 
-						urls.push('https://test-oss.lx-device.com/userFeedback/1733822395232q39.png');
-					 
-					 
-					// 预览图片
-					uni.previewImage({
-						urls: urls,
-						current: 0,
+				let urls = [];
+				urls.push('https://test-oss.lx-device.com/userFeedback/1733822395232q39.png');
+				// 预览图片
+				uni.previewImage({
+					urls: urls,
+					current: 0,
+				});
+			},
+			showImg2(){
+				let urls = [];
 				
-					});
-				 
+				urls.push('https://test-oss.lx-device.com/userFeedback/1733906846387GEI.jpg');
+				// 预览图片
+				uni.previewImage({
+					urls: urls,
+					current: 0,
+				});
 			}
 		}
 	}

pages/mine/addFeed.vue

@@ -224,7 +224,7 @@
 				request.post('/slbFeedback/add', params).then(res => {
 					if(res.success){
 						uni.showToast({
-							title:'已提交',
+							title:'问题反馈已提交',
 							icon:'none',
 							success:()=>{
 								setTimeout(()=>{

pages/mine/feedback.vue

@@ -213,15 +213,15 @@
 				const extension = fileName.split('.').pop().toLowerCase();
 				return imageExtensions.includes(extension);
 			},
-			loadData() {
+			loadData(pageIndex=1) {
 				if(!uni.getStorageSync('userNo')){
 					return false;
 				}
 				let that = this;
 				that.showEmpty = false;
 				request.post('/slbFeedback/query', {
-				 
-					index:1,
+					limit:10,
+					index:pageIndex,
 					userNo: uni.getStorageSync('userNo'),
 				}).then(res => {
 					console.warn(res);
@@ -235,12 +235,20 @@
 								}
 							}
 						}
-						that.content = newList;
+						if(pageIndex==1){
+							that.content = newList;
+						}else{
+							that.content = that.content.concat(newList || []);
+						}
+						
 						if (newList.length == 0) {
 							that.showEmpty = true;
 						} else {
 							that.showEmpty = false;
 						}
+						if(res.total>that.content.length&&res.total>pageIndex*10){
+							that.loadData(pageIndex+1);
+						}
 					}
 					uni.stopPullDownRefresh();
 				})

pages/mine/mine.vue

@@ -193,7 +193,17 @@
 		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
 		      <view class="tn-icon-safe-fill"></view>
 		    </view>
-		    <view class="tn-margin-left-sm tn-flex-1">协议展示</view>
+		    <view class="tn-margin-left-sm tn-flex-1">用户声明</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="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
+		      <view class="tn-icon-lock"></view>
+		    </view>
+		    <view class="tn-margin-left-sm tn-flex-1">隐私协议</view>
 		    <view class="tn-color-gray tn-icon-right"></view>
 		  </view>
 		</tn-list-cell>
@@ -326,6 +336,14 @@
 		 // 	url:'/pages/webview/web-view?url='+encodeURIComponent('http://slb-m.dev.ml1993.com/webview?title=用户服务协议&url='+'https://test-oss.lx-device.com/userFeedback/1732866523422nfH.docx'),
 		 // })
 	  },
+	  showInfo2() {
+		  uni.navigateTo({
+		  	url:'/pages/webview/web-view?url='+encodeURIComponent('http://slb-m.dev.ml1993.com/webview?title=隐私协议&url='+'https://test-oss.lx-device.com/userFeedback/1732866629261TEn.docx'),
+		  })
+	  	// uni.navigateTo({
+	  	// 	url:'/pages/webview/web-view?url='+'https://test-oss.lx-device.com/userFeedback/1732866629261TEn.docx',
+	  	// })
+	  },
 	  showAbout(){
 		  uni.navigateTo({
 		    url: '/pages/mine/about'

pages/mine/share.vue

@@ -383,7 +383,7 @@
 			},
 			finishItem(item){
 				let that = this;
-				uniShowModal('下架提醒', '下架之后内容不再展示在供应页面里, 是否继续?', {
+				uniShowModal('下架提醒', '下架之后内容不再展示在我有什么页面里, 是否继续?', {
 					showCancel: true,
 					confirmText:'继续',
 					success: (res) => {

utils/request.js

@@ -31,8 +31,8 @@ let setCancel;
 // 请求拦截器
 instance.interceptors.request.use(
 	config => {
-		var token = store.state.token||uni.getStorageSync('frontlixiangsid');//'7221b77a-899b-492b-8263-9507f5c470e9';// store.state.token
-	
+		var token = store.state.token;//'7221b77a-899b-492b-8263-9507f5c470e9';// store.state.token
+	    console.error('token'+token);
 		//console.log("frontlixiangsid:"+token);
 		config.header['frontlixiangsid']= token;//登录token 标志id
 		config.header['platType']= 'slb';
@@ -99,9 +99,9 @@ function baseRequest(config, options) {
 			  let frontlixiangsid = getCookie(cookie,"frontlixiangsid")||res.resultMap.frontlixiangsid;
 			   console.log('cookie',frontlixiangsid);
 			 if(frontlixiangsid&&frontlixiangsid!='deleteMe'){
-				 
+				 // uni.setStorageSync('frontlixiangsid',frontlixiangsid)
 						  store.state.token = frontlixiangsid;
-						  uni.setStorageSync('frontlixiangsid',frontlixiangsid)
+						  
 			 }	
 			}catch(err){
 				console.log(err);