diff --git a/README.md b/README.md
new file mode 100644
index 0000000..57c3959
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# GitProject
+
diff --git a/app.js b/app.js
index 1ed57c4..270dfbf 100644
--- a/app.js
+++ b/app.js
@@ -1,19 +1,7 @@
-// app.js
 App({
-  onLaunch() {
-    // 展示本地存储能力
-    const logs = wx.getStorageSync('logs') || []
-    logs.unshift(Date.now())
-    wx.setStorageSync('logs', logs)
-
-    // 登录
-    wx.login({
-      success: res => {
-        // 发送 res.code 到后台换取 openId, sessionKey, unionId
-      }
+  onLaunch:function(){
+    wx.cloud.init({
+      env:"cloud-travel-7gc7n4zqa50965ff"
     })
-  },
-  globalData: {
-    userInfo: null
   }
-})
+})
\ No newline at end of file
diff --git a/app.json b/app.json
index 69e04f9..4c1c417 100644
--- a/app.json
+++ b/app.json
@@ -3,9 +3,11 @@
     "pages/home/home",
     "pages/my/my",
     "pages/navigate/navigate",
+    "pages/navigate1/navigate1",
     "pages/index/index",
     "pages/logs/logs",
-    "pages/message/message"
+    "pages/message/message",
+    "pages/schedule/schedule"
   ],
   "window":{
     "backgroundTextStyle":"light",
diff --git a/cloud/add/config.json b/cloud/add/config.json
new file mode 100644
index 0000000..5ecc33e
--- /dev/null
+++ b/cloud/add/config.json
@@ -0,0 +1,6 @@
+{
+  "permissions": {
+    "openapi": [
+    ]
+  }
+}
\ No newline at end of file
diff --git a/cloud/add/index.js b/cloud/add/index.js
new file mode 100644
index 0000000..1caf678
--- /dev/null
+++ b/cloud/add/index.js
@@ -0,0 +1,11 @@
+// 云函数入口文件
+const cloud = require('wx-server-sdk')
+
+cloud.init({ env: cloud.DYNAMIC_CURRENT_ENV }) // 使用当前云环境
+
+// 云函数入口函数
+exports.main = async (event, context) => {
+ let a = envent.a;
+ let b = envent.b;
+ return a+b;
+}
\ No newline at end of file
diff --git a/cloud/add/package.json b/cloud/add/package.json
new file mode 100644
index 0000000..614f4d2
--- /dev/null
+++ b/cloud/add/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "add",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "wx-server-sdk": "~2.6.3"
+  }
+}
\ No newline at end of file
diff --git a/images/activebooks.png b/images/activebooks.png
new file mode 100644
index 0000000..04430d5
Binary files /dev/null and b/images/activebooks.png differ
diff --git a/images/activehome.png b/images/activehome.png
new file mode 100644
index 0000000..898b796
Binary files /dev/null and b/images/activehome.png differ
diff --git a/images/activeperson.png b/images/activeperson.png
new file mode 100644
index 0000000..f152cf6
Binary files /dev/null and b/images/activeperson.png differ
diff --git a/images/books.png b/images/books.png
new file mode 100644
index 0000000..48c214c
Binary files /dev/null and b/images/books.png differ
diff --git a/images/gangtie.png b/images/gangtie.png
new file mode 100644
index 0000000..77953a9
Binary files /dev/null and b/images/gangtie.png differ
diff --git a/images/home.png b/images/home.png
new file mode 100644
index 0000000..3494c42
Binary files /dev/null and b/images/home.png differ
diff --git a/images/normal world.png b/images/normal world.png
new file mode 100644
index 0000000..05e1891
Binary files /dev/null and b/images/normal world.png differ
diff --git a/images/normalworld.png b/images/normalworld.png
new file mode 100644
index 0000000..9608b86
Binary files /dev/null and b/images/normalworld.png differ
diff --git a/images/paihang.png b/images/paihang.png
new file mode 100644
index 0000000..fccdc3f
Binary files /dev/null and b/images/paihang.png differ
diff --git a/images/person.png b/images/person.png
new file mode 100644
index 0000000..5802f6b
Binary files /dev/null and b/images/person.png differ
diff --git a/images/reddream.png b/images/reddream.png
new file mode 100644
index 0000000..21c00c5
Binary files /dev/null and b/images/reddream.png differ
diff --git a/images/word.png b/images/word.png
new file mode 100644
index 0000000..91e9c33
Binary files /dev/null and b/images/word.png differ
diff --git a/pages/book/book.js b/pages/book/book.js
new file mode 100644
index 0000000..b0e95fc
--- /dev/null
+++ b/pages/book/book.js
@@ -0,0 +1,66 @@
+// pages/book/book.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/book/book.json b/pages/book/book.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/book/book.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/book/book.wxml b/pages/book/book.wxml
new file mode 100644
index 0000000..00dce3c
--- /dev/null
+++ b/pages/book/book.wxml
@@ -0,0 +1,2 @@
+<!--pages/book/book.wxml-->
+<text>pages/book/book.wxml</text>
diff --git a/pages/book/book.wxss b/pages/book/book.wxss
new file mode 100644
index 0000000..19826fa
--- /dev/null
+++ b/pages/book/book.wxss
@@ -0,0 +1 @@
+/* pages/book/book.wxss */
\ No newline at end of file
diff --git a/pages/home/home.js b/pages/home/home.js
index 148060d..72bb0b3 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -9,26 +9,35 @@ Page({
     [
       {url:"https://s2.loli.net/2023/09/23/41Yw6HvduCrLnJo.png"},
       {url:"https://s2.loli.net/2023/09/23/8cZ3VoNfFiLIQ4q.png"},
+      {url:"https://img1.imgtp.com/2023/10/09/8w8uWsZa.png"}
     ],
     gridList:
     [
-      {name:"课表",url:"/static/course.png"},
-      {name:"校历",url:"/static/schedule.png"},
-      {name:"通知",url:"/static/notice.png"},
+      {name:"课表",icon:"/static/course.png",url:"/pages/schedule/schedule"},
+      {name:"校历",icon:"/static/schedule.png",url:""},
+      {name:"通知",icon:"/static/notice.png",url:""},
     ],
     messageList:
     [
       {id:1,url:"https://s2.loli.net/2023/09/23/IQoPKBG68JTRHht.png",message:"今天星期一"},
       {id:2,url:"",message:"今天星期二"},
       {id:3,url:"",message:"今天星期三"}
-    ]
+    ],
+
+    goToPage(e) {
+      wx.navigateTo({
+        url: e.currentTarget.dataset.url
+      })
+      console.log('1')
+    }
+  
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    
+   
   },
 
   /**
@@ -79,4 +88,5 @@ Page({
   onShareAppMessage() {
 
   }
+  
 })
\ No newline at end of file
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 504b663..e40632d 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -10,7 +10,7 @@
   <block wx:for="{{gridList}}" wx:key="index">
     <view class='grid-item-child'>
       <view>
-        <image class='grid-item-img' src="{{item.url}}"></image>
+        <image bindtap="goToPage" class='grid-item-img' src="{{item.icon}}" data-url="{{item.url}}"></image>
         <text class='grid-item-txt'>{{item.name}}</text>
       </view>
     </view>
diff --git a/pages/my/my.wxml b/pages/my/my.wxml
index 1b09772..7b32e7f 100644
--- a/pages/my/my.wxml
+++ b/pages/my/my.wxml
@@ -2,10 +2,10 @@
 <view class="top_img" >
   <view class="my_iocn">
     <image src="https://s2.loli.net/2023/09/23/Z47iIRVULOcA15m.jpg"></image>
-    <view class="myname">z默</view>
+    <view class="myname">马嘉序</view>
     <view class="xinzuo_xx">
       <view><text class="iconfont icon-sousuo1" style="color: red;font-size: 12px;"></text> 天秤座</view>
-      <view>帅气小马哥</view>
+      <view>工作ing</view>
       <view >软件工程</view> 
       <view class="r_jt"><text class="iconfont icon-icon-arrow-right2"></text></view>
     </view>
diff --git a/pages/navigate/navigate.js b/pages/navigate/navigate.js
index 5566346..37072cd 100644
--- a/pages/navigate/navigate.js
+++ b/pages/navigate/navigate.js
@@ -1,119 +1,719 @@
-// pages/navigate/navigate.js
+// 引入SDK核心类，js文件根据自己业务，位置可自行放置
+var QQMapWX = require('../../qqmap-wx-jssdk.js');
+var qqmapsdk;
+var app = getApp();
+// pages/home/home.js
 Page({
-
   /**
    * 页面的初始数据
    */
+  //设置下拉刷新
+  onPullDownRefresh: function () {
+    var that = this;
+    that.setData({
+      currentTab: 0 //当前页的一些初始数据，视业务需求而定
+    })
+    this.onLoad(); //重新加载onLoad()
+  },
   data: {
-    subkey:'NS4BZ-A5GK3-MAA3K-OT63P-S3CHS-PSBKH',
-    scale:16,
-    enable3d: false,
-    showLocation: true,//是否显示定位
-    showCompass: false,
-    enanleOverlooking: false,//是否俯视视角
-    enableZoom: true,
-    enableScroll: true,
-    enableRotate: false,//是否可旋转
-    drawPolygon: false,//多边形
-    enableSatellite: false,//是否启用卫星影像
-    enableTraffic: false,//是否启用交通流量
-    longitude:'117.3523',
-    latitude: '39.109123',
+    buildData:app.globalData.map,
+    hidden:true,
+    // 设置markers
+    markers:[],
+    // 设置航大数据
+    tripdata:[],
+    studydata: [],
+    eatdata:[],
+    rundata:[],
+    trandata:[],
+    lifedata:[],
+    admindata:[],
+    dordata:[],
+    //输入的查询地址
+    inputvalue:'',
+    //起始地址
+    startPoint:null,
+    endPoint:null,
+    //获取当前分类
+    currentdatabase:null,
+    modalimg:null,
+    modalname:null,
+    modaltitle:null,
+    modaladdress:null,
 
-    
-    markers:[
-      {
-        'id':1,
-        "latitude":39.11032674145096,
-        "longitude":117.34284579482159,
-        'width':32,
-        'height':32
-      }
-    ],
-    circles:[],
-    polylishes:[],
-    polygons:[],
-    showDialog:true,
-    currentMarker:null
   },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
+  //点击按钮现实地图上对应的点
+  tripplace:function(){
+    var that=this;
+    var result = that.data.tripdata;
+    var number = that.data.markers.length;
+    let markers = that.data.markers
+    markers.splice(1,number-1)
+    that.setData({
+      markers:markers,
+      currentdatabase:result
+    })
+        for(var i=0;i<result.length;i++){
+          let lat = result[i].latitude;
+          let lon = result[i].longitude;
+          let name = result[i].name;
+          var index="markers["+(i+1)+"]";
+          that.setData({
+            [index]:{
+              id:i+1,
+              latitude: lat,
+              longitude: lon,
+              iconPath: "../../image/旅游icon.png",
+              width: 30,
+              height: 30,
+              label: {
+                content: name,
+                color: '#FFFFFF',
+                bgColor:'#6495ED',
+                fontSize: 13,
+                anchorX:10,
+                anchorY:-23,
+                borderRadius: 5,
+                borderWidth: 1,
+                borderColor: '#6495ED',
+                padding: 2,
+                //display: 'ALWAYS'
+              }
+            }            
+          })
+        }
   },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-    this.mapCtx = wx.createMapContext('map')
-    this.mapCtx.moveToLocation()
-  },
-  //获取位置
-  getCenterLocation: function () {
-    var that = this
-    that.mapCtx.getCenterLocation({
-      success: function (res) {
-        console.log('经度',res.longitude)
-        console.log('纬度',res.latitude)
-        that.setData({
-          location: '经度:' + res.longitude + '纬度:'+res.latitude
-        })
+  studyplace:function(){
+    var that=this;
+    var result = that.data.studydata;
+    var number = that.data.markers.length;
+    let markers = that.data.markers
+    markers.splice(1,number-1)
+    that.setData({
+      markers:markers,
+      currentdatabase:result
+    })
+        for(var i=0;i<result.length;i++){
+          let lat = result[i].latitude;
+          let lon = result[i].longitude;
+          let name = result[i].name;
+          var index="markers["+(i+1)+"]";
+          that.setData({
+            [index]:{
+              id:i+1,
+              latitude: lat,
+              longitude: lon,
+              iconPath: "../../image/学习icon.png",
+              width: 30,
+              height: 30,
+              label: {
+                content: name,
+                color: '#FFFFFF',
+                bgColor:'#6495ED',
+                fontSize: 13,
+                anchorX:16,
+                anchorY:-22.5,
+                borderRadius: 5,
+                borderWidth: 1,
+                borderColor: '#6495ED',
+                padding: 2,
+                //display: 'ALWAYS'
+              }
+            }            
+          })
+        }
+  },
+  eatplace:function(){
+    var that=this;
+    var result = that.data.eatdata;
+    var number = that.data.markers.length;
+    let markers = that.data.markers
+    markers.splice(1,number-1)
+    that.setData({
+      markers:markers,
+      currentdatabase:result
+    })
+        for(var i=0;i<result.length;i++){
+          let lat = result[i].latitude;
+          let lon = result[i].longitude;
+          let name = result[i].name;
+          var index="markers["+(i+1)+"]";
+          that.setData({
+            [index]:{
+              id:i+1,
+              latitude: lat,
+              longitude: lon,
+              iconPath: "../../image/吃饭icon.png",
+              width: 30,
+              height: 30,
+              label: {
+                content: name,
+                color: '#FFFFFF',
+                bgColor:'#6495ED',
+                fontSize: 13,
+                anchorX:10,
+                anchorY:-26,
+                borderRadius: 5,
+                borderWidth: 1,
+                borderColor: '#6495ED',
+                padding: 2,
+                //display: 'ALWAYS'
+              }
+            }            
+          })
+        }
+  },
+  runplace:function(){
+    var that=this;
+    var result = that.data.rundata;
+    var number = that.data.markers.length;
+    let markers = that.data.markers
+    markers.splice(1,number-1)
+    that.setData({
+      markers:markers,
+      currentdatabase:result
+    })
+        for(var i=0;i<result.length;i++){
+          let lat = result[i].latitude;
+          let lon = result[i].longitude;
+          let name = result[i].name;
+          var index="markers["+(i+1)+"]";
+          that.setData({
+            [index]:{
+              id:i+1,
+              latitude: lat,
+              longitude: lon,
+              iconPath: "../../image/运动icon.png",
+              width: 30,
+              height: 30,
+              label: {
+                content: name,
+                color: '#FFFFFF',
+                bgColor:'#6495ED',
+                fontSize: 13,
+                anchorX:14,
+                anchorY:-26,
+                borderRadius: 5,
+                borderWidth: 1,
+                borderColor: '#6495ED',
+                padding: 2,
+                //display: 'ALWAYS'
+              }
+            }            
+          })
+        }
+  },
+  tranplace:function(){
+    var that=this;
+    var result = that.data.trandata;
+    var number = that.data.markers.length;
+    let markers = that.data.markers
+    markers.splice(1,number-1)
+    that.setData({
+      markers:markers,
+      currentdatabase:result
+    })
+        for(var i=0;i<result.length;i++){
+          let lat = result[i].latitude;
+          let lon = result[i].longitude;
+          let name = result[i].name;
+          var index="markers["+(i+1)+"]";
+          that.setData({
+            [index]:{
+              id:i+1,
+              latitude: lat,
+              longitude: lon,
+              iconPath: "../../image/交通icon.png",
+              width: 30,
+              height: 30,
+              label: {
+                content: name,
+                color: '#FFFFFF',
+                bgColor:'#6495ED',
+                fontSize: 13,
+                anchorX:14,
+                anchorY:-26,
+                borderRadius: 5,
+                borderWidth: 1,
+                borderColor: '#6495ED',
+                padding: 2,
+                //display: 'ALWAYS'
+              }
+            }            
+          })
+        }
+  },
+  lifeplace:function(){
+    var that=this;
+    var result = that.data.lifedata;
+    var number = that.data.markers.length;
+    let markers = that.data.markers
+    markers.splice(1,number-1)
+    that.setData({
+      markers:markers,
+      currentdatabase:result
+    })
+        for(var i=0;i<result.length;i++){
+          let lat = result[i].latitude;
+          let lon = result[i].longitude;
+          let name = result[i].name;
+          var index="markers["+(i+1)+"]";
+          that.setData({
+            [index]:{
+              id:i+1,
+              latitude: lat,
+              longitude: lon,
+              iconPath: "../../image/生活icon.png",
+              width: 30,
+              height: 30,
+              label: {
+                content: name,
+                color: '#FFFFFF',
+                bgColor:'#6495ED',
+                fontSize: 13,
+                anchorX:14,
+                anchorY:-26,
+                borderRadius: 5,
+                borderWidth: 1,
+                borderColor: '#6495ED',
+                padding: 2,
+                //display: 'ALWAYS'
+              }
+            }            
+          })
+        }
+  },
+  adminplace:function(){
+    var that=this;
+    var result = that.data.admindata;
+    var number = that.data.markers.length;
+    let markers = that.data.markers
+    markers.splice(1,number-1)
+    that.setData({
+      markers:markers,
+      currentdatabase:result
+    })
+        for(var i=0;i<result.length;i++){
+          let lat = result[i].latitude;
+          let lon = result[i].longitude;
+          let name = result[i].name;
+          var index="markers["+(i+1)+"]";
+          that.setData({
+            [index]:{
+              id:i+1,
+              latitude: lat,
+              longitude: lon,
+              
+              iconPath: "../../image/行政icon.png",
+              width: 30,
+              height: 30,
+              label: {
+                content: name,
+                color: '#FFFFFF',
+                bgColor:'#6495ED',
+                fontSize: 13,
+                anchorX:14,
+                anchorY:-26,
+                borderRadius: 5,
+                borderWidth: 1,
+                borderColor: '#6495ED',
+                padding: 2,
+                //display: 'ALWAYS'
+              }
+            }            
+          })
+        }
+  },
+  dorplace:function(){
+    var that=this;
+    var result = that.data.dordata;
+    var number = that.data.markers.length;
+    let markers = that.data.markers
+    markers.splice(1,number-1)
+    that.setData({
+      markers:markers,
+      currentdatabase:result
+    })
+        for(var i=0;i<result.length;i++){
+          let lat = result[i].latitude;
+          let lon = result[i].longitude;
+          let name = result[i].name;
+          var index="markers["+(i+1)+"]";
+          that.setData({
+            [index]:{
+              id:i+1,
+              latitude: lat,
+              longitude: lon,
+              joinCluster:true,
+              iconPath: "../../image/公寓icon.png",
+              width: 30,
+              height: 30,
+              label: {
+                content: name,
+                color: '#FFFFFF',
+                bgColor:'#6495ED',
+                fontSize: 13,
+                anchorX:14,
+                anchorY:-25,
+                borderRadius: 5,
+                borderWidth: 0.8,
+                borderColor: '#6495ED',
+                padding: 2,
+                //display: 'ALWAYS'
+              }
+            }            
+          })
+        }
+  },
+  //获取输入的查询地址
+  inputplace:function(e){
+    this.setData({
+      inputvalue:e.detail.value
+    })
+  },
+  // 搜索
+nearby_search:function(){
+  var that = this;
+  var text = that.data.inputvalue;
+  // 调用接口
+  qqmapsdk.search({
+     keyword: text,  //搜索关键词
+     location: '30.51863,114.401',  //设置周边搜索中心点
+     success: function (res) { //搜索成功后的回调
+      var texttitle = '共找到'+res.data.length+'个地点'
+      wx.showToast({
+        title: texttitle,
+        icon: 'success',
+        duration: 2000
+      })
+      var number = that.data.markers.length;
+      let markers = that.data.markers;
+      markers.splice(1,number-1)
+      that.setData({
+        markers:markers
+      })
+       for (var i = 0; i < res.data.length; i++) {
+         let lat = res.data[i].location.lat;
+         let lon = res.data[i].location.lng;
+         let name = res.data[i].title;
+         var index = "markers["+(i+1)+"]";
+         that.setData({
+           [index]:{
+            id:i+1,
+            latitude: lat,
+            longitude: lon,
+            iconPath: "../../image/标记.png",
+            width: 25,
+            height: 25,
+            label: {
+              content: name,
+              color: '#FFFFFF',
+              bgColor:'#6495ED',
+              fontSize: 13,
+              anchorX:14,
+              anchorY:-24,
+              borderRadius: 5,
+              borderWidth: 1,
+              borderColor: '#6495ED',
+              padding: 2,
+              //display: 'ALWAYS'
+            }
+           },
+           currentdatabase:res.data
+         })
+       }
+     },
+     fail: function (res) {
+      wx.showToast({
+        title: '抱歉，搜索错误',
+        icon: 'fail',
+        duration: 2000
+      })
+     },
+     complete: function (res){
+       console.log(res);
+     }
+ });
+},
+ //点击地点进行路径规划
+  onPointTap: function(e) {
+    console.log(e)
+    var that = this;
+    var lat = ''; // 获取点击的markers经纬度
+    var lon = ''; // 获取点击的markers经纬度
+    var name = ''; // 获取点击的markers名称
+    var markerId = e.detail.markerId;// 获取点击的markers  id
+    var markersda = this.data.markers;
+    var currentdatabase = this.data.currentdatabase;
+    //定位所点击的坐标点
+    for (var item of markersda){
+      if (item.id === markerId) {
+        lat = item.latitude;
+        lon = item.longitude;
+        name = item.label.content;
+        break;
       }
+    }
+    //初始化起点为西大门门口
+    var startPoint = JSON.stringify({
+      'name': markersda[0].callout.content,
+      'latitude': markersda[0].latitude,
+      'longitude': markersda[0].longitude
+    });
+    var endPoint = JSON.stringify({  //终点
+        'name': name,
+        'latitude': lat,
+        'longitude': lon
+    });
+    if(currentdatabase[markerId-1].title != null)
+    {
+      that.setData({
+        hidden:false,
+        modalname:currentdatabase[markerId-1].title
+      })
+    }else{
+      that.setData({
+        hidden:false,
+        modalname:currentdatabase[markerId-1].name
+      })
+    }
+    that.setData({
+      hidden:false,
+      modaladdress:currentdatabase[markerId-1].address,
+      startPoint:startPoint,
+      endPoint:endPoint
     })
   },
-  handleMarkerTap(e){
-    consle.log(e);
-    const marker = this.data.markers.find(item =>item.id==e.markerId);
-    marker && this.setData({
-      currentMarker:marker,
-      showDialog:true
+  // 路径规划
+  test:function(){
+    let plugin = requirePlugin('routePlan');
+    let key = 'NS4BZ-A5GK3-MAA3K-OT63P-S3CHS-PSBKH';  //使用在腾讯位置服务申请的key
+    let referer = 'cugerguider';   //调用插件的app的名称
+    let endPoint = JSON.stringify({  //终点
+        'name': '中国民航大学(东丽校区)',
+        'latitude': 39.11198,
+        'longitude': 117.35002
+    });
+    wx.navigateTo({
+        url: 'plugin://routePlan/index?key=' + key + '&referer=' + referer + '&endPoint=' + endPoint
     });
   },
-
-
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
+  //获取自己当前的位置
+  getmyPlace:function(){
+    var that=this;
+    wx.getLocation({
+      success: function(res) {
+        console.log(res);
+        that.setData({
+          markers:[
+            {
+              latitude:res.latitude,
+              longitude:res.longitude,
+              iconPath:"../../image/mapcenter.png",
+              width:25,
+              height:25,
+              callout:{
+                content:"当前位置",
+                color:'#0000ff',
+                fontSize:13,
+                borderRadius:5,
+                borderWidth:1,
+                borderColor:'#0000ff',
+                padding:2,
+                display:'ALWAYS'
+              }
+            }
+          ]
+        })
+      },
+    })
   },
-
   /**
-   * 生命周期函数--监听页面隐藏
+   * 生命周期函数--监听页面加载
    */
-  onHide() {
+  onLoad: function (options) {
+    wx.stopPullDownRefresh() //刷新完成后停止下拉刷新动效
+        // 实例化API核心类
+        qqmapsdk = new QQMapWX({
+          key: 'NS4BZ-A5GK3-MAA3K-OT63P-S3CHS-PSBKH'
+      });
+      // wx.showModal({
+      //   title:'提示',
+      //   content:'当前位置不在校区内，是否切换？',
+      //   success(res){
+      //     if(res.confirm)
+      //     {
+      //       console.log('用户点击确定')
+      //     }else if(res.cancel)
+      //     {
+      //       console.log('用户点击取消')
+      //     }
+      //   }
+      // });
+      var that = this;
+      var trip = that.data.buildData[0].data;
+      var study = that.data.buildData[1].data;
+      var eat = that.data.buildData[2].data;
+      var run = that.data.buildData[3].data;
+      var tran = that.data.buildData[4].data;
+      var life = that.data.buildData[5].data;
+      var admi = that.data.buildData[6].data;
+      var ador = that.data.buildData[7].data;
+      that.setData({
+        tripdata:trip,
+        eatdata:eat,
+        studydata:study,
+        rundata:run,
+        trandata:tran,
+        lifedata:life,
+        admindata:admi,
+        dordata:ador
+      })
+      //判断所在位置是否在校区内
+      wx.getLocation({
+		 type:'gcj02',
+        success:function(res)
+        {
+          // console.log(res)
+          var nowlatitude = res.latitude
+          var nowlongitude = res.longitude
+          if((nowlatitude > 39.11198) && (nowlatitude < 39.11198) && (nowlongitude > 117.35002) && (nowlongitude <117.35002))
+          {
+            that.setData({
+              markers:[
+                {
+                  id:0,
+                  latitude:nowlatitude,
+                  longitude:nowlongitude,
+                  iconPath:"../../image/mapcenter.png",
+                  width:25,
+                  height:25,
+                  callout:{
+                    content:"当前位置",
+                    color:'#0000ff',
+                    fontSize:13,
+                    borderRadius:5,
+                    borderWidth:1,
+                    borderColor:'#0000ff',
+                    padding:2,
+                    display:'ALWAYS'
+                  }
+                }
+              ]
+            })
+          }else{
+            wx.showModal({
+              title:'提示',
+              content:'当前位置不在校区内，是否切换？',
+              success(res)
+              {
+                if(res.confirm)
+                {
+                  that.setData({
+                    markers:[
+                      {
+                        id:0,
+                        latitude:30.51863,
+                        longitude:114.401,
+                        iconPath:"../../image/mapcenter.png",
+                        width:25,
+                        height:25,
+                        callout:{
+                          content:"西大门",
+                          color:'#0000ff',
+                          fontSize:13,
+                          borderRadius:5,
+                          borderWidth:1,
+                          borderColor:'#0000ff',
+                          padding:2,
+                          display:'BYCLICK'
+                        }
+                      }
+                    ]
+                  })
+                }else if(res.cancel)
+                {
+                  that.setData({
+                    markers:[
+                      {
+                        id:0,
+                        latitude:nowlatitude,
+                        longitude:nowlongitude,
+                        iconPath:"../../image/mapcenter.png",
+                        width:25,
+                        height:25,
+                        callout:{
+                          content:"当前位置",
+                          color:'#0000ff',
+                          fontSize:13,
+                          borderRadius:5,
+                          borderWidth:1,
+                          borderColor:'#0000ff',
+                          padding:2,
+                          display:'ALWAYS'
+                        }
+                      }
+                    ]
+                  })
+                }
+              }
+            })
 
+          }
+        }
+      });
+      // let mapCtx = wx.createMapContext('myMap',that)
+      // console.log(mapCtx)
+      // mapCtx.initMarkerCluster({
+      //   enableDefaultStyle:true,
+      //   zoomOnClick:true,
+      //   gridSize:60,
+      //   complete(res){
+      //     console.log('initMarkerCluster',res)
+      //   }
+      // })
   },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-   
+  onReady: function (e) {
+    // 使用 wx.createMapContext 获取 map 上下文
+    this.mapCtx = wx.createMapContext('myMap');
   },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
+  // 设置点聚合
+  initMarkerCluster:function(){
+    this.mapCtx.initMarkerCluster({
+      enableDefaultStyle:true,
+      zoomOnClick:true,
+      gridSize:20,
+      complete(res){
+        console.log('initMarkerCluster',res)
+      }
+    })
   },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
+  clickButton: function (e) {
+    //console.log(this.data.fullscreen)
+    //打印所有关于点击对象的信息
+    this.setData({ fullscreen: !this.data.fullscreen })
   },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
+  modalcancel:function(e)
+  {
+    this.setData({
+      hidden:true,
+    })
+  },
+  modalconfirm:function(e)
+  {
+    var that = this;
+    this.setData({
+      hidden:true,
+    })
+    //路径规划
+    var plugin = requirePlugin('routePlan');
+    var key = 'NS4BZ-A5GK3-MAA3K-OT63P-S3CHS-PSBKH    ';  //使用在腾讯位置服务申请的key
+    var referer = 'cugerguider';   //调用插件的app的名称
+    var themeColor = '#7B68EE';  //主题颜色
+    var endPoint = that.data.endPoint;
+    var startPoint = that.data.startPoint;
+    wx.navigateTo({
+      url: 'plugin://routePlan/index?key=' + key + '&referer=' + referer +'&endPoint=' + endPoint  + '&startPoint='+ startPoint + '&themeColor=' + themeColor
+  });
   }
 })
\ No newline at end of file
diff --git a/pages/navigate/navigate.json b/pages/navigate/navigate.json
index 8835af0..b807cb4 100644
--- a/pages/navigate/navigate.json
+++ b/pages/navigate/navigate.json
@@ -1,3 +1,7 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+  },
+  "navigationBarTitleText": "航大云系统",
+  "enablePullDownRefresh": true ,
+  "backgroundTextStyle": "dark" 
 }
\ No newline at end of file
diff --git a/pages/navigate/navigate.wxml b/pages/navigate/navigate.wxml
index ba35253..d5a6226 100644
--- a/pages/navigate/navigate.wxml
+++ b/pages/navigate/navigate.wxml
@@ -1,32 +1,72 @@
-<view class="contentView">
-  <view class="mapView">
-    <map id="map"
-      subkey="{{subkey}}"
-      style="width: 100%; height: 100%;"
-      latitude="{{latitude}}"
-      longitude="{{longitude}}"
-      scale="{{scale}}"
-      markers="{{makers}}"
-      circles="={{circles}}"
-      polyline="{{polylines}}"
-      polygons="{{polygons}}"
-      enable-3D="{{enable3d}}"
-      show-location="{{showLoaction}}"
-      show-compass="{{showCompass}}"
-      enable-zoom="{{enableZoom}}"
-      enable-rotate="{{enableRotate}}"
-      enable-satellite="{{enableSatellite}}"
-      enable-traffic="{{enbaleTraffic}}"
-      enable-overlooking="{{enbleOverlooking}}" 
-      bindmarkertap="handleMarkerTap"
-    >
-    </map>
+
+<view class='framework'>
+   <view class='input-position'>
+      <image src='https://mmbiz.qpic.cn/mmbiz_png/JZxArCU6LRribpVmzlUNGvYVU4jojoICBY1u3ic8lBGbs3sC86DgZy2wwicU5yMtUiagyicNcibu2mP8ibaVyBEysUy5A/0?wx_fmt=png' class='search-image'></image>
+       <input class="input" placeholder="搜索 周边 地址" placeholder-style="color:#bdbdbd;" bindinput="inputplace" />
+       <view class='line'></view>
+       <view class='search-text' bindtap="nearby_search">搜索</view>
+   </view>
+</view>
+<view class="index_other">
+   <view class="other_element" bindtap="tripplace" >
+     <image class="other_element_icon" src="../../image/trip.png"></image>
+     <view class="other_element_text">游在地大</view>
+   </view>
+   <view class="other_element" bindtap="studyplace">
+     <image class="other_element_icon" src="../../image/study.png"></image>
+     <view class="other_element_text">学在地大</view>
+   </view>
+   <view class="other_element" bindtap="eatplace">
+     <image class="other_element_icon" src="../../image/eat.png"></image>
+     <view class="other_element_text">吃在地大</view>
+   </view>
+   <view class="other_element" bindtap="runplace">
+     <image class="other_element_icon" src="../../image/running.png"></image>
+     <view class="other_element_text">运动地大</view>
+   </view>
+ </view>
+  <view class="index_other">
+   <view class="other_element" bindtap="tranplace">
+     <image class="other_element_icon" src="../../image/transform.png"></image>
+     <view class="other_element_text">交通服务</view>
+   </view>
+   <view class="other_element" bindtap="lifeplace">
+     <image class="other_element_icon" src="../../image/life.png"></image>
+     <view class="other_element_text">生活服务</view>
+   </view>
+   <view class="other_element" bindtap="adminplace">
+     <image class="other_element_icon" src="../../image/administrative.png"></image>
+     <view class="other_element_text">行政大楼</view>
+   </view>
+   <view class="other_element" bindtap="dorplace">
+     <image class="other_element_icon" src="../../image/dormitory.png"></image>
+     <view class="other_element_text">学生宿舍</view>
+   </view>
+ </view>
+<map 
+id="myMap"
+style="width:100%;height:1000rpx"
+markers="{{markers}}"
+data-markers="{{markers}}"
+scale="17"
+show-compass="true"
+enable-rotate="true"
+enable-building="true"
+bindmarkertap="onPointTap"
+bindlabeltap="onPointTap"
+subkey="LM6BZ-WVQKQ-BFH5Z-GJLKI-4YHNK-NAFM5"
+layer-style="2"
+latitude="{{markers[0].latitude}}" longitude="{{markers[0].longitude}}"
+></map>
+
+<!--弹出框-->
+<modal class="model" hidden="{{hidden}}" confirm-text="确定" cancel-text="取消" bindconfirm="modalconfirm" bindcancel="modalcancel" title="前往此处" style="width:80%">
+  <view class="model-img">
+    <image style="width:565rpx;height:300rpx" src="https://mmbiz.qpic.cn/mmbiz_png/JZxArCU6LRqEceyJTIetvRDXXfK5AsGulNDrG2TW1rDybw5ibOOIypHQDgY5vlpSENo9HBpibGWmr6sNEicgtiaXyw/0?wx_fmt=png"></image>
   </view>
-  <mp-halfScreenDialog show="{{showDialog}}">
-    <view slot="title">{{currenMarker.name}}</view>
-    <view slot="desc"></view>
-    <view slot="footer">
-      <button type="primary" class="weui-btn" bindtap="navi1">开始导航</button>
-    </view>
-  </mp-halfScreenDialog>
-</view>
\ No newline at end of file
+  <view class="model-name">{{modalname}}</view>
+  <view class="model-name">{{modaladdress}}</view>
+</modal>
+<!--弹出框结束-->
+
+
diff --git a/pages/navigate/navigate.wxss b/pages/navigate/navigate.wxss
index a1afc9d..e3d0fe2 100644
--- a/pages/navigate/navigate.wxss
+++ b/pages/navigate/navigate.wxss
@@ -1,9 +1,182 @@
-/* pages/navigate/navigate.wxss */
-.contentView{
-  width: 100%
+/* pages/home/home.wxss */
+
+.index_other{
+  margin-top: 10rpx;
+  height: 150rpx;
+  width: 100%;
+  display: flex;
+  flex-flow: row;
+}
+
+.other_element{
+  flex-direction: column;
+  width: 25%;
+}
+
+.other_element_icon{
+  width: 40%;
+  height: 80rpx;
+  margin-left: 30%;
+}
+
+.other_element_text{
+  display: flex;
+  justify-content: center;
+  font-size: 30rpx;
 }
-.mapView{
-  box-sizing: border-box;
-  padding:30rpx,30rpx,0,30rpx;
+.framework{
+  border: 1rpx solid #b3b3b3;
+  width: 700rpx;
+  height: 80rpx;
+  margin-left: 20rpx;
+  margin-top: 50rpx;
+  border-radius: 10rpx;
+  margin-bottom: 20rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.input-position{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: row;
+}
+.input{
+  color: #b3b3b3;
+  border: none;
+  border-radius: 10rpx;
+  width: 60vw;
+  height: 6vh;
+  text-indent:10rpx;
+  margin-left: 10rpx;
+}
+.line{
+  width: 3rpx;
+  height: 50rpx;
+  background-color: #b6b6b6;
+}
+.search-text{
+  color: #bdbdbd;
+  width: 80rpx;
+  height: 30rpx;
+  text-align: center;
+  margin-bottom: 20rpx;
+  margin-left: 30rpx;
+}
+.search-image{
+  width: 40rpx;
+  height:40rpx;
+  margin-right: 12rpx;
+
+}
+
+
+/* pages/map/map.wxss */
+
+.building-item {
+  height: 50px;
+  border-bottom: 1px solid #e0e0e0;
+  padding: 10px;
+}
+
+.top-swich {
+  background-color: #079df2;
+  height: 6vh;
+  color: white;
+  display: flex;
+  justify-content: space-around;
+}
+
+::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  color: transparent;
+}
+
+.top-swich-btn {
+  background-color: none;
+  letter-spacing: 3rpx;
+  height: 65rpx;
+  color: #fff;
+  font-size: 30rpx;
+}
+
+.active {
+  border-bottom: solid white;
+  height: 50rpx;
+  display: inline-block;
 }
 
+button {
+  font-size: 26rpx;
+  height: 6vh;
+}
+
+.img-view {
+  height: 100%;
+  display: flex;
+}
+
+.img {
+  width: 85%;
+  height: 100%;
+  display: flex;
+}
+
+.img image {
+  width: 60px;
+  height: 90%;
+  margin: auto 7rpx;
+}
+
+.item {
+  display: flex;
+  flex-direction: column;
+  margin: auto 0;
+}
+
+.itemName {
+  margin: 0 20rpx;
+  font-size: 32rpx;
+}
+
+.itemFloor {
+  margin: 0 20rpx;
+  font-size: 28rpx;
+  color: #555;
+}
+
+.text {
+  margin: auto 15px;
+  width: 13%;
+}
+
+.text image {
+  width: 70rpx;
+  height: 70rpx;
+}
+
+.controls {
+  position: relative;
+  top: 65%;
+  left: 85%;
+  /* display: flex; */
+}
+
+.controls .img {
+  margin-top: 5px;
+  width: 80rpx;
+  height: 80rpx;
+}
+
+.full {
+  top: 82%;
+}
+.model{
+  width: 100%;
+}
+.model-name{
+  text-align: center;
+  margin-top: 10rpx;
+}
\ No newline at end of file
diff --git a/pages/navigate1/navigate1.js b/pages/navigate1/navigate1.js
new file mode 100644
index 0000000..65de62e
--- /dev/null
+++ b/pages/navigate1/navigate1.js
@@ -0,0 +1,66 @@
+// pages/navigate1/navigate1.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/navigate1/navigate1.json b/pages/navigate1/navigate1.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/navigate1/navigate1.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/navigate1/navigate1.wxml b/pages/navigate1/navigate1.wxml
new file mode 100644
index 0000000..5ae08c2
--- /dev/null
+++ b/pages/navigate1/navigate1.wxml
@@ -0,0 +1,2 @@
+<!--pages/navigate1/navigate1.wxml-->
+<text>pages/navigate1/navigate1.wxml</text>
diff --git a/pages/navigate1/navigate1.wxss b/pages/navigate1/navigate1.wxss
new file mode 100644
index 0000000..d6ac509
--- /dev/null
+++ b/pages/navigate1/navigate1.wxss
@@ -0,0 +1 @@
+/* pages/navigate1/navigate1.wxss */
\ No newline at end of file
diff --git a/pages/person/person.json b/pages/person/person.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/person/person.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/person/person.wxml b/pages/person/person.wxml
new file mode 100644
index 0000000..74f353a
--- /dev/null
+++ b/pages/person/person.wxml
@@ -0,0 +1,2 @@
+<!--pages/person/person.wxml-->
+<text>pages/person/person.wxml</text>
diff --git a/pages/person/person.wxss b/pages/person/person.wxss
new file mode 100644
index 0000000..08f4ce6
--- /dev/null
+++ b/pages/person/person.wxss
@@ -0,0 +1 @@
+/* pages/person/person.wxss */
\ No newline at end of file
diff --git a/pages/schedule/schedule.js b/pages/schedule/schedule.js
new file mode 100644
index 0000000..416aef5
--- /dev/null
+++ b/pages/schedule/schedule.js
@@ -0,0 +1,66 @@
+// pages/schedule/schedule.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/schedule/schedule.json b/pages/schedule/schedule.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/schedule/schedule.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/schedule/schedule.wxml b/pages/schedule/schedule.wxml
new file mode 100644
index 0000000..3c3b38e
--- /dev/null
+++ b/pages/schedule/schedule.wxml
@@ -0,0 +1,2 @@
+<!--pages/schedule/schedule.wxml-->
+<view>hello</view>
diff --git a/pages/schedule/schedule.wxss b/pages/schedule/schedule.wxss
new file mode 100644
index 0000000..a7b35ef
--- /dev/null
+++ b/pages/schedule/schedule.wxss
@@ -0,0 +1 @@
+/* pages/schedule/schedule.wxss */
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index ef8c1df..9805d28 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,5 +1,6 @@
 {
   "description": "项目配置文件",
+  "cloudfunctionRoot": "cloud/",
   "packOptions": {
     "ignore": [],
     "include": []
@@ -38,7 +39,7 @@
       "disablePlugins": [],
       "outputPath": ""
     },
-    "condition": false
+    "condition": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.4",