From cfe677bc8ad5f9c99cc7a825de1f417d8d1c3635 Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Tue, 2 Feb 2021 10:12:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=AF=E7=94=B1=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC,=20=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/empty.png                   | Bin 0 -> 1969 bytes
 src/router/ebiz/eqiVisit.js                   |   3 +-
 src/views/ebiz/eqiVisit/ScoreRanking.vue      |  90 +++++++++++-------
 src/views/ebiz/eqiVisit/VisitHistory.vue      |  42 ++++----
 src/views/ebiz/eqiVisit/VisitInfoRegister.vue |  75 ++++++++++++++-
 5 files changed, 149 insertions(+), 61 deletions(-)
 create mode 100644 src/assets/images/empty.png

diff --git a/src/assets/images/empty.png b/src/assets/images/empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb30b65b407f657db65a6f9da1fd916e4df26dfd
GIT binary patch
literal 1969
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

literal 0
HcmV?d00001

diff --git a/src/router/ebiz/eqiVisit.js b/src/router/ebiz/eqiVisit.js
index 2a1c00396..c45f02022 100644
--- a/src/router/ebiz/eqiVisit.js
+++ b/src/router/ebiz/eqiVisit.js
@@ -49,9 +49,10 @@ export default [
     }
   },
   {
-    path: '/eqiVisit/historyDetail',
+    path: '/eqiVisit/historyDetail/:id',
     name: 'VisitHistory',
     component: HistoryDetail,
+    props: true,
     meta: {
       title: '陪访记录详情'
     }
diff --git a/src/views/ebiz/eqiVisit/ScoreRanking.vue b/src/views/ebiz/eqiVisit/ScoreRanking.vue
index 0939d2eed..2c17c7efa 100644
--- a/src/views/ebiz/eqiVisit/ScoreRanking.vue
+++ b/src/views/ebiz/eqiVisit/ScoreRanking.vue
@@ -1,62 +1,65 @@
 <template>
   <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
     <div class="bg-white ranking">
-      <van-notice-bar text="温馨提示: 每日凌晨更新前一日积分排行，下拉刷新最新排行" wrapable />
-      <div class="table-wrapper">
+      <van-notice-bar :text="noticeText" wrapable />
+      <div class="table-wrapper" v-if="data.length">
         <table class="van-hairline--surround">
           <thead>
             <th v-for="(th, i) in theads" :key="i">{{ th }}</th>
           </thead>
           <tbody>
             <tr class="van-hairline--bottom">
-              <td class="van-hairline--right van-hairline--bottom" style="max-width: 2em;">{{ agentRank.rank }}</td>
-              <td class="van-hairline--right van-hairline--bottom" style="max-width: 3em;">{{ agentRank.name }}</td>
-              <td class="van-hairline--right van-hairline--bottom" style="max-width: 4em;">{{ agentRank.org }}</td>
-              <td class="van-hairline--right van-hairline--bottom" style="max-width: 2em;">{{ agentRank.level }}</td>
-              <td class="van-hairline--bottom" style="max-width: 2em;">{{ agentRank.score }}</td>
+              <template v-if="agentRank">
+                <td class="van-hairline--right van-hairline--bottom" style="max-width: 2em;">{{ agentRank.rank }}</td>
+                <td class="van-hairline--right van-hairline--bottom" style="max-width: 3em;">{{ agentRank.name }}</td>
+                <td class="van-hairline--right van-hairline--bottom" style="max-width: 4em;">{{ agentRank.org }}</td>
+                <td class="van-hairline--right van-hairline--bottom" style="max-width: 2em;">{{ agentRank.level }}</td>
+                <td class="van-hairline--bottom" style="max-width: 2em;" @click="jumpToDetail">{{ agentRank.score }}</td>
+              </template>
+              <td v-else colspan="5">暂无积分</td>
+            </tr>
+
+            <tr v-for="(d, index) in data" :key="index">
+              <td class="van-hairline--right van-hairline--bottom" style="max-width: 2em;">{{ d.rank }}</td>
+              <td class="van-hairline--right van-hairline--bottom" style="max-width: 3em;">{{ d.name }}</td>
+              <td class="van-hairline--right van-hairline--bottom" style="max-width: 4em;">{{ d.org }}</td>
+              <td class="van-hairline--right van-hairline--bottom" style="max-width: 2em;">{{ d.level }}</td>
+              <td class="van-hairline--bottom" style="max-width: 2em;">{{ d.score }}</td>
             </tr>
-            <template v-for="j in 20">
-              <tr v-for="(d, index) in data" :key="index">
-                <td class="van-hairline--right van-hairline--bottom" style="max-width: 2em;">{{ j }}</td>
-                <td class="van-hairline--right van-hairline--bottom" style="max-width: 3em;">{{ d.name }}</td>
-                <td class="van-hairline--right van-hairline--bottom" style="max-width: 4em;">{{ d.org }}</td>
-                <td class="van-hairline--right van-hairline--bottom" style="max-width: 2em;">{{ d.level }}</td>
-                <td class="van-hairline--bottom" style="max-width: 2em;">{{ d.score }}</td>
-              </tr>
-            </template>
           </tbody>
         </table>
       </div>
+      <div class="empty pt150">
+        <p class="mb10">暂无排名</p>
+        <img :src="empty" />
+      </div>
     </div>
   </van-pull-refresh>
 </template>
 
 <script>
 import { NoticeBar } from 'vant'
+import empty from '@/assets/images/empty.png'
 export default {
   components: {
     [NoticeBar.name]: NoticeBar
   },
   data() {
     return {
-      agentRank: {
-        rank: 1,
-        name: '弓箭',
-        org: '国富人寿国富人寿国富',
-        level: '区经理',
-        score: 9
-      },
+      empty,
+      agentRank: null,
       isLoading: false,
       theads: ['排名', '姓名', '所在机构', '职级', '积分'],
-      data: [
-        {
-          rank: 1,
-          name: '速度飞快',
-          org: '国富人寿国富人寿',
-          level: '区经理',
-          score: 99
-        }
-      ]
+      data: []
+    }
+  },
+  computed: {
+    noticeText() {
+      if (this.data.length) {
+        return '温馨提示: 每日凌晨更新前一日积分排行，下拉刷新最新排行'
+      } else {
+        return '温馨提示：当前暂无最新排名，赶紧去陪访吧！'
+      }
     }
   },
   methods: {
@@ -64,6 +67,16 @@ export default {
       setTimeout(() => {
         this.isLoading = false
       }, 2000)
+    },
+    jumpToDetail() {
+      this.$jump({
+        flag: 'h5',
+        extra: {
+          forbidSwipeBack: '1',
+          url: location.origin + `/#/eqiVisit/scoreHistory`
+        },
+        routerInfo: { path: `/eqiVisit/scoreHistory` }
+      })
     }
   }
 }
@@ -94,9 +107,22 @@ export default {
       }
     }
   }
+
+  .empty {
+    text-align: center;
+    p {
+      font-size: 20px;
+      color: #999999;
+    }
+  }
 }
 
 .van-pull-refresh {
   overflow: auto;
 }
+
+.van-notice-bar {
+  background-color: #f6f6f6;
+  color: #199ed8;
+}
 </style>
diff --git a/src/views/ebiz/eqiVisit/VisitHistory.vue b/src/views/ebiz/eqiVisit/VisitHistory.vue
index b6d6d30b6..9c40a8353 100644
--- a/src/views/ebiz/eqiVisit/VisitHistory.vue
+++ b/src/views/ebiz/eqiVisit/VisitHistory.vue
@@ -7,22 +7,22 @@
     </div>
     <div class="divider" />
     <van-list v-model="loading" :finished="finished" @load="onLoad" finished-text="没有更多了...">
-      <transition-group name="list-complete">
-        <div class="history-item p10 van-hairline--bottom arrow list-complete-item" v-for="i in list" :key="i">
-          <div>冲刺挑战</div>
-          <div>胡娜</div>
-          <div class="time">
-            <span>2020-01-09</span>
-            <van-icon name="arrow" />
-          </div>
+      <div class="history-item p10 van-hairline--bottom arrow" v-for="i in list" :key="i" @click="jumpToDetail(i)">
+        <div>冲刺挑战</div>
+        <div>胡娜</div>
+        <div class="time">
+          <span>2020-01-09</span>
+          <van-icon name="arrow" />
         </div>
-      </transition-group>
+      </div>
     </van-list>
   </div>
 </template>
 
 <script>
 export default {
+  name: 'VisitHistory',
+  props: ['id'],
   data() {
     return {
       loading: false,
@@ -41,6 +41,16 @@ export default {
           this.finished = true
         }
       }, 1000)
+    },
+    jumpToDetail(id) {
+      this.$jump({
+        flag: 'h5',
+        extra: {
+          forbidSwipeBack: '1',
+          url: location.origin + `/#/eqiVisit/historyDetail/${id}`
+        },
+        routerInfo: { path: `/eqiVisit/historyDetail/${id}` }
+      })
     }
   }
 }
@@ -82,18 +92,4 @@ export default {
   top: 50%;
   transform: translate(50%, -60%);
 }
-
-.list-complete-item {
-  transition: all 1s;
-  display: inline-block;
-  width: 100%;
-}
-.list-complete-enter,
-.list-complete-leave-to {
-  opacity: 0;
-  transform: translateY(30px);
-}
-.list-complete-leave-active {
-  position: absolute;
-}
 </style>
diff --git a/src/views/ebiz/eqiVisit/VisitInfoRegister.vue b/src/views/ebiz/eqiVisit/VisitInfoRegister.vue
index a028530d2..f49dc60c8 100644
--- a/src/views/ebiz/eqiVisit/VisitInfoRegister.vue
+++ b/src/views/ebiz/eqiVisit/VisitInfoRegister.vue
@@ -52,6 +52,10 @@
       <van-uploader class="m10" v-model="fileList" :after-read="afterRead" :max-count="9" />
     </div>
     <van-button type="info" block @click="submitInfo">提交</van-button>
+
+    <van-popup :value="isSearchMoreShow" position="bottom" @click-overlay="isSearchMoreShow = false">
+      <div class="action van-hairline--bottom" v-for="(action, i) in actions" :key="i" @click="jumpPage(action)">{{ action.title }}</div>
+    </van-popup>
   </div>
 </template>
 
@@ -85,7 +89,25 @@ export default {
       visitDate: '',
       visitDuration: '',
       show: false,
-      currentDate: new Date()
+      currentDate: new Date(),
+      isSearchMoreShow: false,
+      actions: [
+        {
+          title: '陪访记录',
+          to: '/eqiVisit/visitHistory'
+        },
+        {
+          title: '查询积分',
+          to: '/eqiVisit/scoreHistory'
+        },
+        {
+          title: '积分榜',
+          to: '/eqiVisit/scoreRanking'
+        },
+        {
+          title: '取消'
+        }
+      ]
     }
   },
   computed: {
@@ -106,7 +128,28 @@ export default {
       return age
     }
   },
+  mounted() {
+    this.setRightBtn()
+  },
   methods: {
+    setRightBtn() {
+      // setTimeout(() => {
+      //   // eslint-disable-next-line no-undef
+      //   EWebBridge.webCallAppInJs('webview_right_button', {
+      //     btns: [
+      //       {
+      //         title: '查询更多'
+      //       }
+      //     ]
+      //   })
+      // }, 1000)
+      window.appCallBack = this.appCallBack
+    },
+    appCallBack(data) {
+      if (data.trigger == 'right_button_click') {
+        this.isSearchMoreShow = true
+      }
+    },
     async afterRead(file) {
       let data = new FormData()
       data.append('imgPath', file.file)
@@ -135,11 +178,26 @@ export default {
       fun()
     },
     async submitInfo() {
-      let res = await this.$validator.validate()
-      if (!res) {
-        return this.$toast(this.$validator.errors.all()[0])
+      this.isSearchMoreShow = true
+      // let res = await this.$validator.validate()
+      // if (!res) {
+      //   return this.$toast(this.$validator.errors.all()[0])
+      // }
+      // console.log('res :>> ', res)
+    },
+    jumpPage(route) {
+      if (route.to) {
+        this.$jump({
+          flag: 'h5',
+          extra: {
+            forbidSwipeBack: '1',
+            url: location.origin + `/#${route.to}`
+          },
+          routerInfo: { path: route.to }
+        })
+      } else {
+        this.isSearchMoreShow = false
       }
-      console.log('res :>> ', res)
     }
   }
 }
@@ -151,10 +209,17 @@ export default {
   height: 100vh;
   position: fixed;
   overflow: auto;
+
   .form {
     padding-bottom: 50px;
     flex: 1;
   }
+
+  .action {
+    text-align: center;
+    font-size: 16px;
+    padding: 12px;
+  }
 }
 
 .van-button {