From 5e3b290ff5b97c7d75f148899cc43c527fecfcb7 Mon Sep 17 00:00:00 2001
From: Ming Sun <ming@tiny.group>
Date: Tue, 5 May 2020 22:08:14 +0800
Subject: [PATCH] add lazyload  & infinite-loading

---
 .vscode/settings.json        |   1 +
 package.json                 |   2 +
 src/components/app.vue       |   5 +-
 src/components/discounts.vue | 129 ++++++++++++++++++++++++-----------
 src/components/report.vue    |   2 +-
 src/content_script.js        |   1 +
 src/popup.js                 |   3 +
 static/style/popup.css       |  10 ++-
 static/style/style.css       |   7 ++
 yarn.lock                    |  10 +++
 10 files changed, 120 insertions(+), 50 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 56d7d3c..30b6e07 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
   "cSpell.words": [
+    "Lazyload",
     "fliggy",
     "metatit",
     "tmall"
diff --git a/package.json b/package.json
index e0bc66d..656dbbd 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,8 @@
     "microtip": "^0.2.2",
     "parcel-bundler": "^1.12.3",
     "vue": "^2.6.11",
+    "vue-infinite-loading": "^2.4.5",
+    "vue-lazyload": "^1.3.3",
     "weui": "^2.3.0",
     "weui.js": "^1.2.1",
     "zepto": "^1.2.0"
diff --git a/src/components/app.vue b/src/components/app.vue
index 11c92b9..a8a2634 100644
--- a/src/components/app.vue
+++ b/src/components/app.vue
@@ -626,11 +626,12 @@ export default {
   display: flex;
   justify-content: space-between;
 }
-.messages,
-.discounts {
+.messages, .discounts {
   overflow: hidden;
   height: 515px;
+  background: #f9f9f9;
 }
+
 .message-items {
   margin-top: 10px;
   height: 504px;
diff --git a/src/components/discounts.vue b/src/components/discounts.vue
index b759f81..e9eb2d3 100644
--- a/src/components/discounts.vue
+++ b/src/components/discounts.vue
@@ -27,16 +27,16 @@
         <div class="tag-box">
           <span class="tag-name">{{selectTag.name}}</span>
         </div>
-        <a
+        <button
           v-if="followed"
-          class="weui-btn weui-btn_mini weui-btn_plain-disabled"
+          class="weui-btn weui-btn_mini weui-btn_disabled"
           @click="unfollowTag(selectTag)"
-        >取消</a>
-        <a
+        >取消</button>
+        <button
           v-else
-          class="weui-btn weui-btn_mini weui-btn_plain-primary"
+          class="weui-btn weui-btn_mini weui-btn_primary"
           @click="followTag(selectTag)"
-        >关注</a>
+        >关注</button>
       </div>
       <div class="search" v-else>
         <input v-model="keyword" placeholder="输入关键词搜索" v-on:keyup.enter="search">
@@ -49,7 +49,7 @@
         <div :class="discount.pinned ? 'discount pinned' : 'discount'">
           <div class="title" @mouseover="discount.focus = true" @mouseout="discount.focus = false">
             <span class="merchant" v-if="discount.merchant">
-              <img :src="discount.merchant.icon" :alt="discount.merchant.name">
+              <img v-lazy="discount.merchant.icon" :alt="discount.merchant.name">
             </span>
             <a :href="`${discount.goodLink}`" target="_blank">{{discount.title}}</a>
             <span class="discount_price">{{discount.price}}</span>
@@ -59,7 +59,7 @@
             <a :href="`${discount.goodLink}`" target="_blank">
               <img
                 v-if="discount.photo"
-                :src="`${discount.photo}`"
+                v-lazy="`${discount.photo}`"
                 @error.once="backup_picture($event)"
                 width="75"
                 class="discount-photo backup_picture"
@@ -90,6 +90,10 @@
           </div>
         </div>
       </div>
+      <infinite-loading v-if="discountList.length > 20" spinner="waveDots" @infinite="infiniteHandler">
+        <div slot="no-more" class="no-more">😭暂时没有近期优惠了</div>
+        <div slot="no-results" class="no-results">😭没有更多优惠信息了</div>
+      </infinite-loading>
       <div v-if="discountTab == 'concerned' && followedTagIds.length < 1" class="no_message">
         <h4>暂时还没有关注任何标签</h4>
         <p class="tips">点击优惠信息中的标签可以筛选并关注标签哦</p>
@@ -110,6 +114,7 @@
 
 <script>
 import { DateTime } from "luxon";
+import InfiniteLoading from 'vue-infinite-loading';
 import { getSetting, readableTime } from "../utils";
 import loading from "./loading.vue";
 import report from "./report.vue";
@@ -117,13 +122,14 @@ import events from "./events.vue";
 
 export default {
   name: "discounts",
-  components: { loading, report, events },
+  components: { loading, report, events, InfiniteLoading },
   data() {
     return {
       followedTagIds: getSetting("followedTagIds", []),
       discountTab: "featured",
       discountList: null,
       selectTag: null,
+      page: 1,
       keyword: null
     };
   },
@@ -143,20 +149,55 @@ export default {
     },
     events: function() {
       return this.discountList ? this.discountList.filter(discount => discount.event) : [];
+    },
+    condition: function() {
+      if (this.keyword) {
+        return {
+          keyword: this.keyword
+        }
+      }
+      switch (this.discountTab) {
+        case "featured":
+          return {
+            all: false
+          };
+          break;
+        case "concerned":
+          if (this.followedTagIds.length > 0) {
+            return {
+              tagIds: this.followedTagIds.join(",")
+            };
+          } else {
+            return {};
+          }
+          break;
+        case "hot":
+          return {
+            hot: true
+          };
+          break;
+        default:
+          break;
+      }
+      return {}
     }
   },
   methods: {
     backup_picture: function(e) {
       e.currentTarget.src = "https://jjbcdn.zaoshu.so/web/img_error.png";
     },
-    getDiscounts: async function(condition) {
-      this.discountList = null;
-      this.selectTag = null;
-      let queryParams = new URLSearchParams(condition);
+    loadDiscountFormApi: async function(params) {
+      let queryParams = new URLSearchParams(params);
       let response = await fetch(
         `https://teaclub.zaoshu.so/discount?${queryParams.toString()}`
       );
-      let discounts = await response.json();
+      return await response.json();
+    },
+    getDiscounts: async function(condition) {
+      this.discountList = null;
+      this.selectTag = null;
+      this.page = 1
+      const discounts = await this.loadDiscountFormApi(condition)
       this.discountList = discounts.map(function(discount) {
         discount.displayTime = readableTime(
           DateTime.fromISO(discount.createdAt)
@@ -167,10 +208,27 @@ export default {
       localStorage.setItem("readDiscountAt", new Date());
       this.$forceUpdate();
     },
+    infiniteHandler: async function ($state) {
+      if (this.selectTag) return $state.complete();
+      const discounts = await this.loadDiscountFormApi(Object.assign({}, this.condition, {
+        page: this.page,
+      }))
+      if (discounts.length) {
+        this.page += 1;
+        this.discountList.push(...discounts.map(function(discount) {
+          discount.displayTime = readableTime(
+            DateTime.fromISO(discount.createdAt)
+          );
+          discount.focus = false
+          return discount;
+        }));
+        $state.loaded();
+      } else {
+        $state.complete();
+      }
+    },
     search: async function() {
-      this.getDiscounts({
-        keyword: this.keyword
-      });
+      this.getDiscounts(this.condition);
     },
     clear: async function() {
       this.keyword = null;
@@ -179,6 +237,7 @@ export default {
     filterByTag: async function(tag) {
       this.discountTab = null;
       this.discountList = null;
+      this.page = 1
       let response = await fetch(
         `https://teaclub.zaoshu.so/discount/tag/${tag.id}`
       );
@@ -191,7 +250,6 @@ export default {
         discount.focus = false
         return discount;
       });
-      localStorage.setItem("readDiscountAt", new Date());
       this.$forceUpdate();
     },
     unfollowTag: async function(tag) {
@@ -214,28 +272,10 @@ export default {
     switchTab: async function(type) {
       this.discountTab = type;
       this.selectTag = null;
-      switch (type) {
-        case "featured":
-          this.getDiscounts({
-            all: false
-          });
-          break;
-        case "concerned":
-          if (this.followedTagIds.length > 0) {
-            this.getDiscounts({
-              tagIds: this.followedTagIds.join(",")
-            });
-          } else {
-            this.discountList = [];
-          }
-          break;
-        case "hot":
-          this.getDiscounts({
-            hot: true
-          });
-          break;
-        default:
-          break;
+      if (type == "concerned" && this.followedTagIds.length < 1) {
+        this.discountList = []
+      } else {
+        this.getDiscounts(this.condition);
       }
     }
   }
@@ -326,7 +366,7 @@ export default {
 .search input {
   -webkit-appearance: none;
   border-radius: 4px;
-  border: 1px solid #eeeeee3d;
+  border: 1px solid #0000003d;
   box-sizing: border-box;
   color: #606266;
   display: inline-block;
@@ -384,6 +424,7 @@ export default {
 .discount-list {
   overflow-y: auto;
   height: 465px;
+  margin-top: 0;
 }
 
 .discount-list li {
@@ -478,4 +519,10 @@ export default {
 .weui-cells:after{
   border-bottom: none
 }
+
+.no-more, .no-results{
+    color: #666;
+    padding: 3px;
+    font-size: 14px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/report.vue b/src/components/report.vue
index e9a6158..0dca522 100644
--- a/src/components/report.vue
+++ b/src/components/report.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="reprot">
-  <div class="report-mask" @click="hide"></div>
+  <div class="report-mask" @click="hide" v-if="show"></div>
   <div class="report-problem" :ref="`report-${discount.id}`">
     <div class="report-icon" data-microtip-position="bottom-right" role="tooltip" aria-label="反馈问题" @click="showList">
       <span>i</span>
diff --git a/src/content_script.js b/src/content_script.js
index ad5441d..c58ae80 100644
--- a/src/content_script.js
+++ b/src/content_script.js
@@ -185,6 +185,7 @@ function addCouponElement(coupon) {
     <a class="teaclub-coupon" href="${coupon.url}" target="_blank">
       <div class="coupon-bonus-item">
         <div class="coupon-item-left">
+          <img class="qrcode" src="${`https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${coupon.shortUrl}&bgcolor=de1d3d`}">
           <p class="coupon-item-rmb">
             <span class="rmb">${displayCouponName}</span>
           </p>
diff --git a/src/popup.js b/src/popup.js
index 48d1eff..ec6c59b 100644
--- a/src/popup.js
+++ b/src/popup.js
@@ -16,6 +16,9 @@ $.each(['show', 'hide'], function (i, ev) {
 });
 
 import App from './components/app.vue';
+import VueLazyload from 'vue-lazyload'
+
+Vue.use(VueLazyload)
 new Vue({
   el: '#app',
   template: '<App/>',
diff --git a/static/style/popup.css b/static/style/popup.css
index 58c73bd..a264083 100644
--- a/static/style/popup.css
+++ b/static/style/popup.css
@@ -1,9 +1,3 @@
-body.light-mode {
-  background-color: #fff;
-  color: #333;
-  transition: background-color 0.3s ease;
-}
-
 
 @media (prefers-color-scheme:dark) {
   body:not([data-weui-theme='light']) {
@@ -11,6 +5,10 @@ body.light-mode {
     color: #999;
   }
 
+  body:not([data-weui-theme='light']) .messages, body:not([data-weui-theme='light']) .discounts {
+    background-color: transparent;
+  }
+
   body:not([data-weui-theme='light']) .weui-navbar__item.weui-bar__item_on.zaoshu-tab {
     color: #b9b9b9;
     background: #661c1a91;
diff --git a/static/style/style.css b/static/style/style.css
index e7307c0..a483f12 100644
--- a/static/style/style.css
+++ b/static/style/style.css
@@ -64,6 +64,13 @@ a.teaclub-coupon:hover {
   vertical-align: middle;
 }
 
+#teaclub .qrcode{
+  width: 60px;
+  display: block;
+  float: left;
+  padding: 5px;
+}
+
 .teaclub-discount {
   padding: 10px;
   background-color: #FFF2E8;
diff --git a/yarn.lock b/yarn.lock
index 37b8a18..f34e683 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8971,6 +8971,16 @@ vue-hot-reload-api@^2.3.0:
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
+vue-infinite-loading@^2.4.5:
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/vue-infinite-loading/-/vue-infinite-loading-2.4.5.tgz#cc20fd40af7f20188006443c99b60470cf1de1b3"
+  integrity sha512-xhq95Mxun060bRnsOoLE2Be6BR7jYwuC89kDe18+GmCLVrRA/dU0jrGb12Xu6NjmKs+iTW0AA6saSEmEW4cR7g==
+
+vue-lazyload@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.3.3.tgz#4df50a271bde9b74c3caf7a228d6e0af50d5682f"
+  integrity sha512-uHnq0FTEeNmqnbBC2aRKlmtd9LofMZ6Q3mWvgfLa+i9vhxU8fDK+nGs9c1iVT85axSua/AUnMttIq3xPaU9G3A==
+
 vue-loader@^15.9.1:
   version "15.9.2"
   resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.2.tgz#ae01f5f4c9c6a04bff4483912e72ef91a402c1ae"