diff --git a/pages.js b/pages.js index 04f9a4a..b324d8f 100644 --- a/pages.js +++ b/pages.js @@ -37,7 +37,7 @@ module.exports = hot((pagesJson)=>{ current: 0, list: [ // {name:"测试页面",path:"pages/demo"}, - {name: "地块管理",path: "pages/massif/mana/index","query": ""}, + // {name: "地块管理",path: "pages/massif/mana/index","query": ""}, {name: "登录",path: "pages/home/login","query": ""}, {name: "首页",path: "pages/home/index","query": ""}, {name: "仓库管理",path: "pages/warehouse/mana","query": ""}, diff --git a/pages/home/index.vue b/pages/home/index.vue index b53bdd0..a5adcc5 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -236,7 +236,7 @@ padding-top:90px; background-image:url(@/static/home_picker_head.png); background-repeat: no-repeat; - background-size:auto 90px; + background-size:100% 90px; } } } diff --git a/pages/massif/mana/index.vue b/pages/massif/mana/index.vue index 1001f77..f784390 100644 --- a/pages/massif/mana/index.vue +++ b/pages/massif/mana/index.vue @@ -78,6 +78,12 @@ export default { polygon.setFillColor("#10C176") polygon.setFillOpacity(0.3) maps.addOverlay(polygon) + + var marker=new plus.maps.Marker(new plus.maps.Point(116.396137,39.924055)); + marker.setIcon("/static/tab_home.png"); + marker.bringToTop() + marker.setDraggable(true) + maps.addOverlay(marker); /* #endif */ }, methods:{ diff --git a/store/index.js b/store/index.js index b3e7423..4b31437 100644 --- a/store/index.js +++ b/store/index.js @@ -22,9 +22,9 @@ export default new Vuex.Store({ outLogin(state){ state.userInfo={} state.token='' - // uni.reLaunch({ - // url:"/pages/home/login", - // }) + uni.reLaunch({ + url:"/pages/home/login", + }) }, setHeadImg(state,val){ state.userInfo.avatar=val