Merge branch 'master' of http://git.cc-lotus.info/ball-court/court-mobile

app.json

@@ -1,7 +1,7 @@
 {
   "pages": [
-    "pages/index/index",
     "pages/login/index",
+    "pages/index/index",
     "pages/register/index",
     "pages/home/index",
     "pages/search/index",

pages/home/index.wxss

@@ -133,6 +133,7 @@ button {
   width: 100%;
   height: 80px;
   background-color: #e9e9e9;
+  border-bottom: 2px solid white;
 }
 
 .right1_2 {

pages/match/detail.js

@@ -15,8 +15,7 @@ Page({
     // 主体高度
     infoHeight: '',
     id: '',
-    schedulelist: [
-    ]
+    schedulelist: []
   },
   //上传图片
   imgUpload: function (e) {
@@ -58,7 +57,6 @@ Page({
           method: 'get',
           data: {},
           success(res) {
-            console.log(res.data.data);
             that.setData({
               schedulelist: res.data.data,
             })
@@ -70,17 +68,16 @@ Page({
       }
     })
   },
- // 计算高度
- searchHeight: function () {
-  let frameStyle = this.data.frameStyle;
-  let client = app.globalData.client;
-  let infoHeight = client.windowHeight;
-  // 是否去掉状态栏
-  if (frameStyle.useTop) infoHeight = infoHeight - (client.statusBarHeight + client.getMenu.height + (client.getMenu.top - client.statusBarHeight) * 2);
-  // 是否减去底部菜单
-  if (frameStyle.useBar) infoHeight = infoHeight - 50;
-  if (infoHeight) this.setData({ infoHeight: infoHeight })
-},
+  // 计算高度
+  searchHeight: function () {
+    let frameStyle = this.data.frameStyle;
+    let client = app.globalData.client;
+    // 减去状态栏
+    let infoHeight = client.windowHeight - (client.statusBarHeight + client.getMenu.height + (client.getMenu.top - client.statusBarHeight) * 2);
+    // 是否减去底部菜单
+    if (frameStyle.useBar) infoHeight = infoHeight - 50;
+    if (infoHeight) this.setData({ infoHeight: infoHeight })
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成

pages/match/detail.wxss

@@ -55,7 +55,6 @@
 .two-9 {
   width: 70%;
 }
-
 .two2 {
   background-color: #ffffff;
 }