驿站地图加搜索框

# Conflicts:
#	miniprogram/app.json

miniprogram/app.json

@@ -1,302 +1,307 @@
 {
-    "pages": [
-        "pages/home/home",
-   
-        "pages/message/message",
-        "pages/my/my",
-        "pages/index/index",
-        "pages/toRegister/toRegister",
-        "pages/heart/heart",
-        "pages/mine/mine",
-        "pages/association/association",
-        "pages/discussion/discussion",
-        "pages/toScan/toScan",
-        "pages/complete/complete",
-        "pages/formid/formid",
-        "pages/fromVirus/fromVirus",
-        "pages/register/register",
-        "pages/detail/detail",
-        "pages/fromVirus/detail/detail",
-        "pages/accept/accept",
-        "pages/gridLeaderRegister/gridLeaderRegister",
-        "pages/navigatetoApp/navigatetoApp"
-    ],
-    "subPackages": [
-        {
-            "root": "subpages/redSail",
-            "name": "redSail",
-            "pages": [
-                "pages/redSail/redSail"
-            ]
-        },
-        {
-            "root": "subpages/knight",
-            "name": "knight",
-            "pages": [
-                "pages/knight/knight"
-            ]
-        },
-        {
-            "root": "subpages/redGrider",
-            "name": "redGrider",
-            "pages": [
-                "pages/redGrider/redGrider"
-            ]
-        },
-        {
-            "root": "subpages/pioneer",
-            "name": "pioneer",
-            "pages": [
-                "pages/pioneer/pioneer"
-            ]
-        },
-        {
-            "root": "subpages/checkIn",
-            "name": "checkIn",
-            "pages": [
-                "pages/checkIn/checkIn"
-            ]
-        },
-        {
-            "root": "subpages/volunteer",
-            "name": "volunteer",
-            "pages": [
-                "pages/volunteer/volunteer"
-            ]
-        },
-
-
-
-
-        {
-            "root": "subpages/home",
-            "name": "home",
-            "pages": [
-                "pages/webview/webview",
-                "pages/agreement/agreement",
-                "pages/notice/notice",
-                "pages/consultation/consultation",
-                "pages/info/info",
-                "pages/noticeDetail/noticeDetail",
-                "pages/newsDetail/newsDetail"
-            ]
-        },
-        {
-            "root": "subpages/changegrid",
-            "name": "changeGrid",
-            "pages": [
-                "pages/changeGrid/changeGrid"
-            ]
-        },
-        {
-            "root": "subpages/association",
-            "name": "association",
-            "pages": [
-                "pages/joinassociation/joinassociation",
-                "pages/createassociation/createassociation",
-                "pages/associationMember/associationMember",
-                "pages/associationDetail/associationDetail",
-                "pages/inviteFriend/inviteFriend",
-                "pages/incomingVerify/incomingVerify",
-                "pages/unpassAssociation/unpassAssociation",
-                "pages/topicList/topicList",
-                "pages/addTopic/addTopic",
-                "pages/topicDetail/topicDetail",
-                "pages/replyOrRemark/replyOrRemark",
-                "pages/changeToIssue/changeToIssue"
-            ]
-        },
-        {
-            "root": "subpages/heart",
-            "pages": [
-                "pages/heartDetail/heartDetail",
-                "pages/leaderboard/leaderboard",
-                "pages/myNews/myNews",
-                "pages/clockIn/clockIn",
-                "pages/volunteer/volunteer",
-                "pages/signed/signed",
-                "pages/refusedOrEndedDetail/refusedOrEndedDetail",
-                "pages/cancelDetail/cancelDetail"
-            ]
-        },
-        {
-            "root": "subpages/discussion",
-            "name": "discussion",
-            "pages": [
-                "pages/anytimeSay/anytimeSay",
-                "pages/addIssue/addIssue",
-                "pages/discussionDetail/discussionDetail",
-                "pages/publishEvaluation/publishEvaluation",
-                "pages/remarkOrReply/remarkOrReply",
-                "pages/searchDiscussion/searchDiscussion",
-                "pages/categoryList/categoryList"
-            ]
-        },
-        {
-            "root": "subpages/mine",
-            "name": "mine",
-            "pages": [
-                "pages/eventDetail/eventDetail",
-                "pages/company/company",
-                "pages/companyInfo/companyInfo",
-                "pages/inviteRecord/inviteRecord",
-                "pages/gridManage/gridManage"
-            ]
-        },
-        {
-            "root": "subpages/integralCentre",
-            "name": "integralCentre",
-            "pages": [
-                "pages/eshop/eshop"
-            ]
-        },
-        {
-            "root": "subpages/demand",
-            "name": "demand",
-            "pages": [
-                "pages/demandList/demandList",
-                "pages/myDemand/myDemand",
-                "pages/demandCreate/demandCreate",
-                "pages/demandDetail/demandDetail",
-                "pages/demandFinish/demandFinish"
-            ]
-        },
-        {
-            "root": "subpages/partyMassesServiceCenter",
-            "name": "partyMassesServiceCenter",
-            "pages": [
-                "pages/partyMassesList/partyMassesList",
-                "pages/partyMassesDetail/partyMassesDetail",
-                "pages/bookList/bookList",
-                "pages/partyMassesMap/partyMassesMap"
-            ]
-        },
-        {
-            "root": "subpages/extend",
-            "name": "extend",
-            "pages": [
-                "pages/tripReport/tripReport",
-                "pages/moreList/moreList"
-            ]
-        },
-        {
-            "root": "subpages/questionnaire",
-            "name": "questionnaire",
-            "pages": [
-                "pages/index/index",
-                "pages/detail/detail"
-            ]
-        },
-        {
-            "root": "subpages/workguide",
-            "name": "workguide",
-            "pages": [
-                "pages/index/index",
-                "pages/collect/collect",
-                "pages/detail/detail",
-                "pages/link/link"
-            ]
-        },
-        {
-            "root": "subpages/partyElegant",
-            "name": "partyElegant",
-            "pages": [
-                "pages/partyElegant/partyElegant"
-            ]
-        },
-        {
-            "root": "subpages/unionBuild",
-            "name": "unionBuild",
-            "pages": [
-                "pages/list/list",
-                "pages/detail/detail"
-            ]
-        },
-        {
-            "root": "subpages/appeal",
-            "name": "appeal",
-            "pages": [
-                "pages/peopleLivelihood/peopleLivelihood",
-                "pages/development/development",
-                "pages/list/list",
-                "pages/peopleLivelihoodWork/peopleLivelihoodWork"
-            ]
-        }
-    ],
-    "preloadRule": {
-        "pages/index/index": {
-            "network": "all",
-            "packages": [
-                "subpages/changegrid",
-                "subpages/home"
-            ]
-        },
-        "pages/discussion/discussion": {
-            "network": "all",
-            "packages": [
-                "discussion"
-            ]
-        },
-        "pages/association/association": {
-            "network": "all",
-            "packages": [
-                "subpages/association"
-            ]
-        },
-        "pages/mine/mine": {
-            "network": "all",
-            "packages": [
-                "mine"
-            ]
-        }
-    },
-    "tabBar": {
-        "color": "#666666",
-        "selectedColor": "#FF0000",
-        "backgroundColor": "#FFFFFF",
-        "borderStyle": "white",
-        "custom": true,
-        "list": [
-            {
-                "pagePath": "pages/home/home",
-                "text": "首页",
-                "iconPath": "images/main/icon01.png",
-                "selectedIconPath": "images/main/icon01-a.png"
-            },
-            {
-                "pagePath": "pages/message/message",
-                "text": "消息",
-                "iconPath": "images/main/icon02.png",
-                "selectedIconPath": "images/main/icon02-a.png"
-            },
-           
-            {
-                "pagePath": "pages/my/my",
-                "text": "我的",
-                "iconPath": "images/main/icon03.png",
-                "selectedIconPath": "images/main/icon03-a.png"
-            }
-        ]
-    },
-    
-    "window": {
-        "backgroundTextStyle": "light",
-        "navigationBarBackgroundColor": "#fff",
-        "navigationBarTitleText": "WeChat",
-        "navigationBarTextStyle": "black"
-    },
-    "networkTimeout": {
-        "request": 60000
-    },
-    "permission": {
-        "scope.userLocation": {
-            "desc": "党群e家将获取您的位置信息"
-        }
-    },
-    "requiredPrivateInfos": [
-        "getLocation",
-        "chooseLocation"
-    ],
-    "sitemapLocation": "sitemap.json",
-    "serviceProviderTicket": "BhBC8k6Lkgi+6uDaV2haUUUH7ZC81tEpXdNMtSxiPnrYRxkRxMu5f6gprJ5i+leAKUxHM1E5YWc3P9vtgTtu2BULafIVikYURVk="
+	"pages": [
+		"pages/home/home",
+		"pages/message/message",
+		"pages/my/my",
+		"pages/index/index",
+		"pages/toRegister/toRegister",
+		"pages/heart/heart",
+		"pages/mine/mine",
+		"pages/association/association",
+		"pages/discussion/discussion",
+		"pages/toScan/toScan",
+		"pages/complete/complete",
+		"pages/formid/formid",
+		"pages/fromVirus/fromVirus",
+		"pages/register/register",
+		"pages/detail/detail",
+		"pages/fromVirus/detail/detail",
+		"pages/accept/accept",
+		"pages/gridLeaderRegister/gridLeaderRegister",
+		"pages/navigatetoApp/navigatetoApp"
+	],
+	"subPackages": [{
+			"root": "subpages/redSail",
+			"name": "redSail",
+			"pages": [
+				"pages/redSail/redSail",
+				"pages/registerParty/registerParty",
+				"pages/flowParty/flowParty",
+				"pages/event/event"
+			]
+		},
+		{
+			"root": "subpages/knight",
+			"name": "knight",
+			"pages": [
+				"pages/knight/knight",
+				"pages/knight/brief/brief",
+				"pages/knight/observeResi/observeResi",
+				"pages/knight/stageMap/index",
+				"pages/knight/commonts/stageMap/index"
+			]
+		},
+		{
+			"root": "subpages/redGrider",
+			"name": "redGrider",
+			"pages": [
+				"pages/redGrider/redGrider",
+				"components/demeanor/index"
+			]
+		},
+		{
+			"root": "subpages/pioneer",
+			"name": "pioneer",
+			"pages": [
+				"pages/pioneer/pioneer"
+			]
+		},
+		{
+			"root": "subpages/checkIn",
+			"name": "checkIn",
+			"pages": [
+				"pages/checkIn/checkIn",
+				"pages/checkIn/register/register"
+			]
+		},
+		{
+			"root": "subpages/volunteer",
+			"name": "volunteer",
+			"pages": [
+				"pages/volunteer/volunteer",
+				"components/recruitOrder/index",
+				"components/demeanor/index"
+			]
+		},
+		{
+			"root": "subpages/home",
+			"name": "home",
+			"pages": [
+				"pages/webview/webview",
+				"pages/agreement/agreement",
+				"pages/notice/notice",
+				"pages/consultation/consultation",
+				"pages/info/info",
+				"pages/noticeDetail/noticeDetail",
+				"pages/newsDetail/newsDetail"
+			]
+		},
+		{
+			"root": "subpages/changegrid",
+			"name": "changeGrid",
+			"pages": [
+				"pages/changeGrid/changeGrid"
+			]
+		},
+		{
+			"root": "subpages/association",
+			"name": "association",
+			"pages": [
+				"pages/joinassociation/joinassociation",
+				"pages/createassociation/createassociation",
+				"pages/associationMember/associationMember",
+				"pages/associationDetail/associationDetail",
+				"pages/inviteFriend/inviteFriend",
+				"pages/incomingVerify/incomingVerify",
+				"pages/unpassAssociation/unpassAssociation",
+				"pages/topicList/topicList",
+				"pages/addTopic/addTopic",
+				"pages/topicDetail/topicDetail",
+				"pages/replyOrRemark/replyOrRemark",
+				"pages/changeToIssue/changeToIssue"
+			]
+		},
+		{
+			"root": "subpages/heart",
+			"pages": [
+				"pages/heartDetail/heartDetail",
+				"pages/leaderboard/leaderboard",
+				"pages/myNews/myNews",
+				"pages/clockIn/clockIn",
+				"pages/volunteer/volunteer",
+				"pages/signed/signed",
+				"pages/refusedOrEndedDetail/refusedOrEndedDetail",
+				"pages/cancelDetail/cancelDetail"
+			]
+		},
+		{
+			"root": "subpages/discussion",
+			"name": "discussion",
+			"pages": [
+				"pages/anytimeSay/anytimeSay",
+				"pages/addIssue/addIssue",
+				"pages/discussionDetail/discussionDetail",
+				"pages/publishEvaluation/publishEvaluation",
+				"pages/remarkOrReply/remarkOrReply",
+				"pages/searchDiscussion/searchDiscussion",
+				"pages/categoryList/categoryList"
+			]
+		},
+		{
+			"root": "subpages/mine",
+			"name": "mine",
+			"pages": [
+				"pages/eventDetail/eventDetail",
+				"pages/company/company",
+				"pages/companyInfo/companyInfo",
+				"pages/inviteRecord/inviteRecord",
+				"pages/gridManage/gridManage"
+			]
+		},
+		{
+			"root": "subpages/integralCentre",
+			"name": "integralCentre",
+			"pages": [
+				"pages/eshop/eshop"
+			]
+		},
+		{
+			"root": "subpages/demand",
+			"name": "demand",
+			"pages": [
+				"pages/demandList/demandList",
+				"pages/myDemand/myDemand",
+				"pages/demandCreate/demandCreate",
+				"pages/demandDetail/demandDetail",
+				"pages/demandFinish/demandFinish"
+			]
+		},
+		{
+			"root": "subpages/partyMassesServiceCenter",
+			"name": "partyMassesServiceCenter",
+			"pages": [
+				"pages/partyMassesList/partyMassesList",
+				"pages/partyMassesDetail/partyMassesDetail",
+				"pages/bookList/bookList",
+				"pages/partyMassesMap/partyMassesMap"
+			]
+		},
+		{
+			"root": "subpages/extend",
+			"name": "extend",
+			"pages": [
+				"pages/tripReport/tripReport",
+				"pages/moreList/moreList"
+			]
+		},
+		{
+			"root": "subpages/questionnaire",
+			"name": "questionnaire",
+			"pages": [
+				"pages/index/index",
+				"pages/detail/detail"
+			]
+		},
+		{
+			"root": "subpages/workguide",
+			"name": "workguide",
+			"pages": [
+				"pages/index/index",
+				"pages/collect/collect",
+				"pages/detail/detail",
+				"pages/link/link"
+			]
+		},
+		{
+			"root": "subpages/partyElegant",
+			"name": "partyElegant",
+			"pages": [
+				"pages/partyElegant/partyElegant"
+			]
+		},
+		{
+			"root": "subpages/unionBuild",
+			"name": "unionBuild",
+			"pages": [
+				"pages/list/list",
+				"pages/detail/detail"
+			]
+		},
+		{
+			"root": "subpages/appeal",
+			"name": "appeal",
+			"pages": [
+				"pages/peopleLivelihood/peopleLivelihood",
+				"pages/development/development",
+				"pages/list/list",
+				"pages/peopleLivelihoodWork/peopleLivelihoodWork"
+			]
+		}
+	],
+	"preloadRule": {
+		"pages/index/index": {
+			"network": "all",
+			"packages": [
+				"subpages/changegrid",
+				"subpages/home"
+			]
+		},
+		"pages/discussion/discussion": {
+			"network": "all",
+			"packages": [
+				"discussion"
+			]
+		},
+		"pages/association/association": {
+			"network": "all",
+			"packages": [
+				"subpages/association"
+			]
+		},
+		"pages/mine/mine": {
+			"network": "all",
+			"packages": [
+				"mine"
+			]
+		}
+	},
+	"tabBar": {
+		"color": "#666666",
+		"selectedColor": "#FF0000",
+		"backgroundColor": "#FFFFFF",
+		"borderStyle": "white",
+		"custom": true,
+		"list": [{
+				"pagePath": "pages/home/home",
+				"text": "首页",
+				"iconPath": "images/main/icon01.png",
+				"selectedIconPath": "images/main/icon01-a.png"
+			},
+			{
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "images/main/icon02.png",
+				"selectedIconPath": "images/main/icon02-a.png"
+			},
+			{
+				"pagePath": "pages/my/my",
+				"text": "我的",
+				"iconPath": "images/main/icon03.png",
+				"selectedIconPath": "images/main/icon03-a.png"
+			}
+		]
+	},
+	"window": {
+		"backgroundTextStyle": "light",
+		"navigationBarBackgroundColor": "#fff",
+		"navigationBarTitleText": "WeChat",
+		"navigationBarTextStyle": "black"
+	},
+	"networkTimeout": {
+		"request": 60000
+	},
+	"permission": {
+		"scope.userLocation": {
+			"desc": "党群e家将获取您的位置信息"
+		}
+	},
+	"requiredPrivateInfos": [
+		"getLocation",
+		"chooseLocation"
+	],
+	"navigateToMiniProgramAppIdList": [
+		"wx50ebeb95943868cd"
+	],
+	"sitemapLocation": "sitemap.json",
+	"serviceProviderTicket": "BhBC8k6Lkgi+6uDaV2haUUUH7ZC81tEpXdNMtSxiPnrYRxkRxMu5f6gprJ5i+leAKUxHM1E5YWc3P9vtgTtu2BULafIVikYURVk="
 }

miniprogram/custom-tab-bar/index.js

@@ -5,25 +5,25 @@ Component({
     color: "#999",
     selectedColor: "#F13A47",
     "list": [
-        {
-            "pagePath": "/pages/index/index",
-            "text": "首页",
-            "iconPath": "/images/main/icon01.png",
-            "selectedIconPath": "/images/main/icon01-a.png"
-        },
-        {
-            "pagePath": "/pages/message/message",
-            "text": "消息",
-            "iconPath": "/images/main/icon02.png",
-            "selectedIconPath": "/images/main/icon02-a.png"
-        },
+        // {
+        //     "pagePath": "/pages/home/home",
+        //     "text": "",
+        //     "iconPath": "/images/main/icon01.png",
+        //     "selectedIconPath": "/images/main/icon01-a.png"
+        // },
+        // {
+        //     "pagePath": "/pages/message/message",
+        //     "text": "消息",
+        //     "iconPath": "/images/main/icon02.png",
+        //     "selectedIconPath": "/images/main/icon02-a.png"
+        // },
        
-        {
-            "pagePath": "/pages/my/my",
-            "text": "我的",
-            "iconPath": "/images/main/icon03.png",
-            "selectedIconPath": "/images/main/icon03-a.png"
-        }
+        // {
+        //     "pagePath": "/pages/my/my",
+        //     "text": "我的",
+        //     "iconPath": "/images/main/icon03.png",
+        //     "selectedIconPath": "/images/main/icon03-a.png"
+        // }
     ]
   },
   attached() {
@@ -35,7 +35,7 @@ Component({
   },
   methods: {
     switchTab(e) {
-        // console.log(e);
+        console.log(e);
         const data = e.currentTarget.dataset;
         const url = data.path;
         app.globalData.selected = data.index;

miniprogram/custom-tab-bar/index.wxml

@@ -1,5 +1,6 @@
 <!--miniprogram/custom-tab-bar/index.wxml-->
-<view class="tab-bar">
+<!-- class="tab-bar" -->
+<view >
 
     <view wx:for="{{list}}" wx:key="index" class="tab-bar-item" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab">
         <image src="{{selected === index ? item.selectedIconPath : item.iconPath}}"></image>

miniprogram/pages/formid/formid.js

@@ -14,7 +14,6 @@ Page({
     GridNameId:""
   },
 onLoad(options) {
-    // 上级页面传递过来的gid
     if (options.gid) {
       this.setData({
         gridId: options.gid,
@@ -22,17 +21,17 @@ onLoad(options) {
       })
     }
     this.getToken(options.gid)
-    this.getInvitation()
-  },
-  getInvitation(){
-    let that = this
-    api.getInvitation(this.data.gridId).then(function (res) {
-     that.setData({
-        GridNameId:res.data
-      })
-     that.getGridName()
-    })
+    // this.getInvitation()
   },
+//   getInvitation(){
+//     let that = this
+//     api.getInvitation(this.data.gridId).then(function (res) {
+//      that.setData({
+//         GridNameId:res.data
+//       })
+//      that.getGridName()
+//     })
+//   },
   getToken: function (gid) {
     let that = this
     wx.login({
@@ -119,7 +118,7 @@ onLoad(options) {
   },
   navigateToIndex () {
     wx.reLaunch({
-      url: '/pages/index/index'
+      url: '/pages/home/home'
     })
   }
 })

miniprogram/pages/formid/formid.wxml

@@ -2,11 +2,11 @@
   <view class="card">
     <image class="bgimg" src="../../images/ig_woyaozhuce.png"  mode="widthFix"/>
     <view class="context2">
-      <view class="context-title">欢迎加入</view>
+      <view class="context-title">欢迎使用北尚先锋</view>
       <view class="context-name">
-        <view  wx:for="{{gridNameArr}}" wx:key="thiskey" wx:for-index="idx" wx:for-item="item">
+        <!-- <view  wx:for="{{gridNameArr}}" wx:key="thiskey" wx:for-index="idx" wx:for-item="item">
           {{item}}
-        </view>
+        </view> -->
       </view>
   　</view>
   </view>

miniprogram/pages/home/home.js

@@ -21,7 +21,7 @@ Page({
     pageSize: 10, // 新闻列表-分页页长
     timestamp: "", // 时间戳
     sudokuState: { // 九宫格显隐状态
-      consultAvailable: "0", // 网格专员
+      consultAvailable: "0", // 网格力量
       appraiseAvailable: "0", // 请您监督,
       talkAndNeedAndPartyAvaliable: "0" // 随时讲、需求清单、党群服务中心
     },
@@ -32,6 +32,7 @@ Page({
     street: "",//所在街道
     isCarryLoad: false,
     userId: "",
+    
     userInfo: {
       nickname: "",
       mobile: "",
@@ -41,7 +42,15 @@ Page({
     signMsg: "",
     signCode: 0,
     isSignUp: 0,
-    communityId: "" // 社区id
+    communityId: "", // 社区id
+    tabList:[
+        {url:'/subpages/redSail/pages/redSail/redSail',src:'../../images/main/home1.png',text:'新锋支部'},
+        {url:'/subpages/knight/pages/knight/knight',src:'../../images/main/home2.png',text:'新锋驿站'},
+        {url:'/subpages/checkIn/pages/checkIn/register/register',src:'../../images/main/home3.png',text:'在职党员到居住社区报到'},
+        {url:'/subpages/volunteer/pages/volunteer/volunteer',src:'../../images/main/home4.png',text:'红色志愿服务队'},
+        {url:'/subpages/redGrider/pages/redGrider/redGrider',src:'../../images/main/home5.png',text:'红色网格'},
+        {url:'',src:'../../images/main/home6.png',text:'新新向党'},
+    ],
   },
  
   async onLoad(options) {
@@ -139,12 +148,13 @@ Page({
                 // 非扫码进入，通过搜索小程序直接进入的情况
                 if (wx.getStorageSync("shareObj")) {
                   const para = JSON.parse(wx.getStorageSync("shareObj"))
+                  app.globalData.tempGridId = "1222489495054602241"
                   wx.redirectTo({
-                    url: "/pages/formid/formid?gid=" + para.nowGridId
+                    url: "/pages/formid/formid?gid=1222489495054602241" 
                   })
                 } else {
                   wx.redirectTo({
-                    url: "/pages/toRegister/toRegister"
+                    url: "/pages/formid/formid?gid=1222489495054602241"
                   })
                 }
               } else {
@@ -171,6 +181,17 @@ Page({
       }
     })
   },
+  handleXinxin(){
+    wx.navigateToMiniProgram({
+        appId: 'wxf09c0e08ffee7711',
+        path: 'pages/home/home',
+        envVersion: 'release',
+        extraData:{},
+        success(res) {
+          // 打开成功
+        }
+      })
+  },
   // 获取小程序用户登录日志
   async getUserLoginlog() {
     let data = {
@@ -412,7 +433,7 @@ Page({
       url: "/subpages/discussion/pages/addIssue/addIssue"
     })
   },
-  // 跳转到网格专员
+  // 跳转到网格力量
   navigatetoConsultion() {
     if (app.globalData.infoCompleted == 0) {
       this.setData({

miniprogram/pages/home/home.wxml

@@ -4,80 +4,36 @@
         首页
     </view>
 </view>
-<view class="bgw topf50">
-    <view class="gridouter">
-        <navigator url="/subpages/redSail/pages/redSail/redSail" class="grid">
-            <image src="../../images/main/home01.png" />
-            <view>红帆支队</view>
-        </navigator>
-        <navigator url="/subpages/knight/pages/knight/knight" class="grid">
-            <image src=" ../../images/main/home02.png" />
-            <view>骑士驿站</view>
-        </navigator>
-        <navigator url="/subpages/redGrider/pages/redGrider/redGrider" class="grid">
-            <image src="../../images/main/home03.png" />
-            <view>红色网格员</view>
-        </navigator>
-        <navigator url="/subpages/pioneer/pages/pioneer/pioneer" class="grid">
-            <image src="../../images/main/home04.png" />
-            <view>西海岸先锋</view>
-        </navigator>
-    </view>
-    <view class="grid2outer">
-
-        <navigator url="/subpages/checkIn/pages/checkIn/checkIn" class="grid2 blue">
-            <image src="../../images/main/home05.png" />
-            <view>
-                <view class="h1">在职党员</view>
-                <view class="h2">到居住社区报到</view>
-            </view>
-        </navigator>
-
-        <view class="w40"></view>
-
-        <navigator url="/subpages/volunteer/pages/volunteer/volunteer" class="grid2 red">
-            <image src="../../images/main/home06.png" />
-            <view>
-                <view class="h1">红色尖兵</view>
-                <view class="h2">志愿服务队</view>
-            </view>
-        </navigator>
-
+<view class="tab">
+    <navigator class="card"   url="/subpages/redSail/pages/redSail/redSail">
+        <image src="../../images/main/home1.png" mode="" />
+        <view class="{{index == 2?'small':'text'}}">新锋支部</view>
+    </navigator>
+    <navigator class="card"   url="/subpages/knight/pages/knight/knight">
+        <image src="../../images/main/home2.png" mode="" />
+        <view class="{{index == 2?'small':'text'}}">新锋驿站</view>
+    </navigator>
+    <navigator class="card" style="padding:50rpx 30rpx 10rpx 30rpx"   url="/subpages/checkIn/pages/checkIn/register/register">
+        <image src="../../images/main/home3.png" mode="" />
+        <view class="{{index == 2?'small':'text'}}">在职党员到居住社区报到</view>
+    </navigator>
+    <navigator class="card"   url="/subpages/volunteer/pages/volunteer/volunteer">
+        <image src="../../images/main/home4.png" mode="" />
+        <view class="{{index == 2?'small':'text'}}">红色志愿服务队</view>
+    </navigator>
+    <navigator class="card"   url="/subpages/redGrider/pages/redGrider/redGrider">
+        <image src="../../images/main/home5.png" mode="" />
+        <view class="{{index == 2?'small':'text'}}">红色网格</view>
+    </navigator>
+    <view class="card" bind:tap="handleXinxin">
+        <image src="../../images/main/home6.png" mode="" />
+        <view class="{{index == 2?'small':'text'}}">新新向党</view>
     </view>
 </view>
-
-<view class="bgw top16">
-    <view class="title01">推荐</view>
-    <view class="home_news_list">
-        <view class="item">
-            <image src="../../images/main/home_top.png"></image>
-            <view class="vbetween">
-                <view class="h1">围绕“经济抓党建，抓好党建促 发展”主题展开活动</view>
-                <view class="h2">
-                    <view class="time">2023-05-22</view>XXX社区党支部
-                </view>
-            </view>
-        </view>
-        <view class="item">
-            <image src="../../images/main/home_top.png"></image>
-            <view class="vbetween">
-                <view class="h1">围绕“经济抓党建，抓好党建促 发展”主题展开活动</view>
-                <view class="h2">
-                    <view class="time">2023-05-22</view>XXX社区党支部
-                </view>
-            </view>
-        </view>
-        <view class="item">
-            <image src="../../images/main/home_top.png"></image>
-            <view class="vbetween">
-                <view class="h1">围绕“经济抓党建，抓好党建促 发展”主题展开活动</view>
-                <view class="h2">
-                    <view class="time">2023-05-22</view>XXX社区党支部
-                </view>
-            </view>
-        </view>
-    </view>
+<view class="bto_image">
+    <image src="../../images/main/home_bot.png" mode="" />
 </view>
+
 <!-- <view class="home" style="margin-top: {{statusHeight + navigationHeight}}px"> -->
 
 <!-- <view class="belong-grid">

miniprogram/pages/home/home.wxss

@@ -38,7 +38,48 @@ page {
     position: relative;
     z-index: 100;
 }
-
+.tab{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    padding: 0 60rpx;
+   /* position: relative;
+   top: -190rpx; */
+    margin-top: -160rpx;
+}
+.tab .card{
+    display: flex;
+    width: 38%;
+    height: 180rpx;
+    justify-content: center;
+    align-items: center;
+    font-size: 32rpx;
+    font-weight: 600;
+    padding: 30rpx;
+    margin: 30rpx 0 0;
+    text-align: center;
+} 
+.bto_image{
+    margin: 20rpx auto 0rpx;
+    padding: 0 40rpx;
+    box-sizing: border-box;
+}
+.bto_image image {
+    width: 100%;
+    height: 146rpx;
+    margin-bottom: 100rpx;
+}
+.tab .card image{
+    width: 100rpx;
+    height: 100rpx;
+    margin-bottom: 18rpx;
+}
+/* .tab .card .text{
+    margin-top: 30rpx;
+} */
+.tab .card  .small{
+    font-size: 30rpx;
+}
 .home {
     width: 100%;
 }
@@ -230,9 +271,9 @@ page {
     color: #C89C74;
 }
 
-.topf50 {
+/* .topf50 {
     margin-top: -50rpx;
-}
+} */
 
 .top16 {
     margin-top: 16rpx

miniprogram/pages/index/components/sudoku/sudoku.js

@@ -21,7 +21,7 @@ Component({
     isShowAll: false, // 是否显示全部菜单 默认最多显示8个(2行)
     consultAvailableList: [
       {
-        title: "网格专员",
+        title: "网格力量",
         icon: "../../../../images/home/consult.png",
         triggerEvent: "navigatetoConsultion",
         sort: 7
@@ -196,7 +196,7 @@ Component({
     navigateToAddIssue() {
       this.triggerEvent("navigateToAddIssue")
     },
-    // 跳转到网格专员
+    // 跳转到网格力量
     navigatetoConsultion() {
       this.triggerEvent("navigatetoConsultion")
     },

miniprogram/pages/index/index.js

@@ -21,7 +21,7 @@ Page({
     pageSize: 10, // 新闻列表-分页页长
     timestamp: "", // 时间戳
     sudokuState: { // 九宫格显隐状态
-      consultAvailable: "0", // 网格专员
+      consultAvailable: "0", // 网格力量
       appraiseAvailable: "0", // 请您监督,
       talkAndNeedAndPartyAvaliable: "0" // 随时讲、需求清单、党群服务中心
     },
@@ -146,7 +146,7 @@ Page({
                   })
                 } else {
                   wx.redirectTo({
-                    url: "/pages/toRegister/toRegister"
+                    url: "pages/formid/formid"
                   })
                 }
               } else {
@@ -414,7 +414,7 @@ Page({
       url: "/subpages/discussion/pages/addIssue/addIssue"
     })
   },
-  // 跳转到网格专员
+  // 跳转到网格力量
   navigatetoConsultion() {
     if (app.globalData.infoCompleted == 0) {
       this.setData({
@@ -468,8 +468,8 @@ Page({
       loadMoreType: "loading",
       loadMoreVisible: false
     })
-    this.getBannerList()
-    this.getIndexSudokuState()
+    // this.getBannerList()
+    // this.getIndexSudokuState()
     this.getProjectList()
     this.getInfoList()
     this.getUnreadNum()

miniprogram/pages/index/index.wxml

@@ -12,11 +12,11 @@
         </navigator>
         <navigator url="/subpages/knight/pages/knight/knight" class="grid">
             <image src=" ../../images/main/home02.png" />
-            <view>骑士驿站</view>
+            <view>新锋驿站</view>
         </navigator>
         <navigator url="/subpages/redGrider/pages/redGrider/redGrider" class="grid">
             <image src="../../images/main/home03.png" />
-            <view>网格力量</view>
+            <view>红色网格</view>
         </navigator>
         <navigator url="/subpages/pioneer/pages/pioneer/pioneer" class="grid">
             <image src="../../images/main/home04.png" />

miniprogram/pages/index_bk/index.js

@@ -74,15 +74,15 @@ Page({
   onShow: function () {
     if (wx.getStorageSync('token') != '' && wx.getStorageSync('token') != undefined && wx.getStorageSync('token') != null) {
       if (!this.data.first) {
-        this.getBannerList()
-        this.getFirstInfo()
-        this.getNoticeList()
+        // this.getBannerList()
+        // this.getFirstInfo()
+        // this.getNoticeList()
         this.setData({
           pageNo: 1,
           newsList: []
         })
-        this.getNewsList(),
-        this.getIndexSudokuState()
+        // this.getNewsList(),
+        // this.getIndexSudokuState()
       }
     }
   },
@@ -205,11 +205,11 @@ Page({
                   })
                 }
               } else { // 直接进首页
-                that.getBannerList()
-                that.getFirstInfo()
-                that.getNoticeList()
-                that.getNewsList()
-                that.getIndexSudokuState()
+                // that.getBannerList()
+                // that.getFirstInfo()
+                // that.getNoticeList()
+                // that.getNewsList()
+                // that.getIndexSudokuState()
               }
             } else if (state == '4') { //未注册，跳到我要注册页面
               if (that.data.gid !== '') { //扫码进来的
@@ -299,7 +299,7 @@ Page({
       url: '/subpages/discussion/pages/addIssue/addIssue'
     })
   },
-  // 跳转到网格专员
+  // 跳转到网格力量
   navigatetoConsultion() {
     if (app.globalData.infoCompleted == 0) {
       this.setData({

miniprogram/project.config.json

@@ -44,7 +44,7 @@
     },
     "compileType": "miniprogram",
     "libVersion": "2.10.4",
-    "appid": "wx8d2c0ec0d6d73f6c",
+    "appid": "wxfa4afaa2b5f9c876",
     "projectname": "%E5%85%9A%E7%BE%A4e%E5%AE%B6-%E7%BA%BF%E4%B8%8A%E7%89%88",
     "simulatorType": "wechat",
     "simulatorPluginLibVersion": {},

miniprogram/project.private.config.json

@@ -77,12 +77,55 @@
                     "query": "",
                     "launchMode": "default",
                     "scene": null
+                },
+                {
+                    "name": "在职党员",
+                    "pathName": "subpages/checkIn/pages/checkIn/checkIn",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "新锋支部",
+                    "pathName": "subpages/redSail/pages/redSail/redSail",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "我要入党",
+                    "pathName": "subpages/redSail/pages/registerParty/registerParty",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "/subpages/homepages/consultation/consultation",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "流动党员报到",
+                    "pathName": "subpages/redSail/pages/flowParty/flowParty",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "城市观察员",
+                    "pathName": "subpages/knight/pages/knight/observeResi/observeResi",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
                 }
             ]
         }
     },
-    "libVersion": "2.31.1",
+    "libVersion": "2.32.2",
     "setting": {
-        "compileHotReLoad": true
+        "compileHotReLoad": true,
+        "bigPackageSizeSupport": false
     }
 }

miniprogram/subpages/checkIn/pages/checkIn/checkIn.wxml

@@ -7,7 +7,7 @@
 </view>
 <view class="mtf80">
     <view class="list">
-        <view class="item ">
+        <navigator  class="item " url="/subpages/checkIn/pages/checkIn/register/register">
             <image src="../../images/01.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">我来报道</view>
@@ -18,7 +18,7 @@
             <view class="vcenter w20">
                 <image src="../../images/right.png"  class="go"></image>
             </view>
-        </view>
+        </navigator >
         <view class="item ">
             <image src="../../images/02.png" class="icon"></image>
             <view class="vcenter flex1">

miniprogram/subpages/checkIn/pages/checkIn/register/register.js

@@ -0,0 +1,286 @@
+// subpages/checkIn/pages/checkIn/register/register.js
+const api = require('../../../../../utils/partApi')
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        look:true,
+        informFlag:false,
+        selectOption:[
+           ],
+        selectedStatus:false,
+        selectTitle:'',
+        deptName:'',
+        form:{
+           name:'',
+           idCard:'',
+           mobile:'',
+           homeName:'',//居住小区名称
+           workUnit:'',//工作单位
+           workType:'',//单位性质
+           workIndustry:'',//所属行业
+           party:1,//是否为党员
+           volunteer:1,//是否加入志愿者
+           gridStaff:1,//是否红色网格
+           owners:1,//是否参加业主委员会
+           allDeptIds:[]
+        },
+        orgOptions:[]
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+this.getByLoginUser()
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+    getByLoginUser(){
+        api.getByLoginUser().then(res=>{
+            if (res.code !== 0) {
+                return this.$message.error(res.msg)
+              }
+              let arr = res.data.options[0].children.filter((item)=>(item.children))
+              this.setData({
+                orgOptions : arr
+              })
+        })
+    },
+     //姓名双向绑定
+     bindRealNameInput (e) {
+        this.setData({
+          'form.name': e.detail.value
+        })
+        console.log(this.data.form)
+      },
+      //身份证双向绑定
+      bindRealIdcardInput (e) {
+        this.setData({
+          'form.idCard': e.detail.value
+        })
+        console.log(this.data.form)
+      },
+      //工作单位
+      bindWorkUnitInput (e) {
+        this.setData({
+          'form.workUnit': e.detail.value
+        })
+        console.log(this.data.form)
+      },
+      //所属行业
+      bindWorkIndustryInput(e) {
+        this.setData({
+          'form.workIndustry': e.detail.value
+        })
+        console.log(this.data.form)
+      },
+    //手机号双向绑定
+    bindRealMobileInput (e) {
+        this.setData({
+        'form.mobile': e.detail.value
+        })
+        console.log(this.data.form)
+    },
+    bindHomeNameInput(e){
+        this.setData({
+            'form.homeName': e.detail.value
+            })
+            console.log(this.data.form)
+    },
+    //取消选择
+    pickerCancel () {
+        this.setData({
+            selectedStatus: false
+        });
+    },
+    //单选框事件
+    bindFlagPartyChange(e) {
+        this.setData({
+          'form.party': e.detail.value
+        })
+      },
+      bindFlagVolunteerChange(e) {
+        this.setData({
+          'form.volunteer': e.detail.value
+        })
+      },
+      bindFlagGridStaffChange(e){
+        this.setData({
+            'form.gridStaff': e.detail.value
+          })
+      },
+      bindFlagOwnersChange(e){
+        this.setData({
+            'form.owners': e.detail.value
+          })
+      },
+    pickerConfirm (e) {
+       
+            if(e.currentTarget.dataset.value == '0'){
+                this.setData({
+                    ['form.allDeptIds']: ['1175270520603930625',e.detail.selectedValue[0]],
+                    deptName:e.detail.label,
+                    selectedStatus: false
+                });
+            } else if(e.currentTarget.dataset.value == '1'){
+                this.setData({
+                    'form.workType':e.detail.label,
+                    selectedStatus: false
+                });
+            }
+    },
+    
+    //点击显示下拉
+    handleCLickShow(e){
+        this.setData({
+            pickerValue:e.currentTarget.dataset.value,
+            selectedStatus: true,
+            selectOption:[]
+        })
+        if(e.currentTarget.dataset.value == '0'){
+            this.setData({
+                selectOption:  orgOptions
+            })
+        }else if(e.currentTarget.dataset.value == '1'){
+            this.setData({
+                selectOption:  [ {label:'党政机关',value:'0'},
+                {label:'事业单位',value:'1'},
+                {label:'国有企业',value:'2'},
+                {label:'私营企业',value:'3'},
+                {label:'集体企业',value:'4'},
+                {label:'外资企业、合资企业',value:'5'},
+                {label:'社会组织',value:'6'},
+                {label:'其他',value:'7'}]
+            })
+        }
+    },
+    showToast (title) {
+        wx.showToast({
+          title: title,
+          icon: 'none',
+          duration: 2000
+        })
+      },
+    submit(){
+        if (!this.data.form.name) {
+              this.showToast('请输入姓名')
+              return false
+          } 
+          if (!this.data.form.idCard) {
+            this.showToast('请填写身份证号')
+            return false
+          }
+          if (!this.data.form.mobile) {
+            this.showToast('请填写手机号')
+            return false
+          }
+        //   if (this.data.form.allDeptIds.length == 0) {
+        //     this.showToast('请选择报到常住社区名称')
+        //     return false
+        //   } 
+         
+          if (!this.data.form.homeName) {
+            this.showToast('请填写居住小区名称')
+            return false
+          }
+         
+          const para = {
+          ...this.data.form
+          }
+          para.party = parseInt(para.party)
+          para.volunteer = parseInt(para.volunteer)
+          para.gridStaff = parseInt(para.gridStaff)
+          para.owners = parseInt(para.owners)
+          wx.showLoading({
+            title: "提交中..."
+          })
+        api.submitReportparty(para).then(res=>{
+            wx.hideLoading()
+            wx.showLoading({
+              title: '信息提交成功',
+              content: res.data.msg,
+              success: () => {
+                  wx.reLaunch({
+                    url: "/pages/index/index"
+                  })
+                }
+            })
+        }).catch(err=>{
+            wx.hideLoading()
+            console.log(err);
+        })
+    },
+    handleCheckbox(e){
+        console.log(e);
+        if(e.detail .value.length!=0){
+            this.setData({
+                look:false
+            })
+        }else{
+            this.setData({
+                look:true
+            })
+        }
+    },
+    handleBack(){
+        wx.navigateBack({
+            delta: 1
+        })
+    },
+    handleNext(){
+        console.log('11233');
+       this.setData({
+        informFlag:true
+       })
+    }
+})

miniprogram/subpages/checkIn/pages/checkIn/register/register.json

@@ -0,0 +1,8 @@
+{
+    "usingComponents": {
+        "wux-picker": "../../../../../dist/picker/index"
+    },
+    "navigationBarBackgroundColor": "#e33131",
+    "navigationBarTitleText": "党员报到",
+    "navigationBarTextStyle": "white"
+}

miniprogram/subpages/checkIn/pages/checkIn/register/register.wxml

@@ -0,0 +1,155 @@
+<!--subpages/checkIn/pages/checkIn/register/register.wxml-->
+<block wx:if="{{informFlag}}">
+    <view class="basic-info">
+        <view class="list-item ">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">姓名</view>
+            </view>
+            <view class="right">
+                <input confirm-type="next" bindblur="bindRealNameInput" bindinput="bindRealNameInput" value="{{form.name}}" placeholder-class="placeholder-style" placeholder="请输入" />
+            </view>
+        </view>
+        <view class="list-item gray ">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">身份证号</view>
+            </view>
+            <view class="right">
+                <input confirm-type="next" bindblur="bindRealIdcardInput" bindinput="bindRealIdcardInput" value="{{form.idCard}}" placeholder-class="placeholder-style" placeholder="请输入" />
+            </view>
+        </view>
+        <view class="list-item ">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">手机号码</view>
+            </view>
+            <view class="right">
+                <input confirm-type="next" bindblur="bindRealMobileInput" bindinput="bindRealMobileInput" value="{{form.mobile}}" placeholder-class="placeholder-style" placeholder="请输入" />
+            </view>
+        </view>
+        <view class="list-item gray">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">报到的常住社区名称</view>
+            </view>
+            <view class="right" bind:tap="handleCLickShow" data-value='0'>
+                    <view class="{{deptName?'picker':'picker gray-font'}}" >{{deptName?deptName:'请选择'}}</view>
+                </view>
+        </view>
+        <view class="list-item ">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">居住小区名称</view>
+            </view>
+            <view class="right">
+                <input confirm-type="next" bindblur="bindHomeNameInput" bindinput="bindHomeNameInput" value="{{form.homeName}}" placeholder-class="placeholder-style" placeholder="请输入" />
+            </view>
+        </view>
+        <view class="list-item gray">
+            <view class="left">
+                <!-- <text class="must">*</text> -->
+                <view class="title">工作单位</view>
+            </view>
+            <view class="right">
+                <input confirm-type="next" bindblur="bindWorkUnitInput" bindinput="bindWorkUnitInput" value="{{form.workUnit}}" placeholder-class="placeholder-style" placeholder="请输入" />
+            </view>
+        </view>
+        <view class="list-item ">
+            <view class="left">
+                <!-- <text class="must">*</text> -->
+                <view class="title">单位性质</view>
+            </view>
+           <view class="right" bind:tap="handleCLickShow" data-value='1'>
+                    <view class="{{form.workType?'picker':'picker gray-font'}}" >{{form.workType?form.workType:'请选择'}}</view>
+                </view>
+        </view>
+
+        <view class="list-item gray">
+            <view class="left">
+                <!-- <text class="must">*</text> -->
+                <view class="title">所属行业</view>
+            </view>
+            <view class="right">
+                <input confirm-type="next" bindblur="bindWorkIndustryInput" bindinput="bindWorkIndustryInput" value="{{form.workIndustry}}" placeholder-class="placeholder-style" placeholder="请输入" />
+            </view>
+        </view>
+
+    </view>
+    <view class="basic-info" >
+        <view class="list-item ">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">是否为中共党员</view>
+            </view>
+            <view class="right">
+                <radio-group class="radio-group" bindchange="bindFlagPartyChange">
+                <radio checked="{{form.party == 1}}" value="1"  class="radio" checked="true">是</radio>
+                <radio checked="{{form.party == 0}}" value="0"  class="radio">否</radio>
+              </radio-group>
+            </view>
+        </view>
+        <view class="list-item gray">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">是否愿意加入红色志愿服务队</view>
+            </view>
+            <view class="right">
+                <radio-group class="radio-group" bindchange="bindFlagVolunteerChange">
+                <radio checked="{{form.volunteer == 1}}" value="1"   checked="true">是</radio>
+                <radio checked="{{form.volunteer == 0}}" value="0"  class="radio">否</radio>
+              </radio-group>
+            </view>
+        </view>
+        <view class="list-item ">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">是否愿意加入红色网格队伍</view>
+            </view>
+            <view class="right">
+                <radio-group class="radio-group" bindchange="bindFlagGridStaffChange">
+                <radio checked="{{form.gridStaff == 1}}" value="1"  class="radio" checked="true">是</radio>
+                <radio checked="{{form.gridStaff == 0}}" value="0"  class="radio">否</radio>
+              </radio-group>
+            </view>
+        </view>
+        <view class="list-item gray" >
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">是否愿意参加业主委员会工作</view>
+            </view>
+            <view class="right">
+                <radio-group class="radio-group" bindchange="bindFlagOwnersChange">
+                <radio checked="{{form.owners == 1}}" value="1"  class="radio" checked="true">是</radio>
+                <radio checked="{{form.owners == 0}}" value="0"  class="radio">否</radio>
+              </radio-group>
+            </view>
+        </view>
+    </view>
+    <view class="bottom_box"></view>
+    <view class="buttom_btn">
+        <button type="warn" plain="true" class="back" bind:tap="handleBack">返回</button>
+        <button type="warn" class="next" disabled="{{look}}" bind:tap="submit">提交</button>
+    </view>
+</block>
+<block wx:else>
+    <view class="card">
+        <view class="title">报到要求</view>
+        <view class="content" style="white-space:pre-wrap"> 凡党组织关系在青岛市市北区机关事业单位的党员干部职工(包含离退休党员干部)，以及其他公职人员，应向长期居住地社区党组织报到。</view>
+        <view class="look">
+            <checkbox-group bindchange="handleCheckbox">
+                <checkbox value="{{look}}" color="#e33131" style="width: 50rpx;height: 50rpx;margin-right: 10rpx;"></checkbox>
+                <text>我已阅读并同意</text>
+            </checkbox-group>
+
+        </view>
+    </view>
+
+
+    <view class="buttom_btn">
+        <button type="warn" plain="true" class="back" bind:tap="handleBack">返回</button>
+        <button type="warn" class="next" disabled="{{look}}" bind:tap="handleNext">下一步</button>
+    </view>
+</block>
+<wux-picker cols="1" data-value="{{pickerValue}}" options="{{selectOption}}" value="{{selectedValuevalue}}" visible="{{selectedStatus}}" controlled bind:confirm="pickerConfirm" bind:cancel="pickerCancel">
+</wux-picker>

miniprogram/subpages/checkIn/pages/checkIn/register/register.wxss

@@ -0,0 +1,109 @@
+/* subpages/checkIn/pages/checkIn/register/register.wxss */
+page {
+    width: 100%;
+    height: auto;
+    overflow-y: auto;
+    background: #f5f5f5;
+    font-family: PingFang SC;
+    font-size: 30rpx;
+}
+.card{
+    background-color: #fff;
+}
+.gray{
+    background-color: #fafafa;
+}
+.gray-font{
+    color:#808080 ;
+    }
+.card .title{
+    height: 100rpx;
+    line-height: 100rpx;
+    text-align: center;
+    border-bottom: 1px solid #e9e9e9;
+}
+.card .content{
+    padding: 30rpx;
+    font-weight: 300;
+}
+.card .look{
+    color: #999999;
+    text-align: center;
+    margin-bottom: 30rpx;
+    display: flex;
+    justify-content: center;
+}
+.card .look checkbox-group {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.buttom_btn{
+    position: fixed;
+    bottom: 0;
+    height: 120rpx;
+    background-color: #fff;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.buttom_btn .back{
+    width: 46%;
+    height: 80rpx;
+    line-height: 80rpx;
+}
+.buttom_btn .next{
+    width: 46%;
+    height: 80rpx;
+    line-height: 80rpx;
+    color: #fff;
+}
+.basic-info {
+    width: 95%;
+    background: #fff;
+    border-radius: 16rpx;
+    box-sizing: border-box;
+    padding: 0 20rpx;
+    margin: 20rpx auto;
+  }
+  .basic-info .list-item {
+    width: 100%;
+    height: 100rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  .basic-info .list-item .left .must {
+    color: #F61616;
+    font-size: 30rpx;
+  }
+  .basic-info .list-item .left .title {
+    color: #333;
+    font-size: 34rpx;
+  }
+  .basic-info .list-item .left {
+    display: flex;
+    align-items: center;
+    height: 100rpx;
+  }
+  .basic-info .list-item .right {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    flex: 1;
+  }
+  .basic-info .list-item .right picker{
+      width: 100rpx;
+  }
+  .basic-info .list-item .right input{
+      text-align: right;
+  }
+  .radio{
+      margin-left: 20rpx;
+  }
+  .bottom_box{
+      height: 120rpx;
+      width: 100%;
+  }

miniprogram/subpages/home/pages/consultation/consultation.js

@@ -1,61 +1,396 @@
 const api = require('../../../../utils/home')
-import { getTimestamp } from '../../../../utils/common'
+import org from '../../images/org'
+import {
+    getTimestamp
+} from '../../../../utils/common'
 Page({
-  data: {
-    pageNo: 1,
-    pageSize: 10,
-    timestamp: getTimestamp(),
-    issueLoadMoreVisible: false,
-    loadMoreType: 'loading',
-    noticeList: []
-  },
-  onLoad() {
-    this.getNoticeList()
-  },
-  onReachBottom() {
-    console.log('加载翻页')
-    this.setData({
-      issueLoadMoreVisible: true
-    })
-    if (this.data.loadMoreType === 'loading') {
-      this.setData({
-        pageNo: this.data.pageNo + 1,
-        pageSize: this.data.pageSize,
-        pageIndex: getTimestamp()
-      })
-      this.getNoticeList()
-    }
+    data: {
+        multiIndex: [0, 0, 0],
+        multiIds: [],
+        newArr: [],
+        multiArray: [ ],
+        pageNo: 1,
+        pageSize: 10,
+        timestamp: getTimestamp(),
+        issueLoadMoreVisible: false,
+        loadMoreType: 'loading',
+        noticeList: [{
+            "category": "微网格长",
+            "name": "郭风霞",
+            "sex": "女",
+            "scope": "四机社区第一网格",
+            "mobile": "13589261795",
+            "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/1.jpg",
+            "community": "四机社区",
+            "grid": "第一网格",
+            "smallGrid": "第一微网格"
+        }, {
+            "category": "党员中心户",
+            "name": "刘桂芳",
+            "sex": "女",
+            "scope": "四机社区第一网格",
+            "mobile": "13589261795",
+            "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/2.jpg",
+            "community": "四机社区",
+            "grid": "第一网格",
+            "smallGrid": "第一微网格"
+        }, {
+            "category": "微网格联络员",
+            "name": "王会霞",
+            "sex": "女",
+            "scope": "四机社区第一网格",
+            "mobile": "13589261795",
+            "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/3.jpg",
+            "community": "四机社区",
+            "grid": "第一网格",
+            "smallGrid": "第一微网格"
+        }, {
+            "category": "社区工作人员",
+            "name": "徐文婷",
+            "sex": "女",
+            "scope": "四机社区第一网格",
+            "mobile": "13589261795",
+            "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/4.jpg",
+            "community": "四机社区",
+            "grid": "第一网格",
+            "smallGrid": "第一微网格"
+        }, {
+            "category": "物业红管家",
+            "name": "刘丽娜",
+            "sex": "女",
+            "scope": "四机社区第一网格",
+            "mobile": "13589261795",
+            "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/5.jpg",
+            "community": "四机社区",
+            "grid": "第一网格",
+            "smallGrid": "第一微网格"
+        }, {
+            "category": "网格帮办员",
+            "name": "宋健伟",
+            "sex": "男",
+            "scope": "四机社区第一网格",
+            "mobile": "13589261795",
+            "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/6.jpg",
+            "community": "四机社区",
+            "grid": "第一网格",
+            "smallGrid": "第一微网格"
+        },]
 
+    },
+    onLoad() {
+        this.getNoticeList()
+        this.setData({
+            multiArray:org[0].data
+        })
+        console.log(this.data.multiArray);
+        let state = {
+            arr: [],
+            arr1: [],
+            arr2: [],
+            arr3: [],
+            multiIds: []
+          }
+          this.data.multiArray.map((v, vk) => {
+            state.arr1.push(v.lable);
+            if (this.data.multiIndex[0] === vk) {
+              state.multiIds[0] = v;
+            }
+            if (state.arr2.length <= 0) {
+              v.children.map((c, ck) => {
+                state.arr2.push(c.lable);
+                if (this.data.multiIndex[1] === ck) {
+                  state.multiIds[1] = c;
+                }
+                if (state.arr3.length <= 0) {
+                  c.children.map((t, tk) => {
+                    state.arr3.push(t.lable);
+                    if (this.data.multiIndex[2] === tk) {
+                      state.multiIds[2] = t;
+                    }
+                  });
+                }
+              });
+            }
+          });
+          state.arr[0] = state.arr1;
+          state.arr[1] = state.arr2;
+          state.arr[2] = state.arr3;
+          this.setData({
+            newArr: state.arr,
+            multiIds: state.multiIds,
+          });
+     
+    },
+    onReachBottom() {
+        console.log('加载翻页')
+        this.setData({
+            issueLoadMoreVisible: true
+        })
+        if (this.data.loadMoreType === 'loading') {
+            this.setData({
+                pageNo: this.data.pageNo + 1,
+                pageSize: this.data.pageSize,
+                pageIndex: getTimestamp()
+            })
+            this.getNoticeList()
+        }
+
+    },
+
+  bindMultiPickerChange(e) {
+    console.log(this.data.multiIds);
+    let diyiweiwangge = [{
+        "category": "微网格长",
+        "name": "郭风霞",
+        "sex": "女",
+        "scope": "四机社区第一网格",
+        "mobile": "13589261795",
+        "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/1.jpg",
+        "community": "四机社区",
+        "grid": "第一网格",
+        "smallGrid": "第一微网格"
+    }, {
+        "category": "党员中心户",
+        "name": "刘桂芳",
+        "sex": "女",
+        "scope": "四机社区第一网格",
+        "mobile": "13589261795",
+        "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/2.jpg",
+        "community": "四机社区",
+        "grid": "第一网格",
+        "smallGrid": "第一微网格"
+    }, {
+        "category": "微网格联络员",
+        "name": "王会霞",
+        "sex": "女",
+        "scope": "四机社区第一网格",
+        "mobile": "13589261795",
+        "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/3.jpg",
+        "community": "四机社区",
+        "grid": "第一网格",
+        "smallGrid": "第一微网格"
+    }, {
+        "category": "社区工作人员",
+        "name": "徐文婷",
+        "sex": "女",
+        "scope": "四机社区第一网格",
+        "mobile": "13589261795",
+        "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/4.jpg",
+        "community": "四机社区",
+        "grid": "第一网格",
+        "smallGrid": "第一微网格"
+    }, {
+        "category": "物业红管家",
+        "name": "刘丽娜",
+        "sex": "女",
+        "scope": "四机社区第一网格",
+        "mobile": "13589261795",
+        "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/5.jpg",
+        "community": "四机社区",
+        "grid": "第一网格",
+        "smallGrid": "第一微网格"
+    }, {
+        "category": "网格帮办员",
+        "name": "宋健伟",
+        "sex": "男",
+        "scope": "四机社区第一网格",
+        "mobile": "13589261795",
+        "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/6.jpg",
+        "community": "四机社区",
+        "grid": "第一网格",
+        "smallGrid": "第一微网格"
+    },]
+    let dierweiwangge = [{
+        "category": "微网格长",
+        "name": "仉桂华",
+        "sex": "女",
+        "scope": "四机社区第一网格",
+        "mobile": "13589261795",
+        "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/7.jpg",
+        "community": "四机社区",
+        "grid": "第一网格",
+        "smallGrid": "第二微网格"
+    }, {
+        "category": "党员中心户",
+        "name": "黄秀茹",
+        "sex": "女",
+        "scope": "四机社区第一网格",
+        "mobile": "13589261795",
+        "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/8.jpg",
+        "community": "四机社区",
+        "grid": "第一网格",
+        "smallGrid": "第二微网格"
+    }, {
+        "category": "微网格联络员",
+        "name": "牟秀玉",
+        "sex": "女",
+        "scope": "四机社区第一网格",
+        "mobile": "13589261795",
+        "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/9.jpg",
+        "community": "四机社区",
+        "grid": "第一网格",
+        "smallGrid": "第二微网格"
+    }, {
+        "category": "网格帮办员",
+        "name": "宋健伟",
+        "sex": "男",
+        "scope": "四机社区第一网格",
+        "mobile": "13589261795",
+        "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/12.jpg",
+        "community": "四机社区",
+        "grid": "第一网格",
+        "smallGrid": "第二微网格"
+    }, ]
+    let disanwangge = [
+        {
+            "category": "微网格长",
+            "name": "袁露霞",
+            "sex": "女",
+            "scope": "四机社区第一网格",
+            "mobile": "13589261795",
+            "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/13.jpg",
+            "community": "四机社区",
+            "grid": "第一网格",
+            "smallGrid": "第三微网格"
+        }, {
+            "category": "党员中心户",
+            "name": "梁秀珍",
+            "sex": "女",
+            "scope": "四机社区第一网格",
+            "mobile": "13589261795",
+            "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/14.jpg",
+            "community": "四机社区",
+            "grid": "第一网格",
+            "smallGrid": "第三微网格"
+        }, {
+            "category": "微网格联络员",
+            "name": "曲江",
+            "sex": "男",
+            "scope": "四机社区第一网格",
+            "mobile": "13589261795",
+            "imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgll/15.jpg",
+            "community": "四机社区",
+            "grid": "第一网格",
+            "smallGrid": "第三微网格"
+        }
+    ]
+    if (this.data.multiIds[1].lable === '四机社区第一网格') {
+        switch (this.data.multiIds[2].lable) {
+          case '第二微网格':
+            this.setData({
+              noticeList: dierweiwangge
+            });
+            break;
+          case '第三微网格':
+            this.setData({
+              noticeList: disanwangge
+            });
+            break;
+          case '第一微网格':
+            this.setData({
+              noticeList: diyiweiwangge
+            });
+            break;
+          default:
+            this.setData({
+              noticeList: []
+            });
+            break;
+        }
+      } else {
+        this.setData({
+          noticeList: []
+        });
+      }
+  
+  
   },
-  to_call: function (e) {
-    console.log('e', e.currentTarget.dataset.phone)
-    wx.makePhoneCall({
-      phoneNumber: e.currentTarget.dataset.phone
-    })
-  },
-  // 加载网格长管辖的网格列表
-  getNoticeList() {
-    let that = this
-    let para = {
-      pageIndex: this.data.pageNo,
-      pageSize: this.data.pageSize,
-      timestamp: getTimestamp()
+  bindMultiPickerColumnChange(e) {
+    let data = {
+      newArr: this.data.newArr,
+      multiIndex: this.data.multiIndex,
+      multiIds: this.data.multiIds,
+    };
+    data.multiIndex[e.detail.column] = e.detail.value;
+ 
+    let searchColumn = () => {
+      let arr1 = [];
+      let arr2 = [];
+      this.data.multiArray.map((v, vk) => {
+        if (data.multiIndex[0] === vk) {
+          data.multiIds[0] = {
+            ...v,
+          };
+          v.children.map((c, ck) => {
+            arr1.push(c.lable);
+            if (data.multiIndex[1] === ck) {
+              data.multiIds[1] = {
+                ...c,
+              };
+              c.children.map((t, vt) => {
+                arr2.push(t.lable);
+                if (data.multiIndex[2] === vt) {
+                  data.multiIds[2] = {
+                    ...t,
+                  };
+                }
+              });
+            }
+          });
+        }
+      });
+      data.newArr[1] = arr1;
+      data.newArr[2] = arr2;
+    };
+    switch (e.detail.column) {
+      case 0:
+        // 每次切换还原初始值
+        data.multiIndex[1] = 0;
+        data.multiIndex[2] = 0;
+        // 执行函数处理
+        searchColumn();
+        break;
+      case 1:
+        data.multiIndex[2] = 0;
+        searchColumn();
+        break;
+      case 2:
+        searchColumn();
+        break;
+ 
     }
-    api.getConsultion(para).then(res => {
-      that.setData({
-        noticeList: that.data.noticeList.concat(res.data),
-        loadMoreType: res.data.length === 10 ? 'loading' : 'none'
-      })
-    }).catch(err => {
-      console.log(err)
-      that.setData({
-        preloadVisible: false,
-        loadMoreType: 'none'
-      })
-    })
+    this.setData(data);
   },
-  // toDetail (e) {
-  //   console.log(e.currentTarget.dataset.id)
-  //   wx.navigateTo({ url: '/subpages/home/pages/noticeDetail/noticeDetail?id='+e.currentTarget.dataset.id })
-  // }
+
+    to_call: function (e) {
+        console.log('e', e.currentTarget.dataset.phone)
+        wx.makePhoneCall({
+            phoneNumber: e.currentTarget.dataset.phone
+        })
+    },
+    // 加载网格长管辖的网格列表
+    getNoticeList() {
+        let that = this
+        let para = {
+            pageIndex: this.data.pageNo,
+            pageSize: this.data.pageSize,
+            timestamp: getTimestamp()
+        }
+        api.getConsultion(para).then(res => {
+            that.setData({
+                noticeList: that.data.noticeList.concat(res.data),
+                loadMoreType: res.data.length === 10 ? 'loading' : 'none'
+            })
+        }).catch(err => {
+            console.log(err)
+            that.setData({
+                preloadVisible: false,
+                loadMoreType: 'none'
+            })
+        })
+    },
+    // toDetail (e) {
+    //   console.log(e.currentTarget.dataset.id)
+    //   wx.navigateTo({ url: '/subpages/home/pages/noticeDetail/noticeDetail?id='+e.currentTarget.dataset.id })
+    // }
 })

miniprogram/subpages/home/pages/consultation/consultation.json

@@ -2,5 +2,7 @@
   "usingComponents": {
     "load-more": "../../../../components/loadMore/loadMore"
   },
-  "navigationBarTitleText": "网格专员"
+  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#e33131",
+  "navigationBarTitleText": "网格力量"
 }

miniprogram/subpages/home/pages/consultation/consultation.wxml

@@ -1,30 +1,43 @@
 <view class="notice">
+    <view>
+  <picker mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange"
+    value="{{multiIndex}}" range="{{newArr}}">
+    <view class="picker">
+      <van-button type="primary">
+        {{newArr[0][multiIndex[0]]}}，{{newArr[1][multiIndex[1]]}}
+        ，{{newArr[2][multiIndex[2]]}}
+    </van-button>
+        <image src="../../images/down.png" style="width: 24rpx;height: 24rpx;" mode=""/>
+    </view>
+  </picker>
+</view>
   <view class="content">
     <view class="notice-list">
-      <view class="list-item" wx:if="{{noticeList.length>0}}" wx:for="{{noticeList}}" data-id="{{item.id}}" bindtap="toDetail">
+      <view class="list-item"   wx:if="{{noticeList.length>0}}" wx:for="{{noticeList}}"  bindtap="toDetail">
         <view class="title">
           <view class="proleft">
-            <image class="image" src="{{item.faceImg}}" />
+            <image class="image" src="{{item.imgUrl}}" />
           </view>
           <view class="proright">
-            <view class="tit">{{item.dutyCategoryName}}</view>
-            <view class="name">{{item.realName}} I {{item.sex == '0' ? '女' : item.sex === '1' ? '男' : ''}}</view>
-            <view class="add">{{item.workUnit}}</view>
+            <view class="tit">{{item.category}}</view>
+            <view class="name">{{item.name}} I {{item.sex}}</view>
+            <view class="add">{{item.scope}} I {{item.smallGrid}}</view>
             <view class="tel">
               <text>{{item.mobile}}</text>
               <image src="../../images/call.jpg" data-phone="{{item.mobile}}" bindtap='to_call' />
             </view>
           </view>
         </view>
-        <view class="tip">{{item.remark}}</view>
+        <!-- <view class="tip">{{item.remark}}</view> -->
       </view>
       <view wx:if="{{noticeList.length==0}}">
       <view class="nodata">
       <image src="../../images/nodata.png" mode="widthFix"/>
       </view>
-      <view class="nodatatxt">敬请期待~</view>
+      <view class="nodatatxt">暂无数据~</view>
       </view>
     </view>
+
     <load-more loadMoreVisible="{{issueLoadMoreVisible}}" loadMoreType="{{loadMoreType}}"></load-more>
   </view>
 </view>

miniprogram/subpages/home/pages/consultation/consultation.wxss

@@ -113,4 +113,16 @@
 }
 .time {
   margin-left: 18rpx;
+}
+.picker{
+    border: 2rpx solid #e33131;
+    border-radius: 100rpx;
+    box-sizing: border-box;
+    line-height: 50rpx;
+    font-size: 26rpx;
+    width: 650rpx;
+    height: 50rpx;
+    color: #e33131;
+    text-align: center;
+    margin: 20rpx auto 0;
 }

miniprogram/subpages/knight/pages/knight/brief/brief.js

@@ -0,0 +1,90 @@
+// subpages/knight/pages/knight/brief/brief.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        look:true,
+        informFlag:false
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+    handleCheckbox(e){
+        console.log(e);
+        if(e.detail .value.length!=0){
+            this.setData({
+                look:false
+            })
+        }else{
+            this.setData({
+                look:true
+            })
+        }
+    },
+    handleBack(){
+        wx.navigateBack({
+            delta: 1
+        })
+    },
+    handleNext(){
+        console.log('11233');
+       this.setData({
+        informFlag:true
+       })
+    }
+})

miniprogram/subpages/knight/pages/knight/brief/brief.json

@@ -0,0 +1,5 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "驿站简介",
+    "navigationBarBackgroundColor": "#e33131"
+}

miniprogram/subpages/knight/pages/knight/brief/brief.wxml

@@ -0,0 +1,28 @@
+<!--subpages/knight/pages/knight/brief/brief.wxml-->
+<block wx:if="{{informFlag}}">
+   
+    <!-- <view class="buttom_btn">
+        <button type="warn" plain="true" class="back" bind:tap="handleBack">返回</button>
+        <button type="warn" class="next"  bind:tap="handleNext">骑士导航</button>
+    </view> -->
+</block>
+<block wx:else>
+    <view class="card">
+        <!-- <view class="title">入党须知</view> -->
+        <view class="content" style="white-space:pre-wrap">      “新锋驿站”是面向全区快递小哥、外卖骑手、网约车司机等新就业群体打造的“累了能歇脚、渴了能喝水、饭凉能加热、心烦能倾诉、闲时能充电”的“温暖避风港”。
+      “新锋驿站”原则上实行全天候开放，均设在一楼以及临街位置，配备可供休息就餐的桌椅、烧水壶(饮水机)、微波炉、报刊书籍、无线网络、应急药品、充电充气工具等基本设施，有条件的还配备有冰箱、沙发、诸物柜、维修工具箱、电视机、爱心捐赠柜等设备，可就近解决如厕问题。
+      “新锋驿站”免费为外卖、快递等新就业群体提供学习休息、纳凉取暖、饮水充电、饭菜加热、政策咨询等基础服务，后期还将探索引入社会力量拓展职业指导、法律援助等专业服务，创新“青年联谊”“联系帮扶”“新锋相亲会”等特色服务项目，搭建婚恋、交友平台，开展送心理疏导、送技能提升、送权益维护等活动，号召新就业群体常“回家”看看，通过小小驿站筑起暖“新”港湾。</view>
+        <!-- <view class="look">
+            <checkbox-group bindchange="handleCheckbox">
+                <checkbox value="{{look}}" color="#e33131" style="width: 50rpx;height: 50rpx;margin-right: 10rpx;"></checkbox>
+                <text>我已阅读并同意</text>
+            </checkbox-group>
+
+        </view> -->
+    </view>
+
+
+    <view class="buttom_btn">
+        <button type="warn" class="next1"  bind:tap="handleNext">驿站地图</button>
+    </view>
+</block>

miniprogram/subpages/knight/pages/knight/brief/brief.wxss

@@ -0,0 +1,64 @@
+/* subpages/knight/pages/knight/brief/brief.wxss */
+page {
+    width: 100%;
+    height: auto;
+    overflow-y: auto;
+    background: #f5f5f5;
+    font-family: PingFang SC;
+    margin: 0 auto;
+}
+.gray{
+    background-color: #fafafa;
+}
+.card{
+    background-color: #fff;
+}
+.card .title{
+    height: 100rpx;
+    line-height: 100rpx;
+    text-align: center;
+    border-bottom: 1px solid #e9e9e9;
+}
+.card .content{
+    padding: 30rpx;
+    font-weight: 300;
+}
+.card .look{
+    color: #999999;
+    text-align: center;
+    margin-bottom: 30rpx;
+    display: flex;
+    justify-content: center;
+}
+.card .look checkbox-group {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.buttom_btn{
+    position: fixed;
+    bottom: 0;
+    height: 120rpx;
+    background-color: #fff;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.buttom_btn .back{
+    width: 46%;
+    height: 80rpx;
+    line-height: 80rpx;
+}
+.buttom_btn .next{
+    width: 46%;
+    height: 80rpx;
+    line-height: 80rpx;
+    color: #fff;
+}
+.buttom_btn .next1{
+    width: 98%;
+    height: 80rpx;
+    line-height: 80rpx;
+    color: #fff;
+}

miniprogram/subpages/knight/pages/knight/commonts/stageMap/index.js

@@ -0,0 +1,463 @@
+// subpages/knight/commonts/stageMap/index.js
+const QQMapWX = require('../../utils/qqmap-wx-jssdk')
+Page({
+
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		qqMapWX: null,
+		mapCtx: null,
+		personalInfo: {
+			longitude: 120.34943,
+			latitude: 36.06598
+		},
+		markers: [{
+			id: 0,
+			stageName: "昌乐路社区第一二三网格党群服务站",
+			stageDescription: "本驿站位于昌邑路15号3号楼1层，所属大港街道。提供乘凉取暖、饮水、充电、雨具、急救医疗箱、志愿报名服务、服务，并提供心理咨询、智慧社区、安全培训等个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：姜华\n联系电话：13275328721.0\n地址：青岛市市北区昌邑路15号3号楼1层",
+			latitude: 36.06598,
+			longitude: 120.34943,
+			width: 28,
+			height: 34,
+			label: {
+				content: '昌乐路社区第一二三网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 1,
+			stageName: "冠县路社区党群服务中心",
+			stageDescription: "本驿站位于邱县路13号甲，所属即墨路街道。提供乘凉取暖、饮水、充电、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供政策咨询、政务代办个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：张振焕\n联系电话：13687698559.0\n地址：青岛市市北区邱县路13号甲",
+			latitude: 36.07768,
+			longitude: 120.31743,
+			width: 28,
+			height: 34,
+			label: {
+				content: '冠县路社区党群服务中心',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 2,
+			stageName: "大连路户外劳动者驿站",
+			stageDescription: "本驿站位于大连路22号，所属辽宁路街道。提供乘凉取暖、饮水、充电、饭菜加热、服务，并提供图书阅览、冰吧个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：鄢龙\n联系电话：18678957896.0\n地址：青岛市市北区大连路22号",
+			latitude: 36.07643,
+			longitude: 120.33541,
+			width: 28,
+			height: 34,
+			label: {
+				content: '大连路户外劳动者驿站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 3,
+			stageName: "平安路社区第三网格党群服务站",
+			stageDescription: "本驿站位于温州路30号，所属兴隆路街道。提供乘凉取暖、饮水、充电、免费上网、志愿报名服务、服务，并提供为快递人员提供休息、饮水场所个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：张林芳\n联系电话：18661736637.0\n地址：青岛市市北区温州路30号",
+			latitude: 36.10151,
+			longitude: 120.35538,
+			width: 28,
+			height: 34,
+			label: {
+				content: '平安路社区第三网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 4,
+			stageName: "延安一路社区第六网格党群服务站",
+			stageDescription: "本驿站位于延安一路13号，所属延安路街道。提供乘凉取暖、饮水、充电、急救医疗箱、志愿报名服务、服务，并提供政务代办、法律援助、子女托管个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：张英英\n联系电话：15066833216.0\n地址：青岛市市北区延安一路13号",
+			latitude: 36.07571,
+			longitude: 120.34793,
+			width: 28,
+			height: 34,
+			label: {
+				content: '延安一路社区第六网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 5,
+			stageName: "滨海社区第三网格党群服务站",
+			stageDescription: "本驿站位于瑞湖路昌茂路交界，所属湖岛街道。提供乘凉取暖、饮水、充电、饭菜加热、雨具、急救医疗箱、志愿报名服务、服务，并提供维修服务、政务代办等个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：兰辉青\n联系电话：13156485567.0\n地址：青岛市市北区瑞湖路昌茂路交界",
+			latitude: 36.08743,
+			longitude: 120.37479,
+			width: 28,
+			height: 34,
+			label: {
+				content: '滨海社区第三网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 6,
+			stageName: "瑞安路社区第三网格党群服务站",
+			stageDescription: "本驿站位于瑞昌路185号，所属街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供公益活动、法律援助、政务代办等个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：焦学雯\n联系电话：18669753726.0\n地址：青岛市市北区瑞昌路185号",
+			latitude: 36.123859,
+			longitude: 120.353912,
+			width: 28,
+			height: 34,
+			label: {
+				content: '瑞安路社区第三网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 7,
+			stageName: "丰盛路社区第一网格党群服务站",
+			stageDescription: "本驿站位于郭口东路临字46号，所属登州路街道。提供乘凉取暖、饮水、充电、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：朱培军\n联系电话：13792831116.0\n地址：青岛市市北区郭口东路临字46号",
+			latitude: 36.079002,
+			longitude: 120.3573,
+			width: 28,
+			height: 34,
+			label: {
+				content: '丰盛路社区第一网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 8,
+			stageName: "金沙路社区第五网格党群服务站",
+			stageDescription: "本驿站位于金华支路12号，所属水清沟街道。提供乘凉取暖、饮水、充电、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：王立波\n联系电话：15269295139.0\n地址：青岛市市北区金华支路12号",
+			latitude: 36.13233,
+			longitude: 120.36569,
+			width: 28,
+			height: 34,
+			label: {
+				content: '金沙路社区第五网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 9,
+			stageName: "台东街道红色里院",
+			stageDescription: "本驿站位于台东五路4号，所属台东街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供可提供子女托管、政务代办、科普教育、养老助老等个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：霍云霞\n联系电话：18562628699.0\n地址：青岛市市北区台东五路4号",
+			latitude: 36.08606,
+			longitude: 120.35271,
+			width: 28,
+			height: 34,
+			label: {
+				content: '台东街道红色里院',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 10,
+			stageName: "新华里社区第一网格党群服务站",
+			stageDescription: "本驿站位于威海路245号，所属街道。提供乘凉取暖、饮水、充电、饭菜加热、急救医疗箱、服务，并提供可提供帮办代办等个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：娄淑琴\n联系电话：13370889622.0\n地址：青岛市市北区威海路245号",
+			latitude: 36.08786,
+			longitude: 120.35794,
+			width: 28,
+			height: 34,
+			label: {
+				content: '新华里社区第一网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 11,
+			stageName: "新华里社区第六网格党群服务站",
+			stageDescription: "本驿站位于通化路5号，所属街道。提供乘凉取暖、饮水、充电、服务，并提供可提供帮办代办、象棋指导、理论学习等个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：孙淑青\n联系电话：13176519850.0\n地址：青岛市市北区通化路5号",
+			latitude: 36.08498,
+			longitude: 120.35864,
+			width: 28,
+			height: 34,
+			label: {
+				content: '新华里社区第六网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 12,
+			stageName: "南山社区第一二网格党群服务站",
+			stageDescription: "本驿站位于鞍山一路33号-6，所属阜新路街道。提供乘凉取暖、饮水、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：于凤\n联系电话：18905323597.0\n地址：青岛市市北区鞍山一路33号-6",
+			latitude: 36.10197,
+			longitude: 120.36439,
+			width: 28,
+			height: 34,
+			label: {
+				content: '南山社区第一二网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 13,
+			stageName: "北岭社区第四网格党群服务站",
+			stageDescription: "本驿站位于金华路31-59号网点，所属四方街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供可提供子女托管、心理咨询、法律援助等个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：是\n联系人：孙艳颖\n联系电话：13355321039.0\n地址：青岛市市北区金华路31-59号网点",
+			latitude: 36.129875,
+			longitude: 120.361551,
+			width: 28,
+			height: 34,
+			label: {
+				content: '北岭社区第四网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 14,
+			stageName: "鲁阳路社区第四五六网格党群服务站",
+			stageDescription: "本驿站位于四流南路70号，所属开平路街道。提供乘凉取暖、饮水、充电、饭菜加热、急救医疗箱、服务，并提供图书阅读个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：刘娟\n联系电话：18753260085.0\n地址：青岛市市北区四流南路70号",
+			latitude: 36.14347,
+			longitude: 120.37615,
+			width: 28,
+			height: 34,
+			label: {
+				content: '鲁阳路社区第四五六网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 15,
+			stageName: "仲家洼社区党群服务中心",
+			stageDescription: "本驿站位于西仲路26号，所属宁夏路街道。提供乘凉取暖、饮水、充电、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供提供心理个案服务、法律援助、政务代办等服务个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：孙慧卿\n联系电话：13061403169.0\n地址：青岛市市北区西仲路26号",
+			latitude: 36.07899,
+			longitude: 120.36369,
+			width: 28,
+			height: 34,
+			label: {
+				content: '仲家洼社区党群服务中心',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 16,
+			stageName: "海泊河社区党群服务中心",
+			stageDescription: "本驿站位于市北区鞍山路136号，所属镇江路街道。提供乘凉取暖、饮水、充电、免费上网、雨具、志愿报名服务、服务，并提供可提供读书学习、社会服务实践、文艺活动场地等个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：邵静\n联系电话：13361266916.0\n地址：青岛市市北区市北区鞍山路136号",
+			latitude: 36.09411,
+			longitude: 120.36334,
+			width: 28,
+			height: 34,
+			label: {
+				content: '海泊河社区党群服务中心',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 17,
+			stageName: "南昌路社区第一至六网格党群服务站",
+			stageDescription: "本驿站位于南昌路8号，所属海伦路街道。提供乘凉取暖、饮水、充电、急救医疗箱、志愿报名服务、服务，并提供政务代办个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：王金峰\n联系电话：13969887046.0\n地址：青岛市市北区南昌路8号",
+			latitude: 36.11164,
+			longitude: 120.36861,
+			width: 28,
+			height: 34,
+			label: {
+				content: '南昌路社区第一至六网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 18,
+			stageName: "金坛路社区第四网格党群服务站",
+			stageDescription: "本驿站位于延吉路73号，所属敦化路街道。提供乘凉取暖、饮水、充电、雨具、服务，并提供心理咨询、法律援助个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：赵荃\n联系电话：19953261893.0\n地址：青岛市市北区延吉路73号",
+			latitude: 36.08645,
+			longitude: 120.37079,
+			width: 28,
+			height: 34,
+			label: {
+				content: '金坛路社区第四网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 19,
+			stageName: "伊春路社区党群服务中心",
+			stageDescription: "本驿站位于通榆路46号，所属街道。提供乘凉取暖、饭菜加热、免费上网、雨具、志愿报名服务、服务，并提供心理咨询、法律援助、政务代办等个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：是\n联系人：王峰\n联系电话：19953261965.0\n地址：青岛市市北区通榆路46号",
+			latitude: 36.10115,
+			longitude: 120.38311,
+			width: 28,
+			height: 34,
+			label: {
+				content: '伊春路社区党群服务中心',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 20,
+			stageName: "双山社区党群服务中心",
+			stageDescription: "本驿站位于台柳路276号甲23-25网点，所属双山街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供法律援助、临时救助等个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：杨露璐\n联系电话：13235327752.0\n地址：青岛市市北区台柳路276号甲23-25网点",
+			latitude: 36.116462,
+			longitude: 120.392981,
+			width: 28,
+			height: 34,
+			label: {
+				content: '双山社区党群服务中心',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 21,
+			stageName: "双山街道党建红盟",
+			stageDescription: "本驿站位于哈尔滨路88号保利广场2号门，所属街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-21:00 周末、节假日是否开放：是\n联系人：史静\n联系电话：18953280502.0\n地址：青岛市市北区哈尔滨路88号保利广场2号门",
+			latitude: 36.109757,
+			longitude: 120.390814,
+			width: 28,
+			height: 34,
+			label: {
+				content: '双山街道党建红盟',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 22,
+			stageName: "双山社区党群服务中心",
+			stageDescription: "本驿站位于台柳路196号和达新都汇，所属街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：杨露璐\n联系电话：13235327754.0\n地址：青岛市市北区台柳路196号和达新都汇",
+			latitude: 36.109241,
+			longitude: 120.387253,
+			width: 28,
+			height: 34,
+			label: {
+				content: '双山社区党群服务中心',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 23,
+			stageName: "郑州路社区党群服务中心",
+			stageDescription: "本驿站位于郑州路6号，所属洛阳路街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供可提供子女托管、心理咨询、法律援助、政务代办等个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：王艳芳\n联系电话：13668889197.0\n地址：青岛市市北区郑州路6号",
+			latitude: 36.14116,
+			longitude: 120.39985,
+			width: 28,
+			height: 34,
+			label: {
+				content: '郑州路社区党群服务中心',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 24,
+			stageName: "辽阳西路社区第二网格党群服务站",
+			stageDescription: "本驿站位于永吉路47号，所属辽源路街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供纠纷调解、法律援助个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：郑菊花\n联系电话：13665427627.0\n地址：青岛市市北区永吉路47号",
+			latitude: 36.095203,
+			longitude: 120.395744,
+			width: 28,
+			height: 34,
+			label: {
+				content: '辽阳西路社区第二网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 25,
+			stageName: "南京路社区第四网格党群服务站",
+			stageDescription: "本驿站位于东胜路10号，所属街道。提供乘凉取暖、饮水、充电、免费上网、志愿报名服务、服务，并提供子女托管个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：郭彦瑛\n联系电话：15820035585.0\n地址：青岛市市北区东胜路10号",
+			latitude: 36.09999,
+			longitude: 120.38782,
+			width: 28,
+			height: 34,
+			label: {
+				content: '南京路社区第四网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 26,
+			stageName: "长沙路社区第三网格党群服务站",
+			stageDescription: "本驿站位于长沙路33号，所属河西街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：是\n联系人：王桂民\n联系电话：13687627879.0\n地址：青岛市市北区长沙路33号",
+			latitude: 36.12667,
+			longitude: 120.39548,
+			width: 28,
+			height: 34,
+			label: {
+				content: '长沙路社区第三网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 27,
+			stageName: "同德路社区党群服务中心",
+			stageDescription: "本驿站位于合肥路280号，所属合肥路街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供社区有对外开放的大食堂，为辖区居民提供餐食个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：孙玲\n联系电话：13665320026.0\n地址：青岛市市北区合肥路280号",
+			latitude: 36.112544,
+			longitude: 120.404553,
+			width: 28,
+			height: 34,
+			label: {
+				content: '同德路社区党群服务中心',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}, {
+			id: 28,
+			stageName: "同安路社区第二网格党群服务站",
+			stageDescription: "本驿站位于同兴路621号 西侧，所属浮山新区街道。提供乘凉取暖、饮水、充电、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-17:30 周末、节假日是否开放：否\n联系人：毕君华\n联系电话：15288987327.0\n地址：青岛市市北区同兴路621号 西侧",
+			latitude: 36.10219,
+			longitude: 120.41981,
+			width: 28,
+			height: 34,
+			label: {
+				content: '同安路社区第二网格党群服务站',
+				color: '#f00',
+				textAlign: 'center'
+			}
+		}],
+	},
+
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad(options) {
+		this.data.qqMapWX = new QQMapWX({
+			key: 'LSOBZ-5CEE3-37U3I-36BMA-3HXTZ-ULBTM'
+		})
+		this.mapCtx = wx.createMapContext('Map')
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload() {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh() {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom() {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage() {
+
+	},
+	back() {
+		wx.redirectTo({
+			url: "/subpages/knight/pages/knight/stageMap/index"
+		})
+	},
+	markerTap(e) {
+		wx.redirectTo({
+			url: `/subpages/knight/pages/knight/stageMap/index?mapId=${e.markerId}`
+		})
+	}
+})

miniprogram/subpages/knight/pages/knight/commonts/stageMap/index.json

@@ -0,0 +1,8 @@
+{
+	"usingComponents": {
+		"wux-picker": "../../../../../../dist/picker/index"
+
+	},
+	"navigationBarBackgroundColor": "#e33131",
+	"navigationBarTitleText": "骑士地图"
+}

miniprogram/subpages/knight/pages/knight/commonts/stageMap/index.wxml

@@ -0,0 +1,9 @@
+<view class="stageMap">
+	<view class="mapBox" >
+		<map id="Map" bindmarkertap="markerTap" longitude="{{personalInfo['longitude']}}" latitude="{{personalInfo['latitude']}}"  markers="{{markers}}" scale="12" class="Map" subkey="LSOBZ-5CEE3-37U3I-36BMA-3HXTZ-ULBTM"/>
+	</view>
+</view>
+<view class="typeOneButton">
+<view class="typeOneButtonOne" bindtap="back">返回</view>
+<view class="typeOneButtonTwo" bindtap="back">确定</view>
+</view>

miniprogram/subpages/knight/pages/knight/commonts/stageMap/index.wxss

@@ -0,0 +1,39 @@
+page {
+	height: 100%;
+	width: 100%;
+	overflow: hidden;
+}
+
+.Map {
+	height: 100%;
+	width: 100%;
+}
+
+.mapBox {
+	background-color: #fff;
+	width: calc(100% - 12rpx);
+	height: 90vh;
+	padding: 12rpx;
+}
+
+.typeOneButton {
+	background-color: #fff;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	height: 130rpx;
+}
+
+.typeOneButtonOne {
+	border-radius: 6rpx;
+	color: #E82C19;
+	border: 1rpx solid #E82C19;
+	padding: 16rpx 130rpx;
+}
+
+.typeOneButtonTwo {
+	border-radius: 6rpx;
+	color: #fff;
+	background-color: #E82C19;
+	padding: 16rpx 130rpx;
+}

miniprogram/subpages/knight/pages/knight/knight.json

@@ -1,5 +1,5 @@
 {
-    "navigationBarTitleText": "骑士驿站",
+    "navigationBarTitleText": "新锋驿站",
     "navigationStyle": "custom",
     "navigationBarTextStyle": "white",
     "enablePullDownRefresh": true,

miniprogram/subpages/knight/pages/knight/knight.wxml

@@ -2,24 +2,24 @@
      <image src="../../images/back2.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
     <image class="header-bg" src="../../images/bg.png" mode="widthFix" />
     <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
-        骑士驿站
+        新锋驿站
     </view>
 </view>
 <view class="mtf80">
     <view class="list">
-        <view class="item color01">
+        <navigator class="item color01" url="/subpages/knight/pages/knight/brief/brief">
             <image src="../../images/01.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">驿站简介</view>
                 <view class="h2">
-                    “骑士驿站”是面向全区外卖、快递···
+                    “新锋驿站”是面向全区外卖、快递···
                 </view>
             </view>
             <view class="vcenter w20">
                 <image src="../../images/01r.png"  class="go"></image>
             </view>
-        </view>
-        <view class="item color02">
+        </navigator>
+        <navigator class="item color02" url="/subpages/knight/pages/knight/stageMap/index">
             <image src="../../images/02.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">驿站地图</view>
@@ -30,8 +30,8 @@
             <view class="vcenter w20">
                 <image src="../../images/02r.png"  class="go"></image>
             </view>
-        </view>
-        <view class="item color03">
+        </navigator>
+        <!-- <view class="item color03">
             <image src="../../images/03.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">骑士注册</view>
@@ -42,20 +42,20 @@
             <view class="vcenter w20">
                 <image src="../../images/03r.png"  class="go"></image>
             </view>
-        </view>
-        <view class="item color04">
+        </view> -->
+        <navigator class="item color04" url="/subpages/knight/pages/knight/observeResi/observeResi">
             <image src="../../images/04.png" class="icon"></image>
             <view class="vcenter flex1">
-                <view class="h1">骑先锋</view>
+                <view class="h1">城市观察员</view>
                 <view class="h2">
-                    申请加入网格力量。
+                    城市管理齐出力,优美环境共受益。
                 </view>
             </view>
             <view class="vcenter w20">
                 <image src="../../images/04r.png"  class="go"></image>
             </view>
-        </view>
-        <view class="item color05">
+        </navigator>
+        <!-- <view class="item color05">
             <image src="../../images/05.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">骑士上报</view>
@@ -66,8 +66,8 @@
             <view class="vcenter w20">
                 <image src="../../images/05r.png"  class="go"></image>
             </view>
-        </view>
-        <view class="item color06">
+        </view> -->
+        <!-- <view class="item color06">
             <image src="../../images/06.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">关爱行动</view>
@@ -78,6 +78,6 @@
             <view class="vcenter w20">
                 <image src="../../images/06r.png"  class="go"></image>
             </view>
-        </view>
+        </view> -->
     </view>
 </view>

miniprogram/subpages/knight/pages/knight/observeResi/observeResi.js

@@ -0,0 +1,263 @@
+// subpages/knight/pages/knight/observeResi/observeResi.js
+const api = require('../../../../../utils/partApi')
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        selectedListH: [],
+        selectedValueGlabel:'',
+        pickerValue:'',
+        selectedStatusH:false,
+        selectedValueHvalue:'',
+        selectedValueHlabel:'',
+        look:true,
+        informFlag:false,
+        orgOptions:[],
+        form:{
+            name:'',
+            idCard:'',
+            mobile:'',
+            party:'',
+            allDeptIds:[],
+            courier:'',
+            workUnit:'',
+        }
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+       
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        this.getByLoginUser()
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+       
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+    showToast (title) {
+        wx.showToast({
+          title: title,
+          icon: 'none',
+          duration: 2000
+        })
+      },
+    getByLoginUser(){
+       
+        api.getByLoginUser().then(res=>{
+            if (res.code !== 0) {
+                return this.$message.error(res.msg)
+              }
+              let arr = res.data.options[0].children.filter((item)=>(item.children))
+              this.setData({
+                orgOptions : arr
+              })
+        })
+    },
+       //姓名双向绑定
+       bindRealNameInput (e) {
+        this.setData({
+          'form.name': e.detail.value
+        })
+        console.log(this.data.form)
+      },
+      //身份证双向绑定
+      bindRealIdcardInput (e) {
+        this.setData({
+          'form.idCard': e.detail.value
+        })
+        console.log(this.data.form)
+      },
+    //手机号双向绑定
+    bindRealMobileInput (e) {
+        this.setData({
+        'form.mobile': e.detail.value
+        })
+        console.log(this.data.form)
+    },
+    bindRealWorkUnitInput (e) {
+        this.setData({
+        'form.workUnit': e.detail.value
+        })
+        console.log(this.data.form)
+    },
+    handleCLickH (e) {
+        console.log(e);
+        this.setData({
+            pickerValue:e.currentTarget.dataset.value
+        })
+        this.setData({
+            selectedStatusH: true
+        });
+        if(e.currentTarget.dataset.value == '0'){
+            this.setData({
+                selectedListH:  [{label:'直播电商',value:'0'}, {label:'网约车司机',value:'1'}, {label:'外卖配送人员',value:'2'}, {label:'快递小哥',value:'3'} , {label:'道路运输行业',value:'4'},{label:'其他',value:'5'}]
+            })
+        }else if(e.currentTarget.dataset.value == '1'){
+            this.setData({
+                selectedListH: this.data.orgOptions
+            })
+        }else if(e.currentTarget.dataset.value == '2'){
+            this.setData({
+                selectedListH:  [{label:'是',value:'1'},{label:'否',value:'0'}]
+            })
+        }
+     
+    },
+    //下拉提交
+    pickerConfirmH (e) {
+        console.log(e);
+        if(e.currentTarget.dataset.value == '0'){
+            this.setData({
+                ['form.courier']: e.detail.selectedValue[0],
+                selectedValueHlabel: e.detail.label,
+                selectedStatusH: false
+            });
+        } else if(e.currentTarget.dataset.value == '1'){
+            this.setData({
+                ['form.allDeptIds']: ['1175270520603930625',e.detail.selectedValue[0]],
+                selectedValueGlabel:e.detail.label,
+                selectedStatusH: false
+            });
+        }  else if(e.currentTarget.dataset.value == '2'){
+            this.setData({
+                ['form.party']: e.detail.selectedValue[0],
+                selectedStatusH: false
+            });
+        }
+     
+    },
+    submit(){
+        if (!this.data.form.name) {
+            this.showToast('请输入姓名')
+            return false
+        } 
+        if (!this.data.form.idCard) {
+          this.showToast('请填写身份证号')
+          return false
+        }
+        if (!this.data.form.mobile) {
+          this.showToast('请填写手机号')
+          return false
+        }
+        if (!this.data.form.party) {
+          this.showToast('请选择是否为中共党员')
+          return false
+        } 
+        if (!this.data.form.allDeptIds) {
+          this.showToast('请选择服务网格所属社区')
+          return false
+        }
+        if (!this.data.form.workUnit) {
+          this.showToast('请填写现工作单位')
+          return false
+        }
+      
+        const para = {
+        ...this.data.form
+        }
+        para.party = parseInt(para.party) 
+        para.courier = parseInt(para.courier) 
+
+        wx.showLoading({
+          title: "提交中..."
+        })
+        console.log(para);
+     
+      api.submitKnightpionner(para).then(res=>{
+          wx.hideLoading()
+          wx.showLoading({
+            title: '信息提交成功',
+            content: res.data.msg,
+            success: () => {
+                wx.reLaunch({
+                  url: "/pages/index/index"
+                })
+              }
+          })
+      }).catch(err=>{
+          wx.hideLoading()
+          console.log(err);
+      })      
+    },
+    pickerCancelH () {
+        this.setData({
+            selectedStatusH: false
+        });
+    },
+    onPickerChange (event) {
+        const selectedIndex = event.detail.value;
+        const selectedValue = ['是', '否'][selectedIndex];
+        this.setData({
+          selectedValue: selectedValue
+        });
+      },
+    handleCheckbox(e){
+        console.log(e);
+        if(e.detail .value.length!=0){
+            this.setData({
+                look:false
+            })
+        }else{
+            this.setData({
+                look:true
+            })
+        }
+    },
+    handleBack(){
+        wx.navigateBack({
+            delta: 1
+        })
+    },
+    handleNext(){
+       this.setData({
+        informFlag:true
+       })
+    }
+})

miniprogram/subpages/knight/pages/knight/observeResi/observeResi.json

@@ -0,0 +1,8 @@
+{
+    "usingComponents": { 
+         "wux-picker": "../../../../../dist/picker/index"
+        },
+    "navigationBarBackgroundColor": "#e33131",
+    "navigationBarTitleText": "城市观察员",
+    "navigationBarTextStyle": "white"
+}

miniprogram/subpages/knight/pages/knight/observeResi/observeResi.wxml

@@ -0,0 +1,99 @@
+<!--subpages/knight/pages/knight/observeResi/observeResi.wxml-->
+<block wx:if="{{informFlag}}">
+    <view class="basic-info">
+        <view class="list-item ">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">姓名</view>
+            </view>
+            <view class="right">
+                <input confirm-type="next" bindblur="bindRealNameInput" bindinput="bindRealNameInput" value="{{personalInfo.name}}" placeholder-class="placeholder-style" placeholder="请输入" />
+            </view>
+        </view>
+        <view class="list-item gray ">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">身份证号</view>
+            </view>
+            <view class="right">
+                <input confirm-type="next" bindblur="bindRealIdcardInput" bindinput="bindRealIdcardInput" value="{{personalInfo.idCard}}" placeholder-class="placeholder-style" placeholder="请输入" />
+            </view>
+        </view>
+        <view class="list-item ">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">手机号码</view>
+            </view>
+            <view class="right">
+                <input confirm-type="next" bindblur="bindRealMobileInput" bindinput="bindRealMobileInput" value="{{personalInfo.mobile}}" placeholder-class="placeholder-style" placeholder="请输入" />
+            </view>
+        </view>
+        <view class="list-item ">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">是否中共党员</view>
+            </view>
+            <view class="right">
+                <view class="{{form.party?'picker':'picker gray-font'}}" data-value='2'  bind:tap="handleCLickH">{{form.party?form.party == 0 ?'否':'是':'请选择'}}</view>
+            </view>
+        </view>
+        <view class="list-item ">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">服务网格所属社区</view>
+            </view>
+            <view class="right">
+                <view class="{{selectedValueGlabel?'picker':'picker gray-font'}}" data-value='1'  bind:tap="handleCLickH">{{selectedValueGlabel?selectedValueGlabel:'请选择'}}</view>
+            </view>
+        </view>
+        <view class="list-item ">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">行业类别</view>
+            </view>
+            <view class="right">
+                <view class="{{selectedValueHlabel?'picker':'picker gray-font'}}" data-value='0'  bind:tap="handleCLickH">{{selectedValueHlabel?selectedValueHlabel:'请选择'}}</view>
+            </view>
+        </view>
+            <view class="list-item gray">
+                <view class="left">
+                    <text class="must">*</text>
+                    <view class="title">现工作单位</view>
+                </view>
+                <view class="right">
+                    <input confirm-type="next" bindblur="bindRealWorkUnitInput" bindinput="bindRealWorkUnitInput" value="{{form.workUnit}}" placeholder-class="placeholder-style" placeholder="请输入" />
+                </view>
+            </view>
+        </view>
+        <view class="buttom_btn">
+            <button type="warn" plain="true" class="back" bind:tap="handleBack">返回</button>
+            <button type="warn" class="next" disabled="{{look}}" bind:tap="submit">提交</button>
+        </view>
+</block>
+<block wx:else>
+    <view class="card">
+        <view class="title">城市观察员招募条件</view>
+        <view class="content" style="white-space:pre-wrap"> （一）“城市观察员”招募条件
+            1.在报名社区长期居住或工作的热心民众，中共党员或积极分子优先。
+            2.身体健康，年满18周岁，具备完全民事行为能力。
+            3.遵纪守法，无违纪违法行为，服从社区合理安排，具有较强的社会公德意识。
+            4.乐干奉献，热心志愿服务等公益事业，能够利用周末、节假日及日常业余时间自愿参与社区治理、公益活动等志愿服务。
+            （二）“城市观察员”主要职责
+            作为社区基层治理的“兼职网格员”，发挥异常情况预警、突发事件直报、社情民意传递等“移动探头”作用，将发现的城市管理、环境卫生、安全隐患等问题第一时间上报社区，并在保障自身安全的前提下，力所能及协助有关事件处置。同时，在日常生活中带头参与平安建设、文明创建等社区治理和服务工作。</view>
+        <view class="look">
+            <checkbox-group bindchange="handleCheckbox">
+                <checkbox value="{{look}}" color="#e33131" style="width: 50rpx;height: 50rpx;margin-right: 10rpx;"></checkbox>
+                <text>我已阅读并同意</text>
+            </checkbox-group>
+
+        </view>
+    </view>
+
+
+    <view class="buttom_btn">
+        <button type="warn" plain="true" class="back" bind:tap="handleBack">返回</button>
+        <button type="warn" class="next" disabled="{{look}}" bind:tap="handleNext">下一步</button>
+    </view>
+</block>
+<wux-picker cols="1" data-value="{{pickerValue}}" options="{{selectedListH}}" value="{{pickerValue == 0?form.courier:pickerValue == 1?form.deptId:form.party}}" visible="{{selectedStatusH}}" controlled bind:confirm="pickerConfirmH" bind:cancel="pickerCancelH" >
+</wux-picker>

miniprogram/subpages/knight/pages/knight/observeResi/observeResi.wxss

@@ -0,0 +1,105 @@
+/* subpages/knight/pages/knight/observeResi/observeResi.wxss */
+page {
+    width: 100%;
+    height: auto;
+    overflow-y: auto;
+    background: #f5f5f5;
+    font-family: PingFang SC;
+    margin: 0 auto;
+}
+.gray{
+    background-color: #fafafa;
+}
+.gray-font{
+color:#808080 ;
+}
+.card{
+    background-color: #fff;
+}
+.card .title{
+    height: 100rpx;
+    line-height: 100rpx;
+    text-align: center;
+    border-bottom: 1px solid #e9e9e9;
+}
+.card .content{
+    padding: 30rpx;
+    font-weight: 300;
+}
+.card .look{
+    color: #999999;
+    text-align: center;
+    margin-bottom: 30rpx;
+    display: flex;
+    justify-content: center;
+}
+.card .look checkbox-group {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.buttom_btn{
+    position: fixed;
+    bottom: 0;
+    height: 120rpx;
+    background-color: #fff;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.buttom_btn .back{
+    width: 46%;
+    height: 80rpx;
+    line-height: 80rpx;
+}
+.buttom_btn .next{
+    width: 46%;
+    height: 80rpx;
+    line-height: 80rpx;
+    color: #fff;
+}
+
+.basic-info {
+    width: 95%;
+    background: #fff;
+    border-radius: 16rpx;
+    box-sizing: border-box;
+    padding: 0 20rpx;
+    margin: 20rpx auto;
+  }
+  .basic-info .list-item {
+    width: 100%;
+    height: 100rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  .basic-info .list-item .left .must {
+    color: #F61616;
+    font-size: 30rpx;
+  }
+  .basic-info .list-item .left .title {
+    color: #333;
+    font-size: 34rpx;
+  }
+  .basic-info .list-item .left {
+    display: flex;
+    align-items: center;
+    height: 100rpx;
+  }
+  .basic-info .list-item .right {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    flex: 1;
+  }
+  .basic-info .list-item .right .picker{
+      width: 100%;
+      height: 50rpx;
+      text-align: right;
+  }
+  .basic-info .list-item .right input{
+      text-align: right;
+  }

miniprogram/subpages/knight/pages/knight/stageMap/index.js

@@ -0,0 +1,383 @@
+const QQMapWX = require('../utils/qqmap-wx-jssdk')
+Page({
+
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		mapData: [{
+			id: 0,
+			stageName: "昌乐路社区第一二三网格党群服务站",
+			stageDescription: "本驿站位于昌邑路15号3号楼1层，所属大港街道。提供乘凉取暖、饮水、充电、雨具、急救医疗箱、志愿报名服务、服务，并提供心理咨询、智慧社区、安全培训等个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：姜华\n联系电话：13275328721\n地址：青岛市市北区昌邑路15号3号楼1层",
+			location: {
+				lng: 120.34943,
+				lat: 36.086598
+			}
+		}, {
+			id: 1,
+			stageName: "冠县路社区党群服务中心",
+			stageDescription: "本驿站位于邱县路13号甲，所属即墨路街道。提供乘凉取暖、饮水、充电、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供政策咨询、政务代办个性化服务\n工作时间:09:00-17:30 \n周末、节假日是否开放：否\n联系人：张振焕\n联系电话：13275328721\n地址：青岛市市北区邱县路13号甲",
+			location: {
+				lng: 120.31743,
+				lat: 36.07768
+			}
+		}, {
+			id: 2,
+			stageName: "大连路户外劳动者驿站",
+			stageDescription: "本驿站位于大连路22号，所属辽宁路街道。提供乘凉取暖、饮水、充电、饭菜加热、服务，并提供图书阅览、冰吧个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：鄢龙\n联系电话：13275328721\n地址：青岛市市北区大连路22号",
+			location: {
+				lng: 120.33541,
+				lat: 36.07643
+			}
+		}, {
+			id: 3,
+			stageName: "平安路社区第三网格党群服务站",
+			stageDescription: "本驿站位于温州路30号，所属兴隆路街道。提供乘凉取暖、饮水、充电、免费上网、志愿报名服务、服务，并提供为快递人员提供休息、饮水场所个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：张林芳\n联系电话：13275328721\n地址：青岛市市北区温州路30号",
+			location: {
+				lng: 120.35538,
+				lat: 36.10151
+			}
+		}, {
+			id: 4,
+			stageName: "延安一路社区第六网格党群服务站",
+			stageDescription: "本驿站位于延安一路13号，所属延安路街道。提供乘凉取暖、饮水、充电、急救医疗箱、志愿报名服务、服务，并提供政务代办、法律援助、子女托管个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：张英英\n联系电话：13275328721\n地址：青岛市市北区延安一路13号",
+			location: {
+				lng: 120.34793,
+				lat: 36.07571
+			}
+		}, {
+			id: 5,
+			stageName: "滨海社区第三网格党群服务站",
+			stageDescription: "本驿站位于瑞湖路昌茂路交界，所属湖岛街道。提供乘凉取暖、饮水、充电、饭菜加热、雨具、急救医疗箱、志愿报名服务、服务，并提供维修服务、政务代办等个性化服务\n工作时间:09:00-17:30 \n周末、节假日是否开放：否\n联系人：兰辉青\n联系电话：13275328721\n地址：青岛市市北区瑞湖路昌茂路交界",
+			location: {
+				lng: 120.37479,
+				lat: 36.08743
+			}
+		}, {
+			id: 6,
+			stageName: "瑞安路社区第三网格党群服务站",
+			stageDescription: "本驿站位于瑞昌路185号，所属街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供公益活动、法律援助、政务代办等个性化服务\n工作时间:09:00-17:30 \n周末、节假日是否开放：否\n联系人：焦学雯\n联系电话：13275328721\n地址：青岛市市北区瑞昌路185号",
+			location: {
+				lng: 120.353912,
+				lat: 36.123859
+			}
+		}, {
+			id: 7,
+			stageName: "丰盛路社区第一网格党群服务站",
+			stageDescription: "本驿站位于郭口东路临字46号，所属登州路街道。提供乘凉取暖、饮水、充电、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：朱培军\n联系电话：13275328721\n地址：青岛市市北区郭口东路临字46号",
+			location: {
+				lng: 120.3573,
+				lat: 36.079002
+			}
+		}, {
+			id: 8,
+			stageName: "金沙路社区第五网格党群服务站",
+			stageDescription: "本驿站位于金华支路12号，所属水清沟街道。提供乘凉取暖、饮水、充电、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：王立波\n联系电话：13275328721\n地址：青岛市市北区金华支路12号",
+			location: {
+				"lng": 120.36569,
+				"lat": 36.13233
+			}
+		}, {
+			id: 9,
+			stageName: "台东街道红色里院",
+			stageDescription: "本驿站位于台东五路4号，所属台东街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供可提供子女托管、政务代办、科普教育、养老助老等个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：霍云霞\n联系电话：13275328721\n地址：青岛市市北区台东五路4号",
+			location: {
+				lng: 120.35271,
+				lat: 36.08606
+			}
+		}, {
+			id: 10,
+			stageName: "新华里社区第一网格党群服务站",
+			stageDescription: "本驿站位于威海路245号，所属街道。提供乘凉取暖、饮水、充电、饭菜加热、急救医疗箱、服务，并提供可提供帮办代办等个性化服务\n工作时间:09:00-17:30 \n周末、节假日是否开放：否\n联系人：娄淑琴\n联系电话：13275328721\n地址：青岛市市北区威海路245号",
+			location: {
+				lng: 120.35794,
+				lat: 36.08786
+			}
+		}, {
+			id: 11,
+			stageName: "新华里社区第六网格党群服务站",
+			stageDescription: "本驿站位于通化路5号，所属街道。提供乘凉取暖、饮水、充电、服务，并提供可提供帮办代办、象棋指导、理论学习等个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：孙淑青\n联系电话：13275328721\n地址：青岛市市北区通化路5号",
+			location: {
+				lng: 120.35864,
+				lat: 36.08498
+			}
+		}, {
+			id: 12,
+			stageName: "南山社区第一二网格党群服务站",
+			stageDescription: "本驿站位于鞍山一路33号-6，所属阜新路街道。提供乘凉取暖、饮水、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：于凤\n联系电话：13275328721\n地址：青岛市市北区鞍山一路33号-6",
+			location: {
+				lng: 120.36439,
+				lat: 36.10197
+			}
+		}, {
+			id: 13,
+			stageName: "北岭社区第四网格党群服务站",
+			stageDescription: "本驿站位于金华路31-59号网点，所属四方街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供可提供子女托管、心理咨询、法律援助等个性化服务\n工作时间:09:00-17:30 \n周末、节假日是否开放：是\n联系人：孙艳颖\n联系电话：13275328721\n地址：青岛市市北区金华路31-59号网点",
+			location: {
+				lng: 120.361551,
+				lat: 36.129875
+			}
+		}, {
+			id: 14,
+			stageName: "鲁阳路社区第四五六网格党群服务站",
+			stageDescription: "本驿站位于四流南路70号，所属开平路街道。提供乘凉取暖、饮水、充电、饭菜加热、急救医疗箱、服务，并提供图书阅读个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：刘娟\n联系电话：13275328721\n地址：青岛市市北区四流南路70号",
+			location: {
+				lng: 120.37615,
+				lat: 36.14347
+			}
+		}, {
+			id: 15,
+			stageName: "仲家洼社区党群服务中心",
+			stageDescription: "本驿站位于西仲路26号，所属宁夏路街道。提供乘凉取暖、饮水、充电、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供提供心理个案服务、法律援助、政务代办等服务个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：孙慧卿\n联系电话：13275328721\n地址：青岛市市北区西仲路26号",
+			location: {
+				lng: 120.36369,
+				lat: 36.07899
+			}
+		}, {
+			id: 16,
+			stageName: "海泊河社区党群服务中心",
+			stageDescription: "本驿站位于市北区鞍山路136号，所属镇江路街道。提供乘凉取暖、饮水、充电、免费上网、雨具、志愿报名服务、服务，并提供可提供读书学习、社会服务实践、文艺活动场地等个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：邵静\n联系电话：13275328721\n地址：青岛市市北区市北区鞍山路136号",
+			location: {
+				lng: 120.36334,
+				lat: 36.09411
+			}
+		}, {
+			id: 17,
+			stageName: "南昌路社区第一至六网格党群服务站",
+			stageDescription: "本驿站位于南昌路8号，所属海伦路街道。提供乘凉取暖、饮水、充电、急救医疗箱、志愿报名服务、服务，并提供政务代办个性化服务\n工作时间:09:00-17:30 \n周末、节假日是否开放：否\n联系人：王金峰\n联系电话：13275328721\n地址：青岛市市北区南昌路8号",
+			location: {
+				lng: 120.36861,
+				lat: 36.11164
+			}
+		}, {
+			id: 18,
+			stageName: "金坛路社区第四网格党群服务站",
+			stageDescription: "本驿站位于延吉路73号，所属敦化路街道。提供乘凉取暖、饮水、充电、雨具、服务，并提供心理咨询、法律援助个性化服务\n工作时间:09:00-17:30 \n周末、节假日是否开放：否\n联系人：赵荃\n联系电话：13275328721\n地址：青岛市市北区延吉路73号",
+			location: {
+				lng: 120.37079,
+				lat: 36.08645
+			}
+		}, {
+			id: 19,
+			stageName: "伊春路社区党群服务中心",
+			stageDescription: "本驿站位于通榆路46号，所属街道。提供乘凉取暖、饭菜加热、免费上网、雨具、志愿报名服务、服务，并提供心理咨询、法律援助、政务代办等个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：是\n联系人：王峰\n联系电话：13275328721\n地址：青岛市市北区通榆路46号",
+			location: {
+				lng: 120.38311,
+				lat: 36.10115
+			}
+		}, {
+			id: 20,
+			stageName: "双山社区党群服务中心",
+			stageDescription: "本驿站位于台柳路276号甲23-25网点，所属双山街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供法律援助、临时救助等个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：杨露璐\n联系电话：113275328721\n地址：青岛市市北区台柳路276号甲23-25网点",
+			location: {
+				lng: 120.392981,
+				lat: 36.116462
+			}
+		}, {
+			id: 21,
+			stageName: "双山街道党建红盟",
+			stageDescription: "本驿站位于哈尔滨路88号保利广场2号门，所属街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-21:00\n 周末、节假日是否开放：是\n联系人：史静\n联系电话：13275328721\n地址：青岛市市北区哈尔滨路88号保利广场2号门",
+			location: {
+				lng: 120.390814,
+				lat: 36.109757
+			}
+		}, {
+			id: 22,
+			stageName: "双山社区党群服务中心",
+			stageDescription: "本驿站位于台柳路196号和达新都汇，所属街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：杨露璐\n联系电话：13275328721\n地址：青岛市市北区台柳路196号和达新都汇",
+			location: {
+				lng: 120.387253,
+				lat: 36.109241
+			}
+		}, {
+			id: 23,
+			stageName: "郑州路社区党群服务中心",
+			stageDescription: "本驿站位于郑州路6号，所属洛阳路街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供可提供子女托管、心理咨询、法律援助、政务代办等个性化服务\n工作时间:09:00-17:30 \n周末、节假日是否开放：否\n联系人：王艳芳\n联系电话：13275328721\n地址：青岛市市北区郑州路6号",
+			location: {
+				lng: 120.39985,
+				lat: 36.14116
+			}
+		}, {
+			id: 24,
+			stageName: "辽阳西路社区第二网格党群服务站",
+			stageDescription: "本驿站位于永吉路47号，所属辽源路街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供纠纷调解、法律援助个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：郑菊花\n联系电话：13275328721\n地址：青岛市市北区永吉路47号",
+			location: {
+				lng: 120.395744,
+				lat: 36.095203
+			}
+		}, {
+			id: 25,
+			stageName: "南京路社区第四网格党群服务站",
+			stageDescription: "本驿站位于东胜路10号，所属街道。提供乘凉取暖、饮水、充电、免费上网、志愿报名服务、服务，并提供子女托管个性化服务\n工作时间:09:00-17:30 \n周末、节假日是否开放：否\n联系人：郭彦瑛\n联系电话：13275328721\n地址：青岛市市北区东胜路10号",
+			location: {
+				lng: 120.38782,
+				lat: 36.09999
+			}
+		}, {
+			id: 26,
+			stageName: "长沙路社区第三网格党群服务站",
+			stageDescription: "本驿站位于长沙路33号，所属河西街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：是\n联系人：王桂民\n联系电话：13275328721\n地址：青岛市市北区长沙路33号",
+			location: {
+				lng: 120.39548,
+				lat: 36.12667
+			}
+		}, {
+			id: 27,
+			stageName: "同德路社区党群服务中心",
+			stageDescription: "本驿站位于合肥路280号，所属合肥路街道。提供乘凉取暖、饮水、充电、饭菜加热、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供社区有对外开放的大食堂，为辖区居民提供餐食个性化服务\n工作时间:09:00-17:30 \n周末、节假日是否开放：否\n联系人：孙玲\n联系电话：13275328721\n地址：青岛市市北区合肥路280号",
+			location: {
+				lng: 120.404553,
+				lat: 36.112544
+			}
+		}, {
+			id: 28,
+			stageName: "同安路社区第二网格党群服务站",
+			stageDescription: "本驿站位于同兴路621号 西侧，所属浮山新区街道。提供乘凉取暖、饮水、充电、免费上网、雨具、急救医疗箱、志愿报名服务、服务，并提供个性化服务\n工作时间:09:00-17:30 \n周末、节假日是否开放：否\n联系人：毕君华\n联系电话：13275328721\n地址：青岛市市北区同兴路621号 西侧",
+			location: {
+				lng: 120.41981,
+				lat: 36.10219
+			}
+		}],
+		qqMapWX: null,
+		personalInfo: {
+			longitude: 120.34943,
+			latitude: 36.086598
+		},
+		mapCtx: null,
+		markers: [ //标志点的位置
+			//位置0
+			{
+				id: 0,
+				latitude: 36.086598,
+				longitude: 120.34943,
+				width: 28,
+				height: 32,
+				label: {
+					content: '昌乐路社区第一二三网格党群服务站',
+					color: '#f00',
+					textAlign: 'center'
+				}
+			},
+
+		],
+		stageName: "昌乐路社区第一二三网格党群服务站",
+		stageDescription: "本驿站位于昌邑路15号3号楼1层，所属大港街道。提供乘凉取暖、饮水、充电、雨具、急救医疗箱、志愿报名服务、服务，并提供心理咨询、智慧社区、安全培训等个性化服务\n工作时间:09:00-17:30\n 周末、节假日是否开放：否\n联系人：姜华\n联系电话：13275328721\n地址：青岛市市北区昌邑路15号3号楼1层",
+		searchValue: ""
+	},
+
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad(options) {
+		this.data.qqMapWX = new QQMapWX({
+			key: 'LSOBZ-5CEE3-37U3I-36BMA-3HXTZ-ULBTM'
+		})
+		this.mapCtx = wx.createMapContext('myMap');
+		if (options.mapId) {
+			this.data.mapData.forEach(f => {
+				if (options.mapId == f.id) {
+					this.setData({
+						stageName: f.stageName,
+						stageDescription: f.stageDescription,
+						'markers[0].latitude': f.location.lat,
+						'markers[0].longitude': f.location.lng,
+						'markers[0].label.content': f.stageName,
+						'personalInfo.latitude': f.location.lat,
+						'personalInfo.longitude': f.location.lng,
+					})
+				}
+			})
+		}
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload() {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh() {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom() {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage() {
+
+	},
+	goKnightMap() {
+		wx.redirectTo({
+			url: "/subpages/knight/pages/knight/commonts/stageMap/index"
+		})
+	},
+	back() {
+		wx.navigateBack({
+			delta: 1
+		})
+	},
+	submit() {
+		const latitude = this.data.personalInfo.latitude
+		const longitude = this.data.personalInfo.longitude
+		wx.openLocation({
+			latitude,
+			longitude,
+			scale: 18
+		})
+	},
+	bindSerach(e) {
+		this.setData({
+			searchValue: e.detail.value
+		})
+	},
+	goSearch() {
+		if (!this.data.searchValue) {
+			return
+		}
+		this.data.mapData.forEach(f => {
+			if (f.stageName && (f.stageName).indexOf(this.data.searchValue) != -1) {
+				this.setData({
+					stageName: f.stageName,
+					stageDescription: f.stageDescription,
+					'markers[0].latitude': f.location.lat,
+					'markers[0].longitude': f.location.lng,
+					'markers[0].label.content': f.stageName,
+					'personalInfo.latitude': f.location.lat,
+					'personalInfo.longitude': f.location.lng,
+				})
+			}
+		})
+	}
+})

miniprogram/subpages/knight/pages/knight/stageMap/index.json

@@ -0,0 +1,7 @@
+{
+	"usingComponents": {
+		"wux-picker": "../../../../../dist/picker/index"
+	},
+	"navigationBarBackgroundColor": "#e33131",
+	"navigationBarTitleText": "驿站地图"
+}

miniprogram/subpages/knight/pages/knight/stageMap/index.wxml

@@ -0,0 +1,20 @@
+<view class="stageMap">
+	<view style="display: flex;flex-direction: row;justify-content: space-around;align-items: center;">
+		<view class="search">
+			 <input bindinput="bindSerach" placeholder="请输入骑士驿站名称"/>
+		</view>
+		<view class="serchButton" bindtap="goSearch">搜索</view>
+	</view>
+	
+	<view class="mapBox" bindtap="goKnightMap">
+		<map id="myMap"  bindtap="goKnightMap"longitude="{{personalInfo['longitude']}}" latitude="{{personalInfo['latitude']}}" markers="{{markers}}" scale="12" class="maMap" subkey="LSOBZ-5CEE3-37U3I-36BMA-3HXTZ-ULBTM"/>
+	</view>
+	<text class="textBox">
+	<text class="textBoxTitle">{{stageName}}</text>
+	<text>{{stageDescription}}</text>
+	</text>
+	<view class="typeOneButton">
+		<view class="typeOneButtonOne" data-type="1" bindtap="back">返回</view>
+		<view class="typeOneButtonTwo" bindtap="submit">骑士导航</view>
+	</view>
+</view>

miniprogram/subpages/knight/pages/knight/stageMap/index.wxss

@@ -0,0 +1,82 @@
+.stageMap {
+	background-color: #f5f5f5;
+	height: 100vh;
+	overflow: hidden;
+	padding: 15rpx 30rpx 0 30rpx;
+}
+
+page {
+	height: 100%;
+	width: 100%;
+	overflow: hidden;
+}
+
+.maMap {
+	height: 100%;
+	width: 100%;
+}
+
+.mapBox {
+	background-color: #fff;
+	width: calc(100% - 12rpx);
+	height: 300rpx;
+	border-radius: 12rpx;
+	padding: 12rpx;
+}
+
+.textBox {
+	background-color: #fff;
+	width: calc(100% - 42rpx);
+	padding: 0rpx 24rpx 24rpx 24rpx;
+	height: auto;
+	display: block;
+	margin-top: 12rpx;
+	text-indent: 2em;
+}
+
+.textBoxTitle {
+	font-size: 35rpx;
+	font-weight: 800;
+	display: block;
+	margin-bottom: 30rpx;
+	padding-top: 30rpx;
+}
+
+.typeOneButton {
+	background-color: #fff;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	height: 150rpx;
+	margin-top: 280rpx;
+}
+
+.typeOneButtonOne {
+	border-radius: 6rpx;
+	color: #E82C19;
+	border: 1rpx solid #E82C19;
+	padding: 16rpx 90rpx;
+}
+
+.typeOneButtonTwo {
+	border-radius: 6rpx;
+	color: #fff;
+	background-color: #E82C19;
+	padding: 16rpx 90rpx;
+}
+
+.search {
+	margin: 12rpx;
+	border: 2rpx solid #e33131;
+	padding: 4rpx 20rpx;
+	width: 70%;
+	border-radius: 50rpx;
+}
+
+.serchButton {
+	background-color: #e33131;
+	border-radius: 24rpx;
+	padding: 12rpx 26rpx;
+	color: #fff;
+	font-size: 26rpx;
+}

miniprogram/subpages/knight/pages/knight/utils/api.js

@@ -0,0 +1,24 @@
+var request = require('../../../utils/request.js')
+
+export function getDeptTree () {
+  return request.get(`admin/dept/getAllDeptTree`)
+}
+// 根据经纬度查询 街道 社区
+export function getDeptIdByItude (para) {
+  return request.post(`admin/dept/getGridByCoordinate`, para)
+}
+
+// 上报
+export function submitItem (para) {
+  return request.post(`events/item/submitItem`, para)
+}
+// 列表
+export function getProjectList(param) {
+  return request.get('events/item/getItemListByUserId', param)
+}
+
+// 查询企业
+export function getCompany(param) {
+  return request.post('events/item/company', param)
+}
+

miniprogram/subpages/knight/pages/knight/utils/wgs84_to_gcj02.js

@@ -0,0 +1,115 @@
+//wgs84_to_gcj02.js文件
+ 
+//地标 转 国测 常量
+var x_PI = (3.14159265358979324 * 3000.0) / 180.0;
+var PI = 3.1415926535897932384626;
+var a = 6378245.0; //卫星椭球坐标投影到平面地图坐标系的投影因子。  
+var ee = 0.00669342162296594323; //椭球的偏心率。
+ 
+ 
+//判断是否在国内，在中国国内的经纬度才需要做偏移
+function out_of_china(lng, lat) {
+    return (
+        lng < 72.004 ||
+        lng > 137.8347 ||
+        (lat < 0.8293 || lat > 55.8271 || false)
+    );
+}
+ 
+//转化经度
+function transformlng(lng, lat) {
+    var ret =
+        300.0 +
+        lng +
+        2.0 * lat +
+        0.1 * lng * lng +
+        0.1 * lng * lat +
+        0.1 * Math.sqrt(Math.abs(lng));
+    ret +=
+        ((20.0 * Math.sin(6.0 * lng * PI) +
+            20.0 * Math.sin(2.0 * lng * PI)) *
+            2.0) /
+        3.0;
+    ret +=
+        ((20.0 * Math.sin(lng * PI) +
+            40.0 * Math.sin((lng / 3.0) * PI)) *
+            2.0) /
+        3.0;
+    ret +=
+        ((150.0 * Math.sin((lng / 12.0) * PI) +
+            300.0 * Math.sin((lng / 30.0) * PI)) *
+            2.0) /
+        3.0;
+    return ret;
+}
+ 
+//转化纬度
+function transformlat(lng, lat) {
+    var ret =
+        -100.0 +
+        2.0 * lng +
+        3.0 * lat +
+        0.2 * lat * lat +
+        0.1 * lng * lat +
+        0.2 * Math.sqrt(Math.abs(lng));
+    ret +=
+        ((20.0 * Math.sin(6.0 * lng * PI) +
+            20.0 * Math.sin(2.0 * lng * PI)) *
+            2.0) /
+        3.0;
+    ret +=
+        ((20.0 * Math.sin(lat * PI) +
+            40.0 * Math.sin((lat / 3.0) * PI)) *
+            2.0) /
+        3.0;
+    ret +=
+        ((160.0 * Math.sin((lat / 12.0) * PI) +
+            320 * Math.sin((lat * PI) / 30.0)) *
+            2.0) /
+        3.0;
+    return ret;
+}
+ 
+//wgs84 to gcj02   地球坐标系 转 火星坐标系
+export function wgs84_to_gcj02(lng, lat) {
+    if (out_of_china(lng, lat)) {
+        return [lng, lat];
+    } else {
+        var dlat = transformlat(lng - 105.0, lat - 35.0);
+        var dlng = transformlng(lng - 105.0, lat - 35.0);
+        var radlat = (lat / 180.0) * PI;
+        var magic = Math.sin(radlat);
+        magic = 1 - ee * magic * magic;
+        var sqrtmagic = Math.sqrt(magic);
+        dlat =
+            (dlat * 180.0) /
+            (((a * (1 - ee)) / (magic * sqrtmagic)) * PI);
+        dlng =
+            (dlng * 180.0) / ((a / sqrtmagic) * Math.cos(radlat) * PI);
+        var mglat = lat + dlat;
+        var mglng = lng + dlng;
+ 
+        return [mglng, mglat];
+    }
+}
+ 
+ 
+//gcj02 to wgs84  火星坐标系 转 地球坐标系
+export function gcj02_to_wgs84(lng, lat) {
+    if (out_of_china(lng, lat)) {
+        return [lng, lat]
+    }
+    else {
+        var dlat = transformlat(lng - 105.0, lat - 35.0);
+        var dlng = transformlng(lng - 105.0, lat - 35.0);
+        var radlat = lat / 180.0 * PI;
+        var magic = Math.sin(radlat);
+        magic = 1 - ee * magic * magic;
+        var sqrtmagic = Math.sqrt(magic);
+        dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
+        dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
+        var mglat = lat + dlat;
+        var mglng = lng + dlng;
+        return [lng * 2 - mglng, lat * 2 - mglat]
+    }
+}

miniprogram/subpages/pioneer/pages/pioneer/pioneer.wxml

@@ -15,6 +15,6 @@
     <view class="h1">扫码关注“北尚先锋”</view>
     <view class="h2">点击上图，长按可进入“北尚先锋”公众号</view>
   
-    <button type="primary" class="btn01">返回</button>
+    <button type="primary" class="btn01" bind:tap="back">返回</button>
    
 </view>

miniprogram/subpages/redGrider/components/demeanor/index.js

@@ -0,0 +1,225 @@
+// subpages/volunteer/components/demeanor/index.js
+const app = getApp()
+Page({
+
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		statusHeight: app.globalData.deviceInfo.statusHeight, // 自定义头部状态栏高度
+		navigationHeight: app.globalData.deviceInfo.navigationHeight,
+		list: [{
+			"title": "嘉善社区“迎新年联欢”网格活动",
+			"createTime": "2023-01-04",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/1.png"
+		}, {
+			"title": "宣化社区新春茶话会",
+			"createTime": "2023-01-10",
+			"address": "山东省青岛市市北区金华路22号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/2.jpg"
+		}, {
+			"title": "建国村社区“利民惠民 修理行动”主题修理活动",
+			"createTime": "2023-01-18",
+			"address": "山东省青岛市市北区宁化路33号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/3.jpg"
+		}, {
+			"title": "建国村社区“写福送福”网格活动",
+			"createTime": "2023-01-20",
+			"address": "山东省青岛市市北区宁化路33号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/4.jpg"
+		}, {
+			"title": "嘉善社区“垃圾分类 从我做起”网格活动",
+			"createTime": "2023-01-29",
+			"address": "山东省青岛市市北区嘉善路82号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/5.png"
+		}, {
+			"title": "四机社区学雷锋，当先锋，我与城市共提升网格活动",
+			"createTime": "2023-02-01",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/6.jpg"
+		}, {
+			"title": "四机社区开展家庭教育网格活动",
+			"createTime": "2023-02-01",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/7.jpg"
+		}, {
+			"title": "嘉兴路社区“心连心”网格活动",
+			"createTime": "2023-02-17",
+			"address": "山东省青岛市市北区嘉兴路32号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/8.jpg"
+		}, {
+			"title": "瑞昌路社区第一网格开展党的理论政策宣讲活动",
+			"createTime": "2023-02-20",
+			"address": "山东省青岛市市北区人民路299号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/9.jpg"
+		}, {
+			"title": "四机社区开展学雷锋网格活动",
+			"createTime": "2023-03-02",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/10.jpg"
+		}, {
+			"title": "四机社区第五网格开展党的二十大理论专题学习和教育宣讲",
+			"createTime": "2023-03-09",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/11.png"
+		}, {
+			"title": "上四方社区“移风易俗”网格活动",
+			"createTime": "2023-04-04",
+			"address": "山东省青岛市市北区人民路58号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/12.jpg"
+		}, {
+			"title": "宣化路社区“宜居靓家园 健康新生活”网格活动",
+			"createTime": "2023-04-08",
+			"address": "山东省青岛市市北区金华路22号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/13.jpg"
+		}, {
+			"title": "四机社区开展环境整治活动",
+			"createTime": "2023-04-11",
+			"address": "山东省青岛市市北区嘉善路33号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/14.png"
+		}, {
+			"title": "嘉善社区免费注射狂犬疫苗网格活动",
+			"createTime": "2023-04-17",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/15.jpg"
+		}, {
+			"title": "上四方社区“人人动手 洁净家园”网格活动",
+			"createTime": "2023-04-17",
+			"address": "山东省青岛市市北区人民路58号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/16.jpg"
+		}, {
+			"title": "宣化路社区网格连心送温暖 组团服务进家门",
+			"createTime": "2023-05-09",
+			"address": "山东省青岛市市北区金华路22号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/17.png"
+		}, {
+			"title": "宣化路社区“走清廉之路 忆初心使命”网格活动",
+			"createTime": "2023-05-11",
+			"address": "山东省威海市荣成市",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/18.jpg"
+		}, {
+			"title": "四机社区开展“清洁我们的家园”",
+			"createTime": "2023-05-12",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/19.jpg"
+		}, {
+			"title": "嘉善社区金融安全知识活动",
+			"createTime": "2023-05-14",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/20.jpg"
+		}, {
+			"title": "上四方社区第6网格开展实践科学理论宣讲活动",
+			"createTime": "2023-05-21",
+			"address": "山东省青岛市市北区人民路58号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/21.jpg"
+		}, {
+			"title": "上四方社区“洁净家园”网格活动",
+			"createTime": "2023-05-25",
+			"address": "山东省青岛市市北区人民一路58号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/22.jpg"
+		}, {
+			"title": "嘉善社区为学习保驾护航网格活动",
+			"createTime": "2023-06-08",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/23.jpg"
+		}, {
+			"title": "嘉善社区开展民族宗教宣讲活动",
+			"createTime": "2023-06-13",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/24.jpg"
+		}, {
+			"title": "上四方第一网格开展二十大理论宣讲活动",
+			"createTime": "2023-06-15",
+			"address": "山东省青岛市市北区人民路58号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/25.jpg"
+		}, {
+			"title": "嘉善社区开展“端午粽飘香”网格活动活动 ",
+			"createTime": "2023-06-20",
+			"address": "山东省青岛市市北区重庆南路6号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/26.jpg"
+		}, {
+			"title": "宣化路社区连心广场送服务网格活动",
+			"createTime": "2023-06-21",
+			"address": "山东省青岛市市北区金华路22号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/27.jpg"
+		}, {
+			"title": "四机社区“垃圾分一分 环境美十分”网格活动",
+			"createTime": "2023-06-23",
+			"address": "山东省青岛市市北区嘉善路35号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/28.jpg"
+		}, {
+			"title": "宣化社区开展七一活动",
+			"createTime": "2023-06-27",
+			"address": "山东省青岛市海岸路22号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/29.jpg"
+		}, {
+			"title": "四机社区“庆七一光荣在党50年”网格活动",
+			"createTime": "2023-06-29",
+			"address": "山东省青岛市市北区鞍山一路121号",
+			"imgUrl": "https://elink-party-building.oss-cn-beijing.aliyuncs.com/wgfc/wgfc/30.jpg"
+		}]
+	},
+
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad(options) {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload() {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh() {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom() {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage() {
+
+	},
+	back() {
+		//返回上一级，关闭当前页面
+		wx.navigateBack({
+			delta: 1
+		})
+	},
+})