guhongwei 2 years ago
parent
commit
a490bcc079

+ 1 - 0
app.json

@@ -1,5 +1,6 @@
 {
     "pages": [
+     
         "pages/index/index",
         "pages/register/index",
         "pages/home/index",

+ 3 - 0
commpents/mobile-frame/index.less

@@ -3,6 +3,9 @@
     flex-direction: column;
     height: 100vh;
     background-color: #f9f9f9;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+
     .info {
         flex-grow: 1;
         position: relative;

+ 1 - 1
commpents/mobile-frame/index.wxml

@@ -2,7 +2,7 @@
     <view class="head" wx:if="{{frameStyle.useTop}}" style="background:{{frameStyle.topBg||'#F5F5F9'}};">
         <top frameStyle="{{frameStyle}}" bind:back="back"></top>
     </view>
-    <view class="info">
+    <view class="info" >
         <scroll-view scroll-y="true" class="scroll-view">
             <view class="list-scroll-view">
                 <slot name="info"></slot>

+ 2 - 0
commpents/mobile-frame/index.wxss

@@ -3,6 +3,8 @@
   flex-direction: column;
   height: 100vh;
   background-color: #f9f9f9;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
 }
 .body .info {
   flex-grow: 1;

+ 1 - 0
pages/home/index.less

@@ -46,6 +46,7 @@
                     display: flex;
                     flex-direction: row;
                     justify-content: space-between;
+                    background-color: #ffffff;
 
                     .list_1 {
                         padding: 8vw 0 0 0;

+ 1 - 0
pages/home/index.wxss

@@ -41,6 +41,7 @@
   display: flex;
   flex-direction: row;
   justify-content: space-between;
+  background-color: #ffffff;
 }
 .main .two .scroll-view .list-scroll-view .list .list_1 {
   padding: 8vw 0 0 0;

+ 5 - 71
pages/matchInfo/index.js

@@ -24,76 +24,7 @@ Page({
         },
         // 选手
         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: []
-                    }
-                ]
-            }
-        ]
+        groupList: []
     },
     // 跳转菜单
     back(e) {
@@ -140,11 +71,14 @@ Page({
             success: async (res) => {
                 that.setData({ user: res.data })
                 if (that.data.id) {
-                    const arr = await app.$get(`/newCourt/api/match/${that.data.id}`);
+                    let arr;
+                    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 }); }
+                    arr = await app.$get(`/newCourt/api/view/groupProjectUser?match_id=${that.data.id}`);
+                    if (arr.errcode == '0') { that.setData({ groupList: arr.data }) }
                 }
             },
             fail: async (res) => {

+ 0 - 2
pages/matchInfo/sign.wxml

@@ -31,7 +31,6 @@
                     </view>
                 </view>
                 <view>
-                    {{form.project_id}}
                 </view>
                 <view class="btn">
                     <button type="primary" size="mini" form-type="submit">提交报名</button>
@@ -47,7 +46,6 @@
                 <view class="info_1">温馨提示:</view>
                 <view class="info_2">
                     <view class="info_2_1">1.参赛人员报名费每人每项50元!</view>
-                    <view class="info_2_1">2.成功转发朋友圈的参赛人员可优惠10元报名费!</view>
                 </view>
             </view>
             <view class="btn">

+ 5 - 1
pages/topic/index.less

@@ -55,9 +55,13 @@
                         display: flex;
                         flex-direction: row;
                         justify-content: space-between;
-                        font-size: 10px;
+                        font-size: 12px;
                         margin: 0 0 1vw 0;
                         color: #858585;
+
+                        .name {
+                            width: 72vw;
+                        }
                     }
 
                     .list_2 {

+ 1 - 1
pages/topic/index.wxml

@@ -8,7 +8,7 @@
                 <view class="list-scroll-view">
                     <view class="list" wx:for="{{list}}" wx:key="item">
                         <view class="list_1">
-                            <view>辽源市第一届青少年羽毛球公开赛暨“小虎杯”羽毛球争霸赛</view>
+                            <view class="name">辽源市第一届青少年羽毛球公开赛暨“小虎杯”羽毛球争霸赛</view>
                             <view>2022-08-06</view>
                         </view>
                         <view class="list_2">辽源市第一届青少年羽毛球公开赛暨“小虎杯”羽毛球争霸赛</view>

+ 4 - 1
pages/topic/index.wxss

@@ -49,10 +49,13 @@
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  font-size: 10px;
+  font-size: 12px;
   margin: 0 0 1vw 0;
   color: #858585;
 }
+.main .two .scroll-view .list-scroll-view .list .list_1 .name {
+  width: 72vw;
+}
 .main .two .scroll-view .list-scroll-view .list .list_2 {
   margin: 0 0 3vw 0;
   font-size: 16px;

+ 1 - 1
pages/usermyorder/index.js

@@ -24,7 +24,7 @@ Page({
                 "package": `prepay_id=${res.data.wxSign.prepay_id}`,
                 "signType": res.data.wxSign.signType,
                 "paySign": res.data.wxSign.paySign,
-                "success": async function (res) {
+                "success": async function (arr) {
                     wx.showToast({ title: `支付成功`, icon: 'success', duration: 2000 });
                     const aee = await app.$post(`/newCourt/api/payOrder/${res.data.data._id}`, { status: '1' });
                     if (aee.errcode == '0') { that.watchLogin(); }