跳转调整

nngkxxdp/src/main/resources/static/nnzwminiapp/app.json

@@ -1,9 +1,9 @@
 {
 	"pages": [
+		"pages/index/index",
 		"pages/ZCWDK/index/index",
     	"pages/ZCWDK/add/add",
 		"pages/nais/nais",
-		"pages/index/index",
 		"pages/dataCenterZWTJ/dataCenterZWTJ",
 		"pages/login/login",
 		"pages/ourCanteen/ourCanteen",
@@ -17,7 +17,6 @@
 		"pages/publics/publics",
 		"pages/dataCenter/dataCenter",
 		"pages/dataCenterXXTJ/dataCenterXXTJ",
-		
 		"pages/ZCWDK/info/info",
 		"pages/yxnaJfq/yxnaJfq",
 		"pages/yxnaJfh/yxnaJfh",

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/index/index.js

@@ -9,13 +9,13 @@ Page({
 	 * 页面的初始数据
 	 */
 	data: {
-    imgUrl: imgUrl,
-    defaultSearch:{
-      name:"全部",
-      id:""
-    },
-    searchItems:[{name:"全部",id:""},{name:"区教委",id:""},{name:"区科技局",id:""},{name:"区经济信息委",id:""},{name:"区民政局",id:""}],
-    showModal: false,
+		imgUrl: imgUrl,
+		defaultSearch:{
+		name:"全部",
+		id:""
+		},
+		searchItems:[{name:"全部",id:""},{name:"区教委",id:""},{name:"区科技局",id:""},{name:"区经济信息委",id:""},{name:"区民政局",id:""}],
+		showModal: false,
 	},
 
 	/**
@@ -88,5 +88,15 @@ Page({
     wx.navigateTo({
       url: "/pages/ZCWDK/info/info",
     })
-  }
+  },
+  back(){
+	wx.navigateBack({
+		delta: 1
+	  });
+	},
+	askQuestion(){
+		wx.navigateTo({
+		  url: '/pages/ZCWDK/add/add',
+		})
+	}
 })

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/index/index.json

@@ -1,6 +1,6 @@
 {
   "navigationStyle": "custom",
 	"usingComponents": {
-    
-  }
+		"t-icon": "tdesign-miniprogram/icon/icon"
+	}
 }

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/index/index.wxml

@@ -1,9 +1,18 @@
 <!--pages/ZCWDK/index/index.wxml-->
 <view>
   <!-- <image src="{{imgUrl}}/wdkbg.png"></image> -->
-  
+
   <view class="head" style="background-image: url({{imgUrl}}/wdkbg.png);">
-    <view  class="navTitle"></view>
+	<view class="navTitle">
+		<t-icon name="chevron-left" size="68rpx" data-name="chevron-left"  bind:click="back" />
+		<view class="title" style="float: left;">政策问答库</view>
+	</view>
+	<view class="ttp">
+		<view class="tw" bindtap="askQuestion">
+			<text>我要</text>
+			<text>提问</text>
+		</view>
+	</view>
     <view class="logo">
       <image src="{{imgUrl}}/wdklogo.png"></image>
       <text>共计问答数：6526</text>
@@ -13,10 +22,7 @@
       <input class="inputText"/>
       <image src="{{imgUrl}}/wdksearchIcon.png" class="serachIcon"></image>
     </view>
-	<view class="tw">
-		<text>我要</text>
-		<text>提问</text>
-	</view>
+	
   </view>
   <view class="body">
     <view class="title">

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/index/index.wxss

@@ -8,7 +8,27 @@ page{
 .navTitle{
   width: 100%;
   height: 130rpx;
-  margin-bottom: 70rpx;
+  margin-bottom: 20rpx;
+}
+.navTitle t-icon{
+	width: 48rpx; 
+	float: left;
+	margin-top: 50rpx;
+	margin-left: 20rpx;
+	height: 130rpx;
+	line-height: 130rpx;
+	text-align: center;
+	color: #fff;
+}
+.navTitle .title{
+	width: 600rpx;
+	height: 130rpx;
+	line-height: 130rpx;
+	text-align: center;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
 }
 
 .head{
@@ -20,13 +40,13 @@ page{
 
 .logo{
   margin: 0 auto;
-  width: 80%;
-  height: 70rpx;
+  width: 60%;
+  height: 50rpx;
 }
 
 .logo image{
   width: 100%;
-  height: 70rpx;
+  height: 50rpx;
 }
 .logo text{
   font-size: 30rpx;
@@ -81,10 +101,12 @@ page{
 .serachItems{
   width: 100%;
   height: 700rpx;
-  margin-top: -60rpx;
+  margin-top: 460rpx;
   background: #fff;
   padding-top: 20rpx;
   position: fixed;
+  top: 0;
+  left: 0;
   z-index: 9999;
 }
 
@@ -194,12 +216,26 @@ page{
   background: #fff;
   transform: translateX(3rpx);
 }
-
+.ttp{
+	width: 100%;
+	height: 80rpx;
+}
 .tw{
 	width: 138rpx;
 	height: 80rpx;
 	background: #CCA65E;
 	color: #fff;
-	
+	border-radius: 80rpx 0 0 80rpx;
+	padding-top: 10rpx;
+	float: right;
+}
+.tw text{
+	width: 100%;
+	display: block;
+	margin-left: 40rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
 }
 

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/info/info.js

@@ -7,7 +7,15 @@ Page({
 	 * 页面的初始数据
 	 */
 	data: {
-    imgUrl: imgUrl,
+		imgUrl: imgUrl,
+		defaultSearch:{
+			name:"全部",
+			id:""
+			},
+		searchItems:[
+			{name:"全部",id:""},
+			{name:"区教委",id:""},{name:"区科技局",id:""},{name:"区经济信息委",id:""},{name:"区民政局",id:""}],
+		showModal: false,
 	},
 
 	/**
@@ -64,5 +72,26 @@ Page({
 	 */
 	onShareAppMessage() {
 
+	},
+  
+	selectType(){
+	  this.setData({
+		showModal: !this.data.showModal
+	  })
+	},
+	closedlg(){
+	  this.setData({
+		showModal: false
+	  })
+	},
+	back(){
+		wx.navigateBack({
+			delta: 1
+		  });
+	},
+	askQuestion(){
+		wx.navigateTo({
+		  url: '/pages/ZCWDK/add/add',
+		})
 	}
 })

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/info/info.json

@@ -2,6 +2,7 @@
   "navigationStyle": "custom",
 	"usingComponents": {
     "t-tabs": "tdesign-miniprogram/tabs/tabs",
-    "t-tab-panel": "tdesign-miniprogram/tabs/tab-panel"
+	"t-tab-panel": "tdesign-miniprogram/tabs/tab-panel",
+	"t-icon": "tdesign-miniprogram/icon/icon"
   }
-}
+}

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/info/info.wxml

@@ -1,7 +1,16 @@
 <!--pages/ZCWDK/info/info.wxml-->
 <view>
   <view class="head" style="background-image: url({{imgUrl}}/wdkbg.png);">
-      <view  class="navTitle"></view>
+		<view class="navTitle">
+			<t-icon name="chevron-left" size="68rpx" data-name="chevron-left" bind:click="back" />
+			<view class="title" style="float: left;">政策问答库</view>
+		</view>
+		<view class="ttp">
+		<view class="tw" bindtap="askQuestion">
+			<text>我要</text>
+			<text>提问</text>
+		</view>
+	</view>
       <view class="logo">
         <image src="{{imgUrl}}/wdklogo.png"></image>
         <text>共计问答数：6526</text>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/info/info.wxss

@@ -4,10 +4,30 @@ page{
   background: #F5F5F5 ;
 }
 .navTitle{
-  width: 100%;
-  height: 130rpx;
-  margin-bottom: 70rpx;
-}
+	width: 100%;
+	height: 130rpx;
+	margin-bottom: 20rpx;
+  }
+  .navTitle t-icon{
+	  width: 48rpx; 
+	  float: left;
+	  margin-top: 50rpx;
+	  margin-left: 20rpx;
+	  height: 130rpx;
+	  line-height: 130rpx;
+	  text-align: center;
+	  color: #fff;
+  }
+  .navTitle .title{
+	  width: 600rpx;
+	  height: 130rpx;
+	  line-height: 130rpx;
+	  text-align: center;
+	  font-size: 36rpx;
+	  font-family: PingFang SC;
+	  font-weight: 400;
+	  color: #FFFFFF;
+  }
 
 .head{
   width: 100%;
@@ -15,27 +35,32 @@ page{
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
-
+.title{
+	width: 100%;
+	height: 73rpx;
+	margin-top: 20rpx;
+	margin-bottom: 12rpx;
+  }
 .logo{
-  margin: 0 auto;
-  width: 80%;
-  height: 70rpx;
-}
-
-.logo image{
-  width: 100%;
-  height: 70rpx;
-}
-.logo text{
-  font-size: 30rpx;
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #FFFFFF;
-  opacity: 0.6;
-  display: block;
-  width: 100%;
-  text-align: center;
-}
+	margin: 0 auto;
+	width: 60%;
+	height: 50rpx;
+  }
+  
+  .logo image{
+	width: 100%;
+	height: 50rpx;
+  }
+  .logo text{
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
+	opacity: 0.6;
+	display: block;
+	width: 100%;
+	text-align: center;
+  }
 .searchBox{
   width: 90%;
   height: 80rpx;
@@ -66,25 +91,27 @@ page{
 }
 /* 遮罩层 */
 .mask {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  top: 0;
-  left: 0;
-  background: #000;
-  z-index: 9000;
-  opacity: 0.5;
-}
-
-.serachItems{
-  width: 100%;
-  height: 700rpx;
-  margin-top: -60rpx;
-  background: #fff;
-  padding-top: 20rpx;
-  position: fixed;
-  z-index: 9999;
-}
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	background: #000;
+	z-index: 9000;
+	opacity: 0.5;
+  }
+  
+  .serachItems{
+	width: 100%;
+	height: 700rpx;
+	margin-top: 460rpx;
+	background: #fff;
+	padding-top: 20rpx;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 9999;
+  }
 
 .serachItems scroll-view{
   height: 700rpx;
@@ -254,4 +281,27 @@ page{
   margin-top: 70rpx;
   margin-left: 30rpx;
   
+}
+
+.ttp{
+	width: 100%;
+	height: 80rpx;
+}
+.tw{
+	width: 138rpx;
+	height: 80rpx;
+	background: #CCA65E;
+	color: #fff;
+	border-radius: 80rpx 0 0 80rpx;
+	padding-top: 10rpx;
+	float: right;
+}
+.tw text{
+	width: 100%;
+	display: block;
+	margin-left: 40rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
 }

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/dataCenter/dataCenter.js

@@ -508,5 +508,15 @@ Page({
 	 */
 	onShareAppMessage() {
 
+	},
+	gotoZWTJ(){
+		wx.navigateTo({
+		  url: '/pages/dataCenterZWTJ/dataCenterZWTJ',
+		})
+	},
+	gotoXXTJ(){
+		wx.navigateTo({
+		  url: '/pages/dataCenterXXTJ/dataCenterXXTJ',
+		})
 	}
 })

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

@@ -27,7 +27,7 @@
     </view>
   </view>
   <!-- 政务服务数据统计分析 -->
-  <view style="background-color: #FFFFFF;margin-top: 30rpx;">
+  <view style="background-color: #FFFFFF;margin-top: 30rpx;" bindtap="gotoZWTJ">
     <view style="border-bottom: 1px solid #C5C5C5;">
       <view class="title">
         <image src="{{imgUrl}}riseData.png"></image>
@@ -196,7 +196,7 @@
     </view>
   </view>
   <!-- 本年度公开信息办理情况 -->
-  <view style="background-color: #FFFFFF;margin-top: 30rpx;">
+  <view style="background-color: #FFFFFF;margin-top: 30rpx;" bindtap="gotoXXTJ">
     <view style="border-bottom: 1px solid #C5C5C5;">
       <view class="title">
         <image src="{{imgUrl}}processing.png"></image>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/index/index.js

@@ -584,5 +584,15 @@ mediaBindChange: function( e ) {
 			url: '/pages/yxnaQxn/yxnaQxn',
 		  })
 	},
+	gotoSjzx(){
+		wx.navigateTo({
+		  url: '/pages/dataCenter/dataCenter',
+		})
+	},
+	gotoZWTJ(){
+		wx.navigateTo({
+		  url: '/pages/dataCenterZWTJ/dataCenterZWTJ',
+		})
+	}
 
 })

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

@@ -138,7 +138,7 @@
 		<!-- 数据中心 -->
 		<view class="data-center-contain">
 			<!-- 标题 -->
-			<view class="data-center-title">
+			<view class="data-center-title" bindtap="gotoSjzx">
 				<view style="display:flex;align-items:center;justify-content:center;">
 					<image src="{{imgUrl}}index-data-center.png" style="height: 50rpx;width: 56rpx"></image>
 				</view>
@@ -149,7 +149,7 @@
 			<view class="center-analysis" style="height:272rpx;width:100%;position:relative;">
 				<!-- 分析header -->
 				<view
-					style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
+					style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;" bindtap="gotoZWTJ">
 					<image src="{{ imgUrl }}index-center-analysis-header.png" style="height: 129rpx;width:650rpx"></image>
 				</view>
 				<!-- 分析入口 -->

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/myCenter/myCenter.json

@@ -1,4 +1,5 @@
 {
+	"navigationStyle":"custom",
 	"usingComponents": {
-	  }
+	}
 }

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

@@ -69,7 +69,7 @@
 	</view>
 	<view class="list cont-width">
 		<view class="list-nav">
-			<view class="list-item" bindtap="navto">
+			<view class="list-item" bindtap="toCanteen">
 				<view class="left">
 					<image src="../images/l-grzl.png" alt=""></image>
 					<text>我们的食堂</text>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/myCenter/myCenter.wxss

@@ -9,7 +9,7 @@
 
 .head-bg {
 	width: 100%;
-	height: 300rpx;
+	height: 400rpx;
 	background-image:url(https://s1.ax1x.com/2022/10/13/xaoji9.png);
 	background-size: 100% 100%;
 	display: flex;

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/publics.js

@@ -136,5 +136,10 @@ Page({
    */
   onShareAppMessage() {
 
+  },
+  gotoZXWDK(){
+	  wx.navigateTo({
+		url: '/pages/ZCWDK/index/index',
+	  })
   }
 })

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

@@ -98,7 +98,7 @@
     <swiper display-multiple-items="2" autoplay="{{false}}" style="padding: 0 10px;height: 400rpx;;">
       <block wx:for="{{topics}}" wx:key="*this">
         <swiper-item>
-          <image src="{{imgUrl}}{{item}}" style="width: 327rpx;height: 227rpx;"></image>
+          <image src="{{imgUrl}}{{item}}" bindtap="gotoZXWDK" style="width: 327rpx;height: 227rpx;"></image>
         </swiper-item>
       </block>
     </swiper>