合并

app.json

@@ -1,6 +1,5 @@
 {
   "pages": [
-    
     "pages/home/index",
     "pages/login/index",
     "pages/search/index",
@@ -13,10 +12,14 @@
     "pages/competition/index",
     "pages/ranking/index",
     "pages/me/index",
+    "pages/createTeam/index",
     "pages/information/index",
+    "pages/score/index",
+    "pages/photo/index",
+    "pages/password/index",
+    "pages/auditTeam/index",
     "pages/match/index",
     "pages/match/detail",
-    "pages/score/index",
     "pages/index/index",
     "pages/register/index",
     "pages/logs/logs"

pages/auditTeam/index.js

@@ -0,0 +1,86 @@
+// pages/login/login.js
+import WxValidate from '../../utils/wxValidate'
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        // 主体高度
+        infoHeight: '',
+        frameStyle: { useTop: true, name: '审核队员', leftArrow: true, useBar: false },
+        list: []
+    },
+
+    back: function () {
+        wx.navigateBack({ url: '/pages/me/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/auditTeam/index.json

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

pages/auditTeam/index.wxml

@@ -0,0 +1,11 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+    <view slot="info" class="main" style="height:{{infoHeight}}px;">
+        <view class="one">
+            <image class="logo" src="/image/logo1.png"></image>
+            <text class="text1">队名</text>
+            <text class="text2">申请时间：{{item.time}}</text>
+            <view class="btnl"> <button size="mini" class="btn1">驳回</button></view>
+            <view class="btnr"><button  size="mini" class="btn2">通过</button></view>
+        </view>
+    </view>
+</mobile-main>

pages/auditTeam/index.wxss

@@ -0,0 +1,59 @@
+.main {
+    position: relative;
+    width: 100%;
+    background-color: #eeeeee;
+    padding: 10px 0 0 0;
+}
+
+.one {
+    margin: 0 12px;
+    background-color: #fff;
+}
+
+.logo {
+    height: 50px;
+    width: 45px;
+    padding: 12px;
+}
+
+.text1 {
+    position: relative;
+    left: 10px;
+    top: -45px;
+}
+
+.text2 {
+    position: relative;
+    left: -23px;
+    top: -10px;
+}
+/* .btnl{
+    width: 50%;
+    float: left;
+}
+.btnr{
+    width: 50%;
+    float: left;
+} */
+.btn1 {
+    position: relative;
+    left: 50px;
+    top: 5px;
+    width: 80px !important;
+    background-image: linear-gradient(to right, #6c51fb, #1262fe);
+    border-radius: 30px;
+    color: #ffffff;
+    font-size: small;
+}
+
+.btn2 {
+    position: relative;
+    top: -31px;
+    left: 225px;
+    width: 80px !important;
+    background-image: linear-gradient(to right, #6c51fb, #1262fe);
+    border-radius: 30px;
+    color: #ffffff;
+    text-align: center;
+    font-size: small;
+}

pages/createTeam/index.js

@@ -0,0 +1,126 @@
+// pages/login/login.js
+import WxValidate from '../../utils/wxValidate'
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        // 主体高度
+        infoHeight: '',
+        frameStyle: { useTop: true, name: '创建团队', leftArrow: true, useBar: false },
+        form: {
+            src: '/image/tou.png',
+            ranks: '比赛第一名队',
+            mechanism: '吉佳通达',
+            type: ['乒乓球', '足球'],
+            objectSex: [{ id: 0, name: '乒乓球' }, { id: 1, name: '足球' },],
+
+        },
+        lists: [
+            {
+                id: '1', text: '哈拉海队', logo: '/image/logo1.png', jian: '/image/jian.png '
+            },
+            {
+                id: '1', text: '哈拉海队', logo: '/image/logo1.png', jian: '/image/jian.png '
+            },
+            {
+                id: '1', text: '哈拉海队', logo: '/image/logo1.png', jian: '/image/jian.png '
+            },
+            {
+                id: '1', text: '哈拉海队', logo: '/image/logo1.png', jian: '/image/jian.png '
+            },
+            {
+                id: '1', text: '哈拉海队', logo: '/image/logo1.png', jian: '/image/jian.png '
+            },
+            {
+                id: '1', text: '哈拉海队', logo: '/image/logo1.png', jian: '/image/jian.png '
+            },
+            {
+                id: '1', text: '哈拉海队', logo: '/image/logo1.png', jian: '/image/jian.png '
+            },
+        ],
+        index: 0,
+    },
+    //选择
+    bindPickerChange: function (e) {
+        console.log('picker发送选择改变，携带值为', e.detail.value)
+        this.setData({
+            index: e.detail.value
+        })
+    },
+    back: function () {
+        wx.navigateBack({ url: '/pages/me/index' })
+    },
+    //提交
+    formSubmit: function (e) {
+        console.log('form发生了submit事件，携带数据为：', e.detail.value)
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    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/createTeam/index.json

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

pages/createTeam/index.wxml

@@ -0,0 +1,53 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+    <view slot="info" class="main" style="height:{{infoHeight}}px;">
+        <form catchsubmit="formSubmit" catchreset="formReset">
+            <view class="form" >
+                <view class="top">
+                    <view class="zero">
+                        <view class="text">团队LOGO</view>
+                        <image src="{{form.src}}" class="tou"></image>
+                    </view>
+                    <view class="one">
+                        <view class="text">团队名称</view>
+                        <input class="input" name="ranks" value="{{form.ranks}}" placeholder="" />
+                    </view>
+                    <view class="one">
+                        <view class="text">团队创建人</view>
+                        <input class="input" name="mechanism" value="{{form.mechanism}}" placeholder="" />
+                    </view>
+                    <view class="one">
+                        <view class="text">团队类型</view>
+                        <picker name="sex" bindchange="bindPickerChange" value="{{index}}" range="{{form.type}}">
+                            <view class="input">{{form.type[index]}}
+                                <image class="back" src="/image/back.png"></image>
+                            </view>
+                        </picker>
+                    </view>
+                </view>
+                <view class="bottom" style="height:{{infoHeight-250}}px;">
+                    <view class="two">
+                        <view class="two_title"> 团队队员</view>
+                        <view class="two_1"  wx:key="item" wx:for="{{lists}}">
+                            <view class="team_1">
+                                <image class="two_logo1" src="{{item.logo}}"></image>
+                                <image class="two_jian" src="{{item.jian}}"></image>
+                            </view>
+                            <view class="team_text">{{item.text}}</view>
+                        </view>
+                       
+                        <view class="two_1">
+                            <view class="team_1">
+                                <view class="tianjia">
+                                    <text class=" icon iconfont icon-jia"></text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view class="btn-area">
+                <button class="button" formType="submit">创建团队</button>
+            </view>
+        </form>
+    </view>
+</mobile-main>

pages/createTeam/index.wxss

@@ -0,0 +1,119 @@
+.main {
+  position: relative;
+  width: 100%;
+  background-color: #f0f0f0;
+
+}
+
+.top {
+  padding: 0 0 10px 0;
+  margin: 0 0 20px 0;
+  background-color: #ffffff;
+  height: 200px;
+}
+
+.zero {
+  border-bottom: 1px solid #dddddd;
+  padding: 20px 0 0 0;
+  margin: 0 20px;
+  height: 50px;
+}
+
+.one {
+  border-bottom: 1px solid #dddddd;
+  margin: 0 20px;
+  height: 40px;
+}
+
+.text {
+  position: relative;
+  top: 10px;
+  width: 40%;
+  font-size: 14px;
+}
+
+.tou {
+  width: 50px;
+  height: 50px;
+  position: relative;
+  left: 280px;
+  top: -30px;
+}
+
+.back {
+  width: 30rpx;
+  height: 30rpx;
+  transform-origin: 50% 50%;
+  transform: rotate(-90deg);
+}
+
+.input {
+  position: relative;
+  text-align: right;
+  left: 130px;
+  top: -10px;
+  width: 60%;
+  font-size: 16px;
+}
+
+.bottom {
+  background-color: #ffffff;
+}
+
+.two_title {
+  font-size: 16px;
+  padding: 20px 0 0 20px;
+}
+
+.two_1 {
+  padding: 10px 8px;
+  width: 20%;
+  float: left;
+  text-align: center;
+}
+
+.team_1 {
+  margin: 7px;
+  width: 60px;
+  height: 60px;
+  background-color: #f8f8f8;
+  border-radius: 60px;
+}
+.tianjia{
+  padding: 17px 0 0 0;
+}
+.two_logo1 {
+  margin: 4px 2px;
+  width: 45px;
+  height: 50px;
+}
+
+.two_jian {
+  position: relative;
+  top: -15px;
+  left: 20px;
+  width: 20px;
+  height: 20px;
+}
+
+.team_text {
+  font-size: 12px;
+  color: #555;
+}
+.btn-area{
+  width: 100%;
+  position: absolute;
+  bottom: 0px;
+  background-color: #fff;
+  height: 60px;
+}
+.button {
+  position: relative;
+  top: 10px;
+  width: 300px !important;
+  background-image: linear-gradient(to right, #fd3c1e, #c74df0);
+  border-radius: 30px;
+  color: #ffffff;
+  text-align: center;
+  font-size: small;
+}

pages/information/index.js

@@ -7,6 +7,8 @@ Page({
      * 页面的初始数据
      */
     data: {
+        // 主体高度
+        infoHeight: '',
         frameStyle: { useTop: true, name: '个人信息', leftArrow: true, useBar: false },
         form: {
             src: '/image/tou.png',
@@ -14,12 +16,12 @@ Page({
             mechanism: '吉佳通达',
             sex: ['男', '女'],
             objectSex: [{ id: 0, name: '男' }, { id: 1, name: '女' },],
-           
+
             post: '后勤部长',
             phone: '12311111111',
             email: '123@qq.com',
         },
-         index: 0,
+        index: 0,
     },
     //选择
     bindPickerChange: function (e) {
@@ -34,7 +36,7 @@ Page({
     //提交
     formSubmit: function (e) {
         console.log('form发生了submit事件，携带数据为：', e.detail.value)
-      },
+    },
     /**
      * 生命周期函数--监听页面加载
      */

pages/me/index.js

@@ -41,6 +41,7 @@ Page({
         id: '1', head: '/image/head1.png', group: '哈拉海队', time: '08:30', ball: '足球', grade: 'c', date: '2022.01.15', person: '10',
       },
     ],
+    showModal: false
 
   },
   tabPath(e) {
@@ -54,17 +55,57 @@ Page({
     })
   },
   //修改个人信息
-  modify:function(){
+  modify: function () {
     wx.navigateTo({
       url: `/pages/information/index`,
     })
   },
   //上传比分
-  upload:function(){
+  upload: function () {
     wx.navigateTo({
       url: `/pages/score/index`,
     })
   },
+  //创建团队
+  create: function () {
+    wx.navigateTo({
+      url: `/pages/createTeam/index`,
+    })
+  },
+  //已上传图片
+  Uploaded: function () {
+    wx.navigateTo({
+      url: `/pages/photo/index`,
+    })
+  },
+  //修改密码
+  change: function () {
+    wx.navigateTo({
+      url: `/pages/password/index`,
+    })
+  },
+  //审核队员
+  examine: function () {
+    wx.navigateTo({
+      url: `/pages/auditTeam/index`,
+    })
+  },
+
+  //解散团队弹窗
+  clickme: function () {
+    this.setData({
+      showModal: true
+    })
+  },
+  preventTouchMove: function () {
+  },
+  //关闭弹窗
+  go: function () {
+    this.setData({
+      showModal: false
+    })
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */

pages/me/index.wxml

@@ -25,7 +25,7 @@
           </view>
           <view class="qian" bindtap="modify">
             <text class="text3">{{item.address}}</text>
-            <van-icon  name="arrow" color="rgb(177, 177, 177)" />
+            <van-icon name="arrow" color="rgb(177, 177, 177)" />
           </view>
         </view>
       </view>
@@ -34,7 +34,7 @@
       <view class="left2">
         <text class="text4">可对正在进行的比赛上次比分</text>
       </view>
-      <view class="right2"  bindtap="upload">
+      <view class="right2" bindtap="upload">
         <button class="buttons" size="mini">上传比分</button>
       </view>
     </view>
@@ -84,7 +84,7 @@
         <view class="otherInfo">
           <text class="tuan">我的团队</text>
           <text class="total">共参加{{total}}个队伍</text>
-          <text class="chuang">创建团队</text>
+          <text class="chuang" bindtap="create">创建团队</text>
         </view>
         <view class="weui-cells mgt-0 {{!showMore? 'hiddenmore' : 'showmore'}}">
           <view wx:key="item" wx:for="{{list3}}" wx:for-index="idx" wx:key="key" class="list3 {{idx>1 ? 'more-item' : ''}}">
@@ -131,7 +131,7 @@
     </view>
     <view class="six">
       <view class="six-11"><text class="fui">我的服务</text></view>
-      <view class="six-0">
+      <view class="six-0" bindtap="Uploaded">
         <view class="six-left">
           <text class=" icon iconfont icon-shangchuanzhaopian"></text>
         </view>
@@ -139,7 +139,7 @@
           <text class="six-text">已上传照片</text>
         </view>
       </view>
-      <view class="six-1">
+      <view class="six-1" bindtap="change">
         <view class="six-left">
           <text class=" icon iconfont icon-xiugaimima"></text>
         </view>
@@ -147,7 +147,7 @@
           <text class="six-text">修改密码</text>
         </view>
       </view>
-      <view class="six-2">
+      <view class="six-2" bindtap="examine">
         <view class="six-left">
           <text class=" icon iconfont icon-shenhe"></text>
         </view>
@@ -155,7 +155,7 @@
           <text class="six-text">审核队员</text>
         </view>
       </view>
-      <view class="six-3">
+      <view class="six-3" bindtap="clickme">
         <view class="six-left">
           <text class=" icon iconfont icon-ren_jiesantuandui_line"></text>
         </view>
@@ -163,6 +163,14 @@
           <text class="six-text">解散团队</text>
         </view>
       </view>
+      <view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
+      <view class="modalDlg" wx:if="{{showModal}}">
+        <text class="modal_text1">解散团队</text>
+        <text class="modal_text2">成双成队成双成队</text>
+        <text class="modal_text3">解散的团队不可恢复</text>
+        <button bindtap="go" class="modal_button">解散申请</button>
+        <text bindtap="go" class="modal_text4">取消</text>
+      </view>
     </view>
   </view>
 </mobile-main>

pages/me/index.wxss

@@ -223,7 +223,8 @@
   width: 100%;
   margin-top: 3px;
 }
-.iocns{
+
+.iocns {
   margin-top: -1px;
 }
 
@@ -240,6 +241,7 @@
   height: 33px;
   overflow: hidden;
 }
+
 .head2 {
   width: 89%;
   height: 34px;
@@ -288,7 +290,8 @@
   color: rgb(160, 160, 160);
   margin-right: 85px;
 }
-.total1{
+
+.total1 {
   font-size: 13px;
   color: rgb(160, 160, 160);
   margin-right: 70px;
@@ -327,6 +330,7 @@
   float: left;
   width: 30%;
 }
+
 .date {
   font-size: 13px;
   margin-left: 4px;
@@ -465,10 +469,65 @@
   font-size: 13px;
 
 }
-.listtuan{
+
+.listtuan {
   background-color: white;
   border-radius: 5%;
 }
+
 .hiddenmore .more-item {
   display: none;
+}
+
+.mask {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  z-index: 9000;
+  opacity: 0.3;
+}
+
+.modalDlg {
+  width: 210px;
+  height: 190px;
+  position: fixed;
+  left: 0;
+  z-index: 9999;
+  margin: -450px 85px;
+  background-color: #fff;
+  border-radius: 36rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.modal_text1 {
+  font-size: 14px;
+  color: #666;
+  margin: 20px 0 10px 0;
+}
+
+.modal_text2 {
+  font-size: 18px;
+  margin: 0px 0 10px 0;
+}
+.modal_text3 {
+  font-size: 12px;
+  color: #666;
+  margin: 0 0 10px 0;
+}
+.modal_text4 {
+  font-size: 12px;
+  margin: 10px 0 0 0;
+}
+.modal_button {
+  width: 120px !important;
+  background-image: linear-gradient(to right, #fd3c1e, #c74df0);
+  border-radius: 30px;
+  color: #ffffff;
+  text-align: center;
+  font-size: small;
 }

pages/password/index.js

@@ -0,0 +1,90 @@
+// pages/login/login.js
+import WxValidate from '../../utils/wxValidate'
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        // 主体高度
+        infoHeight: '',
+        frameStyle: { useTop: true, name: '已上传图片', leftArrow: true, useBar: false },
+        form:{
+            password:'123456'
+        }
+    },
+    back: function () {
+        wx.navigateBack({ url: '/pages/me/index' })
+    },
+    //提交
+    formSubmit: function (e) {
+        console.log('form发生了submit事件，携带数据为：', e.detail.value)
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    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/password/index.json

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

pages/password/index.wxml

@@ -0,0 +1,13 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+    <view slot="info" class="main" style="height:{{infoHeight}}px;">
+        <form catchsubmit="formSubmit" catchreset="formReset">
+            <view class="one">
+                <view class="text">输入新密码</view>
+                <input class="input" name="password" value="{{form.password}}" placeholder="{{password}}" />
+            </view>
+            <view class="btn-area">
+                <button class="button" formType="submit">保存</button>
+            </view>
+        </form>
+    </view>
+</mobile-main>

pages/password/index.wxss

@@ -0,0 +1,32 @@
+.main {
+    position: relative;
+    width: 100%;
+    background-color: #ffffff;
+    padding: 20px 0 0 0;
+}
+
+
+.one {
+    margin: 0 20px;
+}
+
+.text {
+    color: #999;
+    margin:  0 0 30px 0;
+}
+
+.input {
+    position: relative;
+    border-bottom: solid 1px #ddd;
+}
+
+.button {
+    position: relative;
+    top: 350px;
+    width: 300px !important;
+    background-image: linear-gradient(to right, #6c51fb, #1262fe);
+    border-radius: 30px;
+    color: #ffffff;
+    text-align: center;
+    font-size: small;
+}

pages/photo/index.js

@@ -0,0 +1,94 @@
+// pages/login/login.js
+import WxValidate from '../../utils/wxValidate'
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        // 主体高度
+        infoHeight: '',
+        frameStyle: { useTop: true, name: '已上传图片', leftArrow: true, useBar: false },
+    },
+    //选择
+    bindPickerChange: function (e) {
+        console.log('picker发送选择改变，携带值为', e.detail.value)
+        this.setData({
+            index: e.detail.value
+        })
+    },
+    back: function () {
+        wx.navigateBack({ url: '/pages/me/index' })
+    },
+    //提交
+    formSubmit: function (e) {
+        console.log('form发生了submit事件，携带数据为：', e.detail.value)
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    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/photo/index.json

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

pages/photo/index.wxml

@@ -0,0 +1,10 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+    <view slot="info" class="main" style="height:{{infoHeight}}px;">
+        <form catchsubmit="formSubmit" catchreset="formReset">
+            <view>111</view>
+            <view class="btn-area">
+                <button class="button" formType="submit">保存</button>
+            </view>
+        </form>
+    </view>
+</mobile-main>

pages/photo/index.wxss

@@ -0,0 +1,49 @@
+.main {
+  position: relative;
+  width: 100%;
+  background-color: #ffffff;
+  padding: 20px 0 0 0;
+}
+
+.zero{
+  border-bottom: 1px solid #dddddd;
+  margin: 0 20px;
+  height: 50px;
+}
+.one {
+  border-bottom: 1px solid #dddddd;
+  margin: 0 20px;
+  height: 40px;
+}
+
+.text {
+  position: relative;
+  top: 10px;
+  width: 40%;
+}
+.tou{
+  width: 50px;
+  height: 50px;
+  position: relative;
+  left: 280px;
+  top: -30px;
+}
+
+.input {
+  position: relative;
+  text-align: right;
+  left: 130px;
+  top: -10px;
+  width: 60%;
+  font-size: 14px;
+}
+.button{
+  position: relative;
+  top: 50px;
+  width: 300px !important;
+  background-image: linear-gradient(to right, #fd3c1e , #c74df0);
+  border-radius: 30px; 
+  color:#ffffff; 
+  text-align: center;
+  font-size: small;
+}

pages/score/index.js

@@ -2,89 +2,174 @@
 import WxValidate from '../../utils/wxValidate'
 const app = getApp()
 Page({
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        frameStyle: { useTop: true, name: '比赛信息', leftArrow: true, useBar: false },
-        list: [
-            {
-                time: '1-15 15:00',
-                ranks1: '哈拉海队幼儿园组',
-                score1: '2',
-                score2: '1',
-                ranks2: '马尼拉老年组',
-                state: '未开始'
-            }
-        ]
-    },
-    back: function () {
-        wx.navigateBack({ url: '/pages/me/index' })
-    },
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        // 计算高度
-        this.searchHeight()
-    },
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    // 主体高度
+    infoHeight: '',
+    frameStyle: { useTop: true, name: '比赛信息', leftArrow: true, useBar: false },
+    list: [{
+        logo1: '/image/logo1.png',
+        logo2: '/image/logo2.png',
+        time: '1-15 15:00',
+        ranks1: '哈拉海队幼儿园组',
+        score1: '2',
+        score2: '1',
+        ranks2: '马尼拉老年组',
+        state: '未开始',
+        match: '第二届老年组小区板王比赛'
+      }],
+    list1: [{ team: '哈拉海队', logo1: '/image/logo1.png',},],
+    lists1: [
+      {id: '1', text: '小孩1', tou: '/image/tou.png'},
+      {id: '1', text: '小孩2', tou: '/image/tou.png'},
+      {id: '1', text: '小孩3', tou: '/image/tou.png'},
+      {id: '1', text: '小孩4', tou: '/image/tou.png'},
+      {id: '1', text: '小孩5', tou: '/image/tou.png'},
+    ],
+    list2: [{ team: '马尼拉队', logo2: '/image/logo2.png',},],
+    lists2: [
+      {id: '1', text: '老头1', tou: '/image/tou.png'},
+      {id: '1', text: '老头2', tou: '/image/tou.png'},
+      {id: '1', text: '老头3', tou: '/image/tou.png'},
+      {id: '1', text: '老头4', tou: '/image/tou.png'},
+      {id: '1', text: '老头5', tou: '/image/tou.png'},
+      {id: '1', text: '老头6', tou: '/image/tou.png'},
+      {id: '1', text: '老头7', tou: '/image/tou.png'},
+      {id: '1', text: '老头8', tou: '/image/tou.png'},
+      {id: '1', text: '老头9', tou: '/image/tou.png'},
+      {id: '1', text: '老头10', tou: '/image/tou.png'},
+    ],
+    form:{
+      logo1:'/image/logo1.png',
+      team1:'哈拉海队',
+      num1:'1',
+      num2:'',
+      logo2:'/image/logo2.png',
+      team2:'马尼拉队',
+      num3:'1',
+      num4:'',
+    }
+  },
+  //提交
+  formSubmit: function (e) {
+    console.log('form发生了submit事件，携带数据为：', e.detail.value)
+},
+  back: function () {
+    wx.navigateBack({ url: '/pages/me/index' })
+  },
+  //点击我显示底部弹出框
+  clickme: function () {
+    this.showModal();
+  },
+
+  //显示对话框
+  showModal: function () {
+    // 显示遮罩层
+    var animation = wx.createAnimation({
+      duration: 200,
+      timingFunction: "linear",
+      delay: 0
+    })
+    this.animation = animation
+    animation.translateY(300).step()
+    this.setData({
+      animationData: animation.export(),
+      showModalStatus: true
+    })
+    setTimeout(function () {
+      animation.translateY(0).step()
+      this.setData({
+        animationData: animation.export()
+      })
+    }.bind(this), 200)
+  },
+  //隐藏对话框
+  hideModal: function () {
+    // 隐藏遮罩层
+    var animation = wx.createAnimation({
+      duration: 200,
+      timingFunction: "linear",
+      delay: 0
+    })
+    this.animation = animation
+    animation.translateY(300).step()
+    this.setData({
+      animationData: animation.export(),
+    })
+    setTimeout(function () {
+      animation.translateY(0).step()
+      this.setData({
+        animationData: animation.export(),
+        showModalStatus: false
+      })
+    }.bind(this), 200)
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
     // 计算高度
-    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 })
-    },
+    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 () {
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
 
-    },
+  },
 
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
 
-    },
+  },
 
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
 
-    },
+  },
 
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
 
-    },
+  },
 
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
 
-    },
+  },
 
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
 
-    },
+  },
 
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
 
-    }
+  }
 })

pages/score/index.wxml

@@ -3,7 +3,7 @@
         <view class="one" wx:key="item" wx:for="{{list}}">
             <view class="one_1">
                 <view class="one_1_img">
-                    <image class="one_logo1" src="/image/logo1.png"></image>
+                    <image class="one_logo1" src="{{item.logo1}}"></image>
                 </view>
                 <view class="one_1_text">{{item.ranks1}}</view>
             </view>
@@ -22,94 +22,70 @@
             </view>
             <view class="one_3">
                 <view class="one_3_img">
-                    <image class="one_logo2" src="/image/logo2.png"></image>
+                    <image class="one_logo2" src="{{item.logo2}}"></image>
                 </view>
                 <view class="one_3_text">{{item.ranks2}}</view>
             </view>
-            <view class="one_4">第二届老年组小区板王比赛</view>
-
+            <view class="one_4">{{item.match}}</view>
         </view>
         <view class="two" style="height:{{infoHeight-250}}px;">
             <view class="two_title">参赛阵容</view>
-            <view class="two_1">
+            <view class="two_1" wx:key="item" wx:for="{{list1}}">
                 <view class="two_1_1">
-                    <image class="two_logo1" src="/image/logo1.png"></image>
-                    <text class="two_1_text">哈拉海队</text>
+                    <image class="two_logo1" src=" {{item.logo1}}"></image>
+                    <text class="two_1_text">{{item.team}}</text>
                 </view>
-                <view class="two_1_2">
-                    <image class="two_logo2" src="/image/head.png"></image>
-                    <text class="two_1_text">小孩1</text>
-                </view>
-                <view class="two_1_2">
-                    <image class="two_logo2" src="/image/head.png"></image>
-                    <text class="two_1_text">小孩1</text>
-                </view>
-                <view class="two_1_2">
-                    <image class="two_logo2" src="/image/head.png"></image>
-                    <text class="two_1_text">小孩1</text>
-                </view>
-                <view class="two_1_2">
-                    <image class="two_logo2" src="/image/head.png"></image>
-                    <text class="two_1_text">小孩1</text>
-                </view>
-                <view class="two_1_2">
-                    <image class="two_logo2" src="/image/head.png"></image>
-                    <text class="two_1_text">小孩1</text>
+                <view class="two_1_2" wx:key="item" wx:for="{{lists1}}">
+                    <image class="two_logo2" src="{{item.tou}}"></image>
+                    <text class="two_1_text">{{item.text}}</text>
                 </view>
             </view>
             <view class="two_2">
-                <view class="two_2_1">
-                    <image class="two_logo1" src="/image/logo2.png"></image>
-                    <text class="two_2_text">哈拉海队</text>
+                <view class="two_2_1" wx:key="item" wx:for="{{list2}}">
+                    <image class="two_logo1" src="{{item.logo2}}"></image>
+                    <text class="two_2_text">{{item.team}}</text>
                 </view>
-                <view class="two_2n1">
-                    <view class="two_2_2">
-                        <image class="two_logo2" src="/image/head.png"></image>
-                        <text class="two_2_text">老头1</text>
-                    </view>
-                    <view class="two_2_2">
-                        <image class="two_logo2" src="/image/head.png"></image>
-                        <text class="two_2_text">老头2</text>
-                    </view>
-                    <view class="two_2_2">
-                        <image class="two_logo2" src="/image/head.png"></image>
-                        <text class="two_2_text">老头3</text>
-                    </view>
-                    <view class="two_2_2">
-                        <image class="two_logo2" src="/image/head.png"></image>
-                        <text class="two_2_text">老头4</text>
-                    </view>
-                    <view class="two_2_2">
-                        <image class="two_logo2" src="/image/head.png"></image>
-                        <text class="two_2_text">老头5</text>
-                    </view>
+                <view class="two_2_2" wx:key="item" wx:for="{{lists2}}">
+                    <image class="two_logo2" src="{{item.tou}}"></image>
+                    <text class="two_2_text">{{item.text}}</text>
                 </view>
-                <view class="two_2n2">
-                    <view class="two_2_2">
-                        <image class="two_logo2" src="/image/head.png"></image>
-                        <text class="two_2_text">老头6</text>
-                    </view>
-                    <view class="two_2_2">
-                        <image class="two_logo2" src="/image/head.png"></image>
-                        <text class="two_2_text">老头7</text>
+            </view>
+        </view>
+        <view class="btn" bindtap="clickme">
+            <button class="button">上传比分</button>
+        </view>
+        <!--屏幕背景变暗的背景  -->
+        <view class="commodity_screen" bindtap="hideModal" wx:if="{{showModalStatus}}"></view>
+        <!--弹出框  -->
+        <view animation="{{animationData}}" class="modal" wx:if="{{showModalStatus}}">
+            <form catchsubmit="formSubmit" catchreset="formReset">
+                <view class="modal_title">上传比分</view>
+                <view class="modal_1">
+                    <view class="model_1l">
+                        <image class="two_logo1" src="{{form.logo1}}"></image>
+                        <view>{{form.team1}}</view>
                     </view>
-                    <view class="two_2_2">
-                        <image class="two_logo2" src="/image/head.png"></image>
-                        <text class="two_2_text">老头8</text>
+                    <view class="model_1r">
+                        <input class="input" name="num1" type="number" value="{{form.num1}}" placeholder="" />
+                        <text class="model_text">积分</text>
+                        <input class="input" name="num2" type="number" value="{{form.num2}}" placeholder="" />
                     </view>
-                    <view class="two_2_2">
-                        <image class="two_logo2" src="/image/head.png"></image>
-                        <text class="two_2_text">老头9</text>
+                </view>
+                <view class="modal_2">
+                    <view class="model_1l">
+                        <image class="two_logo1" src="{{form.logo2}}"></image>
+                        <view>{{form.team2}}</view>
                     </view>
-                    <view class="two_2_2">
-                        <image class="two_logo2" src="/image/head.png"></image>
-                        <text class="two_2_text">老头10</text>
+                    <view class="model_1r">
+                        <input class="input" name="num3" type="number" value="{{form.num3}}" placeholder="" />
+                        <text class="model_text">积分</text>
+                        <input class="input" name="num4" type="number" value="{{form.num4}}" placeholder="" />
                     </view>
                 </view>
-            </view>
-        </view>
-        <view class="btn">
-            <button class="button">上传比分</button>
+                <view class="model_btn">
+                    <button class="button" formType="submit">保存</button>
+                </view>
+            </form>
         </view>
     </view>
 </mobile-main>

pages/score/index.wxss

@@ -3,6 +3,7 @@
   width: 100%;
   background-color: #f0f0f0;
 }
+
 .one {
   position: relative;
   background-color: #ffffff;
@@ -10,31 +11,38 @@
   margin-bottom: 10px;
   padding: 10px 20px;
 }
+
 .one_1 {
   position: relative;
   width: 35%;
   float: left;
 }
+
 .one_1_text {
   text-align: center;
   font-size: 14px;
 }
+
 .one_3_text {
   text-align: center;
   font-size: 14px;
 }
+
 .one_2 {
   position: relative;
   width: 30%;
   float: left;
   height: 102px;
 }
+
 .one_2_1 {
   text-align: center;
 }
+
 .one_2_2 {
   text-align: center;
 }
+
 .text1 {
   background-color: #999;
   text-align: center;
@@ -44,17 +52,20 @@
   text-decoration: line-through;
   text-decoration-color: #fff;
 }
+
 .text2 {
   font-size: 40px;
   font-weight: bold;
   margin: 0 5px;
 }
+
 .text {
   font-size: 15px;
   position: relative;
   top: 9px;
   text-align: center;
 }
+
 .text3 {
   background-color: #999;
   text-align: center;
@@ -64,11 +75,13 @@
   text-decoration: line-through;
   text-decoration-color: #fff;
 }
+
 .one_3 {
   position: relative;
   width: 35%;
   float: right;
 }
+
 .one_4 {
   position: relative;
   top: 10px;
@@ -77,18 +90,22 @@
   color: #999;
   text-align: center;
 }
+
 .one_logo1 {
   width: 90px;
   height: 80px;
 }
-.one_3_img{
-    padding: 0 15px;
+
+.one_3_img {
+  padding: 0 15px;
 }
+
 .one_logo2 {
   align-items: center;
   width: 90px;
   height: 80px;
 }
+
 .two {
   position: relative;
   background-color: #ffffff;
@@ -96,69 +113,152 @@
   /* margin-bottom: 20px; */
   padding: 10px 20px;
 }
-.two_title{
+
+.two_title {
   font-size: 18px;
   margin: 0 0 8px 0;
 }
-.two_1{
+
+.two_1 {
   margin: 10px 0 0px 0;
   height: 70px;
 }
-.two_1_1{
+
+.two_1_1 {
   width: 56px;
   float: left;
   margin: 0 4px 0 0;
 }
-.two_1_2{
+
+.two_1_2 {
   text-align: center;
   width: 47px;
   float: left;
   margin: 0 8px 0 0;
 }
+
 .two_logo1 {
   align-items: center;
   width: 50px;
   height: 45px;
 }
+
 .two_logo2 {
   align-items: center;
   width: 45px;
   height: 45px;
   border: solid 1px #999;
 }
-.two_1_text{
+
+.two_1_text {
   font-size: 14px;
 }
-.two_2{
+
+.two_2 {
   margin: 10px 0 0 0;
 }
-.two_2n2{
+
+.two_2n2 {
   position: relative;
-  top:10px;
+  top: 10px;
   left: 60px;
 }
-.two_2_1{
+
+.two_2_1 {
   width: 56px;
   float: left;
-  margin: 0 4px 0 0;
+  margin: 0 4px 10px 0;
 }
-.two_2_2{
+
+.two_2_2 {
   text-align: center;
   width: 47px;
   float: left;
   margin: 0 8px 0 0;
 }
-.two_2_text{
+
+.two_2_text {
   font-size: 14px;
 }
-.btn{
+
+.btn {
   height: 60px;
   background-color: #fff;
 }
-.button{
+
+.button {
   width: 300px !important;
   background-color: #ff7815;
-  border-radius: 30px; 
-  color:#ffffff; 
+  border-radius: 30px;
+  color: #ffffff;
   text-align: center;
+}
+
+.commodity_screen {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  opacity: 0.2;
+  overflow: hidden;
+  z-index: 1000;
+  color: #fff;
+}
+
+/*对话框 */
+.modal {
+  height: 400px;
+  width: 100%;
+  overflow: hidden;
+  position: fixed;
+  border-radius: 30px 30px 0px 0px;
+  bottom: 0;
+  left: 0;
+  z-index: 2000;
+  background: #fff;
+  padding-top: 20rpx;
+}
+
+.modal_title {
+  margin: 20px;
+  font-size: 18px;
+}
+.model_1{
+  width: 100%;
+  position: relative;
+  height: 70px;
+}
+.model_2{
+  width: 100%;
+  position: relative;
+  top: 10px;
+  height: 70px;
+}
+.model_1l{
+  width: 30%;
+  float: left;
+  height: 70px;
+  margin: 0 0 0 20px;
+}
+.model_text{
+  font-size: 16px;
+  float: left;
+}
+.input{
+  width: 50px;
+  float: left;
+  text-align: center;
+  border-bottom: 1px solid rgb(228, 228, 228);
+}
+.model_1r{
+  width: 60%;
+  height: 60px;
+  float: left;
+  padding: 35px 8px;
+}
+.model_btn {
+  height: 60px;
+  background-color: #fff;
 }

project.config.json

@@ -1,40 +1,40 @@
 {
-  "description": "项目配置文件",
-  "setting": {
-    "urlCheck": false,
-    "es6": false,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "coverView": true,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "description": "项目配置文件",
+    "setting": {
+        "urlCheck": false,
+        "es6": false,
+        "enhance": true,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "coverView": true,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "useIsolateContext": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "minifyWXML": true,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false
     },
-    "useIsolateContext": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "minifyWXML": true,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.23.2",
-  "appid": "wx0fd4b616bc7cf3bb",
-  "projectname": "%E8%B5%9B%E5%9C%BA",
-  "condition": {}
+    "compileType": "miniprogram",
+    "libVersion": "2.23.2",
+    "appid": "wx0fd4b616bc7cf3bb",
+    "projectname": "%E8%B5%9B%E5%9C%BA",
+    "condition": {}
 }