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

commpents/picker/index.js

@@ -7,6 +7,12 @@ Component({
         label: { type: String },
         model: { type: String },
         columns: { type: Array },
+        value: {
+            type: String,
+            observer: function (val) {
+                this.initData()
+            }
+        },
         valueKey: { type: String, value: 'value' },
         labelKey: { type: String, value: 'label' }
     },
@@ -23,6 +29,14 @@ Component({
      * 组件的方法列表
      */
     methods: {
+        initData() {
+            const val = this.properties.value
+            if (!val) return;
+            const res = this.properties.columns.find(f => f[this.properties.valueKey] === val)
+            if (!res) return;
+            const label = res[this.properties.labelKey]
+            this.setData({ text: label })
+        },
         onChange(event) {
             const obj = event?.detail?.value;
             const label = obj[this.properties.labelKey]

commpents/timePicker/index.js

@@ -6,7 +6,12 @@ Component({
     properties: {
         label: { type: String },
         model: { type: String },
-        value: { type: String }
+        value: {
+            type: String,
+            observer: function (val) {
+                this.initData()
+            }
+        }
     },
 
     /**
@@ -18,21 +23,15 @@ Component({
         text: '',
         show: false,
     },
-    onload() {
-        console.log('in');
-        if (this.properties.value) {
-            const val = this.properties.value
-            this.setData({
-                currentDate: val,
-                text: val
-            })
-        }
-    },
-
     /**
      * 组件的方法列表
      */
     methods: {
+        initData() {
+            const val = this.properties.value
+            if (!val) return;
+            this.setData({ text: val })
+        },
         toConfirm(event) {
             const data = event.detail;
             const datetimestr = this.getDateString(data)

pages/f6test/index.js

@@ -22,6 +22,8 @@ Page({
         groundList: [],
         refereeList: [],
 
+        arrangeData: {},
+
         // picker
         show: false,
         personList: [],
@@ -160,7 +162,20 @@ Page({
             d.refereeModelName = `referee_id-${i}`;
             d.timeModelName = `match_time-${i}`;
         }
-        this.setData({ raceList })
+        const oRaceList = this.data.raceList;
+        for (const race of raceList) {
+            const { node_id_one, node_id_two } = race;
+            const r = oRaceList.find(f => f.node_id_one === node_id_one && f.node_id_two === node_id_two)
+            if (r) {
+                const ri = oRaceList.findIndex(f => f.node_id_one === node_id_one && f.node_id_two === node_id_two)
+                const { groundModelName, refereeModelName, timeModelName } = race
+                r = { ...r, groundModelName, refereeModelName, timeModelName }
+                oRaceList.splice(ri, 1, r)
+            } else {
+                oRaceList.push(race)
+            }
+        }
+        this.setData({ raceList: oRaceList })
     },
 
 
@@ -171,8 +186,29 @@ Page({
         this.setData({ data })
         // 请求 小组赛的 胜者列表
         await this.searchWinnerList();
+        await this.search();
         await this.searchOthers()
     },
+    // 查询已安排的数据
+    async search() {
+        let res = await app.$get(`/newCourt/api/eliminatArrange/getOne`, this.query)
+        if (app.$checkRes(res)) {
+            const { arrange } = res.data;
+            this.setData({
+                arrangeData: res.data,
+                arrangeList: arrange
+            })
+        }
+        res = await app.$get(`/newCourt/api/eliminateRace`, this.query)
+        if (app.$checkRes(res)) {
+            this.setData({
+                raceList: res.data
+            })
+        }
+        // 数据本地化处理下
+        this.getRaceList();
+    },
+
     // 获取该项目的小组,形成晋级图
     async getTeams() {
         const res = await app.$get(`/newCourt/api/raceTeam`, this.query)
@@ -275,19 +311,33 @@ Page({
         let arrangeList = this.data.arrangeList;
 
         // arrangeList:需要将match_id,grouping_id,project_id 也放入,确定是这个项目的淘汰赛
-        const arrange = { arrange: arrangeList, ...this.query }
+        let arrange = this.data.arrangeData;
+        if (!arrange._id) {
+            arrange = { arrange: arrangeList, ...this.query }
+        }
         // raceList:淘汰赛的比赛赛程
         raceList = raceList.map(i => {
             const { groundModelName, refereeModelName, timeModelName, ...others } = i
             return { ...others, ...this.query }
         })
         // 创建安排
-        let res = await app.$post('/newCourt/api/eliminatArrange', arrange)
-        if(app.$checkRes(res)) {
-            console.log('淘汰赛安排创建成功')
+        let res
+        if (arrange._id) {
+            res = await app.$post(`/newCourt/api/eliminatArrange/${arrange._id}`, arrange)
+            if (app.$checkRes(res)) {
+                console.log('淘汰赛安排创建成功')
+            }
+        } else {
+            res = await app.$post(`/newCourt/api/eliminatArrange`, arrange)
+            if (app.$checkRes(res)) {
+                console.log('淘汰赛安排创建成功')
+            }
         }
+
         res = await app.$post('/newCourt/api/eliminateRace/saveAll', raceList)
-        console.log(res)
+        wx.showToast({
+            title: '保存成功',
+        })
     }
 
 });

pages/f6test/index.wxml

@@ -2,7 +2,7 @@
     <view slot="info" class="container main">
         <view wx:if="{{view==='graph'}}">
             <view>
-                <button bind:tap="toAutoInitData">自动生成</button>
+                <button bind:tap="toAutoInitData" wx:if="{{!arrangeData._id}}">自动生成</button>
                 <button bind:tap="turnView" data-view="race">设置比赛</button>
                 <!-- <button>保存</button> -->
             </view>
@@ -23,9 +23,9 @@
                     {{r.player_name_one}} VS {{r.player_name_two}}
                     <f-picker value="{{r.ground_id}}" label="场地" model="{{r.groundModelName}}" bind:selected="toSelected" columns="{{groundList}}" valueKey="_id" labelKey="name">
                     </f-picker>
-                    <f-picker value="{{r.ground_id}}" label="裁判" model="{{r.refereeModelName}}" bind:selected="toSelected" columns="{{refereeList}}" valueKey="_id" labelKey="name">
+                    <f-picker value="{{r.referee_id}}" label="裁判" model="{{r.refereeModelName}}"  bind:selected="toSelected" columns="{{refereeList}}" valueKey="_id" labelKey="name">
                     </f-picker>
-                    <f-time-picker label="比赛时间" model="{{r.timeModelName}}" value="{{r.time}}" bind:selected="toSelected" />
+                    <f-time-picker label="比赛时间" model="{{r.timeModelName}}" value="{{r.match_time}}" bind:selected="toSelected" />
                 </view>
             </view>
         </view>

pages/usermymatch/index.js

@@ -6,6 +6,7 @@ Page({
      */
     data: {
         frameStyle: { useTop: true, name: '我的赛事', leftArrow: true, useBar: false },
+        dialog: { title: '详细信息', show: false, type: '1' },
         // 选项卡
         tabs: {
             active: 'a',
@@ -92,7 +93,9 @@ Page({
                 project_name: '组内项目',
                 ground_name: '比赛场地',
             },
-        ]
+        ],
+        // 详细信息
+        info: {},
     },
     // 跳转菜单
     back(e) {
@@ -104,6 +107,18 @@ Page({
         const { name } = e.detail;
         that.setData({ 'tabs.active': name });
     },
+    // 详细信息
+    toView: async function (e) {
+        const { item } = e.currentTarget.dataset;
+        const that = this;
+        that.setData({ info: item })
+        that.setData({ dialog: { title: '详细信息', show: true, type: '1' } })
+    },
+    // 关闭弹框
+    toClose: function () {
+        const that = this;
+        that.setData({ dialog: { title: '详细信息', show: false, type: '1' } })
+    },
     /**
      * 生命周期函数--监听页面加载
      */

pages/usermymatch/index.less

@@ -72,4 +72,34 @@
             }
         }
     }
+}
+
+.dialog_one {
+    margin: 10px 0 0 0;
+
+    .one_1 {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        margin: 0 0 10px 0;
+        padding: 10px;
+
+        .text {
+            width: 22vw;
+            color: #666;
+            font-size: 16px;
+        }
+
+        .text1 {
+            font-size: 16px;
+            color: #000;
+        }
+
+        .image {
+            width: 15vw;
+            height: 15vw;
+        }
+    }
 }

pages/usermymatch/index.wxml

@@ -70,4 +70,34 @@
             </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 class="text">赛事名称：</text>
+                <text class="text1">{{info.match_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text class="text">比赛时间：</text>
+                <text class="text1">{{info.match_time||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text class="text">赛事组别：</text>
+                <text class="text1">{{info.grouping_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text class="text">组内项目：</text>
+                <text class="text1">{{info.project_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text class="text">赛事场地：</text>
+                <text class="text1">{{info.ground_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text class="text">比赛状态：</text>
+                <text class="text1">{{info.status=='0'?'已安排':info.status=='1'?'待开赛':info.status=='2'?'已开赛':info.status=='3'?'已结束':'暂无'}}</text>
+            </view>
+        </view>
+    </view>
+</e-dialog>

pages/usermymatch/index.wxss

@@ -57,3 +57,28 @@
 .main .two .scroll-view .list-scroll-view .list:last-child {
   border-bottom: none;
 }
+.dialog_one {
+  margin: 10px 0 0 0;
+}
+.dialog_one .one_1 {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  margin: 0 0 10px 0;
+  padding: 10px;
+}
+.dialog_one .one_1 .text {
+  width: 22vw;
+  color: #666;
+  font-size: 16px;
+}
+.dialog_one .one_1 .text1 {
+  font-size: 16px;
+  color: #000;
+}
+.dialog_one .one_1 .image {
+  width: 15vw;
+  height: 15vw;
+}