From a850f3f267b9330f94319586569ffcd4d73ab4e5 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Wed, 13 May 2020 18:43:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9C=A8=E6=B4=BB=E5=8A=A8=E7=BB=93=E6=9D=9F=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E9=9A=90=E8=97=8F=E4=B8=8B=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=8C=89=E9=92=AE=EF=BC=9B=E4=BF=AE=E6=94=B9=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=A9=E5=AD=90=E5=88=A0=E9=99=A4=E5=AD=A9=E5=AD=90?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=B8=8Enbs=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebiz/exercising/ExercisingDetails.vue     |  6 ++--
 .../SignUpCompinents/ChildInformation.vue     | 30 +++++++++++++++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/views/ebiz/exercising/ExercisingDetails.vue b/src/views/ebiz/exercising/ExercisingDetails.vue
index 7b7986b92..1490461fe 100644
--- a/src/views/ebiz/exercising/ExercisingDetails.vue
+++ b/src/views/ebiz/exercising/ExercisingDetails.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="exercising-details-container pb50">
     <div class="mt10"><img v-for="(imgSrc, index) in Images" :key="index" v-lazy="imgSrc" alt="详情图片" width="100%" /></div>
-    <div class="bottom-area bottom-btn">
+    <div class="bottom-area bottom-btn" v-if="show">
       <van-button v-if="!isWeixin" type="danger" size="large" @click="share">去邀约</van-button>
       <van-button v-else type="danger" size="large" @click="join">报名参加</van-button>
     </div>
@@ -19,7 +19,8 @@ export default {
     let isWeixin = this.$utils.device().isWeixin //判断环境
     return {
       Images: [],
-      isWeixin
+      isWeixin,
+      show: true
     }
   },
   watch: {},
@@ -33,6 +34,7 @@ export default {
           let nowSt = new Date().getTime()
           if (endTimeSt < nowSt) {
             this.$dialog({ message: '本次活动已结束' })
+            this.show = false
           }
         } else {
           this.$toast(res.resultMessage)
diff --git a/src/views/ebiz/exercising/SignUpCompinents/ChildInformation.vue b/src/views/ebiz/exercising/SignUpCompinents/ChildInformation.vue
index 775f1290c..6e11c109b 100644
--- a/src/views/ebiz/exercising/SignUpCompinents/ChildInformation.vue
+++ b/src/views/ebiz/exercising/SignUpCompinents/ChildInformation.vue
@@ -33,11 +33,14 @@
           <template #header> </template>
           <template #footer>
             <div class="text-right" v-if="childrenList.length > 1">
-              <van-button size="small" icon="delete" type="danger" @click="delChild(index)"></van-button>
+              <!-- <van-button size="small" icon="delete" type="danger" @click="delChild(index)"></van-button> -->
+              <div class="nbs-del" @click="delChild(index)"><van-icon name="delete"></van-icon></div>
             </div>
           </template>
         </van-panel>
-        <van-button plain hairline type="primary" block @click="addChild">+ 添加子女</van-button>
+        
+        <!-- <van-button plain hairline type="primary" block @click="addChild">+ 添加子女</van-button> -->
+        <div class="nbs-add" @click="addChild">+ 添加子女</div>
       </template>
     </div>
     <div class="bottom-area bottom-btn">
@@ -157,4 +160,27 @@ export default {
   border-radius: 10px;
   overflow: hidden;
 }
+
+.nbs-del,
+.nbs-add {
+  height: 32px;
+  margin: 10px auto 0 auto;
+  line-height: 32px;
+}
+.nbs-del {
+  border: 1px solid #f2f2f2;
+  background-color: #f2f2f2;
+  font-size: 20px;
+  text-align: right;
+  /deep/ i {
+    position: relative;
+    top: 6px;
+    right: 5px;
+  }
+}
+.nbs-add {
+  border: 1px solid #e3e3e3;
+  text-align: center;
+  font-size: 14px;
+}
 </style>

From 6edf2f708c3289f3ac5b846589bae842b2f4ebd3 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Wed, 13 May 2020 20:08:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=9C=A8=E6=97=A0=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E5=91=88=E7=8E=B0=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/exercising/SignUpDetails.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/ebiz/exercising/SignUpDetails.vue b/src/views/ebiz/exercising/SignUpDetails.vue
index c84005861..c16bb741b 100644
--- a/src/views/ebiz/exercising/SignUpDetails.vue
+++ b/src/views/ebiz/exercising/SignUpDetails.vue
@@ -5,7 +5,7 @@
       <van-tab title="已报名" name="01"> </van-tab>
       <van-tab title="已上传作品" name="02"> </van-tab>
     </van-tabs>
-    <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+    <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad" v-if="list.length > 0">
       <van-cell v-for="(item, index) in list" :key="index">
         <!-- 使用 title 插槽来自定义标题 -->
         <template #title>
@@ -20,6 +20,10 @@
         </template>
       </van-cell>
     </van-list>
+      <div v-else class="text-center">
+        <img class="mt40 w250" src="@/assets/images/pic_page-non.png" />
+        <div class="fs15 c-gray-dark mt40">暂无数据</div>
+      </div>
   </div>
 </template>