From bcd59f0f839fb8bfd3aec630c9af64da1f78cea4 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Sat, 9 May 2020 16:07:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E9=82=80=E8=AF=B7=EF=BC=8C=E5=88=97=E8=A1=A8=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |  4 ++
 src/views/app/Home.vue                        | 11 +++-
 .../ebiz/exercising/ExercisingDetails.vue     |  8 +--
 src/views/ebiz/exercising/SignUpDetails.vue   | 60 +++++++++++++------
 4 files changed, 59 insertions(+), 24 deletions(-)
diff --git a/public/index.html b/public/index.html
index 23b59b22b..0cfff260e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,6 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <meta http-equiv="Expires" content="0">
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Cache-control" content="no-cache">
+    <meta http-equiv="Cache" content="no-cache">
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
diff --git a/src/views/app/Home.vue b/src/views/app/Home.vue
index 47adb9579..0ff9c2218 100644
--- a/src/views/app/Home.vue
+++ b/src/views/app/Home.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="home-container">
+  <div class="home-container pb150">
     <div class="pv10 text-center">ebiz h5 standard frame</div>
     <ul class="fs14 p20">
       <li class="fs18 mb10">基础工程项目：</li>
@@ -46,6 +46,15 @@
           </li>
         </ul>
       </li>
+      <li class="mt10">
+        <p class="fw600">活动邀请</p>
+        <ul class="pl20">
+          <li>
+            <router-link to="/exercising/ExercisingDetails">活动邀请-活动详情</router-link>
+          </li>
+        </ul>
+      </li>
+      
     </ul>
     <van-tabbar v-model="active">
       <van-tabbar-item icon="home-o">首页</van-tabbar-item>
diff --git a/src/views/ebiz/exercising/ExercisingDetails.vue b/src/views/ebiz/exercising/ExercisingDetails.vue
index df4f6c809..bc270651b 100644
--- a/src/views/ebiz/exercising/ExercisingDetails.vue
+++ b/src/views/ebiz/exercising/ExercisingDetails.vue
@@ -37,7 +37,7 @@ export default {
       .catch(err => {
         console.error(err)
       })
-    if (this.isWeixin) {
+    if (!this.isWeixin) {
       setTimeout(() => {
         // 右上角的显示
         window.EWebBridge.webCallAppInJs('webview_right_button', {
@@ -61,12 +61,12 @@ export default {
         this.$jump({
           flag: 'h5',
           extra: {
-            title: '产品列表',
+            title: '报名详情',
             forbidSwipeBack: 1, //当前页面禁止右滑返回
-            url: location.origin + `/#/cardList/CardTotreasure`
+            url: location.origin + `/#/exercising/SignUpDetails`
           },
           routerInfo: {
-            path: `/cardList/CardTotreasure`,
+            path: `/exercising/SignUpDetails`,
             type: '1'
           }
         })
diff --git a/src/views/ebiz/exercising/SignUpDetails.vue b/src/views/ebiz/exercising/SignUpDetails.vue
index b6efd6d58..ef619085d 100644
--- a/src/views/ebiz/exercising/SignUpDetails.vue
+++ b/src/views/ebiz/exercising/SignUpDetails.vue
@@ -1,9 +1,9 @@
 <!-- 报名详情 -->
 <template>
   <div>
-    <van-tabs v-model="activeName">
-      <van-tab title="已报名" name="a"> </van-tab>
-      <van-tab title="已上传作品" name="b"> </van-tab>
+    <van-tabs v-model="searchData.enterStatus">
+      <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-cell v-for="(item, index) in list" :key="index">
@@ -25,36 +25,58 @@
 
 <script>
 import { List, Cell, Tabs, Tab, Col, Row } from 'vant'
-// import {  } from '@/api/ebiz/manpower/manpower'
+import { getEnrollList } from '@/api/ebiz/exercising/exercising'
 
 export default {
   name: '',
   filters: {},
   data() {
+    let searchData = {
+        "belongAgent":"0",
+        "enterStatus":"01",
+        "pageSize":10,
+        "pageNum":1,
+        "activeCode":"DRAW"
+      }
     return {
-      activeName: 'b',
-      list: [
-        {
-          name: '需水电',
-          phone: '15512341234'
-        },
-        {
-          name: '费发',
-          phone: '58684567425'
-        }
-      ],
+      searchData,
+      list: [],
       loading: false,
       finished: false
     }
   },
-  watch: {},
+  watch: {
+    'searchData.enterStatus': function(newVal, oldVal){
+      this.list = []
+      this.searchData.pageSize = 10
+      this.searchData.pageNum = 1
+      this.onLoad()
+    }
+  },
   created() {},
   mounted() {},
   methods: {
-    init() {},
     onLoad() {
-      this.finished = true
-      this.loading = false
+      this.loading = true
+      this.getEnrollList()
+    },
+    getEnrollList(){
+      getEnrollList(this.searchData).then(res=>{
+        console.log(res);
+        if(res.result == '0'){
+          let resC = res.content;
+          if(resC.nextPage == 0){
+            this.finished = true
+          }
+          this.loading = false
+          this.list = this.list.concat(resC.list)
+          this.searchData.pageNum++
+        }else{
+          this.$toast(res.resultMessage)
+        }
+      }).catch(err=>{
+        console.error(err);
+      })
     }
   },
   components: {
