Merge pull request '更新按钮' (#20) from wny_branch into dev

scr/wechat-weapp-mapdemo-master/app.json

@@ -3,7 +3,10 @@
     "pages/login/login",
     "pages/location/location",
     "pages/Find directions/Find directions",
-    "pages/text/text"
+    "pages/text/text",
+    "pages/ModifyMap/ModifyMap",
+    "pages/ModifyInformation/ModifyInformation",
+    "pages/ManageAccount/ManageAccount"
   ],
   "window":{
     "backgroundTextStyle":"light",

scr/wechat-weapp-mapdemo-master/pages/ManageAccount/ManageAccount.js

@@ -0,0 +1,23 @@
+Page({
+  data: {
+  loginOK: false
+  },
+  //map
+  map() {
+  wx.navigateTo({
+   url: '/pages/ModifyMap/ModifyMap',
+  })
+  },
+  //information
+  information() {
+  wx.navigateTo({
+   url: '/pages/ModifyInformation/ModifyInformation',
+  })
+  },
+  //account
+  account() {
+    wx.navigateTo({
+     url: '/pages/ManageAccount/ManageAccount'
+  })
+  }
+})

scr/wechat-weapp-mapdemo-master/pages/ManageAccount/ManageAccount.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

scr/wechat-weapp-mapdemo-master/pages/ManageAccount/ManageAccount.wxml

@@ -0,0 +1,5 @@
+<view class="ModifyAccount">
+  <button class="map" type="primary" bindtap="map" style="position: relative; left: -244rpx; top: 1081rpx; width: 263rpx; height: 108rpx; display: block; box-sizing: border-box">修改地图</button>
+  <button class="information" type="primary" bindtap="information" style="width: 263rpx; height: 108rpx; display: block; box-sizing: border-box; left: 19rpx; top: 973rpx; position: relative">修改信息</button>
+  <button class="account" type="primary" bindtap="account" style="width: 263rpx; height: 108rpx; display: block; box-sizing: border-box; left: 282rpx; top: 865rpx; position: relative">管理账户</button>
+</view>

scr/wechat-weapp-mapdemo-master/pages/ManageAccount/ManageAccount.wxss

@@ -0,0 +1 @@
+/* pages/ManageAccount/ManageAccount.wxss */

scr/wechat-weapp-mapdemo-master/pages/ModifyInformation/ModifyInformation.js

@@ -0,0 +1,23 @@
+Page({
+  data: {
+  loginOK: false
+  },
+  //map
+  map() {
+  wx.navigateTo({
+   url: '/pages/ModifyMap/ModifyMap',
+  })
+  },
+  //information
+  information() {
+  wx.navigateTo({
+   url: '/pages/ModifyInformation/ModifyInformation',
+  })
+  },
+  //account
+  account() {
+    wx.navigateTo({
+     url: '/pages/ManageAccount/ManageAccount'
+  })
+  }
+})

scr/wechat-weapp-mapdemo-master/pages/ModifyInformation/ModifyInformation.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

scr/wechat-weapp-mapdemo-master/pages/ModifyInformation/ModifyInformation.wxml

@@ -0,0 +1,5 @@
+<view class="ModifyInformation">
+  <button class="map" type="primary" bindtap="map" style="position: relative; left: -244rpx; top: 1081rpx; width: 263rpx; height: 108rpx; display: block; box-sizing: border-box">修改地图</button>
+  <button class="information" type="primary" bindtap="information" style="width: 263rpx; height: 108rpx; display: block; box-sizing: border-box; left: 19rpx; top: 973rpx; position: relative">修改信息</button>
+  <button class="account" type="primary" bindtap="account" style="width: 263rpx; height: 108rpx; display: block; box-sizing: border-box; left: 282rpx; top: 865rpx; position: relative">管理账户</button>
+</view>

scr/wechat-weapp-mapdemo-master/pages/ModifyInformation/ModifyInformation.wxss

@@ -0,0 +1 @@
+/* pages/ModifyInformation/ModifyInformation.wxss */

scr/wechat-weapp-mapdemo-master/pages/ModifyMap/ModifyMap.js

@@ -0,0 +1,23 @@
+Page({
+  data: {
+  loginOK: false
+  },
+  //map
+  map() {
+  wx.navigateTo({
+   url: '/pages/ModifyMap/ModifyMap',
+  })
+  },
+  //information
+  information() {
+  wx.navigateTo({
+   url: '/pages/ModifyInformation/ModifyInformation',
+  })
+  },
+  //account
+  account() {
+    wx.navigateTo({
+     url: '/pages/ManageAccount/ManageAccount'
+  })
+  }
+})

scr/wechat-weapp-mapdemo-master/pages/ModifyMap/ModifyMap.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

scr/wechat-weapp-mapdemo-master/pages/ModifyMap/ModifyMap.wxml

@@ -0,0 +1,5 @@
+<view class="ModifyMap">
+  <button class="map" type="primary" bindtap="map" style="position: relative; left: -244rpx; top: 1081rpx; width: 263rpx; height: 108rpx; display: block; box-sizing: border-box">修改地图</button>
+  <button class="information" type="primary" bindtap="information" style="width: 263rpx; height: 108rpx; display: block; box-sizing: border-box; left: 19rpx; top: 973rpx; position: relative">修改信息</button>
+  <button class="account" type="primary" bindtap="account" style="width: 263rpx; height: 108rpx; display: block; box-sizing: border-box; left: 282rpx; top: 865rpx; position: relative">管理账户</button>
+</view>

scr/wechat-weapp-mapdemo-master/pages/ModifyMap/ModifyMap.wxss

@@ -0,0 +1 @@
+/* pages/ModifyMap/ModifyMap.wxss */

scr/wechat-weapp-mapdemo-master/pages/login/login.js

@@ -21,7 +21,7 @@ Page({
   showpage: function(){
     wx.reLaunch(
       {
-        url:'../Find directions/Find directions'
+        url:'../ModifyMap/ModifyMap'
       }
     )
   }

scr/wechat-weapp-mapdemo-master/pages/login/login.wxml

@@ -2,7 +2,7 @@
   <view class="page__bd">
     <view class="weui-toptips weui-toptips_warn" wx:if="{{showTopTips}}">错误提示</view>
     <view class="weui-cells__title">登录</view>
-    <view class="weui-cells weui-cells_after-title">
+    <view class="weui-cells weui-cells_after-title" style="width: 750rpx; height: 303rpx; display: block; box-sizing: border-box">
       <view class="weui-cell weui-cell_input">
         <view class="weui-cell__hd">
           <view class="weui-label">用户名</view>
@@ -21,12 +21,12 @@
       </view>
     </view>
    
-    <view class="weui-btn-area" bindtap="showLive">
+    <view class="weui-btn-area" bindtap="showLive" style="width: 750rpx; height: 190rpx; display: block; box-sizing: border-box; left: 0rpx; top: 0rpx">
-      <button class="weui-btn" type="primary">用户登陆</button>
+      <button class="weui-btn" type="primary" style="width: 347rpx; height: 108rpx; display: block; box-sizing: border-box; left: -174rpx; top: -61rpx; position: relative">用户登陆</button>
     </view>
     <view class="weui-btn-area" bindtap="showpage">
-      <button class="weui-btn" type="primary">管理员登陆</button>
+      <button class="weui-btn" type="primary" style="width: 331rpx; height: 108rpx; display: block; box-sizing: border-box; left: 188rpx; top: -249rpx; position: relative">管理员登陆</button>
     </view>
-     <view class="weui-cells__title" >注册,忘记密码请联系qq:xx</view>
+     <view class="weui-cells__title"  style="position: relative; left: 0rpx; top: -79rpx">注册,忘记密码请联系qq:xx</view>
   </view>
 </view>