Merge branch 'feature/GFRS-1146【0520】活动邀请' into dev

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)

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>

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>