修复登陆过滤问题

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/api/request.js

@@ -37,35 +37,35 @@ const request = (options) => {
 }
 
 
-function islogin(data){
-	
+function islogin(data) {
 	let urls = data.split("\/")
-	if(noNeedLogin(urls)){
-		return;
-	}
-	let token = wx.getStorageSync('token')
-	if(token==null||token==''){
-		wx.showModal({
-			title: '未授权',
-			content: '您登录授权已过期,请重新登陆授权',
-			showCancel: false,
-			confirmText: '登陆',
-			success: function (res) {
-			  wx.navigateTo({
-				url: '/pages/login/login',
-			  });
-			},
-		  });
+	if (!noNeedLogin(urls)) {
+		let token = wx.getStorageSync('token')
+		if (token == null || token == '') {
+			wx.showModal({
+				title: '未授权',
+				content: '您登录授权已过期,请重新登陆授权',
+				showCancel: false,
+				confirmText: '登陆',
+				success: function (res) {
+					wx.navigateTo({
+						url: '/pages/login/login',
+					});
+				},
+			});
+		}
 	}
+
 }
-var noNeedLoginList =["login","getGoodOrBadByYearAndArea"]
+var noNeedLoginList = ["login", "getGoodOrBadByYearAndArea", "getOfficeNumberByAreaInfo"]
 
-function noNeedLogin(data){
-	noNeedLoginList.forEach(element => {
-		if(urls[urls.length-1]===element){
+function noNeedLogin(data) {
+	for (const element of noNeedLoginList) {
+		let a = data[data.length - 1].split("?")[0]
+		if (a === element) {
 			return true;
 		}
-	});
+	}
 }
 
 export {

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/serve/serve.wxml

@@ -3,26 +3,26 @@
 <scroll-view style="height: 1549rpx;" scroll-y="true">
 	<view class="header" style="background-image: url({{imgUrl}}bgfw.png)">
 		<image src="{{imgUrl}}map-logo.png" class="logo"></image>
-		<view class="search">
+		<view class="search" bindtap="gotoYkb" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp">
 			<input bindinput="bindKeyInput" placeholder="请在此输入关键字" placeholder-class="search-style" />
 			<button>
 				<image src="{{imgUrl}}fwserch.png" alt="" style="width: 16px;height: 16px;"></image>
 			</button>
 		</view>
 		<ul class="banner">
-			<li>
+			<li bindtap="gotoYkb" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp" >
 				<image src="{{imgUrl}}fwzx.png" alt=""></image><span>咨询</span>
 			</li>
-			<li>
+			<li bindtap="gotoYkb" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp">
 				<image src="{{imgUrl}}fwyy.png" alt=""></image><span>预约</span>
 			</li>
-			<li>
+			<li bindtap="gotoYkb" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp">
 				<image src="{{imgUrl}}fwzn.png" alt=""></image><span>指南</span>
 			</li>
-			<li>
+			<li bindtap="gotoYkb" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp">
 				<image src="{{imgUrl}}fwjd.png" alt=""></image><span>进度</span>
 			</li>
-			<li>
+			<li bindtap="gotoYkb" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp">
 				<image src="{{imgUrl}}fwts.png" alt=""></image><span>投诉</span>
 			</li>
 		</ul>
@@ -34,9 +34,9 @@
 			<view>一件事一次办</view>
 		</view>
 		<view class="list">
-			<view class="nav" style="background-image: url({{imgUrl}}yjsycb-gjj.png);color: #1C61CE;">公积金一件事</view>
-			<view class="nav" style="background-image: url({{imgUrl}}yjsycb-jjh.png);color: #A6741E;">公积金一件事</view>
-			<view class="nav" style="background-image: url({{imgUrl}}yjsycb-shtt.png);color: #DC5C0F;">基金会谈</view>
+			<view class="nav" bindtap="gotoYkb" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp" style="background-image: url({{imgUrl}}yjsycb-gjj.png);color: #1C61CE;">公积金一件事</view>
+			<view class="nav" bindtap="gotoYkb" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp" style="background-image: url({{imgUrl}}yjsycb-jjh.png);color: #A6741E;">社会团体证书</view>
+			<view class="nav" bindtap="gotoYkb" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp" style="background-image: url({{imgUrl}}yjsycb-shtt.png);color: #DC5C0F;">基金会证书</view>
 		</view>
 	</view>
 	<!-- 生活缴费 -->
@@ -64,7 +64,7 @@
 				<button class="nav-grbs {{naItem==0?'click':''}}" bindtap="naChangeItem" data-item="0">个人办事</button>
 				<button class="nav-qybs {{naItem==1?'click':''}}" bindtap="naChangeItem" data-item="1">企业办事</button>
 			</view>
-			<view class="more">更多 ></view>
+			<view bindtap="gotoYkb" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp" class="more">更多 ></view>
 		</view>
 		<view wx:if="{{naItem==0}}">
 			<include src="navTabgr.wxml" />