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

app.json

@@ -1,6 +1,5 @@
 {
   "pages": [
-    "pages/photo/index",
     "pages/home/index",
     "pages/login/index",
     "pages/search/index",
@@ -16,7 +15,8 @@
     "pages/createTeam/index",
     "pages/information/index",
     "pages/score/index",
-    
+    "pages/photo/index",
+    "pages/add/index",
     "pages/password/index",
     "pages/auditTeam/index",
     "pages/match/index",
@@ -75,4 +75,4 @@
       "desc": "你的位置信息将用于小程序位置接口的效果展示"
     }
   }
-}
+}

pages/add/index.js

@@ -0,0 +1,118 @@
+// pages/login/login.js
+import WxValidate from '../../utils/wxValidate'
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    frameStyle: { useTop: true, name: '申请加入', leftArrow: true, useBar: false },
+    // 主体高度
+    infoHeight: '',
+    singledate: '2018-09-01',
+    time: '12:01',
+    form: {
+      team_id: '1',// 团队id
+      team_name: '团队名称', // 团队名称
+      apply_time: '2022-03-22',// 申请时间
+      apply_user: '申请人',// 申请人
+      apply_id: '1',// 申请人id
+    },
+  },
+  bindDateChange3: function (e) {
+    console.log('picker发送选择改变，携带值为', e.detail.value)
+    this.setData({
+      singledate: e.detail.value
+    })
+  },
+  bindTimeChange: function (e) {
+    console.log('picker发送选择改变，携带值为', e.detail.value)
+    this.setData({
+      time: e.detail.value
+    })
+  },
+  // 时间段选择  
+  bindDateChange(e) {
+    let that = this;
+    console.log(e.detail.value)
+    that.setData({
+      date: e.detail.value,
+    })
+  },
+  bindDateChange2(e) {
+    let that = this;
+    that.setData({
+      date2: e.detail.value,
+    })
+  },
+  back: function () {
+    wx.navigateBack({ url: '/pages/home/index' })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    // 计算高度
+    this.searchHeight()
+  },
+  // 计算高度
+  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 })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/add/index.json

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

pages/add/index.wxml

@@ -0,0 +1,56 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+  <view slot="info" class="main" style="height:{{infoHeight}}px;">
+    <view>
+      <form style="height:{{infoHeight-140}}px;">
+        <view class="one">
+          <view class="one_list">
+            <!-- team_id: '1',// 团队id
+          team_name: '团队名称', // 团队名称
+          apply_time: '申请时间',// 申请时间
+          apply_user: '申请人',// 申请人
+          apply_id: '1',// 申请人id -->
+            <view class="text">团队id</view>
+            <view class="text">{{form.team_id}}</view>
+          </view>
+          <view class="one_list">
+            <view class="text">团队名称</view>
+            <view class="text">{{form.team_name}}</view>
+          </view>
+          <view class="one_list">
+            <view class="text">申请人</view>
+            <view class="text">{{form.apply_user}}</view>
+          </view>
+          <view class="one_list">
+            <view class="text">申请时间</view>
+            <view class="text" style="display: flex;flex-wrap: wrap;">
+              <picker mode="date" value="{{ form.apply_time}}" start="2018-09-01" end="2150-09-01" bindchange="bindDateChange3">
+                <view class="picker1">
+                  {{form.apply_time}}
+                </view>
+              </picker>
+              <picker mode="time" value="{{time}}" start="00:00" end="24:00" bindchange="bindTimeChange">
+                <view class="picker2">
+                  {{time}}
+                </view>
+              </picker>
+            </view>
+          </view>
+          <view class="one_list">
+            <view class="text">申请人id</view>
+            <view class="text">{{form.team_name}}</view>
+          </view>
+        </view>
+      </form>
+    </view>
+    <view class="four">
+      <view class="four-1">
+        <view class="four1">
+          <button class="button" form-type="submit">返回</button>
+        </view>
+        <view class="four2">
+          <button class="buttons" form-type="submit">确认</button>
+        </view>
+      </view>
+    </view>
+  </view>
+</mobile-main>

pages/add/index.wxss

@@ -0,0 +1,118 @@
+.main {
+  position: relative;
+  width: 100%;
+  background-color: #ffffff;
+}
+
+.one_list {
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid #dddddd;
+  margin: 0 20px;
+  height: 40px;
+  line-height: 40px;
+}
+
+.four {
+  position: absolute;
+  width: 100%;
+  bottom: 0;
+  background-color: white;
+}
+
+.four-1 {
+  background-color: white;
+  width: 100%;
+}
+
+.four1 {
+  background-color: white;
+  margin-top: 15%;
+  margin-bottom: 15%;
+  margin-left: 10%;
+  float: left;
+  width: 37%;
+}
+
+.four2 {
+  background-color: white;
+  margin-top: 15%;
+  margin-bottom: 10%;
+  float: left;
+  width: 30%;
+}
+
+.button {
+  margin-top: 0 !important;
+  width: 140px !important;
+  height: 35px;
+  background-color: rgba(209, 205, 205, 0.5);
+  /* background-image: linear-gradient(to right, rgb(236, 75, 83) , rgb(247, 41, 230)); */
+  border-top-left-radius: 1.5em;
+  border-top-right-radius: 0em;
+  border-bottom-right-radius: 0em;
+  border-bottom-left-radius: 1.5em;
+  color: #777777;
+  font-size: 14px;
+}
+
+.buttons {
+  margin-top: 0 !important;
+  width: 140px !important;
+  height: 35px;
+  background-color: rgba(32, 88, 243, 0.5);
+  background-image: linear-gradient(to right, rgb(75, 113, 236), rgb(203, 97, 245));
+  border-top-left-radius: 0em;
+  border-top-right-radius: 1.5em;
+  border-bottom-right-radius: 1.5em;
+  border-bottom-left-radius: 0em;
+  color: #ffffff;
+  font-size: 14px;
+}
+
+.mult {
+  float: left;
+  width: 65%;
+  padding-left: 15px;
+  font-size: 14px;
+  line-height: 80rpx;
+  background-color: white;
+  font-weight: 500;
+}
+
+.mult11 {
+  padding-left: 15px;
+  font-size: 14px;
+  line-height: 80rpx;
+  background-color: white;
+  font-weight: 500;
+}
+
+.mults {
+  margin-top: -1px;
+  background-color: white;
+  line-height: 80rpx;
+  text-align: center;
+}
+
+.multone {
+  margin-bottom: 1.8px;
+  font-size: 14px;
+}
+
+.mult88 {
+  float: left;
+  width: 63%;
+  line-height: 80rpx;
+  background-color: white;
+  text-align: right;
+  padding: 0 9px 0 0;
+}
+
+.mult00 {
+  padding-left: 15px;
+  float: left;
+  width: 30%;
+  line-height: 80rpx;
+  background-color: white;
+}

pages/administration/index.js

@@ -17,7 +17,7 @@ Page({
     infoHeight: '',
     list: [
       {
-        id: '1', name: '朝阳区乒乓球比赛',week: '星期五', time: '13：00',
+        id: '1', name: '朝阳区乒乓球比赛', week: '星期五', time: '13：00',
         state: '进行中', listbisai: [
           {
             id: '1', head2: '/image/head2.png', head1: '/image/head1.png', fraction2: '1', groupname2: '马尼拉老年组', group: '第一组', fraction1: '2', groupname1: '哈拉海队幼儿园', match: '循环赛'
@@ -70,24 +70,24 @@ Page({
   },
   xun: function () {
     wx.navigateTo({
-      url: '/pages/match/index',
+      url: '/pages/match/detail',
     })
   },
-  jump:function(){
+  jump: function () {
     wx.navigateTo({
-     url: `/pages/competition/index`,
+      url: `/pages/competition/index`,
     })
-   },
-   tuan:function(){
+  },
+  tuan: function () {
     wx.navigateTo({
-     url: `/pages/ranking/index`,
+      url: `/pages/ranking/index`,
     })
-   },
-   shen:function(){
+  },
+  shen: function () {
     wx.navigateTo({
-     url: `/pages/administration/detail`,
+      url: `/pages/administration/detail`,
     })
-   },
+  },
   setup() {
     const active = ref(0);
     return { active };

pages/administration/index.wxml

@@ -34,7 +34,7 @@
               </view>
               <view class="otherInfo textOver"><text class="text3">{{item.address}}</text></view>
             </view>
-            <view class="right1" wx:if="{{item.listbisai}}" wx:for="{{item.listbisai}}" wx:for-item="items">
+            <view class="right1" wx:if="{{item.listbisai}}" wx:for="{{item.listbisai}}" wx:for-item="items" wx:key="key">
               <view class="right1_1" bindtap="xun">
                 <text class="text4">{{items.match}}</text>
                 <text class="text4">{{items.group}}</text>
@@ -69,7 +69,7 @@
               </view>
               <view class="otherInfo textOver"><text class="text3">{{item.address}}</text></view>
             </view>
-            <view class="right1" wx:if="{{item.listbisai}}" wx:for="{{item.listbisai}}" wx:for-item="items">
+            <view class="right1" wx:if="{{item.listbisai}}" wx:for="{{item.listbisai}}" wx:for-item="items" wx:key="key">
               <view class="right1_1" bindtap="xun" >
                 <text class="text4">{{items.match}}</text>
                 <text class="text4">{{items.group}}</text>
@@ -104,7 +104,8 @@
               </view>
               <view class="otherInfo textOver"><text class="text3">{{item.address}}</text></view>
             </view>
-            <view class="right1" wx:if="{{item.listbisai}}" wx:for="{{item.listbisai}}" wx:for-item="items">
+            <view class="right1" wx:if="{{item.listbisai}}" wx:for="{{item.listbisai}}" wx:for-item="items"
+            wx:key="key">
               <view class="right1_1">
                 <text class="text4">{{items.match}}</text>
                 <text class="text4">{{items.group}}</text>

pages/home/index.js

@@ -41,7 +41,7 @@ Page({
   },
   xun: function () {
     wx.navigateTo({
-      url: '/pages/match/index',
+      url: '/pages/match/detail',
     })
   },
   tabPath(e) {

pages/home/index.wxss

@@ -114,6 +114,7 @@ listbut{
 }
 
 .right1_2 .right1_2o {
+  margin-left: 1%;
   float: left;
   width: 11%;
   height: 40px;

pages/list/index.js

@@ -82,16 +82,6 @@ Page({
       }
     ],
   },
-  tiao: function () {
-    wx.navigateTo({
-      url: '/pages/match/index',
-    })
-  },
-  xun: function () {
-    wx.navigateTo({
-      url: '/pages/match/detail',
-    })
-  },
   back: function () {
     wx.navigateBack({ url: '/pages/home/index' })
   },

pages/list/index.wxml

@@ -9,7 +9,7 @@
     <view class="two">
       <view class="list" wx:key="item" wx:for="{{list}}">
         <view class="listtou">
-          <view class="name" bindtap="tiao">{{item.name}}</view>
+          <view class="name">{{item.name}}</view>
           <view class="listbut"> <button class="button" size="mini" style="background:rgb(238, 147, 28);" wx:if="{{item.state == '进行中'}}">{{item.state}}</button>
             <button class="button" size="mini" style="background:rgb(238, 88, 28);" wx:if="{{item.state == '待比赛'}}">{{item.state}}</button>
             <button class="button" size="mini" style="background:rgb(54, 233, 48)" wx:if="{{item.state == '报名中'}}">{{item.state}}</button>
@@ -26,7 +26,7 @@
           <view class="otherInfo"><text class="text3">{{item.match}}</text></view>
         </view>
         <view class="right1" wx:if="{{item.listbisai}}" wx:for="{{item.listbisai}}" wx:for-item="items" wx:key="key">
-          <view class="right1_1" bindtap="xun">
+          <view class="right1_1">
             <text class="text4">{{items.match}}</text>
             <text class="text4">{{items.group}}</text>
           </view>

pages/match/detail.js

@@ -9,20 +9,21 @@ Page({
   data: {
     src: '/image/detail.jpg',
     src1: '/image/head1.png',
-    fileList: '',
+    // 上传图片
+    fileList: [],
     frameStyle: { useTop: true, name: '比赛信息', leftArrow: true, useBar: false },
     // 主体高度
     infoHeight: '',
     listb: [
       {
-          time: '1-15 15:00',
-          ranks1: '哈拉海队幼儿园组',
-          score1: '2',
-          score2: '1',
-          ranks2: '马尼拉老年组',
-          state: '未开始'
+        time: '1-15 15:00',
+        ranks1: '哈拉海队幼儿园组',
+        score1: '2',
+        score2: '1',
+        ranks2: '马尼拉老年组',
+        state: '未开始'
       }
-  ],
+    ],
     lists: [
       {
         id: '1', name: '老头1', head: '/image/tou.png'
@@ -74,21 +75,23 @@ Page({
       }
     ],
   },
-   //上传图片
+  //上传图片
   afterRead: function (event) {
     const { file } = event.detail;
     // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式app.globalData.fileUrl：
+    console.log(file);
     wx.uploadFile({
-      url: "http://broadcast.waityou24.cn/files" + '/baoan/elimg/upload',
+      url: `${app.globalData.imageUrl}/files/court/elimg/upload`,
       filePath: file.url,
       name: 'file',
       formData: {},
       success: (res) => {
         console.log(res);
         if (res.statusCode == '200') {
-          this.setData({ 'el_img': JSON.parse(res.data).uri })
           let data = [{ name: JSON.parse(res.data).name, url: `${app.globalData.imageUrl}` + JSON.parse(res.data).uri }]
-          this.setData({ fileList: data })
+          const { fileList = [] } = this.data;
+          fileList.push({ ...file, url: res.data });
+          this.setData({ fileList });
         } else {
           wx.showToast({ title: `${res.data.errmsg}`, icon: 'fail', duration: 2000 })
         }

pages/match/detail.wxml

@@ -48,7 +48,10 @@
     </view>
     <view class="thr">
       <view class="thrright">
-        <view class="thrleft"><text class="thrss">马尼拉队</text></view>
+        <view class="thrleft">
+          <image class="imgs" src="{{src1}}"></image>
+          <text class="thrss">马尼拉队</text>
+        </view>
         <view class="thr-1" wx:key="item" wx:for="{{list}}">
           <view class="thr1">
             <view class="thr-left">
@@ -61,12 +64,17 @@
 
     </view>
     <view class="four">
-      <view class="four1"><text class="fours">现场照片</text>
-        <van-uploader file-list="{{fileList}}" bind:after-read="afterRead" />
+      <view class="four1">
+        <text class="fours">现场照片</text>
+      </view>
+    </view>
+    <view class="upload">
+      <view class="upload_1">
+        <van-uploader file-list="{{fileList}}" preview-image="true" max-count="4" bind:after-read="afterRead" />
       </view>
     </view>
     <view class="five">
-      <button class="button" form-type="submit">待通过</button>
+      <button class="button" form-type="submit">上传比分</button>
     </view>
   </view>
 </mobile-main>

pages/match/detail.wxss

@@ -2,47 +2,57 @@
   position: relative;
   width: 100%;
 }
-.two{
+
+.two {
   background-color: #ffffff;
   padding-top: 15px;
+  margin-bottom: 1%;
 }
-.two1{
+
+.two1 {
   width: 100%;
   margin-left: 3%;
   font-size: 15px;
   font-weight: 550;
 }
-.tworight{
+
+.tworight {
   width: 100%;
   float: left;
   padding: 2%;
   background-color: #ffffff;
   margin-bottom: 0.5%;
 }
-.two-left{
+
+.two-left {
   width: 90%;
   height: 50.64px;
   background-color: #eeeeee;
 }
-.imgs{
+
+.imgs {
   width: 85%;
-  height: 40.83px; 
+  height: 40.83px;
 }
-.img{
+
+.img {
   width: 100%;
-  height: 50.64px; 
+  height: 50.64px;
 }
-.two-1{
+
+.two-1 {
   padding-top: 17px;
   padding-left: 5px;
   float: left;
   width: 15%;
   background-color: #ffffff;
 }
-.two2{
+
+.two2 {
   background-color: #ffffff;
 }
-.two-2{
+
+.two-2 {
   padding-top: 10px;
   padding-left: 5px;
   float: left;
@@ -51,28 +61,34 @@
   background-color: #ffffff;
   /* border: 1px solid red; */
 }
-.name{
+
+.name {
   margin-left: 10px;
   font-size: 13px;
   color: #727272;
 }
-.thr-left{
+
+.thr-left {
   width: 90%;
   height: 50.64px;
   background-color: #eeeeee;
 }
-.img{
+
+.img {
   width: 100%;
-  height: 50.64px; 
+  height: 50.64px;
 }
-.thr{
+
+.thr {
   background-color: #ffffff;
 }
-.thrright{
+
+.thrright {
   background-color: #ffffff;
   margin-bottom: 2%;
 }
-.thr-1{
+
+.thr-1 {
   padding-top: 10px;
   padding-left: 6.5px;
   float: left;
@@ -80,10 +96,12 @@
   background-color: #ffffff;
   padding-bottom: 5px;
 }
-.thr1{
+
+.thr1 {
   background-color: #ffffff;
 }
-.thr-2{
+
+.thr-2 {
   padding-top: 10px;
   padding-left: 8px;
   float: left;
@@ -92,30 +110,36 @@
   background-color: #ffffff;
   /* border: 1px solid red; */
 }
-.thr2{
+
+.thr2 {
   float: left;
   width: 50px;
   height: 50px;
   border: 2px solid #dddcdc;
 }
-.names{
+
+.names {
   margin-left: 7px;
   font-size: 13px;
   color: #727272;
 }
-.thrss{
+
+.thrss {
+  margin-left: -3px;
   font-size: 14px;
   font-weight: 500;
 }
-.thrleft{
+
+.thrleft {
   float: left;
   height: 100px;
-  padding-top: 73px;
+  padding-top: 38px;
   padding-left: 10px;
   padding-right: 2px;
   background-color: #ffffff;
   margin-bottom: 2%;
 }
+
 .one {
   position: relative;
   background-color: #ffffff;
@@ -123,12 +147,14 @@
   margin-bottom: 5%;
   padding: 10px 20px;
 }
-.onea{
+
+.onea {
   font-weight: 600;
   position: absolute;
   top: 5%;
   left: 2%;
 }
+
 .back {
   width: 40rpx;
   height: 40rpx;
@@ -136,60 +162,101 @@
   width: 40rpx;
   height: 40rpx;
 }
-.four{
-  position: absolute;
-  bottom: 12%;
-  left: 2%;
-  font-weight: 550;
-  font-size: 15px;
-  background-color: #ffffff;
-}
-.five{
-  position: absolute;
-  bottom: 3%;
-  left: 10%;
+
+.five {
+  float: left;
+  width: 100%;
   font-weight: 550;
   font-size: 15px;
+  padding-top: 5%;
+  padding-bottom: 10%;
   background-color: #ffffff;
 }
-.button{
+
+.button {
   margin-top: 5px !important;
   width: 300px !important;
   height: 35px;
   background-color: rgb(247, 89, 16);
-  background-image: linear-gradient(to right, rgb(245, 122, 65) , rgb(247, 89, 41));
-  border-radius: 30px; 
-  color:#ffffff; 
+  background-image: linear-gradient(to right, rgb(245, 122, 65), rgb(247, 89, 41));
+  border-radius: 30px;
+  color: #ffffff;
   font-size: 13px;
 }
+
+.upload {
+  float: left;
+  width: 100%;
+  background-color: #ffffff;
+}
+
+.upload .upload_1 {
+  margin-left: 3%;
+}
+
+.one {
+  float: left;
+  width: 100%;
+}
+
+.two {
+  float: left;
+  width: 100%;
+}
+
+.thr {
+  float: left;
+  width: 100%;
+}
+.four1{
+  margin-left: 3%;
+  font-size: 15px;
+  font-weight: 550;
+}
+.four {
+  margin-top: 2%;
+  float: left;
+  width: 100%;
+  padding-top: 3%;
+  padding-bottom: 3%;
+  background-color: white;
+}
+
 .one_1 {
   position: relative;
-  width: 35%;
+  width: 30%;
   float: left;
 }
+
 .one_1_text {
-  text-align: center;
+  text-align: left;
   font-size: 14px;
 }
+
 .one_3_text {
-  text-align: center;
+  text-align: left;
+  padding-left:9%;
   font-size: 14px;
 }
+
 .one_2 {
   position: relative;
   width: 30%;
   float: left;
   height: 102px;
 }
+
 .one_2_1 {
   text-align: center;
   margin-bottom: 5px;
 }
+
 .one_2_2 {
   text-align: center;
 }
+
 .text1 {
-  background-color: rgb(209, 209, 209);
+  background-color: rgb(240, 240, 240);
   text-align: center;
   color: #00427b;
   font-size: 30px;
@@ -197,19 +264,22 @@
   text-decoration: line-through;
   text-decoration-color: #fff;
 }
+
 .text2 {
   font-size: 25px;
   font-weight: bold;
   margin: 0 5px;
 }
+
 .text {
   font-size: 15px;
   position: relative;
   top: 9px;
   text-align: center;
 }
+
 .text3 {
-  background-color: rgb(209, 209, 209);
+  background-color: rgb(240, 240, 240);
   text-align: center;
   color: #e70000;
   font-size: 30px;
@@ -217,11 +287,13 @@
   text-decoration: line-through;
   text-decoration-color: #fff;
 }
+
 .one_3 {
   position: relative;
-  width: 35%;
+  width: 38%;
   float: right;
 }
+
 .one_4 {
   margin-top: 4%;
   float: left;
@@ -230,13 +302,16 @@
   color: #999;
   text-align: center;
 }
+
 .one_logo1 {
   width: 90px;
   height: 80px;
 }
-.one_3_img{
-    padding: 0 15px;
+
+.one_3_img {
+  padding: 0 10px;
 }
+
 .one_logo2 {
   align-items: center;
   width: 90px;

pages/team/apply.js

@@ -14,34 +14,34 @@ Page({
     infoHeight: '',
     list: [
       {
-        id: '1',time: '08:30', date: '2022.01.15',Founder:'XXX',group:'哈拉海队',person:'10',grade:'c'
+        id: '1', time: '08:30', date: '2022.01.15', Founder: 'XXX', group: '哈拉海队', person: '10', grade: 'c'
       }
     ],
     lists: [
       {
-        id: '1',name:'老头1',head:'/image/tou.png'
+        id: '1', name: '老头1', head: '/image/tou.png'
       },
       {
-        id: '1',name:'老头2',head:'/image/tou.png'
+        id: '1', name: '老头2', head: '/image/tou.png'
       },
       {
-        id: '1',name:'老头3',head:'/image/tou.png'
+        id: '1', name: '老头3', head: '/image/tou.png'
       },
       {
-        id: '1',name:'老头4',head:'/image/tou.png'
+        id: '1', name: '老头4', head: '/image/tou.png'
       },
       {
-        id: '1',name:'老头5',head:'/image/tou.png'
+        id: '1', name: '老头5', head: '/image/tou.png'
       },
       {
-        id: '1',name:'老头6',head:'/image/tou.png'
+        id: '1', name: '老头6', head: '/image/tou.png'
       },
       {
-        id: '1',name:'老头7',head:'/image/tou.png'
+        id: '1', name: '老头7', head: '/image/tou.png'
       },
 
       {
-        id: '1',name:'老头8',head:'/image/tou.png'
+        id: '1', name: '老头8', head: '/image/tou.png'
       }
     ],
   },
@@ -49,22 +49,27 @@ Page({
     let query = e.detail.detail;
     if (query) wx.redirectTo({ url: `/pages/${query}/index` })
   },
+  add: function () {
+    wx.navigateTo({
+      url: '/pages/add/index',
+    })
+  },
   back: function () {
     wx.navigateBack({ url: '/pages/home/index' })
   },
-  out(){
+  out() {
     wx.showModal({
-     title: '',
-     content: '是否确认退出团队',
-     success(res) {
-      if (res.confirm) {
-       console.log('用户点击确定')
-      } else if (res.cancel) {
-       console.log('用户点击取消')
+      title: '',
+      content: '是否确认退出团队',
+      success(res) {
+        if (res.confirm) {
+          console.log('用户点击确定')
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
       }
-     }
     })
-   },
+  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/team/apply.wxml

@@ -65,7 +65,7 @@
     </view>
     <view class="four">
       <button class="button" form-type="submit">待通过</button>
-      <button class="button" form-type="submit">申请加入</button>
+      <button class="button" form-type="submit" bindtap='add'>申请加入</button>
       <button class="button" form-type="submit" bindtap='out'>退出团队</button>
     </view>
   </view>

pages/team/index.wxss

@@ -78,6 +78,7 @@
   border-radius: 30px; 
   color:#ffffff; 
   font-size: 13px;
+  line-height: 15px;
 }
 .head {
   float: left;