feat: 增加注销，优化

circlePages/addShare.vue

@@ -40,7 +40,7 @@
 							<uni-easyinput type="text" disabled v-model="formInfo.contactNickName" placeholder="请输入您的昵称" />
 						</uni-forms-item>
 						<text style="line-height: 30px;vertical-align: middle;">真实姓名:</text>
-						<uni-forms-item label="真实姓名" name="contactMethod" v-if="formInfo.userRealName">
+						<uni-forms-item label="真实姓名" name="contactMethod">
 							<uni-easyinput type="text" disabled="" v-model="formInfo.userRealName" placeholder="请输入真实姓名" />
 						</uni-forms-item>
 						<text style="color: red;line-height: 30px;vertical-align: middle;margin-right: 4px;">*</text><text>联系方式:</text>
@@ -253,7 +253,7 @@
 							placeholder-style="color:#AAAAAA"></textarea>
 					</view>
 
-					<view class="tn-flex tn-flex-row-between tn-flex-col-center   tn-margin"  v-if="stepIndex==3">
+					<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;">
@@ -289,7 +289,7 @@
 
 					</view>
 
-					<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin tn-padding-top-xs" style="margin-top:32px" v-if="stepIndex==3">
+					<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;">
@@ -312,7 +312,7 @@
 							
 						
 						</uni-file-picker>
-						<view style="margin-top: 8px;">
+						<view style="margin-top: 4px;">
 							<text style="color: #999;font-size: 12px;">一次只能上传三个文件，支持格式 pdf .doc .xls，不超过5MB。</text>
 						</view>
 						 
@@ -663,7 +663,14 @@
 						
 					}
 					if(this.stepIndex==2&&that.selectValue2=='服务'){
-						 
+							 if(!this.selectValue3){
+								uni.showToast({
+									title: '请选择服务类型',
+									duration: 2000,
+									icon:'none'
+								});
+								return false;
+							 }
 							if(!this.content){
 								uni.showToast({
 									title: '请输入服务介绍',
@@ -739,9 +746,10 @@
 				let that = this;
 				
 				if(status!=1&&that.selectValue2=='服务'){
-					if(!this.content&&this.fileDetailList.length<1){
+					
+					if(!this.content){
 						uni.showToast({
-							title: '请输入服务介绍或上传图片/文件',
+							title: '请输入服务介绍',
 							duration: 2000,
 							icon:'none'
 						});

circlePages/circle.vue

@@ -75,7 +75,7 @@
 
 			</view>
 			
-			<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top-xl tn-margin">
+			<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top-xl tn-margin" style="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;">
@@ -99,7 +99,7 @@
 				<!-- <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: 8px;">
+				<view style="margin-top: 4px;">
 					<text style="color: #999;font-size: 12px;">一次只能上传三个文件，支持格式 pdf .doc .xls，不超过5MB。</text>
 				</view>
 				
@@ -408,7 +408,7 @@
 				}
 				if(status!=1&&this.formInfo.contactPerson.length<1){
 					uni.showToast({
-						title: '请输入联系人姓名',
+						title: '请输入联系姓名',
 						duration: 2000,
 						icon:'none'
 					});
@@ -416,7 +416,7 @@
 				}
 				if(status!=1&&this.formInfo.contactMethod.length<1){
 					uni.showToast({
-						title: '请输入联系手机/微信/邮箱',
+						title: '请输入联系方式',
 						duration: 2000,
 						icon:'none'
 					});

pages.json

@@ -113,6 +113,13 @@
 			{
 				"navigationBarTitleText" : "详情"
 			}
+		},
+		{
+			"path" : "pages/login/loginByCode",
+			"style" : 
+			{
+				"navigationBarTitleText" : "账号登录"
+			}
 		}
 		 
 	],

pages/discovery/discovery.vue

@@ -1,10 +1,73 @@
 <template>
-	<view style="text-align: center;" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
-		<image style="width: 180px;height: 150px" src="../../static/logo.png"></image>
+	<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+		<view style="width: 100%;padding-bottom: 0;">
+			<view style="display: flex;width: 100%;background: linear-gradient(0deg, #fff, #f8f8f">
+				<view style="margin:16px">
+					<image style="width: 56px; height: 50px; margin-right: 12px;" :mode="fit"
+						src="../../static/logo.png"></image>
+				</view>
+				<view style="margin:16px 0;margin-left: -8px;">
+					<view style="font-weight: bold;font-size: 22px;">速立保</view>
+					<text style="margin-top:12px;color:#888;font-size:15px">生物制药产业一站式产品资源供需平台</text>
+				</view>
+			</view>
+			
+			
+		</view>
+		
+		<view style="padding: 16px 0 0 16px;">
+			优质入驻企业
+		</view>
+		
+		<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" >
+			<swiper-item>
+				<view class="swiper-item uni-bg-red">A</view>
+			</swiper-item>
+			<swiper-item>
+				<view class="swiper-item uni-bg-green">B</view>
+			</swiper-item>
+			<swiper-item>
+				<view class="swiper-item uni-bg-blue">C</view>
+			</swiper-item>
+			<swiper-item>
+				<view class="swiper-item uni-bg-red">D</view>
+			</swiper-item>
+			<swiper-item>
+				<view class="swiper-item uni-bg-green">E</view>
+			</swiper-item>
+			<swiper-item>
+				<view class="swiper-item uni-bg-blue">F</view>
+			</swiper-item>
+		</swiper>
+		<view style="padding: 16px 0 0 16px;">
+			优质供应
+		</view>
+		<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" >
+			<swiper-item>
+				<view class="swiper-item uni-bg-red">A</view>
+			</swiper-item>
+			<swiper-item>
+				<view class="swiper-item uni-bg-green">B</view>
+			</swiper-item>
+			<swiper-item>
+				<view class="swiper-item uni-bg-blue">C</view>
+			</swiper-item>
+			<swiper-item>
+				<view class="swiper-item uni-bg-red">D</view>
+			</swiper-item>
+			<swiper-item>
+				<view class="swiper-item uni-bg-green">E</view>
+			</swiper-item>
+			<swiper-item>
+				<view class="swiper-item uni-bg-blue">F</view>
+			</swiper-item>
+		</swiper>
+		<!-- <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="margin-top:24px"><text style="font-size:20px;">生物制药产业一站式产品资源供需平台</text></view> -->
 		 
 		<view style="display: flex;margin-top:32px">
 			<view style="flex: 1;padding: 0 16px;">
@@ -21,7 +84,8 @@
 	export default {
 		data() {
 			return {
-				
+				  indicatorDots: true,
+				   autoplay: false,
 			}
 		},
 		methods: {
@@ -54,5 +118,10 @@
 </script>
 
 <style>
-
+.swiper-item {
+	text-align: center;
+}
+.swiper{
+	height: 200px;
+}
 </style>

pages/index/index.vue

@@ -330,7 +330,8 @@
 			},
 			
 			addButton() {
-				if (!uni.getStorageSync('userNo')) {
+				
+				if (uni.getStorageSync('userNo')) {
 					uni.showToast({
 						title: '请登录',
 						icon:'none'
@@ -451,6 +452,22 @@
 				    return url;
 				 
 			},
+			addLog(shareData){
+				const that = this;
+				let params= {
+					bisNo:shareData.bisNo,
+					bisType:this.currentIndex === 0?'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 === 0) {
@@ -460,8 +477,10 @@
 						this.$refs.comm.hideSheet();
 					}
 					
-					this.shareData=option.target.dataset.coupon;
 					
+					
+					this.shareData=option.target.dataset.coupon;
+					this.addLog(this.shareData);
 					 const promise = new Promise(async (resolve) => {
 					
 					      const url = await this.initCanvas();

pages/login/login.vue

@@ -39,6 +39,8 @@
 		<view class=""  hover-class="button-hover" style="margin-top: 24px;" v-if="!agreeValue">
 			<button :disabled="!canSave" style="border-radius: 50rpx;width: 100%;background-color: #1d60b1;" type="primary" @click="showToast">手机号快捷登录</button>
 		</view>
+		
+		<view @click="showLogin" style="text-align: center;margin-top: 24px;">验证码登录</view>
 
 
 	</view>
@@ -66,6 +68,11 @@
 
 			// this.getLxSessionKey()
 		},
+		onShow(){
+			if(uni.getStorageSync('agreeInfo')){
+				this.agreeValue = true;
+			}
+		},
 		methods: {
 			goBack() {
 				uni.navigateBack();
@@ -78,15 +85,30 @@
 				wx.vibrateShort();
 			},
 			showInfo() {
-				uni.navigateTo({
-					url:'/pages/webview/web-view?url='+'https://test-oss.lx-device.com/userFeedback/1732866523422nfH.docx',
-				})
+				if(uni.getStorageSync('agreeInfo')){
+					uni.navigateTo({
+					  url: '/pages/login/info?counted=1'
+					})
+					return false;
+				}else{
+					uni.navigateTo({
+					  url: '/pages/login/info'
+					})
+				}
+				// uni.navigateTo({
+				// 	url:'/pages/webview/web-view?url='+'https://test-oss.lx-device.com/userFeedback/1732866523422nfH.docx',
+				// })
 			},
 			showInfo2() {
 				uni.navigateTo({
 					url:'/pages/webview/web-view?url='+'https://test-oss.lx-device.com/userFeedback/1732866629261TEn.docx',
 				})
 			},
+			showLogin(){
+				uni.redirectTo({
+					url:'/pages/login/loginByCode'
+				})
+			},
 			change(e) {
 				this.value = e.detail.data.length == 0 ? [] : [0];
 				console.warn(this.value);
@@ -199,7 +221,7 @@
 
 				).then(res => {
 					console.error(res);
-					if (res.success) {
+					if (res&&res.success) {
 						this.ZhuceByPhone(res.resultMap.waUserPhoneInfo.phoneNumber);
 					} else {
 						uni.showToast({
@@ -236,6 +258,10 @@
 					// uni.navigateTo({
 					//     url:'/pages/index/auth'
 					// })
+					uni.showToast({
+						title: '请稍后',
+						icon: 'none'
+					})
 					this.loginAgain();
 				} else {
 					uni.showToast({
@@ -283,11 +309,13 @@
 								that.getUserInfo();
 								
 							} else {
+								//
 								uni.showToast({
 									title: res2.msg,
 									icon: 'none'
 								})
 								that.canSave = true;
+								
 								//登录失败,
 
 

pages/login/loginByCode.vue

@@ -0,0 +1,534 @@
+<template>
+	<view style="padding: 16px;font-size: 14px;">
+		<tn-nav-bar fixed alpha customBack>
+			<view slot="back" class='tn-custom-nav-bar__back' @click="goBack">
+				<text class='icon tn-icon-left'></text>
+
+			</view>
+		</tn-nav-bar>
+		<view style="text-align: center;padding: 80px 0">
+			<image src="../../static/logo.png" style="width: 110px; height: 100px;"></image>
+			<view style="margin: 8px 0;"><text style="font-size: 22px;font-weight: bold;">速立保</text></view>
+		</view>
+		
+		
+		<uni-forms ref="baseForm" :modelValue="baseFormData">
+			<uni-forms-item label="手机号" required>
+				<uni-easyinput type="number" v-model="baseFormData.userName" :clearable="false" placeholder="请输入手机号" />
+			</uni-forms-item>
+			<uni-forms-item label="验证码" required>
+				<uni-easyinput v-model="baseFormData.code"  :clearable="false" placeholder="请输入验证码" >
+					<template #right>
+							<view @click="getCode" style="margin-right: 4px;background: #ddd;padding: 4px 10px;border-radius: 14px;">{{seconds?seconds+'s后重新获取':'获取验证码'}}</view>
+						</template>
+				</uni-easyinput>
+			</uni-forms-item>
+		</uni-forms>
+		
+		
+		
+		
+		
+		
+		
+		
+
+		<view :class="!agreeValue?'':'isHidden'" style="background: #00000088;
+    display: inline;
+    padding: 4px 10px;
+    border-radius: 12px;
+    border-bottom-left-radius: 0;
+    color: #fff;font-size: 12px;margin-left: 12px;">
+			请先阅读并同意协议
+		</view>
+
+		<view style="margin-top:4px">
+			<tn-checkbox v-model="agreeValue" activeColor="#1d60b1" name="选项1">
+				阅读并同意
+			</tn-checkbox>
+			<view style="display: inline;font-size: 15px;" @click="showInfo()">
+				<view style="color: #1d60b1;display: inline;">《用户服务协议》</view>
+				和
+				<view style="display: inline;color: #1d60b1;" @click="showInfo2()">《隐私政策》</view>
+			</view>
+
+		</view>
+
+		<view class="" hover-class="button-hover" style="margin-top: 24px;" v-if="agreeValue">
+			<button :disabled="!canSave" style="border-radius: 50rpx;width: 100%;background-color: #1d60b1;" type="primary" @click="saveForm"
+				@getphonenumber="getPhoneNumber">登录</button>
+		</view>
+		<view class=""  hover-class="button-hover" style="margin-top: 24px;" v-if="!agreeValue">
+			<button :disabled="!canSave" style="border-radius: 50rpx;width: 100%;background-color: #1d60b1;" type="primary" @click="showToast">登录</button>
+		</view>
+		
+		<view @click="showLogin" style="text-align: center;margin-top: 24px;">微信一键登录</view>
+
+
+	</view>
+</template>
+
+<script>
+	import request from '../../utils/request';
+	export default {
+
+		data() {
+			return {
+				agreeValue: false,
+				value: [],
+				range: [{
+					"value": 0,
+					"text": ""
+				}],
+				baseFormData:{
+					userName:'',
+					code:''
+				},
+				lxSessionKey: '',
+				openId: '',
+				unionid: '',
+				canSave:true,
+				seconds:0,
+			}
+		},
+		onLoad() {
+
+			// this.getLxSessionKey()
+		},
+		onShow(){
+			if(uni.getStorageSync('agreeInfo')){
+				this.agreeValue = true;
+			}
+		},
+		beforeDestroy() {
+			// 组件销毁前清除定时器
+			this.clearTimer();
+		},
+		methods: {
+			goBack() {
+				uni.navigateBack();
+			},
+			getCode(){
+				if(!this.baseFormData.userName){
+					uni.showToast({
+						title: '请输入手机号',
+						icon: 'none'
+					})
+					return false;
+				}
+				 
+				if(this.seconds>0){
+					return false;
+				}else{
+					this.seconds = 60;
+					this.getCodeByPhone();
+					 
+				}
+			},
+			getCodeByPhone(){
+				let params = {
+					mobile: this.baseFormData.userName,
+					platType: "slb",
+					mpType: "engineer",
+					smsType:'Login'
+				}
+				const that = this;
+				request.post('/smsSend/sendSMS', {bean:JSON.stringify(params)}).then(res => {
+					console.error(res);
+					if (res&&res.success) {
+						 that.startCountdown();
+					}else{
+						uni.showToast({
+							title: res.msg||'获取失败,请稍后再试',
+							icon: 'none'
+						})
+					}
+				
+				})
+			},
+			startCountdown() {
+				this.timer = setInterval(() => {
+					if (this.seconds > 0) {
+						this.seconds--;
+					} else {
+						// 倒计时结束，清除定时器
+						this.clearTimer();
+						// 执行倒计时结束后的操作
+						 
+					}
+				}, 1000);
+			},
+			// 清除定时器
+			clearTimer() {
+				clearInterval(this.timer);
+				this.timer = null;
+			},
+			showToast() {
+				uni.showToast({
+					title: '请先阅读并同意协议',
+					icon: 'none'
+				})
+				wx.vibrateShort();
+				return false;
+			},
+			saveForm(){
+				if(!this.baseFormData.userName){
+					uni.showToast({
+						title: '请输入手机号',
+						icon: 'none'
+					})
+					return false;
+				}
+				if(!this.baseFormData.code){
+					uni.showToast({
+						title: '请输入验证码',
+						icon: 'none'
+					})
+					return false;
+				}
+				let params = {
+					userName:this.baseFormData.userName,
+					smCode: this.baseFormData.code,
+					mpType: "engineer",
+				}
+				const that = this;
+				request.post('/slbSmLogin', params).then(res => {
+					console.error(res);
+					if (res&&res.success) {
+						 uni.showToast({
+						 	title: '登录成功',
+						 	icon: 'none'
+						 })
+						 uni.setStorageSync('loginStatus', 'true');
+						 uni.setStorageSync('userMap', JSON.stringify(res2.resultMap));
+						 uni.setStorageSync('userNo', res2.resultMap.accountName);
+						 that.getUserInfo();
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				
+				})
+			},
+			showInfo() {
+				if(uni.getStorageSync('agreeInfo')){
+					uni.navigateTo({
+					  url: '/pages/login/info?counted=1'
+					})
+					return false;
+				}else{
+					uni.navigateTo({
+					  url: '/pages/login/info'
+					})
+				}
+				// uni.navigateTo({
+				// 	url:'/pages/webview/web-view?url='+'https://test-oss.lx-device.com/userFeedback/1732866523422nfH.docx',
+				// })
+			},
+			showInfo2() {
+				uni.navigateTo({
+					url:'/pages/webview/web-view?url='+'https://test-oss.lx-device.com/userFeedback/1732866629261TEn.docx',
+				})
+			},
+			showLogin(){
+				uni.redirectTo({
+					url:'/pages/login/login'
+				})
+			},
+			change(e) {
+				this.value = e.detail.data.length == 0 ? [] : [0];
+				console.warn(this.value);
+				console.log('e:', e);
+			},
+			getLxSessionKey() {
+				const that = this;
+				uni.login({
+					success(res) {
+						console.error(res);
+						that.getOpenId(res.code);
+					},
+					fail(res) {
+						console.error(res);
+						uni.hideLoading();
+					}
+				});
+			},
+			getOpenId(code) {
+				const that = this;
+				request.post('/wxma/code2Session', {
+					code: code,
+					platType: "slb",
+					mpType: "engineer",
+				}).then(res => {
+					console.error(res);
+					if (res.success) {
+						that.lxSessionKey = res.resultMap.lxSessionKey;
+						that.openId = res.resultMap.openId;
+						that.unionid = res.resultMap.unionid;
+					}
+
+				})
+
+			},
+			getPhoneNumber(e) {
+				if (!e.detail.errMsg || e.detail.errMsg != "getPhoneNumber:ok") {
+					// wx.showModal({
+					// 	title: '提示',
+					// 	content: e.detail.errMsg,
+					// 	showCancel: false
+					// })
+					console.error(e)
+					return;
+				}
+				this.getLxSessionKey();
+				setTimeout(() => {
+					this._getPhoneNumber(e)
+				}, 1000)
+
+			},
+
+
+
+
+			_getPhoneNumber(e) {
+				console.warn(e);
+				let that = this;
+
+
+				if (e.detail.errMsg === 'getPhoneNumber:ok') {
+					wx.getUserInfo({
+						success: function(res) {
+							console.error(res);
+							res.encryptedData = encodeURIComponent(e.detail.encryptedData);
+							res.iv = e.detail.iv;
+							res.lxSessionKey = that.lxSessionKey;
+							that.getPhone(res)
+
+
+						}
+					})
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: e.detail.code ? '获取成功' : '拒绝了使用微信手机号'
+					});
+				}
+
+
+				// if (res.code == 0) {
+				// 	uni.showToast({
+				// 		title: '绑定成功',
+				// 		icon: 'success',
+				// 		duration: 2000
+				// 	})
+				// 	this.$u.vuex('mobile', res.data)
+				// 	this.form.mobile = res.data
+				// } else {
+				// 	uni.showModal({
+				// 		title: '提示',
+				// 		content: res.msg,
+				// 		showCancel: false
+				// 	})
+				// }
+			},
+
+			getPhone(prarms) {
+				let newParams = {};
+				newParams.signature = prarms.signature;
+				newParams.rawData = prarms.rawData;
+				newParams.encryptedData = prarms.encryptedData;
+				newParams.iv = prarms.iv;
+				newParams.lxSessionKey = prarms.lxSessionKey;
+
+				let that = this;
+
+				request.post('/wxma/getWaUserPhone',
+					newParams
+
+				).then(res => {
+					console.error(res);
+					if (res.success) {
+						this.ZhuceByPhone(res.resultMap.waUserPhoneInfo.phoneNumber);
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				});
+
+
+				console.warn(res);
+			},
+			async ZhuceByPhone(phone) {
+				const that = this;
+				let params = {
+					phone: phone,
+					openid: that.openId,
+					unionid: that.unionid,
+
+				};
+				that.canSave = false;
+				const res = await request.post('/wxma/register',
+					params, {
+						header: {
+							'content-type': 'application/x-www-form-urlencoded',
+							platType: "slb",
+							mpType: "engineer",
+						}
+					}
+				);
+
+				if (res.success) {
+					//当前页直接登录
+					// uni.navigateTo({
+					//     url:'/pages/index/auth'
+					// })
+					this.loginAgain();
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				}
+
+				console.warn(res);
+			},
+			loginAgain() {
+				let that = this;
+				uni.login({
+					success(res) {
+						that.loginByCode(res.code);
+					},
+					fail(res) {
+
+						uni.hideLoading();
+					}
+				});
+			},
+			loginByCode(frontId) {
+				const that = this;
+				uni.setStorageSync('loginStatus', 'false');
+				wx.getUserInfo({
+					success: function(res) {
+						console.error(res);
+						request.post("/slbMpAutoLogin", {
+							code: frontId,
+							appType: 'ma',
+							encryptedData: res.encryptedData,
+							iv: res.iv
+						}, {
+							login: false,
+							warn: false,
+							loading: false
+						}).then(res2 => {
+							console.error(res2);
+							if (res2.success) {
+								//登录成功
+								uni.setStorageSync('loginStatus', 'true');
+								uni.setStorageSync('userMap', JSON.stringify(res2.resultMap));
+								uni.setStorageSync('userNo', res2.resultMap.accountName);
+								that.getUserInfo();
+								
+							} else {
+								uni.showToast({
+									title: res2.msg,
+									icon: 'none'
+								})
+								that.canSave = true;
+								//登录失败,
+
+
+							}
+							console.error(res2);
+						});
+
+
+					}
+				})
+			},
+			getUserInfo() {
+				let that = this;
+				request.post('/slbWxma/getPersonlInfo', {
+
+				}).then(res => {
+					that.canSave = true;
+					if (res.success) {
+						that.personInfo = res.resultMap.userInfo || {};
+						uni.setStorageSync('userInfo', JSON.stringify(res.resultMap.userInfo));
+						uni.navigateBack();
+					}
+					console.warn(res);
+				})
+
+			},
+			}
+		}
+</script>
+
+<style lang="scss" scoped>
+	.isHidden {
+		visibility: hidden;
+	}
+
+	.template-edit {}
+
+	/* 胶囊*/
+	.tn-custom-nav-bar__back {
+		width: 60%;
+		height: 100%;
+		position: relative;
+		display: flex;
+		justify-content: space-evenly;
+		align-items: center;
+		box-sizing: border-box;
+		// background-color: rgba(0, 0, 0, 0.15);
+		border-radius: 1000rpx;
+		border: 1rpx solid rgba(255, 255, 255, 0.5);
+		// color: #FFFFFF;
+		font-size: 18px;
+
+		.icon {
+			display: block;
+			flex: 1;
+			margin: auto;
+			text-align: center;
+		}
+
+		&:before {
+			content: " ";
+			width: 1rpx;
+			height: 110%;
+			position: absolute;
+			top: 22.5%;
+			left: 0;
+			right: 0;
+			margin: auto;
+			transform: scale(0.5);
+			transform-origin: 0 0;
+			pointer-events: none;
+			box-sizing: border-box;
+			opacity: 0.7;
+			background-color: #FFFFFF;
+		}
+	}
+
+	/* 底部悬浮按钮 start*/
+	.tn-tabbar-height {
+		min-height: 100rpx;
+		height: calc(120rpx + env(safe-area-inset-bottom) / 2);
+	}
+
+	.tn-footerfixed {
+		position: fixed;
+		width: 100%;
+		bottom: calc(30rpx + env(safe-area-inset-bottom));
+		z-index: 1024;
+		box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);
+
+	}
+
+	/* 底部悬浮按钮 end*/
+</style>

pages/mine/feedback.vue

@@ -218,6 +218,8 @@
 				let that = this;
 				that.showEmpty = false;
 				request.post('/slbFeedback/query', {
+					limit:1000,
+					index:1,
 					userNo: uni.getStorageSync('userNo'),
 				}).then(res => {
 					console.warn(res);

pages/mine/mine.vue

@@ -207,10 +207,24 @@
 		    <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" @click="showLog()">
+		  <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-logout"></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>
+		 
       </view>
 
     </view>
-
+	<uni-popup ref="alertDialog" type="dialog">
+		<uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确定" title="确定注销吗" content=" " @confirm="logOff()"
+			@close="dialogClose"></uni-popup-dialog>
+	</uni-popup>
     <view class='tn-tabbar-height'></view>
 
   </view>
@@ -255,18 +269,8 @@
        		  })
           
        },
-      // 跳转到速立保官网
-      navTuniaoWebsite() {
-        uni.navigateToMiniProgram({
-          appId: 'wxa698b1eee960632f'
-        })
-      },
-      // 跳转到速立保UI
-      navTuniaoUI() {
-        uni.navigateToMiniProgram({
-          appId: 'wxf3d81a452b88ff4b'
-        })
-      },
+
+
       // 跳转
       tn(e) {
 		if(!uni.getStorageSync('userNo')){
@@ -312,14 +316,39 @@
         })
       },
 	  showInfo(){
-		 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/1732866523422nfH.docx'),
-		 })
+		  uni.navigateTo({
+		    url: '/pages/login/info?counted=1'
+		  })
+		 // 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/1732866523422nfH.docx'),
+		 // })
 	  },
 	  showAbout(){
 		  uni.navigateTo({
 		    url: '/pages/mine/about'
 		  })
+	  },
+	  showLog(){
+		 
+		this.msgType = 'warn'
+		this.$refs.alertDialog.open()
+					 
+	  },
+	  //注销
+	  logOff(){
+		  const that = this;
+		  request.post('/slbWxma/logOff', {
+		  }).then(res => {
+		  	if (res&&res.success) {
+		  		 uni.showToast({
+		  		 	title: '注销成功',
+		  		 	icon: 'none'
+		  		 })
+				 uni.navigateTo({
+				   url: '/pages/index/auth'
+				 })
+		  	}
+		  })
 	  }
     }
   }

pages/mine/need.vue

@@ -152,20 +152,17 @@
 						</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">
+						<view class="justify-content-item tn-color-gray">
 							<view class="tn-padding-right   tn-padding-top-xs tn-color-gray">
 								{{ item.createTime|formatDate }}
+								<view style="color: red;display: inline;margin-left:8px" v-if="item.status==9&&item.feedback">
+									反馈意见:{{item.feedback||'--'}}
+								</view>
 							</view>
+							
 
 						</view>
 						<view class="justify-content-item tn-flex tn-flex-col-center" v-if="item.status==4&&item.showFlag!='否'">
@@ -175,7 +172,7 @@
 								@click="finishItem(item)">结束需求</tn-button> -->
 
 						</view>
-						<view class="justify-content-item tn-flex tn-flex-col-center" v-if="item.status==1||item.status==9">
+						<view class="justify-content-item tn-flex tn-flex-col-center" style="flex: none;" v-if="item.status==1||item.status==9">
 							<button type="warn" plain="true" size="mini" @click="editItem(item)">编辑</button>
 							<!-- <tn-button shadow shape="round" fontColor="tn-color-white" backgroundColor="tn-bg-blue"
 								:fontSize="24" height="auto" padding="10rpx 18rpx"

pages/mine/share.vue

@@ -174,18 +174,15 @@
 						</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">
 							<view class="tn-padding-right   tn-padding-top-xs tn-color-gray">
 								{{ item.createTime|formatDate }}
+								<view v-if="item.status==9&&item.feedback" style="color: red;display: inline;margin-left:8px">
+									反馈意见:{{item.feedback||'--'}}
+								</view>
 							</view>
 
 						</view>
@@ -194,7 +191,7 @@
 								<!-- <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)">下架供应</button>
 							</view>
-							<view class="justify-content-item tn-flex tn-flex-col-center" v-if="item.status==1||item.status==9">
+							<view class="justify-content-item tn-flex tn-flex-col-center" style="flex:none" v-if="item.status==1||item.status==9">
 								<button type="warn" plain="true" size="mini" @click="editItem(item)">编辑</button>
 								<!-- <tn-button shadow shape="round" fontColor="tn-color-white" backgroundColor="tn-bg-blue"
 									:fontSize="24" height="auto" padding="10rpx 18rpx"

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

@@ -13,7 +13,8 @@
     "pages/mine/addFeed",
     "pages/mine/about",
     "pages/comm/search2",
-    "pages/index/detail/detail"
+    "pages/index/detail/detail",
+    "pages/login/loginByCode"
   ],
   "subPackages": [
     {

unpackage/dist/dev/mp-weixin/pages/login/info.wxss

@@ -41,4 +41,18 @@
   opacity: 0.7;
   background-color: #FFFFFF;
 }
+/* 底部悬浮按钮 start*/
+.tn-tabbar-height.data-v-9fbb6266 {
+  min-height: 100rpx;
+  height: calc(120rpx + env(safe-area-inset-bottom) / 2);
+}
+.tn-footerfixed.data-v-9fbb6266 {
+  position: fixed;
+  width: 100%;
+  bottom: calc(env(safe-area-inset-bottom));
+  z-index: 1024;
+  box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);
+  background: #fff;
+}
+/* 底部悬浮按钮 end*/
 

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

@@ -1,7 +1,9 @@
 {
   "usingComponents": {
     "tn-button": "/tuniao-ui/components/tn-button/tn-button",
-    "tn-list-cell": "/tuniao-ui/components/tn-list-cell/tn-list-cell"
+    "tn-list-cell": "/tuniao-ui/components/tn-list-cell/tn-list-cell",
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "uni-popup-dialog": "/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog"
   },
   "component": true
 }

utils/request.js

@@ -133,6 +133,8 @@ function baseRequest(config, options) {
 						url: '/pages/index/auth'
 					});
 					return Promise.resolve(data);
+				}else if (data.state == -1) {
+					return Promise.resolve(data);
 				}
 				else if(data=='' || data=='success'|| data._redirect){
 					console.log('instance.request data 2',data);