1

app.json

@@ -13,6 +13,9 @@
         "pages/updatepd/index",
         "pages/user/index",
         "pages/user/detail",
+        "pages/matchadmin/index",
+        "pages/matchadmin/edit",
+        "pages/matchadmin/layout",
         "pages/test/index",
         "pages/logs/logs"
     ],

pages/matchadmin/edit.js

@@ -0,0 +1,84 @@
+// pages/login/login.js
+import WxValidate from '../../utils/wxValidate'
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        frameStyle: { useTop: true, name: '修改比赛信息', leftArrow: true, useBar: false },
+        // 主体高度
+        infoHeight: '',
+    },
+    back: function () {
+        wx.navigateBack({ url: '/pages/matchadmin/index' })
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        // 计算高度
+        this.searchHeight()
+    },
+    // 计算高度
+    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 })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

pages/matchadmin/edit.json

@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+      "mobile-main": "/commpents/mobile-frame/mobile-main"
+    }
+  }

pages/matchadmin/edit.wxml

@@ -0,0 +1,5 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+  <view slot="info" class="main" style="height:{{infoHeight}}px;">
+    模板
+  </view>
+</mobile-main>

pages/matchadmin/edit.wxss

@@ -0,0 +1,4 @@
+.main {
+    position: relative;
+    width: 100%;
+}

pages/matchadmin/index.js

@@ -0,0 +1,106 @@
+// pages/login/login.js
+import WxValidate from '../../utils/wxValidate'
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        frameStyle: { useTop: true, name: '比赛管理', leftArrow: true, useBar: false },
+        // 主体高度
+        infoHeight: '',
+        list: [],
+    },
+    back: function () {
+        wx.navigateBack({ url: '/pages/me/index' })
+    },
+    // 修改，编排
+    toCommon: function (e) {
+        let { route, id } = e.currentTarget.dataset;
+        wx.navigateTo({ url: `/pages/matchadmin/${route}?id=${id}` })
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        // 计算高度
+        this.searchHeight();
+        // 监听用户是否登录
+        this.watchLogin();
+    },
+    // 监听用户是否登录
+    watchLogin: function () {
+        const that = this;
+        wx.getStorage({
+            key: 'token',
+            success: async res => {
+                const arr = await app.$get('/courtAdmin/api/match');
+                if (arr.errcode === 0) that.setData({ list: arr.data })
+            },
+            fail: res => {
+                return wx.redirectTo({ url: '/pages/login/index', })
+            }
+        })
+    },
+    // 计算高度
+    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 })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

pages/matchadmin/index.json

@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+      "mobile-main": "/commpents/mobile-frame/mobile-main"
+    }
+  }

pages/matchadmin/index.wxml

@@ -0,0 +1,27 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+    <view slot="info" class="main" style="height:{{infoHeight}}px;">
+        <view class="one">
+            <view class="list" wx:for="{{list}}" wx:key="item">
+                <view class="name textOver">{{item.name}}</view>
+                <view class="other">
+                    <view class="otherInfo">
+                        <text>时间：</text>
+                        <text>{{item.single_time}}</text>
+                    </view>
+                    <view class="otherInfo">
+                        <text>地点：</text>
+                        <text>{{item.address}}</text>
+                    </view>
+                    <view class="otherInfo">
+                        <text>状态：</text>
+                        <text>{{item.status=='0'?'未开始':item.status=='1'?'报名中':item.status=='2'?'待比赛':item.status=='3'?'进行中':'已结束'}}</text>
+                    </view>
+                </view>
+                <view class="btn" wx:if="{{item.status=='0'||item.status=='1'||item.status=='2'}}">
+                    <button type="default" size="mini" bindtap="toCommon" data-id="{{item._id}}" data-route="edit">修改</button>
+                    <button type="warn" size="mini" bindtap="toCommon" data-id="{{item._id}}" data-route="layout">编排</button>
+                </view>
+            </view>
+        </view>
+    </view>
+</mobile-main>

pages/matchadmin/index.wxss

@@ -0,0 +1,53 @@
+.main {
+    position: relative;
+    width: 100%;
+}
+
+.main .one {
+    float: left;
+    width: 95%;
+    padding: 10px;
+}
+
+.main .one .list {
+    float: left;
+    width: 95%;
+    padding: 10px;
+    background-color: #fff;
+    margin: 0 0 10px 0;
+    border-radius: 5px;
+}
+
+.main .one .list .name {
+    float: left;
+    width: 100%;
+    font-size: 14px;
+    font-weight: bold;
+    margin: 0 0 5px 0;
+}
+
+.main .one .list .other {
+    float: left;
+    width: 100%;
+    margin: 0 0 5px 0;
+}
+
+.main .one .list .other .otherInfo {
+    font-size: 12px;
+    color: #666;
+    margin: 0 0 5px 0;
+}
+
+.main .one .list .other .otherInfo text:nth-child(2) {
+    color: #000;
+}
+
+.main .one .list .btn {
+    text-align: center;
+}
+
+.main .one .list .btn button {
+    margin: 0 10px;
+    padding: 0 10px;
+    font-size: 12px;
+}

pages/matchadmin/layout.js

@@ -0,0 +1,84 @@
+// pages/login/login.js
+import WxValidate from '../../utils/wxValidate'
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        frameStyle: { useTop: true, name: '编排比赛赛制', leftArrow: true, useBar: false },
+        // 主体高度
+        infoHeight: '',
+    },
+    back: function () {
+        wx.navigateBack({ url: '/pages/matchadmin/index' })
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        // 计算高度
+        this.searchHeight()
+    },
+    // 计算高度
+    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 })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

pages/matchadmin/layout.json

@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+      "mobile-main": "/commpents/mobile-frame/mobile-main"
+    }
+  }

pages/matchadmin/layout.wxml

@@ -0,0 +1,5 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+  <view slot="info" class="main" style="height:{{infoHeight}}px;">
+    模板
+  </view>
+</mobile-main>

pages/matchadmin/layout.wxss

@@ -0,0 +1,4 @@
+.main {
+    position: relative;
+    width: 100%;
+}

pages/me/index.wxss

@@ -1,382 +1,383 @@
 .main {
-  position: relative;
-  width: 100%;
+    position: relative;
+    width: 100%;
 }
 
 .main .one {
-  float: left;
-  width: 100%;
+    float: left;
+    width: 100%;
 }
 
 .main .one .one_1 {
-  float: left;
-  width: 100%;
+    float: left;
+    width: 100%;
 }
 
 .main .one .one_1 image {
-  width: 100%;
-  height: 180px;
-  overflow: hidden;
+    width: 100%;
+    height: 180px;
+    overflow: hidden;
 }
 
 .main .one .one_2 {
-  position: absolute;
-  top: 100px;
-  width: 89%;
-  background-color: #ffffff;
-  height: 90px;
-  border-radius: 10px;
-  margin: 0 10px;
-  padding: 10px;
+    position: absolute;
+    top: 100px;
+    width: 89%;
+    background-color: #ffffff;
+    height: 90px;
+    border-radius: 10px;
+    margin: 0 10px;
+    padding: 10px;
 }
 
 .main .one .one_2 .one_2o {
-  float: left;
-  width: 100%;
-  height: 70px;
-  overflow: hidden;
+    float: left;
+    width: 100%;
+    height: 70px;
+    overflow: hidden;
 }
 
 .main .one .one_2 .one_2o .one_2o_l {
-  float: left;
-  width: 65%;
+    float: left;
+    width: 65%;
 }
 
 .main .one .one_2 .one_2o .one_2o_l .one_2o_lone {
-  font-size: 16px;
-  margin: 0 0 5px 0;
+    font-size: 16px;
+    margin: 0 0 5px 0;
 }
 
 .main .one .one_2 .one_2o .one_2o_l .one_2o_lone text:nth-child(1) {
-  font-weight: bold;
+    font-weight: bold;
 }
 
 .main .one .one_2 .one_2o .one_2o_l .one_2o_lone text:nth-child(2) {
-  margin: 0 0 0 10px;
-  background-color: rgb(148, 138, 240);
-  color: #fff;
-  border-radius: 5px;
-  padding: 0 5px;
+    margin: 0 0 0 10px;
+    background-color: rgb(148, 138, 240);
+    color: #fff;
+    border-radius: 5px;
+    padding: 0 5px;
 }
 
 .main .one .one_2 .one_2o .one_2o_l .one_2o_ltwo {
-  font-size: 14px;
-  color: #cccccc;
-  margin: 0 0 5px 0;
+    font-size: 14px;
+    color: #cccccc;
+    margin: 0 0 5px 0;
 }
 
 .main .one .one_2 .one_2o .one_2o_l .one_2o_ltwo text:nth-child(2) {
-  margin: 0 0 0 10px;
+    margin: 0 0 0 10px;
 }
 
 .main .one .one_2 .one_2o .one_2o_r {
-  float: left;
-  width: 35%;
+    float: left;
+    width: 35%;
 }
 
 .main .one .one_2 .one_2o .one_2o_r image {
-  width: 90px;
-  height: 90px;
-  background: #f1f1f1;
-  border-radius: 90px;
-  overflow: hidden;
-  position: absolute;
-  top: -30px;
+    width: 90px;
+    height: 90px;
+    background: #f1f1f1;
+    border-radius: 90px;
+    overflow: hidden;
+    position: absolute;
+    top: -30px;
 }
 
 .main .one .one_2 .one_2u {
-  float: left;
-  width: 100%;
-  font-size: 14px;
-  color: #666;
+    float: left;
+    width: 100%;
+    font-size: 14px;
+    color: #666;
 }
 
 .main .one .one_2 .one_2u .one_2u_l {
-  float: left;
-  width: 80%;
+    float: left;
+    width: 80%;
 }
 
 .main .one .one_2 .one_2u .one_2u_l .icon {
-  position: relative;
-  top: 2px;
+    position: relative;
+    top: 2px;
 }
 
 .main .one .one_2 .one_2u .one_2u_r {
-  float: left;
-  width: 20%;
-  text-align: right;
+    float: left;
+    width: 20%;
+    text-align: right;
 }
 
 .main .two {
-  float: left;
-  width: 95%;
-  margin: 45px 10px 0 10px;
+    float: left;
+    width: 95%;
+    margin: 45px 10px 0 10px;
 
 }
 
 .main .two .two_1 {
-  float: left;
-  width: 100%;
-  margin: 0 0 10px 0;
+    float: left;
+    width: 100%;
+    margin: 0 0 10px 0;
 }
 
 .main .two .two_1 .two_1o {
-  float: left;
-  width: 95%;
-  background-color: rgb(217, 235, 250);
-  border-radius: 7px;
-  margin: 0 10px;
-  padding: 6px 0;
+    float: left;
+    width: 95%;
+    background-color: rgb(217, 235, 250);
+    border-radius: 7px;
+    margin: 0 10px;
+    padding: 6px 0;
 }
 
 .main .two .two_1 .two_1o text {
-  padding: 0px 10px;
-  font-size: 13px;
-  color: #666;
+    padding: 0px 10px;
+    font-size: 13px;
+    color: #666;
 }
 
 .main .two .two_1 .two_1o button {
-  float: right;
-  margin: 0 10px 0 0;
-  padding: 0 5px;
-  background: #409eff;
-  color: #ffffff;
-  font-size: 12px;
-  border-radius: 10px;
+    float: right;
+    margin: 0 10px 0 0;
+    padding: 0 5px;
+    background: #409eff;
+    color: #ffffff;
+    font-size: 12px;
+    border-radius: 10px;
 }
 
 .main .two .two_1 .two_1u {
-  float: left;
-  width: 100%;
-  background-color: #ffffff;
-  border-radius: 5px;
+    float: left;
+    width: 100%;
+    background-color: #ffffff;
+    border-radius: 5px;
 
 }
 
 .main .two .two_1 .two_1u .ismatchList {
-  float: left;
-  width: 100%;
+    float: left;
+    width: 100%;
 }
 
 .main .two .two_1 .two_1u .ismatchList .ismatch_1 {
-  float: left;
-  width: 100%;
-  padding: 5px 0;
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  border-top-left-radius: 5px;
-  border-top-right-radius: 5px;
+    float: left;
+    width: 100%;
+    padding: 5px 0;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
 }
 
 .main .two .two_1 .two_1u .ismatchList .ismatch_1 text:nth-child(1) {
-  float: left;
-  padding: 0 10px;
-  font-size: 12px;
-  color: #fff;
+    float: left;
+    padding: 0 10px;
+    font-size: 12px;
+    color: #fff;
 }
 
 .main .two .two_1 .two_1u .ismatchList .ismatch_1 text:nth-child(2) {
-  float: right;
-  padding: 0 10px 0 0;
-  font-size: 12px;
-  color: #fff;
+    float: right;
+    padding: 0 10px 0 0;
+    font-size: 12px;
+    color: #fff;
 }
 
 .main .two .two_1 .two_1u .ismatchList .ismatch_2 {
-  float: left;
-  width: 95%;
-  padding: 10px;
+    float: left;
+    width: 95%;
+    padding: 10px;
 }
 
 .main .two .two_1 .two_1u .ismatchList .ismatch_2_1 {
-  float: left;
-  width: 15%;
-  text-align: center;
+    float: left;
+    width: 15%;
+    text-align: center;
 }
 
 .main .two .two_1 .two_1u .ismatchList .ismatch_2_1 image {
-  width: 40px;
-  height: 40px;
-  border-radius: 90px;
+    width: 40px;
+    height: 40px;
+    border-radius: 90px;
 }
 
 .main .two .two_1 .two_1u .ismatchList .ismatch_2_2 {
-  float: left;
-  width: 70%;
-  text-align: center;
-  padding: 10px 0;
+    float: left;
+    width: 70%;
+    text-align: center;
+    padding: 10px 0;
 }
 
 .main .two .two_1 .two_1u .ismatchList .ismatch_2_2 .name {
-  display: inline-block;
-  width: 30%;
-  text-align: center;
-  font-size: 15px;
-  font-weight: bold;
+    display: inline-block;
+    width: 30%;
+    text-align: center;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .main .two .two_1 .two_1u .ismatchList .ismatch_2_2 .ismatchname {
-  width: 35%;
+    width: 35%;
 }
 
 .main .two .two_1 .two_1u .ismatchList .ismatch_2_2 .name:nth-child(2) {
-  position: relative;
-  top: -4px;
+    position: relative;
+    top: -4px;
 }
 
 .main .two .two_1 .two_1u .ismatchList .ismatch_2_2 .name:nth-child(2) text:nth-child(1) {
-  color: #ff0000;
-  padding: 0 5px 0 0;
+    color: #ff0000;
+    padding: 0 5px 0 0;
 }
 
 .main .two .two_1 .two_1u .ismatchList .ismatch_2_2 .name:nth-child(2) text:nth-child(2) {
-  color: #0000ff;
-  padding: 0 0 0 5px;
+    color: #0000ff;
+    padding: 0 0 0 5px;
 }
 
 .main .two .two_2 {
-  float: left;
-  width: 95%;
-  margin: 0 0 10px 0;
-  background-color: #ffffff;
-  border-radius: 5px;
-  padding: 10px;
+    float: left;
+    width: 95%;
+    margin: 0 0 10px 0;
+    background-color: #ffffff;
+    border-radius: 5px;
+    padding: 10px;
 }
 
 .main .two .two_2 .two_2_1 {
-  float: left;
-  width: 100%;
-  font-size: 12px;
-  margin: 0 0 5px 0;
+    float: left;
+    width: 100%;
+    font-size: 12px;
+    margin: 0 0 5px 0;
 }
 
 .main .two .two_2 .two_2_1 text:nth-child(1) {
-  font-size: 16px;
-  color: #000;
-  font-weight: bold;
+    font-size: 16px;
+    color: #000;
+    font-weight: bold;
 }
 
 .main .two .two_2 .two_2_1 text:nth-child(2) {
-  color: #666;
-  padding: 0 0 0 10px;
+    color: #666;
+    padding: 0 0 0 10px;
 }
 
 .main .two .two_2 .two_2_1 button {
-  float: right;
-  color: #866cf8;
-  font-style: oblique;
-  font-weight: 600;
-  background: transparent;
-  font-size: 14px !important;
+    float: right;
+    color: #866cf8;
+    font-style: oblique;
+    font-weight: 600;
+    background: transparent;
+    font-size: 14px !important;
 }
 
 .main .two .two_2 .two_2_2 {
-  float: left;
-  width: 100%;
+    float: left;
+    width: 100%;
 }
 
 .main .two .two_2 .two_2_2 .teamList {
-  float: left;
-  width: 95%;
-  background-color: rgba(245, 172, 63, 0.1);
-  margin: 0 0 10px 0;
-  padding: 8px 10px;
+    float: left;
+    width: 95%;
+    background-color: rgba(245, 172, 63, 0.1);
+    margin: 0 0 10px 0;
+    padding: 8px 10px;
 }
 
 .main .two .two_2 .two_2_2 .teamList .team_l {
-  float: left;
-  width: 80%;
+    float: left;
+    width: 80%;
 }
 
 .main .two .two_2 .two_2_2 .teamList .team_l .team_l_1 {
-  float: left;
-  width: 100%;
-  margin: 0 0 5px 0;
+    float: left;
+    width: 100%;
+    margin: 0 0 5px 0;
 }
 
 .main .two .two_2 .two_2_2 .teamList .team_l .team_l_1 image {
-  float: left;
-  width: 40px;
-  height: 40px;
-  border-radius: 90px;
+    float: left;
+    width: 40px;
+    height: 40px;
+    border-radius: 90px;
 }
 
 .main .two .two_2 .two_2_2 .teamList .team_l .team_l_1 text {
-  float: left;
-  font-size: 14px;
-  margin: 10px 0 0 10px;
+    float: left;
+    font-size: 14px;
+    margin: 10px 0 0 10px;
 }
 
 .main .two .two_2 .two_2_2 .teamList .team_l .team_l_1 text:nth-child(2) {
-  position: relative;
-  top: 2px;
-  max-width: 56%;
-  font-weight: bold;
+    position: relative;
+    top: 2px;
+    max-width: 56%;
+    font-weight: bold;
 }
 
 .main .two .two_2 .two_2_2 .teamList .team_l .team_l_1 text:nth-child(3) {
-  background-color: #409eff;
-  color: #ffffff;
-  border-radius: 8px;
-  padding: 2px 5px;
+    background-color: #409eff;
+    color: #ffffff;
+    border-radius: 8px;
+    padding: 2px 5px;
 }
 
 .main .two .two_2 .two_2_2 .teamList .team_l .team_l_2 {
-  float: left;
-  width: 100%;
-  font-size: 12px;
-  color: #666;
+    float: left;
+    width: 100%;
+    font-size: 12px;
+    color: #666;
 }
 
 .main .two .two_2 .two_2_2 .teamList .team_r {
-  float: left;
-  width: 20%;
-  text-align: right;
-  font-size: 12px;
-  color: #666;
-  position: relative;
-  top: 20px;
+    float: left;
+    width: 20%;
+    text-align: right;
+    font-size: 12px;
+    color: #666;
+    position: relative;
+    top: 20px;
 }
 
 .main .two .two_3 {
-  float: left;
-  width: 95%;
-  background-color: #fff;
-  padding: 10px;
-  margin: 0 0 10px 0;
-  border-radius: 5px;
+    float: left;
+    width: 95%;
+    background-color: #fff;
+    padding: 10px;
+    margin: 0 0 10px 0;
+    border-radius: 5px;
 }
 
 .two_3 .two_3_o {
-  float: left;
-  width: 100%;
-  font-size: 12px;
-  margin: 0 0 5px 0;
+    float: left;
+    width: 100%;
+    font-size: 12px;
+    margin: 0 0 5px 0;
 }
 
 .two_3 .two_3_o text {
-  font-size: 16px;
-  color: #000;
-  font-weight: bold;
+    font-size: 16px;
+    color: #000;
+    font-weight: bold;
 }
 
 .two_3_u {
-  float: left;
-  width: 100%;
+    float: left;
+    width: 100%;
 }
 
-.btnList {
-  float: left;
-  width: 25%;
-  text-align: center;
-  margin: 0 0 5px 0;
+.two_3_u .btnList {
+    float: left;
+    width: 25%;
+    min-height: 50px;
+    text-align: center;
+    margin: 0 0 5px 0;
 }
 
-.btnList .icons {
-  margin: 0 0 5px 0;
+.two_3_u .btnList .icons {
+    margin: 0 0 5px 0;
 }
 
-.btnList .title {
-  font-size: 14px;
-  color: #666;
-}
+.two_3_u .btnList .title {
+    font-size: 14px;
+    color: #666;
+}

pages/uploadimg/index.wxss

@@ -60,7 +60,7 @@
 .main .two .list .list_2 .fileList {
     position: relative;
     float: left;
-    width: 48%;
+    width: 47%;
     margin: 0 10px 10px 0;
 }