..

app.json

@@ -1,5 +1,6 @@
 {
   "pages": [
+    "pages/photo/index",
     "pages/home/index",
     "pages/login/index",
     "pages/search/index",
@@ -15,7 +16,7 @@
     "pages/createTeam/index",
     "pages/information/index",
     "pages/score/index",
-    "pages/photo/index",
+    
     "pages/password/index",
     "pages/auditTeam/index",
     "pages/match/index",

icon/icon.wxss

@@ -4,6 +4,7 @@
   src: url('//at.alicdn.com/t/font_3244772_zz1ijhtxj2o.woff2?t=1647846813638') format('woff2'),
     url('//at.alicdn.com/t/font_3244772_zz1ijhtxj2o.woff?t=1647846813638') format('woff'),
     url('//at.alicdn.com/t/font_3244772_zz1ijhtxj2o.ttf?t=1647846813638') format('truetype');
+
 }
 
 .iconfont {

pages/auditTeam/index.js

@@ -10,7 +10,12 @@ Page({
         // 主体高度
         infoHeight: '',
         frameStyle: { useTop: true, name: '审核队员', leftArrow: true, useBar: false },
-        list: []
+        list: [
+            { id: '1', team: '我是第一队', time: '2020.01.20 08:30'},
+            { id: '1', team: '我是第一队', time: '2020.01.20 08:30'},
+            { id: '1', team: '我是第一队', time: '2020.01.20 08:30'},
+            { id: '1', team: '我是第一队', time: '2020.01.20 08:30'}
+        ]
     },
 
     back: function () {

pages/auditTeam/index.wxml

@@ -1,11 +1,11 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
     <view slot="info" class="main" style="height:{{infoHeight}}px;">
-        <view class="one">
+        <view class="one" wx:key="item" wx:for="{{list}}">
             <image class="logo" src="/image/logo1.png"></image>
-            <text class="text1">队名</text>
+            <text class="text1">{{item.team}}</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>
+       <button size="mini" class="btn1">驳回</button>
+        <button  size="mini" class="btn2">通过</button>
         </view>
     </view>
 </mobile-main>

pages/auditTeam/index.wxss

@@ -6,13 +6,13 @@
 }
 
 .one {
-    margin: 0 12px;
+    margin: 0 12px 10px 12px;
     background-color: #fff;
 }
 
 .logo {
     height: 50px;
-    width: 45px;
+    width: 50px;
     padding: 12px;
 }
 
@@ -24,36 +24,34 @@
 
 .text2 {
     position: relative;
-    left: -23px;
+    left: -70px;
     top: -10px;
+    font-size: 14px;
+    color: #666;
 }
-/* .btnl{
-    width: 50%;
-    float: left;
-}
-.btnr{
-    width: 50%;
-    float: left;
-} */
 .btn1 {
     position: relative;
     left: 50px;
-    top: 5px;
+    top: -4px;
     width: 80px !important;
-    background-image: linear-gradient(to right, #6c51fb, #1262fe);
+    height: 30px !important;
+    background-color: rgba(136, 136, 136, 0.4);
     border-radius: 30px;
-    color: #ffffff;
-    font-size: small;
+    color: #5e5e5e;
+    font-size: 14px;
+    margin: 4px 0 4px 0;
 }
 
 .btn2 {
     position: relative;
-    top: -31px;
-    left: 225px;
+    top: -4px;
+    left: 140px;
     width: 80px !important;
-    background-image: linear-gradient(to right, #6c51fb, #1262fe);
+    height: 30px !important;
+    background-image: linear-gradient(to right, #f43f3f, #ce4bd2);
     border-radius: 30px;
     color: #ffffff;
     text-align: center;
-    font-size: small;
+    font-size: 14px;
+    margin: 4px 0 4px 0;
 }

pages/createTeam/index.js

@@ -53,6 +53,23 @@ Page({
     back: function () {
         wx.navigateBack({ url: '/pages/me/index' })
     },
+    //点击加号添加
+    addList: function(){
+        var  lists = this.data.lists;
+        var newData = {};
+        lists.push(newData);//实质是添加lists数组内容，使for循环多一次
+        this.setData({
+          lists: lists,
+        })  
+      },
+       //点击减号删除
+    delList: function () {
+        var lists = this.data.lists;
+        lists.pop();      //实质是删除lists数组内容，使for循环少一次
+        this.setData({
+          lists: lists,
+        })
+      }, 
     //提交
     formSubmit: function (e) {
         console.log('form发生了submit事件，携带数据为：', e.detail.value)

pages/createTeam/index.wxml

@@ -1,7 +1,7 @@
 <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="form">
                 <view class="top">
                     <view class="zero">
                         <view class="text">团队LOGO</view>
@@ -27,18 +27,17 @@
                 <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="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>
+                                <image bindtap='delList' 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>
+                                    <text bindtap='addList' class=" icon iconfont icon-jia"></text>
                                 </view>
                             </view>
                         </view>

pages/password/index.js

@@ -9,7 +9,7 @@ Page({
     data: {
         // 主体高度
         infoHeight: '',
-        frameStyle: { useTop: true, name: '已上传图片', leftArrow: true, useBar: false },
+        frameStyle: { useTop: true, name: '修改密码', leftArrow: true, useBar: false },
         form:{
             password:'123456'
         }

pages/password/index.wxml

@@ -8,6 +8,7 @@
             <view class="btn-area">
                 <button class="button" formType="submit">保存</button>
             </view>
+            
         </form>
     </view>
 </mobile-main>

pages/photo/index.js

@@ -10,6 +10,14 @@ Page({
         // 主体高度
         infoHeight: '',
         frameStyle: { useTop: true, name: '已上传图片', leftArrow: true, useBar: false },
+        list: [
+            {
+                id: '1', name: '朝阳沟第三节力气大赛', time: '2020.11.12', shop1: '/image/shop1.png', shop2: '/image/shop2.png', shop2: '/image/shop2.png',
+            },
+            {
+                id: '1', name: '朝阳沟第三节力气大赛', time: '2020.11.12', shop1: '/image/shop1.png', shop2: '/image/shop2.png', shop2: '/image/shop2.png',
+            }
+        ]
     },
     //选择
     bindPickerChange: function (e) {

pages/photo/index.wxml

@@ -1,10 +1,24 @@
 <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 class="one">
+            <text class="text1">多选</text>
+            <text class="text2">删除</text>
+        </view>
+        <view class="two" wx:key="item" wx:for="{{list}}">
+            <view class="two_text">
+                <text class="text3">{{item.name}}</text>
+                <text class="text4">{{item.time}}</text>
             </view>
-        </form>
+            <view class="two_shop">
+                <image class="shop1" src="{{item.shop1}}"></image>
+                <image class="shop2" src="{{item.shop2}}"></image>
+                <image class="shop3" src="{{item.shop2}}"></image>
+            </view>
+        </view>
+        <view class="btn-area">
+            <button class="button">保存</button>
+        </view>
+
     </view>
 </mobile-main>

pages/photo/index.wxss

@@ -1,49 +1,71 @@
 .main {
   position: relative;
   width: 100%;
-  background-color: #ffffff;
-  padding: 20px 0 0 0;
+  background-color: #f8f8f8;
 }
 
-.zero{
-  border-bottom: 1px solid #dddddd;
-  margin: 0 20px;
-  height: 50px;
-}
 .one {
-  border-bottom: 1px solid #dddddd;
-  margin: 0 20px;
-  height: 40px;
+  background-color: #ffffff;
+  padding: 10px 20px;
 }
 
-.text {
+.text2 {
   position: relative;
-  top: 10px;
-  width: 40%;
+  left: 270px;
 }
-.tou{
-  width: 50px;
-  height: 50px;
-  position: relative;
-  left: 280px;
-  top: -30px;
+
+.two {
+  padding: 5px 20px;
 }
 
-.input {
+.two_text {
+  margin: 0 0 10px 0;
+}
+
+.text3 {
+  font-size: 12px;
+  color: #999;
+}
+
+.text4 {
   position: relative;
-  text-align: right;
-  left: 130px;
-  top: -10px;
-  width: 60%;
-  font-size: 14px;
+  left: 150px;
+  font-size: 12px;
+  color: #999;
+}
+
+.two_shop {
+  background-color: #ffffff;
+  padding: 10px 0;
+}
+
+.shop1 {
+  width: 162px;
+  height: 80px;
+  margin: 0px 10px 10px 0;
+}
+
+.shop2 {
+  width: 162px;
+  height: 80px;
+  margin: 0px 0px 10px 0;
+}
+
+.shop3 {
+  width: 162px;
+  height: 80px;
+  margin: 0px 10px 0px 0;
 }
-.button{
+
+.btn-area {
   position: relative;
-  top: 50px;
+  top: 20px;
+}
+.button {
   width: 300px !important;
-  background-image: linear-gradient(to right, #fd3c1e , #c74df0);
-  border-radius: 30px; 
-  color:#ffffff; 
+  background-image: linear-gradient(to right, #fd3c1e, #c74df0);
+  border-radius: 30px;
+  color: #ffffff;
   text-align: center;
   font-size: small;
 }

pages/score/index.js

@@ -6,56 +6,65 @@ Page({
    * 页面的初始数据
    */
   data: {
+    showModal: false,
     // 主体高度
     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',},],
+      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'},
+      { 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',},],
+    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'},
+      { 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:'',
+    form: {
+      logo1: '/image/logo1.png',
+      team1: '哈拉海队',
+      num1: '0',
+      num2: '',
+      logo2: '/image/logo2.png',
+      team2: '马尼拉队',
+      num3: '0',
+      num4: '',
     }
   },
   //提交
   formSubmit: function (e) {
     console.log('form发生了submit事件，携带数据为：', e.detail.value)
-},
+    this.setData({
+      showModal: false
+    }),
+      wx.showToast({
+        title: '保存成功',
+        icon: 'success',
+        duration: 2000
+      })
+  },
   back: function () {
     wx.navigateBack({ url: '/pages/me/index' })
   },
@@ -65,46 +74,19 @@ Page({
   },
 
   //显示对话框
-  showModal: function () {
-    // 显示遮罩层
-    var animation = wx.createAnimation({
-      duration: 200,
-      timingFunction: "linear",
-      delay: 0
-    })
-    this.animation = animation
-    animation.translateY(300).step()
+
+  clickme: function () {
     this.setData({
-      animationData: animation.export(),
-      showModalStatus: true
+      showModal: 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()
+  preventTouchMove: function () {
+  },
+  //关闭弹窗
+  go: function () {
     this.setData({
-      animationData: animation.export(),
+      showModal: false
     })
-    setTimeout(function () {
-      animation.translateY(0).step()
-      this.setData({
-        animationData: animation.export(),
-        showModalStatus: false
-      })
-    }.bind(this), 200)
   },
   /**
    * 生命周期函数--监听页面加载

pages/score/index.wxml

@@ -54,12 +54,11 @@
         <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}}">
+        <view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
+      <view class="modal" wx:if="{{showModal}}">
             <form catchsubmit="formSubmit" catchreset="formReset">
                 <view class="modal_title">上传比分</view>
+              <view bindtap="go">  <image class="cuo" src="/image/cuo.png"></image></view>
                 <view class="modal_1">
                     <view class="model_1l">
                         <image class="two_logo1" src="{{form.logo1}}"></image>

pages/score/index.wxss

@@ -194,7 +194,7 @@
   text-align: center;
 }
 
-.commodity_screen {
+.mask {
   width: 100%;
   height: 100%;
   position: fixed;
@@ -261,4 +261,11 @@
 .model_btn {
   height: 60px;
   background-color: #fff;
+}
+.cuo{
+  width: 20px;
+  position: relative;
+  top: -50px;
+  left: 330px;
+  height: 20px;
 }