zs 2 years ago
parent
commit
be943e3e6c

+ 2 - 2
commpents/match-achieve/group.js

@@ -4,14 +4,14 @@ Component({
      * 组件的属性列表
      */
     properties: {
-
+        teamintegralList: { type: Array },
     },
 
     /**
      * 组件的初始数据
      */
     data: {
-
+        top: ["积分排名", "积分"],
     },
 
     /**

+ 17 - 1
commpents/match-achieve/group.wxml

@@ -1,2 +1,18 @@
 <!--commpents/match-achieve/group.wxml-->
-<text>commpents/match-achieve/group.wxml</text>
+<view class="table">
+    <view class="tr bg-w">
+        <view class="th" wx:for="{{top}}" wx:key="index">{{item}}</view>
+    </view>
+    <block wx:for="{{teamintegralList}}" wx:key="item" wx:for-index="index">
+        <view class="tr bg-g" wx:if="{{index % 2 == 0}}">
+            <view class="td">{{item.rank}}</view>
+            <!-- <view class="td">{{item.address||'--'}}</view> -->
+            <view class="td">{{item.integral}}</view>
+        </view>
+        <view class="tr" wx:else>
+            <view class="td">{{item.rank}}</view>
+            <!-- <view class="td">{{item.address||'--'}}</view> -->
+            <view class="td">{{item.integral}}</view>
+        </view>
+    </block>
+</view>

+ 34 - 1
commpents/match-achieve/group.wxss

@@ -1 +1,34 @@
-/* commpents/match-achieve/group.wxss */
+/* commpents/match-achieve/group.wxss */
+.table {
+    border: 0px solid darkgray;
+  }
+  .tr {
+    display: flex;
+    width: 96vw;
+    justify-content: center;
+    height: 3rem;
+    align-items: center;
+  }
+  .td {
+    width: 48vw;
+    justify-content: center;
+    text-align: center;
+    font-size: 14px;
+  }
+  .bg-w {
+    background: snow;
+  }
+  .bg-g {
+    background: #E6F3F9;
+  }
+  .th {
+    width: 48vw;
+    justify-content: center;
+    background: #3366FF;
+    color: #fff;
+    display: flex;
+    height: 3rem;
+    font-size: 14px;
+    align-items: center;
+  }
+  

+ 2 - 2
commpents/match-achieve/personal.js

@@ -4,14 +4,14 @@ Component({
      * 组件的属性列表
      */
     properties: {
-
+        ownintegralList: { type: Array },
     },
 
     /**
      * 组件的初始数据
      */
     data: {
-
+        top: ["参赛选手", "本场积分", "本场积分排名"],
     },
 
     /**

+ 0 - 0
commpents/match-achieve/personal.less


+ 23 - 1
commpents/match-achieve/personal.wxml

@@ -1,2 +1,24 @@
 <!--commpents/match-achieve/personal.wxml-->
-<text>commpents/match-achieve/personal.wxml</text>
+<view class="table">
+    <view class="tr bg-w">
+        <view class="th" wx:for="{{top}}" wx:key="index">{{item}}</view>
+    </view>
+    <block wx:for="{{ownintegralList}}" wx:key="item" wx:for-index="index">
+        <view class="tr bg-g" wx:if="{{index % 2 == 0}}">
+            <view class="td">
+                <text wx:for="{{item.person}}" wx:for-item="person">{{person.name}}/</text>
+            </view>
+            <!-- <view class="td">{{item.address||'--'}}</view> -->
+            <view class="td">{{item.integral}}</view>
+            <view class="td">{{item.rank}}</view>
+        </view>
+        <view class="tr" wx:else>
+            <view class="td">
+                <text wx:for="{{item.person}}" wx:for-item="person">{{person.name}}/</text>
+            </view>
+            <!-- <view class="td">{{item.address||'--'}}</view> -->
+            <view class="td">{{item.integral}}</view>
+            <view class="td">{{item.rank}}</view>
+        </view>
+    </block>
+</view>

+ 32 - 1
commpents/match-achieve/personal.wxss

@@ -1 +1,32 @@
-/* commpents/match-achieve/personal.wxss */
+.table {
+  border: 0px solid darkgray;
+}
+.tr {
+  display: flex;
+  width: 96vw;
+  justify-content: center;
+  height: 3rem;
+  align-items: center;
+}
+.td {
+  width: 32vw;
+  justify-content: center;
+  text-align: center;
+  font-size: 14px;
+}
+.bg-w {
+  background: snow;
+}
+.bg-g {
+  background: #E6F3F9;
+}
+.th {
+  width: 32vw;
+  justify-content: center;
+  background: #3366FF;
+  color: #fff;
+  display: flex;
+  height: 3rem;
+  font-size: 14px;
+  align-items: center;
+}

+ 27 - 1
pages/matchInfo/achieve.js

@@ -17,7 +17,33 @@ Page({
             ],
         },
         options: {},
-        info: {}
+        info: {},
+        // 个人积分
+        ownintegralList: [
+            {
+                person: [{ name: '李四' }, { name: '张三' }, { name: '刘二' }],
+                integral: '48',
+                rank: '1'
+            },
+            {
+                person: [{ name: '李四' }, { name: '张三' }, { name: '刘二' }],
+                integral: '28',
+                rank: '2'
+            }
+        ],
+        // 团体积分
+        teamintegralList: [
+            {
+                address: '龙伟羽校',
+                integral: '488',
+                rank: '1'
+            },
+            {
+                address: '龙伟羽校',
+                integral: '200',
+                rank: '2'
+            }
+        ],
     },
     // 跳转菜单
     back(e) {

+ 2 - 2
pages/matchInfo/achieve.wxml

@@ -16,10 +16,10 @@
                         <achieve-3></achieve-3>
                     </view>
                     <view wx:elif="{{tabs.active=='d'}}" class="d">
-                        <achieve-4></achieve-4>
+                        <achieve-4 ownintegralList="{{ownintegralList}}"></achieve-4>
                     </view>
                     <view wx:elif="{{tabs.active=='e'}}" class="e">
-                        <achieve-5></achieve-5>
+                        <achieve-5 teamintegralList="{{teamintegralList}}"></achieve-5>
                     </view>
                 </view>
             </scroll-view>

+ 3 - 0
pages/orderbook/autoAdd.json

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

+ 1 - 0
pages/orderbook/autoAdd.wxss

@@ -0,0 +1 @@
+/* pages/orderbook/autoAdd.wxss */