购好物，新达人页面，onShow的Bug处理~

王强
1 parent 3ad80e7d
Showing 4 changed files with 85 additions and 90 deletions
package-lock.json
package.json
src/main.js
src/pages/newDaren/newDaren.vue
@@ -163,6 +163,14 @@
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
       "dev": true
     },
+    "animate": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/animate/-/animate-1.0.0.tgz",
+      "integrity": "sha1-Rh+Hr+pLyF257s/euu5E1beKGGw=",
+      "requires": {
+        "rafl": "~1.2.2"
+      }
+    },
     "animate.css": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
@@ -332,8 +340,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -2085,7 +2092,6 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
-      "optional": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -3615,8 +3621,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "delegate": {
       "version": "3.2.0",
@@ -4362,8 +4367,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "fast-deep-equal": {
       "version": "1.1.0",
@@ -4692,8 +4696,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4714,14 +4717,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4736,20 +4737,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4866,8 +4864,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4879,7 +4876,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4894,7 +4890,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4902,14 +4897,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -4928,7 +4921,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5009,8 +5001,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5022,7 +5013,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5108,8 +5098,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5145,7 +5134,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5165,7 +5153,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5209,14 +5196,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -6467,8 +6452,7 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "jsesc": {
       "version": "1.3.0",
@@ -11424,6 +11408,14 @@
       "resolved": "https://registry.npmjs.org/raf.js/-/raf.js-0.0.4.tgz",
       "integrity": "sha1-8Vr0RdJBsn+nExpXRQtn75xAL+w="
     },
+    "rafl": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/rafl/-/rafl-1.2.2.tgz",
+      "integrity": "sha1-/pMPdYIRAg1H44gV9Rlqi+QVB0A=",
+      "requires": {
+        "global": "~4.3.0"
+      }
+    },
     "randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
@@ -12899,8 +12891,7 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "type-is": {
       "version": "1.6.16",
@@ -10,6 +10,7 @@
     "build": "node build/build.js"
   },
   "dependencies": {
+    "animate": "^1.0.0",
     "animate.css": "^4.1.1",
     "callapp-lib": "^2.1.8",
     "crypto-js": "^3.1.9-1",
@@ -156,9 +156,9 @@ Vue.prototype.SIGN = {
 /* 根据模式，获取相关请求参数 开始 */
 Vue.prototype.getParams = function(mode) {
-    
+
     // 随机生成字符串
-    function randomString(e) {  
+    function randomString(e) {
         e = e || 8;
         let t = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678";
         let a = t.length;
@@ -391,7 +391,7 @@ Vue.prototype.http = function(path, data, callback, ext) {
                 }
             },
             err => {
-                
+
                 /* 加载错误处理 开始 */
                 Indicator.close();
@@ -448,7 +448,7 @@ Vue.prototype.http = function(path, data, callback, ext) {
                 }
             },
             err => {
-                
+
                 /* 加载错误处理 开始 */
                 Indicator.close();
@@ -467,7 +467,7 @@ Vue.prototype.http = function(path, data, callback, ext) {
     }
     if (path) {
-        
+
         // 上下文
         let context = this;
@@ -22,7 +22,7 @@
             }"
         >
         </swiper> -->
-        
+
         <!--达人信息-->
         <!-- <shop-daten-top v-if="shopDatenTop" @userJump="userJump" :shopDatenTop="shopDatenTop"></shop-daten-top> -->
@@ -67,7 +67,7 @@
         </div>
         <!--推荐达人-->
-        
+
         <!-- 最新动态标题 -->
         <text-title-box  v-if="shopDarenHot && shopDarenHot.length" slot="title-box" @more="recommendedDaren"
             :titles="{
@@ -99,7 +99,7 @@
             <div infinite-scroll-immediate-check="true" v-infinite-scroll="getNewDynamicList" infinite-scroll-disabled="loading" :infinite-scroll-distance="50">
                 <daren-list-box class="daren-list" @userJump="userJump" @jump="jump" @goodsJump="goodsJump" @goodsPrimary="goodsPrimary" @fansShop="fansShop" @toDarenShop="userJump"
                     :lists="shopFnsDynamic">
-                    
+
                     <!--最新达人动态-->
                     <text-title-box v-if="shopFnsDynamic && shopFnsDynamic.length" slot="title-box"
                         :titles="{
@@ -125,7 +125,7 @@
     import shopDatenTop from "@/components/shopDatenTop/shopDatenTop";
     import horizList from "@/components/horizList/horizList";
     import dresserList from "@/components/dresserList/dresserList";
-    
+
     export default {
         name: "newDaren",
         data () {
@@ -156,13 +156,13 @@
             dresserList
         },
         created () {
-            
+
             // 设置标题
             this.$set(this, "title", "达人");
-            
+
             // 判断是否在App内
             if (this.isCNLive.value) {
-                
+
                 // 添加后退按钮组“后退”和“分享”按钮
                 this.$set(this, 'backs', {
                     title: this.title,
@@ -185,7 +185,7 @@
                     // 根据平台，判断是否符合版本，显示搜索和其它导航菜单
                     if ((this.isiPhone.value && this.$parent.compareVersion(version, '1.9.6')) || (this.isAndroid.value && this.$parent.compareVersion(version, '1.8.5.3'))) {
-                        
+
                         // 设置显示nav模块
                         this.$set(this, 'showBack', true);
                     }
@@ -204,14 +204,14 @@
              * 达人最新动态
              */
             getNewDynamicList() {
-                
+
                 // 设置加载中和页码
                 this.$set(this, 'loading', true);
                 this.$set(this, 'pages', ++this.pages);
-                
+
                 // 加载中提示
                 Indicator.open("加载中...");
-                
+
                 // 获取证书请求接口
                 this.http("/Api/" + this.getApiVersion().dynamic + "/getNewDynamicList", {
                     uid: this.$route.query.uid,
@@ -228,20 +228,20 @@
              * @param {Object} ext [扩展参数]
              */
             getNewDynamicListCallback(res, ext) {
-                
+
                 // 加载完成
                 Indicator.close();
-                
+
                 // 返回处理
                 if (res.code == 200) {
-                
+
                     // 解构数据
                     let { data: datas } = res;
                     /* 获取达人动态数据 开始 */
                     if (datas.list && datas.list.length) {
-                        
+
                         // 隐藏加载圈
                         this.$set(this, 'loading', false);
@@ -250,13 +250,13 @@
                         } else {
                             this.$set(this, "shopFnsDynamic", datas.list);
                         }
-                    
+
                         // 将视频地址加入到图片数组中
                         if (this.shopFnsDynamic && this.shopFnsDynamic.length > 0) {
                             // 循环项目列表
                             for (let item of this.shopFnsDynamic) {
-                                
+
                                 // 将视频图片加入图片数组，方便循环输出
                                 if (item.video_img) {
                                     this.$set(item, "img", [...[item.video_img], ...item.img]);
@@ -268,11 +268,11 @@
                     /* 获取达人动态数据 结束 */
                 } else if (res.code == 400) {
-                    
+
                     // 获取达人动态失败
                     Toast(res.message);
                 } else {
-                    
+
                     // 获取优选库精选活动失败
                     Toast("获取达人动态失败");
                 }
@@ -290,7 +290,7 @@
              * 获取优选库精选活动
              */
             newDarenIndex() {
-            
+
                 // 加载中提示
                 Indicator.open("加载中...");
@@ -324,26 +324,26 @@
                     /* 获取优选库精选活动数据 开始 */
                     if (datas.title) {
-                        
+
                         // 设置标题
                         this.$set(this, "title", datas.title);
                     }
                     // 获取“达人列表数据”
                     if (datas.list && datas.list.length) {
-                    
+
                         // 设置“达人列表数据”数据
                         this.$set(this, "dresserList", datas.list.filter((item, index, arr) => { return index < 4 }));
                     }
                     // 设置banner数据
                     this.banner.push(datas.shop_daten_ads)
-                
+
                     // 设置shopDatenTop置顶达人数据
                     if (datas.shop_daten_top) {
                         this.$set(this, "shopDatenTop", datas.shop_daten_top);
                     }
-                
+
                     // 设置shopDarenHot达人推荐数据
                     if (datas.shop_daren_hot && datas.shop_daren_hot.length) {
                         this.$set(this, "shopDarenHot", datas.shop_daren_hot);
@@ -352,10 +352,10 @@
                     // 设置fansDaren已关注达人动态数据
                     if (datas.shop_fans_dynamic && datas.shop_fans_dynamic.length) {
                         this.$set(this, "fansDaren", datas.shop_fans_dynamic);
-                
+
                         // 将视频地址加入到图片数组中
                         for (let item of this.fansDaren) {
-                            
+
                             // 将视频图片加入图片数组，方便循环输出
                             if (item.video_img) {
                                 this.$set(item, "img", [...[item.video_img], ...item.img]);
@@ -366,7 +366,7 @@
                     /* 获取优选库精选活动数据 结束 */
                 } else if (res.code == 400) {
-                    
+
                     // 获取优选库精选活动失败
                     Toast(res.message);
                 } else {
@@ -383,10 +383,10 @@
                 // 加载中
                 Indicator.open("加载中...");
-                
+
                 // 判断必要参数
                 if (item.id && this.$route.query.uid) {
-                
+
                     // 请求接口
                     this.http("/Api/" + this.getApiVersion().dynamic + "/fansShop", {
                         id: (item.shop_user ? item.shop_user.id : item.id) || 0,
@@ -404,25 +404,25 @@
              * @param {Object} ext [扩展参数]
              */
             fansShopCallback(res, ext) {
-                
+
                 // 加载完成
                 Indicator.close();
                 if (res.code == 200) {
-                    
+
                     // 设置已关注
                     if (ext.item.is_fans) {
-                        
+
                         // 判断关注结果
                         if (ext.item.is_fans == "0") {
-                    
+
                             // 关注达人
                             this.$set(ext.item, "is_fans", "1");
-                            
+
                             // 吐司提示
                             Toast("关注成功");
                         } else if (ext.item.is_fans == "1") {
-                    
+
                             // 取消关注达人
                             this.$set(ext.item, "is_fans", "0");
@@ -457,12 +457,12 @@
                     Toast("关注失败");
                 }
             },
-            
+
             /**
              * 已关注达人动态更多页跳转
              */
             moreDynamic() {
-            
+
                 // 判断并调用通用跳转
                 if (typeof this.$parent.gotoDetail === "function") {
@@ -515,7 +515,7 @@
                         to: (window.location.href.split("#")[0] + "#/recommendMore?uid=" + this.getStore("uid")),
                         shop_type: ""
                     }
-                
+
                     // 调用通用跳转
                     this.$parent.gotoDetail(options);
                 }
@@ -546,7 +546,7 @@
              * @param {object} item [数据对象]
              */
             jump(item) {
-            
+
                 // 判断并调用通用跳转
                 if (typeof this.$parent.gotoDetail === "function") {
@@ -634,7 +634,7 @@
              * 后退
              */
             back() {
-                
+
                 // 判断是否有处理函数
                 if (typeof this.$parent.back === 'function') {
@@ -665,14 +665,14 @@
                 }
             }
         },
-        mounted() {  
-            
+        mounted() {
+
             // 页面切换可见状态监听
             document.addEventListener('visibilitychange', () => {
-                
+
                 // 页面显示出来了
                 if (document.hidden === false && this.$route.name == 'newDaren') {
-                    
+
                     // 获取优选库精选活动
                     this.newDarenIndex();
@@ -680,6 +680,9 @@
                     this.$set(this, 'loading', false);
                     this.$set(this, 'pages', 0);
+                    // 初始化最新达人动态数组
+                    this.$set(this, "shopFnsDynamic", null);
+
                     // 达人最新动态
                     this.getNewDynamicList();
                 }