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

app.json

@@ -1,46 +1,34 @@
 {
     "pages": [
-      
         "pages/index/index",
         "pages/register/index",
         "pages/home/index",
         "pages/news/index",
-   
-
         "pages/topic/index",
-
         "pages/my/index",
         "pages/my/userInfo",
-
         "pages/user/index",
-
         "pages/usermymatch/index",
         "pages/usermyorder/index",
         "pages/usermysign/index",
         "pages/usermyteam/index",
         "pages/usermyteam/add",
-
-        
-
         "pages/setting/index",
         "pages/setting/basic",
         "pages/setting/contact",
-        
         "pages/match/index",
         "pages/match/mess",
         "pages/match/matchadd",
         "pages/match/matchgroup",
         "pages/match/project",
         "pages/match/projectadd",
-     
         "pages/match/sign",
         "pages/match/shteam",
-
         "pages/order/index",
-        
-        "pages/matchInfo/index",
         "pages/matchInfo/sign",
-        "pages/test/index"
+        "pages/matchInfo/index",
+        "pages/test/index",
+        "pages/logs/index"
     ],
     "usingComponents": {
         "van-sidebar": "@vant/weapp/sidebar/index",
@@ -58,6 +46,8 @@
         "van-tabbar-item": "@vant/weapp/tabbar-item/index",
         "van-uploader": "@vant/weapp/uploader/index",
         "van-popup": "@vant/weapp/popup/index",
+        "van-collapse": "@vant/weapp/collapse/index",
+        "van-collapse-item": "@vant/weapp/collapse-item/index",
         "van-picker": "@vant/weapp/picker/index"
     },
     "window": {

pages/index/index.js

@@ -1,91 +1,92 @@
 const app = getApp();
 Page({
-  data: {
-    frameStyle: { useTop: true, name: '系统', leftArrow: false, useBar: false },
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    const that = this;
+    data: {
+        frameStyle: { useTop: false, name: '系统', leftArrow: false, useBar: false },
+        fileUrl: app.globalData.fileUrl,
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        const that = this;
+        // 监听用户是否登录
+        that.watchLogin();
+    },
     // 监听用户是否登录
-    that.watchLogin();
-  },
-  // 监听用户是否登录
-  watchLogin: async function () {
-    // 监听用户是否登录，
-    wx.getStorage({
-      key: 'user',
-      success: async (res) => {
-        if (res.data) wx.redirectTo({ url: '/pages/home/index' })
-      },
-      fail: async (res) => {
-        wx.login({
-          success: async (arr) => {
-            if(app.globalData?.wxInfo?.openid) {
-                await this.toLogin(app.globalData?.wxInfo?.openid);
-                return;
-            }
-            const { code: js_code } = arr;
-            const aee = await app.$get('/wechat/api/login/app', { js_code: js_code, config: 'newCourtApp' });
-            if (aee.errcode === 0 && aee.data?.openid) {
-              const openid = aee.data.openid;
-              app.globalData.wxInfo = { openid };
-              await this.toLogin(openid);
-            } else {
-              wx.showToast({ title: `${res.errMsg}`, icon: 'fail', duration: 2000 });
-              wx.redirectTo({ url: '/pages/login/index' });
-            }
-          },
+    watchLogin: async function () {
+        // 监听用户是否登录，
+        wx.getStorage({
+            key: 'user',
+            success: async (res) => {
+                if (res.data) wx.redirectTo({ url: '/pages/home/index' })
+            },
+            fail: async (res) => {
+                wx.login({
+                    success: async (arr) => {
+                        if (app.globalData?.wxInfo?.openid) {
+                            await this.toLogin(app.globalData?.wxInfo?.openid);
+                            return;
+                        }
+                        const { code: js_code } = arr;
+                        const aee = await app.$get('/wechat/api/login/app', { js_code: js_code, config: 'newCourtApp' });
+                        if (aee.errcode === 0 && aee.data?.openid) {
+                            const openid = aee.data.openid;
+                            app.globalData.wxInfo = { openid };
+                            await this.toLogin(openid);
+                        } else {
+                            wx.showToast({ title: `${res.errMsg}`, icon: 'fail', duration: 2000 });
+                            wx.redirectTo({ url: '/pages/login/index' });
+                        }
+                    },
+                });
+            },
         });
-      },
-    });
-  },
-  async toLogin(openid) {
-    const res = await app.$post('/newCourt/api/user/wxAppLogin', { openid });
-    if (app.$checkRes(res)) {
-      const { data } = res;
-      // 没有用户,去注册
-      if (!data) wx.redirectTo({ url: '/pages/register/index' });
-      else {
-        // 有用户,存起来,跳转
-        wx.setStorageSync('user', data);
-        wx.redirectTo({ url: '/pages/home/index' });
-      }
-    }
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {},
+    },
+    async toLogin(openid) {
+        const res = await app.$post('/newCourt/api/user/wxAppLogin', { openid });
+        if (app.$checkRes(res)) {
+            const { data } = res;
+            // 没有用户,去注册
+            if (!data) wx.redirectTo({ url: '/pages/register/index' });
+            else {
+                // 有用户,存起来,跳转
+                wx.setStorageSync('user', data);
+                wx.redirectTo({ url: '/pages/home/index' });
+            }
+        }
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    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/index/index.less

@@ -1,3 +1,9 @@
 .main {
-    height: 80.8vh;
+    height: 97.6vh;
+
+    .image {
+        width: 96vw;
+        height: 100vh;
+    }
+
 }

pages/index/index.wxml

@@ -1,5 +1,5 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back" bind:tabPath="tabPath">
     <view slot="info" class="container main">
-        系统
+        <image class="image" src="{{fileUrl}}/files/court/elimg/20220729140404.png"></image>
     </view>
 </mobile-main>

pages/index/index.wxss

@@ -1,3 +1,7 @@
 .main {
-  height: 80.8vh;
+  height: 97.6vh;
+}
+.main .image {
+  width: 96vw;
+  height: 100vh;
 }

pages/logs/index.js

@@ -0,0 +1,66 @@
+// pages/logs/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

pages/logs/index.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

pages/logs/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/logs/index.wxml-->
+<text>pages/logs/index.wxml</text>

pages/logs/index.wxss

@@ -0,0 +1 @@
+/* pages/logs/index.wxss */

pages/match/shteam.js

@@ -8,7 +8,7 @@ Page({
     data: {
         frameStyle: { useTop: true, name: '组队信息审核', leftArrow: true, useBar: false },
         //查询条件
-        searchName: '',
+        searchInfo: {},
         list: [],
         dialog: { title: '详细信息', show: false, type: '1' },
         info: {},
@@ -18,18 +18,23 @@ Page({
     back(e) {
         wx.navigateBack({ delta: 1 })
     },
-    // 查询信息
-    onSearch: function (e) {
-        const that = this;
-        that.setData({ searchName: e.detail });
-        that.watchLogin();
-    },
     // 查看
     toView: async function (e) {
         const that = this;
-        const { id } = e.currentTarget.dataset;
-        const arr = await app.$get(`/newCourt/api/user/${id}`);
+        const { item } = e.currentTarget.dataset;
+        const arr = await app.$get(`/newCourt/api/teamApply/${item._id}`);
         if (arr.errcode == '0') {
+            // 赛事信息
+            const match = await app.$get(`/newCourt/api/match/${item.match_id}`);
+            if (match.errcode == '0') {
+                arr.data.match_name = match.data.name;
+                // 赛事组别
+                const group = match.data.grouping.find((i) => i._id == item.grouping_id);
+                if (group) { arr.data.grouping_name = group.name }
+            };
+            // 组内项目
+            const project = await app.$get(`/newCourt/api/matchProject/${item.project_id}`)
+            if (project.errcode == '0') { arr.data.project_name = project.data.name; }
             that.setData({ info: arr.data })
             that.setData({ dialog: { title: '详细信息', show: true, type: '1' } })
         }
@@ -37,13 +42,32 @@ Page({
     // 审核
     toCheck: async function (e) {
         const that = this;
-        let { id } = e.currentTarget.dataset;
-        const arr = await app.$get(`/newCourt/api/user/${id}`);
+        let { item } = e.currentTarget.dataset;
+        const arr = await app.$get(`/newCourt/api/teamApply/${item._id}`);
         if (arr.errcode == '0') {
             that.setData({ info: arr.data })
             that.setData({ dialog: { title: '信息审核', show: true, type: '2' } })
         }
     },
+    // 选择状态
+    statusChange: function (e) {
+        const that = this;
+        let data = that.data.statusList[e.detail.value];
+        if (data) { that.setData({ 'info.status': data.value }) }
+    },
+    onSubmit: async function (e) {
+        const that = this;
+        const params = e.detail.value;
+        const info = that.data.info;
+        const arr = await app.$post(`/newCourt/api/teamApply/${info._id}`, params);
+        if (arr.errcode == '0') {
+            wx.showToast({ title: `审核信息成功`, icon: 'success', duration: 2000 });
+            that.watchLogin();
+            that.toClose()
+        } else {
+            wx.showToast({ title: `${arr.errmsg}`, icon: 'fail', duration: 2000 });
+        }
+    },
     // 关闭弹框
     toClose: function () {
         const that = this;
@@ -63,9 +87,16 @@ Page({
             key: 'user',
             success: async res => {
                 let info = {};
-                if (that.data.searchName) info.name = that.data.searchName;
-                const arr = await app.$get(`/newCourt/api/user/`, { ...info });
-                // if (arr.errcode == '0') { that.setData({ list: arr.data }) }
+                const arr = await app.$get(`/newCourt/api/teamApply`, { ...info });
+                if (arr.errcode == '0') {
+                    for (const val of arr.data) {
+                        const match = await app.$get(`/newCourt/api/match/${val.match_id}`);
+                        if (match.errcode == '0') { val.match_name = match.data.name }
+                    }
+                    that.setData({ list: arr.data })
+                } else {
+                    wx.showToast({ title: `${arr.errmsg}`, icon: 'fail', duration: 2000 });
+                }
             },
             fail: res => {
                 wx.redirectTo({ url: '/pages/index/index', })

pages/match/shteam.less

@@ -2,9 +2,13 @@
     height: 88vh;
 
     .one {
-        width: 96vw;
+        width: 92vw;
         margin: 0 0 2vw 0;
-        background-color: #fff;
+        background-color: #f1f1f1;
+        padding: 2vw;
+        input{
+            font-size: 14px;
+        }
     }
 
     .two {

pages/match/shteam.wxml

@@ -1,21 +1,22 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
     <view slot="info" class="container main">
         <view class="one">
-            <van-search value="{{ searchName }}" bind:search="onSearch" placeholder="请输入组队名称" />
+            <input type="text" value="{{searchInfo.teammate_name}}" placeholder="请输入队友姓名" />
         </view>
         <view class="two">
             <scroll-view scroll-y="true" class="scroll-view">
                 <view class="list-scroll-view">
                     <view class="list" wx:for="{{list}}" wx:key="item">
-                        <view class="name textOver">{{item.name||'暂无'}}</view>
+                        <view class="name textOver">{{item.apply_time||'暂无'}}</view>
                         <view class="other">
-                            <view class="other_1"><text>用户类型：</text><text>{{item.type=='-1'?'管理员':item.type=='0'?'个人用户':item.type=='1'?'裁判用户':'暂无'}}</text></view>
-                            <view class="other_1"><text>手机：</text><text>{{item.phone||'暂无'}}</text></view>
+                            <view class="other_1"><text>赛事名称：</text><text>{{item.match_name}}</text></view>
+                            <view class="other_1"><text>申请组队姓名：</text><text>{{item.applyuser_name}}</text></view>
+                            <view class="other_1"><text>队友姓名：</text><text>{{item.teammate_name}}</text></view>
                             <view class="other_1"><text>状态：</text><text>{{item.status=='0'?'待审中':item.status=='1'?'审核通过':'审核拒绝'}}</text></view>
                         </view>
                         <view class="btn">
-                            <button size="mini" type="primary" bindtap="toView" data-id="{{item._id}}">详情</button>
-                            <button size="mini" type="primary" bindtap="toCheck" data-id="{{item._id}}">审核</button>
+                            <button size="mini" type="primary" bindtap="toView" data-item="{{item}}">详细信息</button>
+                            <button size="mini" type="primary" bindtap="toCheck" data-item="{{item}}">审核申请</button>
                         </view>
                     </view>
                 </view>
@@ -27,24 +28,28 @@
     <view slot="info">
         <view class="dialog_one" wx:if="{{dialog.type=='1'}}">
             <view class="one_1">
-                <text class="text">头像：</text>
-                <image class="image" src="{{info.icon[0].url}}"></image>
+                <text class="text">赛事名称：</text>
+                <text class="text1">{{info.match_name||'暂无'}}</text>
             </view>
             <view class="one_1">
-                <text class="text">用户名：</text>
-                <text class="text1">{{info.name||'暂无昵称'}}</text>
+                <text class="text">赛事组别：</text>
+                <text class="text1">{{info.grouping_name||'暂无'}}</text>
             </view>
             <view class="one_1">
-                <text class="text">电话：</text>
-                <text class="text1">{{info.phone||'暂无'}}</text>
+                <text class="text">组内项目：</text>
+                <text class="text1">{{info.project_name||'暂无'}}</text>
             </view>
             <view class="one_1">
-                <text class="text">性别：</text>
-                <text class="text1">{{info.gender||'暂无'}}</text>
+                <text class="text">申请组队姓名：</text>
+                <text class="text1">{{info.applyuser_name||'暂无'}}</text>
             </view>
             <view class="one_1">
-                <text class="text">身份证号：</text>
-                <text class="text1">{{info.card||'暂无'}}</text>
+                <text class="text">队友姓名：</text>
+                <text class="text1">{{info.teammate_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text class="text">申请时间：</text>
+                <text class="text1">{{info.apply_time||'暂无'}}</text>
             </view>
             <view class="one_1">
                 <text class="text">状态：</text>

pages/match/shteam.wxss

@@ -2,9 +2,13 @@
   height: 88vh;
 }
 .main .one {
-  width: 96vw;
+  width: 92vw;
   margin: 0 0 2vw 0;
-  background-color: #fff;
+  background-color: #f1f1f1;
+  padding: 2vw;
+}
+.main .one input {
+  font-size: 14px;
 }
 .main .two {
   flex-grow: 1;

pages/matchInfo/index.js

@@ -1,3 +1,4 @@
+import { match_status } from '../../utils/dict';
 const app = getApp()
 Page({
 
@@ -6,6 +7,8 @@ Page({
      */
     data: {
         frameStyle: { useTop: true, name: '赛事信息', leftArrow: true, useBar: false },
+        fileUrl: app.globalData.fileUrl,
+        user: {},
         id: '',
         info: {},
         // 选项卡
@@ -19,6 +22,78 @@ Page({
                 { title: '成绩册', name: 'e' },
             ],
         },
+        // 选手
+        bActive: '0',
+        groupList: [
+            {
+                name: "第一组",
+                age: "年龄限制",
+                gender: "性别限制",
+                total: "20",
+                project: [
+                    {
+                        name: "名称1",
+                        type: "类别1",
+                        total: "10",
+                        user: [
+                            {
+                                icon: [{ url: '/image/icon.jpg' }],
+                                name: "用户姓名"
+                            },
+                            {
+                                icon: [{ url: '/image/icon.jpg' }],
+                                name: "用户姓名"
+                            },
+                            {
+                                icon: [{ url: '/image/icon.jpg' }],
+                                name: "用户姓名"
+                            },
+                            {
+                                icon: [{ url: '/image/icon.jpg' }],
+                                name: "用户姓名"
+                            },
+                            {
+                                icon: [{ url: '/image/icon.jpg' }],
+                                name: "用户姓名"
+                            },
+                            {
+                                icon: [{ url: '/image/icon.jpg' }],
+                                name: "用户姓名"
+                            },
+                        ]
+                    },
+                    {
+                        name: "名称2",
+                        type: "类别2",
+                        total: "10",
+                        user: [
+                            {
+                                icon: [{ url: '/image/icon.jpg' }],
+                                name: "用户姓名"
+                            },
+                            {
+                                icon: [{ url: '/image/icon.jpg' }],
+                                name: "用户姓名"
+                            },
+                        ]
+                    },
+                ]
+            },
+            {
+                name: "第二组",
+                age: "年龄限制",
+                gender: "性别限制",
+                total: "120",
+                project: [
+                    {
+                        name: "名称1",
+                        type: "类别2",
+                        total: "12",
+                        user: []
+                    }
+                ]
+            }
+        ]
     },
     // 跳转菜单
     back(e) {
@@ -27,13 +102,28 @@ Page({
     // 选项卡
     tabsChange: function (e) {
         const that = this;
-        that.setData({ 'tabs.active': e.detail.name });
+        const { name } = e.detail;
+        if (name == 'c' || name == "d" || name == "e") {
+            wx.showToast({ title: `暂无发布`, icon: 'error', duration: 2000 });
+        } else {
+            that.setData({ 'tabs.active': e.detail.name });
+        }
+    },
+    // 更多
+    toCommon: function (e) {
+        const { route } = e.currentTarget.dataset;
+        wx.redirectTo({ url: `/pages/${route}/index` })
     },
     // 报名
     toSign: function (e) {
         const { item } = e.currentTarget.dataset;
         wx.navigateTo({ url: `/pages/matchInfo/sign?id=${item._id}` })
     },
+    // 选择手风琴
+    bChange: function (e) {
+        const that = this;
+        that.setData({ bActive: e.detail })
+    },
     /**
      * 生命周期函数--监听页面加载
      */
@@ -48,9 +138,11 @@ Page({
         wx.getStorage({
             key: 'user',
             success: async (res) => {
+                that.setData({ user: res.data })
                 if (that.data.id) {
                     const arr = await app.$get(`/newCourt/api/match/${that.data.id}`);
                     if (arr.errcode == '0') {
+                        arr.data.statusZh = that.getStatusZh(arr.data.status);
                         that.setData({ info: arr.data })
                     } else { wx.showToast({ title: `${res.errMsg}`, icon: 'fail', duration: 2000 }); }
                 }
@@ -60,6 +152,12 @@ Page({
             },
         });
     },
+    getStatusZh(status) {
+        let word = "未知"
+        let data = match_status.find((i) => i.label == status);
+        if (data) word = data.value;
+        return word;
+    },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

pages/matchInfo/index.less

@@ -3,11 +3,188 @@
 
     .zero {
         width: 96vw;
-        background-color: #ff0000;
-        margin: 0 0 2vw 0;
     }
 
-    .zero:nth-child(2) {
-        margin: 0;
+    .one {
+        flex-grow: 1;
+        width: 96vw;
+
+        .a {
+            display: flex;
+            flex-direction: column;
+            height: 74vh;
+            background-color: #ffffff;
+            position: relative;
+            margin: 2vw 0 0 0;
+
+            .scroll-view {
+                position: absolute;
+                top: 0;
+                left: 0;
+                right: 0;
+                bottom: 0;
+
+                .list-scroll-view {
+                    display: flex;
+                    flex-wrap: wrap;
+                    align-content: flex-start;
+                    justify-content: space-between;
+
+                    .a_1 {
+                        width: 96vw;
+                        position: relative;
+
+                        .image {
+                            width: 96vw;
+                            height: 160px;
+                        }
+
+                        .a_1_info {
+                            position: absolute;
+                            top: 30vw;
+                            width: 92vw;
+                            margin: 0 2vw;
+
+                            .a_1_1 {
+                                background-color: #ffffff;
+                                margin: 0 0 3vw 0;
+                                border-radius: 5px;
+                                padding: 2vw;
+                                box-shadow: 0 0 1vw #cccccc;
+
+                                .name {
+                                    font-size: 16px;
+                                    font-weight: bold;
+                                    margin: 0 0 2vw 0;
+                                }
+
+                                .status {
+                                    margin: 0 0 2vw 0;
+
+                                    text {
+                                        font-size: 14px;
+                                        color: #ffffff;
+                                        padding: 1vw 2vw;
+                                        background-color: #ff0000;
+                                        border-radius: 10px;
+                                    }
+                                }
+
+                                .other {
+                                    .other_1 {
+                                        margin: 0 0 1vw 0;
+                                        font-size: 14px;
+                                        color: #858585;
+
+                                        .icon {
+                                            margin: 0 2vw 0 0;
+                                        }
+
+                                        text:nth-child(3) {
+                                            color: #000000;
+                                        }
+                                    }
+                                }
+                            }
+
+                            .a_1_2 {
+                                .a_1_2t {
+                                    margin: 0 0 1vw 0;
+
+                                    .txt {
+                                        font-size: 14px;
+                                        margin: 0 0 1vw 0;
+                                    }
+
+                                    .cont {
+                                        font-size: 12px;
+                                        color: #858585;
+                                        text-indent: 1rem;
+                                    }
+                                }
+                            }
+
+                        }
+
+                    }
+
+                    .b_1 {
+                        width: 96vw;
+
+                        .groupList {
+                            .title {
+                                display: flex;
+                                flex-direction: row;
+                                justify-content: space-between;
+                            }
+
+                            .project {
+                                .projectList {
+                                    margin: 0 0 2vw 0;
+                                    border-bottom: 1px solid #cccccc;
+
+                                    .project_1 {
+                                        display: flex;
+                                        flex-direction: row;
+                                        justify-content: space-between;
+                                        margin: 0 0 2vw 0;
+
+                                        .project_1_1 {
+                                            color: #000000;
+                                            font-size: 14px;
+                                        }
+
+                                    }
+
+                                    .user {
+                                        display: flex;
+                                        flex-direction: row;
+                                        justify-content: space-between;
+                                        flex-wrap: wrap;
+
+                                        .userList {
+                                            text-align: center;
+                                            border: 1px solid #cccccc;
+                                            margin: 0 0 2vw 0;
+                                            padding: 2vw;
+                                            border-radius: 5px;
+                                            box-shadow: 0 0 1vw #cccccc;
+                                            width: 22vw;
+
+                                            .icon {
+                                                width: 50px;
+                                                height: 50px;
+                                                border-radius: 5px;
+                                            }
+
+                                            .name {
+                                                text-align: center;
+                                                font-size: 14px;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                }
+            }
+        }
+    }
+
+    .two {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        padding: 2vw 0;
+        background-color: #cccccc;
+
+        button {
+            font-size: 14px;
+            padding: 2vw;
+            margin: 0 2vw;
+            width: 25vw;
+        }
     }
 }

pages/matchInfo/index.wxml

@@ -3,17 +3,119 @@
         <view class="zero one">
             <e-tabs tabs="{{tabs}}" bind:tabsChange="tabsChange"></e-tabs>
             <view wx:if="{{tabs.active=='a'}}" class="a">
-                {{info.name}}
+                <scroll-view scroll-y="true" class="scroll-view">
+                    <view class="list-scroll-view">
+                        <view class="a_1">
+                            <image class="image" src="{{fileUrl}}/files/court/elimg/20220729140648.png"></image>
+                            <view class="a_1_info">
+                                <view class="a_1_1">
+                                    <view class="name">{{info.name}}</view>
+                                    <view class="status"><text>{{info.statusZh}}</text></view>
+                                    <view class="other">
+                                        <view class="other_1">
+                                            <van-icon class="icon" name="like-o" />
+                                            <text>报名截止时间：</text>
+                                            <text>{{info.sign_end_time}}</text>
+                                        </view>
+                                        <view class="other_1">
+                                            <van-icon class="icon" name="like-o" />
+                                            <text>比赛时间：</text>
+                                            <text>{{info.start_time}}-{{info.end_time}}</text>
+                                        </view>
+                                        <view class="other_1">
+                                            <van-icon class="icon" name="like-o" />
+                                            <text>比赛地点：</text>
+                                            <text>{{info.address}}</text>
+                                        </view>
+                                        <view class="other_1">
+                                            <van-icon class="icon" name="like-o" />
+                                            <text>报名费用说明：</text>
+                                            <text>{{info.money_remark}}</text>
+                                        </view>
+                                        <view class="other_1">
+                                            <van-icon class="icon" name="like-o" />
+                                            <text>付款方式：</text>
+                                            <text>{{info.money_mode}}</text>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="a_1_1 a_1_2">
+                                    <view class="a_1_2t">
+                                        <view class="txt">报名说明：</view>
+                                        <view class="cont">{{info.explain}}</view>
+                                    </view>
+                                    <view class="a_1_2t">
+                                        <view class="txt">赛事规程：</view>
+                                        <view class="cont">{{info.regular}}</view>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </scroll-view>
             </view>
-            <view wx:elif="{{tabs.active=='b'}}" class="b">
-                b
+            <view wx:elif="{{tabs.active=='b'}}" class="a b">
+                <scroll-view scroll-y="true" class="scroll-view">
+                    <view class="list-scroll-view">
+                        <view class="b_1">
+                            <van-collapse value="{{ bActive }}" accordion bind:change="bChange">
+                                <van-collapse-item name="{{index}}" class="groupList" wx:for="{{groupList}}" wx:for-item="item" wx:for-index="index">
+                                    <view slot="title" class="title">
+                                        <view>{{item.name}}({{item.age}},{{item.gender}})</view>
+                                        <view>{{item.total}}人</view>
+                                    </view>
+                                    <view class="project">
+                                        <view class="projectList" wx:for="{{item.project}}" wx:for-item="tag">
+                                            <view class="project_1">
+                                                <view class="project_1_1">组内项目：{{tag.name}}</view>
+                                                <view class="project_1_1">{{tag.total}}人</view>
+                                            </view>
+                                            <view class="user">
+                                                <view class="userList" wx:for="{{tag.user}}" wx:for-item="qwe">
+                                                    <image class="icon" src="{{qwe.icon[0].url}}"></image>
+                                                    <view class="name">{{qwe.name}}</view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </van-collapse-item>
+                            </van-collapse>
+                        </view>
+                    </view>
+                </scroll-view>
             </view>
-            <view wx:elif="{{tabs.active=='c'}}" class="b">
-                c
+            <view wx:elif="{{tabs.active=='c'}}" class="a c">
+                <scroll-view scroll-y="true" class="scroll-view">
+                    <view class="list-scroll-view">
+                        秩序册
+                    </view>
+                </scroll-view>
+            </view>
+            <view wx:elif="{{tabs.active=='d'}}" class="a d">
+                <scroll-view scroll-y="true" class="scroll-view">
+                    <view class="list-scroll-view">
+                        赛况
+                    </view>
+                </scroll-view>
+            </view>
+            <view wx:elif="{{tabs.active=='e'}}" class="a e">
+                <scroll-view scroll-y="true" class="scroll-view">
+                    <view class="list-scroll-view">
+                        成绩册
+                    </view>
+                </scroll-view>
             </view>
         </view>
-        <view class="zero two">
-            <button type="primary" size="mini" bindtap="toSign" data-item="{{info}}">赛事报名</button>
+        <view class="zero two" wx:if="{{user.type=='0'}}">
+            <view class="two_1">
+                <button type="default" bindtap="toCommon" data-route="home">更多赛事</button>
+            </view>
+            <view class="two_2">
+                <button type="default" bindtap="toCommon" data-route="topic">更多话题</button>
+            </view>
+            <view class="two_3">
+                <button type="primary" bindtap="toSign" data-item="{{info}}">赛事报名</button>
+            </view>
         </view>
     </view>
 </mobile-main>

pages/matchInfo/index.wxss

@@ -3,9 +3,147 @@
 }
 .main .zero {
   width: 96vw;
+}
+.main .one {
+  flex-grow: 1;
+  width: 96vw;
+}
+.main .one .a {
+  display: flex;
+  flex-direction: column;
+  height: 74vh;
+  background-color: #ffffff;
+  position: relative;
+  margin: 2vw 0 0 0;
+}
+.main .one .a .scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.main .one .a .scroll-view .list-scroll-view {
+  display: flex;
+  flex-wrap: wrap;
+  align-content: flex-start;
+  justify-content: space-between;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 {
+  width: 96vw;
+  position: relative;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 .image {
+  width: 96vw;
+  height: 160px;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info {
+  position: absolute;
+  top: 30vw;
+  width: 92vw;
+  margin: 0 2vw;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 {
+  background-color: #ffffff;
+  margin: 0 0 3vw 0;
+  border-radius: 5px;
+  padding: 2vw;
+  box-shadow: 0 0 1vw #cccccc;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 .name {
+  font-size: 16px;
+  font-weight: bold;
+  margin: 0 0 2vw 0;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 .status {
+  margin: 0 0 2vw 0;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 .status text {
+  font-size: 14px;
+  color: #ffffff;
+  padding: 1vw 2vw;
   background-color: #ff0000;
+  border-radius: 10px;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 .other .other_1 {
+  margin: 0 0 1vw 0;
+  font-size: 14px;
+  color: #858585;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 .other .other_1 .icon {
+  margin: 0 2vw 0 0;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 .other .other_1 text:nth-child(3) {
+  color: #000000;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_2 .a_1_2t {
+  margin: 0 0 1vw 0;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_2 .a_1_2t .txt {
+  font-size: 14px;
+  margin: 0 0 1vw 0;
+}
+.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_2 .a_1_2t .cont {
+  font-size: 12px;
+  color: #858585;
+  text-indent: 1rem;
+}
+.main .one .a .scroll-view .list-scroll-view .b_1 {
+  width: 96vw;
+}
+.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .title {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList {
   margin: 0 0 2vw 0;
+  border-bottom: 1px solid #cccccc;
+}
+.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList .project_1 {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin: 0 0 2vw 0;
+}
+.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList .project_1 .project_1_1 {
+  color: #000000;
+  font-size: 14px;
+}
+.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList .user {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList .user .userList {
+  text-align: center;
+  border: 1px solid #cccccc;
+  margin: 0 0 2vw 0;
+  padding: 2vw;
+  border-radius: 5px;
+  box-shadow: 0 0 1vw #cccccc;
+  width: 22vw;
+}
+.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList .user .userList .icon {
+  width: 50px;
+  height: 50px;
+  border-radius: 5px;
+}
+.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList .user .userList .name {
+  text-align: center;
+  font-size: 14px;
+}
+.main .two {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding: 2vw 0;
+  background-color: #cccccc;
 }
-.main .zero:nth-child(2) {
-  margin: 0;
+.main .two button {
+  font-size: 14px;
+  padding: 2vw;
+  margin: 0 2vw;
+  width: 25vw;
 }

pages/news copy/index.js

@@ -1,89 +0,0 @@
-const app = getApp()
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        frameStyle: { useTop: true, name: '资讯', leftArrow: false, useBar: true },
-        tabs: {
-            active: 'a',
-            list: [
-                { title: '推荐', name: 'a' },
-                { title: '羽毛球', name: 'b' },
-            ],
-        },
-        //查询条件
-        searchInfo: {},
-        list: [{ id: "1" }],
-    },
-    // 跳转菜单
-    tabPath(e) {
-        let { route } = e.detail.detail;
-        if (route) wx.redirectTo({ url: `/${route}` })
-    },
-    // 选项卡
-    tabsChange: function (e) {
-        const that = this;
-        that.setData({ 'tabs.active': e.detail.name });
-    },
-    //搜索
-    onSearch() {
-        console.log("搜索");
-    },
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        const that = this;
-
-    },
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    }
-})

pages/news copy/index.json

@@ -1,7 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "mobile-main": "/commpents/mobile-frame/index",
-    "e-tabs": "/commpents/tabs/index"
-  }
-}

pages/news copy/index.less

@@ -1,79 +0,0 @@
-.main {
-    height: 80.8vh;
-
-    .one {
-        width: 100%;
-    }
-
-    .two {
-        width: 100%;
-        margin: 2px;
-    }
-
-    .thr {
-        width: 96vw;
-        flex-grow: 1;
-        position: relative;
-        background-color: #ffffff;
-
-        .scroll-view {
-            position: absolute;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-
-            .list-scroll-view {
-                display: flex;
-                flex-wrap: wrap;
-                align-content: flex-start;
-                justify-content: space-between;
-
-                .list {
-                    display: flex;
-                    width: 96vw;
-                    margin: 10px 0;
-                    border-bottom: 0.1px solid #D1CFCF;
-
-                    .image {
-                        display: flex;
-                        justify-content: center;
-                        align-items: center;
-                        width: 30vw;
-
-                        image {
-                            width: 20vw;
-                            height: 20vw;
-                            border-radius: 5px;
-                        }
-                    }
-
-                    .content {
-                        padding: 5px;
-
-                        .name {
-                            font-size: 14px;
-                            font-weight: bold;
-                            padding: 2px 0;
-                            list-style: disc;
-                        }
-
-                        .title {
-                            font-size: 12px;
-                            color: #666;
-                            padding: 2px 0;
-                            display: -webkit-box;
-                            overflow: hidden;
-                            -webkit-line-clamp: 3;
-                            -webkit-box-orient: vertical;
-
-                            text {
-                                padding: 0 10px;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

pages/news copy/index.wxml

@@ -1,34 +0,0 @@
-<mobile-main frameStyle="{{frameStyle}}" bind:back="back" bind:tabPath="tabPath">
-    <view slot="info" class="container main">
-        <view class="one">
-            <e-tabs tabs="{{tabs}}" bind:tabsChange="tabsChange"></e-tabs>
-        </view>
-        <view class="two">
-            <input type="text" value="{{searchInfo.name}}" placeholder="请输入关键词" />
-        </view>
-        <view class="thr">
-            <scroll-view scroll-y="true" class="scroll-view">
-                <view class="list-scroll-view">
-                    <view wx:if="{{tabs.active=='a'}}">
-                        a
-                        <!-- <view class="list" wx:for="{{list}}" wx:key="item">
-                            <view class="content">
-                                <view class="name">
-                                    <van-icon name="stop" size="10px" />{{item.name}}
-                                </view>
-                                <view class="title">{{item.content}}</view>
-                                <view class="title">{{item.status=='0'?'其他':'原创'}}<text>来源：{{item.source}}</text></view>
-                            </view>
-                            <view class="image" wx:if="{{item.src}}">
-                                <image src="{{item.src}}"></image>
-                            </view>
-                        </view> -->
-                    </view>
-                    <view wx:if="{{tabs.active=='b'}}">
-                        b
-                    </view>
-                </view>
-            </scroll-view>
-        </view>
-    </view>
-</mobile-main>

pages/news copy/index.wxss

@@ -1,67 +0,0 @@
-.main {
-  height: 80.8vh;
-}
-.main .one {
-  width: 100%;
-}
-.main .two {
-  width: 100%;
-  margin: 2px;
-}
-.main .thr {
-  width: 96vw;
-  flex-grow: 1;
-  position: relative;
-  background-color: #ffffff;
-}
-.main .thr .scroll-view {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-.main .thr .scroll-view .list-scroll-view {
-  display: flex;
-  flex-wrap: wrap;
-  align-content: flex-start;
-  justify-content: space-between;
-}
-.main .thr .scroll-view .list-scroll-view .list {
-  display: flex;
-  width: 96vw;
-  margin: 10px 0;
-  border-bottom: 0.1px solid #D1CFCF;
-}
-.main .thr .scroll-view .list-scroll-view .list .image {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 30vw;
-}
-.main .thr .scroll-view .list-scroll-view .list .image image {
-  width: 20vw;
-  height: 20vw;
-  border-radius: 5px;
-}
-.main .thr .scroll-view .list-scroll-view .list .content {
-  padding: 5px;
-}
-.main .thr .scroll-view .list-scroll-view .list .content .name {
-  font-size: 14px;
-  font-weight: bold;
-  padding: 2px 0;
-  list-style: disc;
-}
-.main .thr .scroll-view .list-scroll-view .list .content .title {
-  font-size: 12px;
-  color: #666;
-  padding: 2px 0;
-  display: -webkit-box;
-  overflow: hidden;
-  -webkit-line-clamp: 3;
-  -webkit-box-orient: vertical;
-}
-.main .thr .scroll-view .list-scroll-view .list .content .title text {
-  padding: 0 10px;
-}

pages/usermyteam/index.js

@@ -5,12 +5,32 @@ Page({
      * 页面的初始数据
      */
     data: {
-        frameStyle: { useTop: true, name: '话题', leftArrow: false, useBar: true },
+        frameStyle: { useTop: true, name: '组队信息', leftArrow: true, useBar: false },
+        list: [
+            {
+                apply_time: '2022-01-01',
+                teammate_name: '申请队友名称',
+                status: '0'
+            }
+        ],
+        // 弹框
+        dialog: { title: '详细信息', show: false, type: '1' },
+        info: {}
     },
     // 跳转菜单
-    tabPath(e) {
-        let { route } = e.detail.detail;
-        if (route) wx.redirectTo({ url: `/${route}` })
+    back(e) {
+        wx.navigateBack({ delta: 1 })
+    },
+    // 详细信息
+    toView: function (e) {
+        const that = this;
+        const { item } = e.currentTarget.dataset;
+        that.setData({ dialog: { title: '详细信息', show: true, type: '1' } })
+    },
+    // 关闭弹框
+    toClose: function () {
+        const that = this;
+        that.setData({ dialog: { title: '详细信息', show: false, type: '1' } })
     },
     /**
      * 生命周期函数--监听页面加载

pages/usermyteam/index.json

@@ -1,6 +1,7 @@
 {
-  "component": true,
-  "usingComponents": {
-    "mobile-main": "/commpents/mobile-frame/index"
-  }
+    "component": true,
+    "usingComponents": {
+        "mobile-main": "/commpents/mobile-frame/index",
+        "e-dialog": "/commpents/dialog/index"
+    }
 }

pages/usermyteam/index.less

@@ -1,4 +1,100 @@
 .main {
-    height: 80.8vh;
-    background-color: #ff0000;
+    height: 88.8vh;
+
+    .zero {
+        width: 96vw;
+
+        margin: 0 0 1vw 0;
+    }
+
+    .zero:last-child {
+        margin: 0;
+    }
+
+    .one {
+        width: 92vw;
+        padding: 2vw;
+        background-color: #f1f1f1;
+
+        input {
+            font-size: 14px;
+        }
+    }
+
+    .two {
+        flex-grow: 1;
+        position: relative;
+        width: 96vw;
+
+        .scroll-view {
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+
+            .list-scroll-view {
+                display: flex;
+                flex-direction: column;
+                flex-wrap: wrap;
+                align-content: flex-start;
+                justify-content: space-between;
+
+                .list {
+                    width: 92vw;
+                    background-color: #ffffff;
+                    margin: 0 0 2vw 0;
+                    padding: 2vw;
+
+                    .time {
+                        font-size: 16px;
+                        font-weight: bold;
+                        margin: 0 0 1vw 0;
+                    }
+
+                    .other {
+                        margin: 0 0 1vw 0;
+
+                        .other_1 {
+                            font-size: 14px;
+                            color: #858585;
+                            margin: 0 0 1vw 0;
+                        }
+                    }
+
+                    .btn {
+                        text-align: center;
+
+                        button {
+                            font-size: 14px;
+                        }
+                    }
+                }
+
+                .list:last-child {
+                    margin: 0;
+                }
+            }
+        }
+
+    }
+}
+
+.dialog_one {
+    display: flex;
+    flex-direction: column;
+
+    .one_1 {
+        border-bottom: 1px solid #ccc;
+        padding: 2vw 0;
+
+        text {
+            font-size: 14px;
+            color: #858585;
+        }
+
+        text:nth-child(1) {
+            color: #000000;
+        }
+    }
 }

pages/usermyteam/index.wxml

@@ -1,5 +1,63 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back" bind:tabPath="tabPath">
     <view slot="info" class="container main">
-        话题
+        <view class="zero one">
+            <input type="text" value="{{searchInfo.teammate_name}}" placeholder="请输入队友姓名" />
+        </view>
+        <view class="zero two">
+            <scroll-view scroll-y="true" class="scroll-view">
+                <view class="list-scroll-view">
+                    <view class="list" wx:for="{{list}}" wx:key="item">
+                        <view class="time">{{item.apply_time}}</view>
+                        <view class="other">
+                            <view class="other_1">
+                                <text>队友姓名：</text>
+                                <text>{{item.teammate_name||'暂无'}}</text>
+                            </view>
+                            <view class="other_1">
+                                <text>申请状态：</text>
+                                <text>{{item.status=='0'?'待审中':item.status=='1'?'审核通过':'审核拒绝'}}</text>
+                            </view>
+                        </view>
+                        <view class="btn">
+                            <button type="primary" size="mini" bindtap="toView" data-item="{{item}}">详细信息</button>
+                        </view>
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
     </view>
-</mobile-main>
+</mobile-main>
+<e-dialog dialog="{{dialog}}" bind:toClose="toClose">
+    <view slot="info">
+        <view class="dialog_one" wx:if="{{dialog.type=='1'}}">
+            <view class="one_1">
+                <text>赛事名称：</text>
+                <text>{{info.match_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text>赛事组别：</text>
+                <text>{{info.grouping_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text>组内项目：</text>
+                <text>{{info.project_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text>申请用户姓名：</text>
+                <text>{{info.applyuser_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text>队友姓名：</text>
+                <text>{{info.teammate_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text>申请时间：</text>
+                <text>{{info.apply_time||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text>审核状态：</text>
+                <text>{{info.status||'暂无'}}</text>
+            </view>
+        </view>
+    </view>
+</e-dialog>

pages/usermyteam/index.wxss

@@ -1,4 +1,80 @@
 .main {
-  height: 80.8vh;
-  background-color: #ff0000;
+  height: 88.8vh;
+}
+.main .zero {
+  width: 96vw;
+  margin: 0 0 1vw 0;
+}
+.main .zero:last-child {
+  margin: 0;
+}
+.main .one {
+  width: 92vw;
+  padding: 2vw;
+  background-color: #f1f1f1;
+}
+.main .one input {
+  font-size: 14px;
+}
+.main .two {
+  flex-grow: 1;
+  position: relative;
+  width: 96vw;
+}
+.main .two .scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.main .two .scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: wrap;
+  align-content: flex-start;
+  justify-content: space-between;
+}
+.main .two .scroll-view .list-scroll-view .list {
+  width: 92vw;
+  background-color: #ffffff;
+  margin: 0 0 2vw 0;
+  padding: 2vw;
+}
+.main .two .scroll-view .list-scroll-view .list .time {
+  font-size: 16px;
+  font-weight: bold;
+  margin: 0 0 1vw 0;
+}
+.main .two .scroll-view .list-scroll-view .list .other {
+  margin: 0 0 1vw 0;
+}
+.main .two .scroll-view .list-scroll-view .list .other .other_1 {
+  font-size: 14px;
+  color: #858585;
+  margin: 0 0 1vw 0;
+}
+.main .two .scroll-view .list-scroll-view .list .btn {
+  text-align: center;
+}
+.main .two .scroll-view .list-scroll-view .list .btn button {
+  font-size: 14px;
+}
+.main .two .scroll-view .list-scroll-view .list:last-child {
+  margin: 0;
+}
+.dialog_one {
+  display: flex;
+  flex-direction: column;
+}
+.dialog_one .one_1 {
+  border-bottom: 1px solid #ccc;
+  padding: 2vw 0;
+}
+.dialog_one .one_1 text {
+  font-size: 14px;
+  color: #858585;
+}
+.dialog_one .one_1 text:nth-child(1) {
+  color: #000000;
 }