Merge branch 'master' of http://git.cc-lotus.info/Consumables/mobiles-two

pages/index/index.wxml

@@ -1,6 +1,7 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
   <view slot="info" class="main" style="height:{{infoHeight}}px;">
     <view class="one">
+      <view>11111</view>
       <button type="primary" size="mini" bindtap="toLogin" data-type="home">系统首页</button>
       <button type="primary" size="mini" bindtap="toLogin" data-type="login">系统登录</button>
       1

pages/test/index.less

@@ -0,0 +1,8 @@
+.main {
+    position: relative;
+    width: 100%;
+
+    .one {
+        text-align: center;
+    }
+}

pages/test/index.wxss

@@ -1 +1,7 @@
-/* pages/test/index.wxss */
+.main {
+  position: relative;
+  width: 100%;
+}
+.main .one {
+  text-align: center;
+}