feat: 增加注销，优化平台页、关于页

circlePages/circle.vue

@@ -569,6 +569,17 @@
 					this.formInfo.jobTitle = e.jobTitle;
 				}
 				this.org = e;
+				this.getAddress(e.name);
+			},
+			getAddress(name){
+				let that = this;
+				request.post('/member/getEnterPriseInfo', {
+					keyWord:  name
+				}).then(res => {
+					if(res&&res.success&&res.resultMap.data&&res.resultMap.data.regLocation){
+						 that.org.base = res.resultMap.data.regLocation
+					}
+				})
 			},
 			search: function(val) {
 				let that = this;
@@ -577,20 +588,11 @@
 					request.post('/member/searchCompys', {
 						keyWord:  val
 					}).then(res => {
-						if(res.success){
+						if(res&&res.success){
 							let list = res.resultMap.data || [];
 							that.items = list;
-							// that.setData({
-							// 	items: list
-							// })
-						}else{
-							uni.showToast({
-								title: res.msg,
-								icon: 'none'
-							})
-						}
+						} 
 					})
-					 
 				}else{
 					that.items = [];
 					that.org = {}; 

pages/discovery/discovery.vue

@@ -18,23 +18,23 @@
 			
 		</view>
 		
-		<view style="padding: 0px 0 4px 16px;">
-			 优质入驻企业 v 
+		<view style="padding: 0px 0 4px 16px;font-weight: bold;">
+			 优质入驻企业 ▼ 
 		</view>
 		
 		<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" >
 			<swiper-item v-for="item of companyList" :key="item.id" style="position:relative">
 				<view style="position: absolute;bottom: 28px;right: 16px;color: #ffffff75;" class="swiper-item uni-bg-red">{{item.company}}</view>
-				<image src="../../static/bg.png" style="width: 100%;height: 100%;"></image>
+				<image :src="item.picUrl?item.picUrl:'../../static/bg.png'" style="width: 100%;height: 100%;"></image>
 			</swiper-item>
 		</swiper>
-		<view style="padding: 16px 0 4px 16px;">
-			 优质供应 v 
+		<view style="padding: 16px 0 4px 16px;font-weight: bold;">
+			 优质供应 ▼ 
 		</view>
 		<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" >
 			<swiper-item v-for="item of prodList" :key="item.id">
 				<view style="position: absolute;bottom: 28px;right: 16px;color: #ffffff75;" class="swiper-item uni-bg-red">{{item.company}}</view>
-				<image src="../../static/bg.png" style="width: 100%;height: 100%;"></image>
+				<image :src="item.picUrl?item.picUrl:'../../static/bg.png'" style="width: 100%;height: 100%;"></image>
 			</swiper-item>
 			 
 		</swiper>
@@ -87,7 +87,7 @@
 			
 			loadData() {
 				let that = this;
-				request.post('/slbCompany/premiumCompanies', {
+				request.post('/slbTopad/premiumCompanies', {
 					 
 				}).then(res => {
 					if (res&&res.success) {
@@ -97,7 +97,7 @@
 			},
 			loadData2() {
 				let that = this;
-				request.post('/slbCompany/premiumShareCompanies', {
+				request.post('/slbTopad/premiumShareCompanies', {
 					 
 				}).then(res => {
 					if (res&&res.success) {

pages/index/auth.vue

@@ -94,12 +94,16 @@
 					  	 
 					  }).then(res => {
 							  console.warn(res);
-							  if(res.success){
+							  if(res&&res.success){
 								  that.personInfo = res.resultMap.userInfo||{};
 								  uni.setStorageSync('userInfo', JSON.stringify(res.resultMap.userInfo));
 								  uni.redirectTo({
 								  	url:'/pages/index/index'
 								  })
+							  }else{
+								  uni.redirectTo({
+								  	url:'/pages/index/index'
+								  })
 							  }
 					  	console.warn(res);
 					  })

pages/index/index.vue

@@ -131,7 +131,7 @@
 			this._freshing = false;
 			this.switchTabbar(index);
 			let that = this;
-			 
+			uni.hideShareMenu();
 			// uni.login({
 			// 	success(res) {
 			// 		 console.error(res);

pages/login/login.vue

@@ -73,6 +73,9 @@
 				this.agreeValue = true;
 			}
 		},
+		beforeDestroy(){
+			uni.removeStorageSync('agreeInfo')
+		},
 		methods: {
 			goBack() {
 				uni.navigateBack();
@@ -174,7 +177,7 @@
 						success: function(res) {
 							console.error(res);
 							res.encryptedData = encodeURIComponent(e.detail.encryptedData);
-							res.iv = e.detail.iv;
+							res.iv = encodeURIComponent(e.detail.iv);
 							res.lxSessionKey = that.lxSessionKey;
 							that.getPhone(res)
 
@@ -230,9 +233,6 @@
 						})
 					}
 				});
-
-
-				console.warn(res);
 			},
 			async ZhuceByPhone(phone) {
 				const that = this;

pages/login/loginByCode.vue

@@ -120,6 +120,14 @@
 				if(this.seconds>0){
 					return false;
 				}else{
+					if(!this.agreeValue){
+						uni.showToast({
+							title: '请先阅读并同意协议',
+							icon: 'none'
+						})
+						wx.vibrateShort();
+						return false;
+					}
 					this.seconds = 60;
 					this.getCodeByPhone();
 					 
@@ -200,8 +208,8 @@
 						 	icon: 'none'
 						 })
 						 uni.setStorageSync('loginStatus', 'true');
-						 uni.setStorageSync('userMap', JSON.stringify(res2.resultMap));
-						 uni.setStorageSync('userNo', res2.resultMap.accountName);
+						 uni.setStorageSync('userMap', JSON.stringify(res.resultMap));
+						 uni.setStorageSync('userNo', res.resultMap.accountName);
 						 that.getUserInfo();
 					}else{
 						uni.showToast({
@@ -358,9 +366,6 @@
 						})
 					}
 				});
-
-
-				console.warn(res);
 			},
 			async ZhuceByPhone(phone) {
 				const that = this;

pages/mine/addFeed.vue

@@ -44,7 +44,7 @@
 			<view style="display: flex;line-height: 37px;padding: 16px;">
 				<view style="margin-right: 8px;">联系方式</view>
 				<view style="flex:1">
-					<uni-easyinput  v-model="contactMethod" placeholder="请填写您的手机号，以便我们联系您"></uni-easyinput>
+					<uni-easyinput  v-model="contactMethod" :clearable="false" placeholder="请填写您的手机号，以便我们联系您"></uni-easyinput>
 					
 				</view>
 				
@@ -173,6 +173,15 @@
 				console.log('上传成功')
 			},
 			saveForm(){
+				if (!uni.getStorageSync('userNo')) {
+					uni.showToast({
+						title: '请登录'
+					})
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+					return false;
+				} 
 				let that = this;
 				let params = {
 					

pages/mine/feedback.vue

@@ -214,11 +214,13 @@
 				return imageExtensions.includes(extension);
 			},
 			loadData() {
-				
+				if(!uni.getStorageSync('userNo')){
+					return false;
+				}
 				let that = this;
 				that.showEmpty = false;
 				request.post('/slbFeedback/query', {
-					limit:1000,
+				 
 					index:1,
 					userNo: uni.getStorageSync('userNo'),
 				}).then(res => {

pages/mine/mine.vue

@@ -250,7 +250,6 @@
 		  if(!uni.getStorageSync('userNo')){
 		  	this.showLogin = true;
 		  }
-		  console.error(JSON.parse(uni.getStorageSync('userInfo')))
 	    this.getContentRectInfo()
 	  })
 	  

pages/mine/need.vue

@@ -204,7 +204,9 @@
 
 <script>
 	import request from '../../utils/request'
-
+	import {
+  	uniShowModal
+  } from '../../utils/uni_api'
 	export default {
 		data() {
 			return {
@@ -330,9 +332,16 @@
 			},
 			finishItem(item) {
 				this.curItem = item;
-				this.$refs.alertDialog.open()
-
-
+				let that = this;
+				uniShowModal('确定结束需求吗?', '', {
+					showCancel: true,
+					confirmText:'确定',
+					success: (res) => {
+						if(res.confirm){
+							that.dialogConfirm(); 
+						}
+					}
+				})
 			},
 			showImg(items, index) {
 				let urls = [];

pages/mine/share.vue

@@ -230,7 +230,9 @@
 
 <script>
 	import request from '../../utils/request'
-
+  import {
+  	uniShowModal
+  } from '../../utils/uni_api'
 	export default {
 		data() {
 			return {
@@ -380,9 +382,16 @@
 				// })
 			},
 			finishItem(item){
-				this.curItem = item;
-				this.showModel = true;
-				return false;
+				let that = this;
+				uniShowModal('下架提醒', '下架之后内容不再展示在供应页面里, 是否继续?', {
+					showCancel: true,
+					confirmText:'继续',
+					success: (res) => {
+						if(res.confirm){
+							that.finishNext(item); 
+						}
+					}
+				})
 			},
 			clickModel(e){
 				if(e.index==1){

utils/request.js

@@ -92,7 +92,7 @@ function baseRequest(config, options) {
 
 	
 	return instance.request(config).then(res => {
-		if(config.url==='/slbMpAutoLogin'){
+		if(config.url==='/slbMpAutoLogin'||config.url==='/slbSmLogin'){
 			try{
 			  
 			  var cookie = res.header["set-cookie"]||res.header["Set-Cookie"];
@@ -127,11 +127,26 @@ function baseRequest(config, options) {
 					return;
 				}
 				else if(data._redirect||data.msg=='未登录'){
+					// if(uni.getStorageSync('userNo')){
+					// 	uniShowModal('', '账号过期,重新登录?', {
+					// 		showCancel: true,
+					// 		success: (res) => {
+					// 			if(res.confirm){
+					// 				//添加跳转 微信绑定公众号页面
+					// 				uni.redirectTo({
+					// 					url: '/pages/login/login'
+					// 				});
+					// 			}else{
+					// 				return Promise.resolve(data);
+					// 			}
+					// 		}
+					// 	})
+					// }
 					 
 					// store.commit("LOGOUT");
-					uni.reLaunch({
-						url: '/pages/index/auth'
-					});
+					// uni.reLaunch({
+					// 	url: '/pages/index/auth'
+					// });
 					return Promise.resolve(data);
 				}else if (data.state == -1) {
 					return Promise.resolve(data);