个人明细页面

components/bussiness/detail-btn.vue

@@ -38,6 +38,8 @@ export default {
     position: fixed;
     left: 0;
     bottom: 0;
+    z-index: 3;
+    background: #fff;
   }
   .detail-btn {
     display: flex;

components/bussiness/detail-list.vue

 <template>
   <div class="detail-list br">
-    <ul v-show="dataList.length">
+    <ul v-show="!dataList.length">
       <li class="list" v-for="(item, index) in dataList" :key="index">
         <img src="../../assets/type-2.png" alt="">
         <ul class="desc">
@@ -10,7 +10,7 @@
         <span class="score"><span>+5</span>勤奋分</span>
       </li>
     </ul>
-    <div v-show="!dataList.length" class="no-content">
+    <div v-show="dataList.length" class="no-content">
       <img src="../../assets/no-content.png" alt="">
       <div class="text">暂无记录,您还没有参加活动</div>
       <DetailBtn style="margin-top: 30px;" btnText="立即参加" :isFixed="isFixed" btnWidth="50%"></DetailBtn>
@@ -26,7 +26,7 @@ export default {
   props: {
     dataList: {
       type: Array,
-      default: () => [0, 1, 3, 4]
+      default: () => [0, 1, 3,0, 1, 3,0, 1, 3,0, 1, 3, 4]
     }
   },
   data() {

components/header/index.vue

@@ -7,7 +7,7 @@
       <div :class="{ active: isScroll }" class="content title">
         <span>{{ shareTitle1 }}</span>
       </div>
-      <div class="content right-icon" @click="share">
+      <div v-show="isShowRightIcon" class="content right-icon" @click="share">
         <img :src="headerRightIcon" />
       </div>
     </div>
@@ -45,6 +45,10 @@ export default {
     },
     shareIconUrl: {
       type: String
+    },
+    isShowRightIcon: {
+      type: Boolean,
+      default: false
     }
   },
   computed: {
@@ -61,8 +65,11 @@ export default {
   },
   methods: {
     goBack() {
-      this.$emit('closeVideo');
+      if(this.$rocNative.isWeb) {
+        this.$router.go(-1);
+      } else {
         this.$rocNative.goBack();
+      }
     },
     share() {
       let shareUrl = '';

pages/perdetails.vue

 <template>
+  <section class="personal-detail">
+    <Header
+			:is-scroll="isScroll"
+			:share-title1="shareTitle1"
+			:share-title2="shareTitle2"
+		/>
     <section class="personal-details-wrapper">
       <article class="user">
         <img class="user-img" src="../assets/user-header.png" alt="">
@@ -11,32 +17,43 @@
         </div>
       </article>
       <DetailList></DetailList>
-    <DetailBtn needBT=true @btnClick="btnClick"></DetailBtn>
+      <DetailBtn v-show="false" needBT=true @btnClick="goBack"></DetailBtn>
+    </section>
   </section>
 </template>
 <script>
 import DetailList from '@/components/bussiness/detail-list';
 import DetailBtn from '@/components/bussiness/detail-btn';
+import Header from '../components/header';
 export default {
   components: {
+    Header,
     DetailList,
     DetailBtn
   },
   data() {
     return {
-      
+      token: '222',
+      shareTitle1: '个人明细',
+      shareTitle2: '',
+      shareIconUrl: '',
+      isScroll: true,      
     }
   },
   methods: {
-    btnClick() {
-      console.log(11);
-      // alert(1);
+    goBack() {
+      if(this.$rocNative.isWeb) {
+        this.$router.go(-1);
+      } else {
+        this.$rocNative.goBack();
       }
     },
+  },
 }
 </script>
 <style lang="less">
   .personal-details-wrapper {
+    padding: 70px 0 60px; 
     .user {
       position: relative;
       top: 0;
@@ -69,16 +86,16 @@ export default {
           // margin-left: 15px;
           text-align: center;
           .score {
-            height: 24px;
-            line-height: 24px;
+            height: 18px;
+            line-height: 18px;
             font-size: 24px;
             font-weight: 700;
-            color: rgba(255,232,165, 0.8);
+            color: rgba(255,232,165, 1);
           }
           .text {
             height: 18px;
             line-height: 18px;
-            // margin-top: 6px;
+            margin-top: 6px;
             font-size: 12px;
             font-weight: 400;
             color: #FFE8A5;