zs 1 년 전
부모
커밋
cf881476ba
4개의 변경된 파일13개의 추가작업 그리고 36개의 파일을 삭제
  1. 1 2
      pagesMatch/enroll/index.js
  2. 2 1
      pagesMy/course/index.js
  3. 8 19
      pagesMy/score/index.js
  4. 2 14
      pagesMy/score/index.wxml

+ 1 - 2
pagesMatch/enroll/index.js

@@ -35,8 +35,7 @@ Page({
         const index = e.detail.value;
         let data = that.data.teamList[index];
         if (data) {
-            that.setData({ 'form.team_id': data._id })
-            that.setData({ 'form.team_name': data.name })
+            that.setData({ 'form.team_id': data._id, 'form.team_name': data.name, 'form.administrator': data.administrator })
             that.setData({ member: '', memberList: [] })
             let userList = []
             for (const val of data.member) {

+ 2 - 1
pagesMy/course/index.js

@@ -14,8 +14,9 @@ Page({
     },
     // 上传比分
     async toUpload(e) {
+        const that = this;
         let item = e.currentTarget.dataset.item
-        wx.navigateTo({ url: '/pagesMy/score/index?id=' + item._id })
+        wx.navigateTo({ url: '/pagesMy/score/index?id=' + item._id + '&team_id=' + that.data.team_id })
     },
     // 分页-触底
     toLower() {

+ 8 - 19
pagesMy/score/index.js

@@ -6,23 +6,14 @@ Page({
      * 页面的初始数据
      */
     data: {
+        team_id: "",
         id: '',
         form: {},
-        // 胜者
-        winnerList: [],
         // 状态
         statusList: [],
-        userList: []
-    },
-    // 选择胜者
-    winnerChange(e) {
-        const that = this;
-        const index = e.detail.value;
-        let data = that.data.winnerList[index];
-        if (data) {
-            that.setData({ 'form.winner': data._id })
-            that.setData({ 'form.winner_name': data.name })
-        }
+        userList: [],
+        red_disabled: false,
+        blue_disabled: false
     },
     // 过滤字典表
     getDict(value, model) {
@@ -81,7 +72,7 @@ Page({
      */
     async onLoad(options) {
         const that = this;
-        that.setData({ id: options.id });
+        that.setData({ id: options.id, team_id: options.team_id });
         wx.showLoading({ title: '加载中', mask: true })
         //验证规则函数
         that.initValidate();
@@ -115,13 +106,11 @@ Page({
                 if (aee.errcode == '0') {
                     form = aee.data;
                     if (form && form._id) {
-                        const red = that.data.userList.filter(i => i._id == form.red_team_id)
-                        const blue = that.data.userList.filter(i => i._id == form.blue_team_id)
-                        that.setData({ winnerList: [...red, ...blue] })
+                        console.log(that.data.team_id);
+                        if (form.red_team_id == that.data.team_id) that.setData({ blue_disabled: true })
+                        else if (form.blue_team_id == that.data.team_id) that.setData({ red_disabled: true })
                         // 状态
                         if (form.status) form.status_name = that.getDict(form.status, 'status')
-                        // 胜者
-                        if (form.winner) form.winner_name = that.getDict(form.winner, 'winner')
                     }
                 } else {
                     wx.showToast({ title: `${aee.errmsg}`, icon: 'error' });

+ 2 - 14
pagesMy/score/index.wxml

@@ -15,7 +15,7 @@
                         红方分数:
                     </view>
                     <view class="value">
-                        <input value="{{form.red_score}}" name="red_score" type="text" placeholder="" />
+                        <input disabled="{{red_disabled}}" value="{{form.red_score}}" name="red_score" type="text" placeholder="" />
                     </view>
                 </view>
                 <view class="info_1">
@@ -31,19 +31,7 @@
                         蓝方分数:
                     </view>
                     <view class="value">
-                        <input value="{{form.blue_score}}" name="blue_score" type="text" placeholder="" />
-                    </view>
-                </view>
-                <view class="info_1">
-                    <view class="label">
-                        胜者:
-                    </view>
-                    <view class="value">
-                        <picker bindchange="winnerChange" value="{{form.winner}}" name="winner" range="{{winnerList}}" range-key='name'>
-                            <view class="picker">
-                                {{form.winner_name||''}}
-                            </view>
-                        </picker>
+                        <input disabled="{{blue_disabled}}" value="{{form.blue_score}}" name="blue_score" type="text" placeholder="" />
                     </view>
                 </view>
                 <view class="info_1">