From 1be78202ad8aa3fd98cd25995a445b01a117d9f4 Mon Sep 17 00:00:00 2001
From: zhoujian <709286540@qq.com>
Date: Wed, 15 Jul 2020 17:52:25 +0800
Subject: [PATCH] add

---
 application/index/controller/Index.php    | 2 +-
 application/index/view/index/myorder.html | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php
index 95d3b0b..88b4bcf 100755
--- a/application/index/controller/Index.php
+++ b/application/index/controller/Index.php
@@ -230,7 +230,7 @@ class Index extends Controller
             $data[$k]['son']=db('activity')->where('parentid',$v['id'])->order('id asc')->select();
             //获取每一期的数据
             foreach ($data[$k]['son'] as $k1=>$v1){
-                $data[$k]['son'][$k1]['order']=db('order')->where(['aid'=>$v1['id'],'status'=>2])->select();
+                $data[$k]['son'][$k1]['order']=db('order')->where(['aid'=>$v1['id']])->select();
             }
         }
 
diff --git a/application/index/view/index/myorder.html b/application/index/view/index/myorder.html
index 2291d6f..4b95c8f 100644
--- a/application/index/view/index/myorder.html
+++ b/application/index/view/index/myorder.html
@@ -22,7 +22,10 @@
             <div style="flex: 1">手机</div>
         </div>
         <div  style="display: flex;width: 100%;margin:0 10px;color: #333333;font-size: 12px;" v-for="(itemSon1,itemKey1) in itemSon.order" v-if="itemSon.order">
-            <div style="flex: 1">{{itemSon1.name}}</div>
+            <div style="flex: 1">
+                <span v-if="itemSon1.status===1" style="background: red;color: #ffffff;">未缴费</span>
+                <span v-if="itemSon1.status===2" style="background: green;color: #ffffff;">已缴费</span>
+                {{itemSon1.name}}</div>
             <div style="flex: 1">{{itemSon1.school}}</div>
             <div style="flex: 1">{{itemSon1.grade}}</div>
             <div style="flex: 1">{{itemSon1.money}}</div>