w-front-end / select_good · Commits

Commit 2d8043939c1597f0cb9f51e09c080b8f0a767d57

Authored by 王强
1 parent 3ad80e7d

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

Inline Side-by-side
Showing 4 changed files with 85 additions and 90 deletions
package-lock.json
  View file @2d80439
... ... @@ -163,6 +163,14 @@
163 163 "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
164 164 "dev": true
165 165 },
  166 + "animate": {
  167 + "version": "1.0.0",
  168 + "resolved": "https://registry.npmjs.org/animate/-/animate-1.0.0.tgz",
  169 + "integrity": "sha1-Rh+Hr+pLyF257s/euu5E1beKGGw=",
  170 + "requires": {
  171 + "rafl": "~1.2.2"
  172 + }
  173 + },
166 174 "animate.css": {
167 175 "version": "4.1.1",
168 176 "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
... ... @@ -332,8 +340,7 @@
332 340 "version": "1.0.0",
333 341 "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
334 342 "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
335   - "dev": true,
336   - "optional": true
  343 + "dev": true
337 344 },
338 345 "assign-symbols": {
339 346 "version": "1.0.0",
... ... @@ -2085,7 +2092,6 @@
2085 2092 "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
2086 2093 "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
2087 2094 "dev": true,
2088   - "optional": true,
2089 2095 "requires": {
2090 2096 "delayed-stream": "~1.0.0"
2091 2097 }
... ... @@ -3615,8 +3621,7 @@
3615 3621 "version": "1.0.0",
3616 3622 "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
3617 3623 "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
3618   - "dev": true,
3619   - "optional": true
  3624 + "dev": true
3620 3625 },
3621 3626 "delegate": {
3622 3627 "version": "3.2.0",
... ... @@ -4362,8 +4367,7 @@
4362 4367 "version": "1.3.0",
4363 4368 "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
4364 4369 "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
4365   - "dev": true,
4366   - "optional": true
  4370 + "dev": true
4367 4371 },
4368 4372 "fast-deep-equal": {
4369 4373 "version": "1.1.0",
... ... @@ -4692,8 +4696,7 @@
4692 4696 "ansi-regex": {
4693 4697 "version": "2.1.1",
4694 4698 "bundled": true,
4695   - "dev": true,
4696   - "optional": true
  4699 + "dev": true
4697 4700 },
4698 4701 "aproba": {
4699 4702 "version": "1.2.0",
... ... @@ -4714,14 +4717,12 @@
4714 4717 "balanced-match": {
4715 4718 "version": "1.0.0",
4716 4719 "bundled": true,
4717   - "dev": true,
4718   - "optional": true
  4720 + "dev": true
4719 4721 },
4720 4722 "brace-expansion": {
4721 4723 "version": "1.1.11",
4722 4724 "bundled": true,
4723 4725 "dev": true,
4724   - "optional": true,
4725 4726 "requires": {
4726 4727 "balanced-match": "^1.0.0",
4727 4728 "concat-map": "0.0.1"
... ... @@ -4736,20 +4737,17 @@
4736 4737 "code-point-at": {
4737 4738 "version": "1.1.0",
4738 4739 "bundled": true,
4739   - "dev": true,
4740   - "optional": true
  4740 + "dev": true
4741 4741 },
4742 4742 "concat-map": {
4743 4743 "version": "0.0.1",
4744 4744 "bundled": true,
4745   - "dev": true,
4746   - "optional": true
  4745 + "dev": true
4747 4746 },
4748 4747 "console-control-strings": {
4749 4748 "version": "1.1.0",
4750 4749 "bundled": true,
4751   - "dev": true,
4752   - "optional": true
  4750 + "dev": true
4753 4751 },
4754 4752 "core-util-is": {
4755 4753 "version": "1.0.2",
... ... @@ -4866,8 +4864,7 @@
4866 4864 "inherits": {
4867 4865 "version": "2.0.3",
4868 4866 "bundled": true,
4869   - "dev": true,
4870   - "optional": true
  4867 + "dev": true
4871 4868 },
4872 4869 "ini": {
4873 4870 "version": "1.3.5",
... ... @@ -4879,7 +4876,6 @@
4879 4876 "version": "1.0.0",
4880 4877 "bundled": true,
4881 4878 "dev": true,
4882   - "optional": true,
4883 4879 "requires": {
4884 4880 "number-is-nan": "^1.0.0"
4885 4881 }
... ... @@ -4894,7 +4890,6 @@
4894 4890 "version": "3.0.4",
4895 4891 "bundled": true,
4896 4892 "dev": true,
4897   - "optional": true,
4898 4893 "requires": {
4899 4894 "brace-expansion": "^1.1.7"
4900 4895 }
... ... @@ -4902,14 +4897,12 @@
4902 4897 "minimist": {
4903 4898 "version": "0.0.8",
4904 4899 "bundled": true,
4905   - "dev": true,
4906   - "optional": true
  4900 + "dev": true
4907 4901 },
4908 4902 "minipass": {
4909 4903 "version": "2.2.4",
4910 4904 "bundled": true,
4911 4905 "dev": true,
4912   - "optional": true,
4913 4906 "requires": {
4914 4907 "safe-buffer": "^5.1.1",
4915 4908 "yallist": "^3.0.0"
... ... @@ -4928,7 +4921,6 @@
4928 4921 "version": "0.5.1",
4929 4922 "bundled": true,
4930 4923 "dev": true,
4931   - "optional": true,
4932 4924 "requires": {
4933 4925 "minimist": "0.0.8"
4934 4926 }
... ... @@ -5009,8 +5001,7 @@
5009 5001 "number-is-nan": {
5010 5002 "version": "1.0.1",
5011 5003 "bundled": true,
5012   - "dev": true,
5013   - "optional": true
  5004 + "dev": true
5014 5005 },
5015 5006 "object-assign": {
5016 5007 "version": "4.1.1",
... ... @@ -5022,7 +5013,6 @@
5022 5013 "version": "1.4.0",
5023 5014 "bundled": true,
5024 5015 "dev": true,
5025   - "optional": true,
5026 5016 "requires": {
5027 5017 "wrappy": "1"
5028 5018 }
... ... @@ -5108,8 +5098,7 @@
5108 5098 "safe-buffer": {
5109 5099 "version": "5.1.1",
5110 5100 "bundled": true,
5111   - "dev": true,
5112   - "optional": true
  5101 + "dev": true
5113 5102 },
5114 5103 "safer-buffer": {
5115 5104 "version": "2.1.2",
... ... @@ -5145,7 +5134,6 @@
5145 5134 "version": "1.0.2",
5146 5135 "bundled": true,
5147 5136 "dev": true,
5148   - "optional": true,
5149 5137 "requires": {
5150 5138 "code-point-at": "^1.0.0",
5151 5139 "is-fullwidth-code-point": "^1.0.0",
... ... @@ -5165,7 +5153,6 @@
5165 5153 "version": "3.0.1",
5166 5154 "bundled": true,
5167 5155 "dev": true,
5168   - "optional": true,
5169 5156 "requires": {
5170 5157 "ansi-regex": "^2.0.0"
5171 5158 }
... ... @@ -5209,14 +5196,12 @@
5209 5196 "wrappy": {
5210 5197 "version": "1.0.2",
5211 5198 "bundled": true,
5212   - "dev": true,
5213   - "optional": true
  5199 + "dev": true
5214 5200 },
5215 5201 "yallist": {
5216 5202 "version": "3.0.2",
5217 5203 "bundled": true,
5218   - "dev": true,
5219   - "optional": true
  5204 + "dev": true
5220 5205 }
5221 5206 }
5222 5207 },
... ... @@ -6467,8 +6452,7 @@
6467 6452 "version": "0.1.1",
6468 6453 "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
6469 6454 "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
6470   - "dev": true,
6471   - "optional": true
  6455 + "dev": true
6472 6456 },
6473 6457 "jsesc": {
6474 6458 "version": "1.3.0",
... ... @@ -11424,6 +11408,14 @@
11424 11408 "resolved": "https://registry.npmjs.org/raf.js/-/raf.js-0.0.4.tgz",
11425 11409 "integrity": "sha1-8Vr0RdJBsn+nExpXRQtn75xAL+w="
11426 11410 },
  11411 + "rafl": {
  11412 + "version": "1.2.2",
  11413 + "resolved": "https://registry.npmjs.org/rafl/-/rafl-1.2.2.tgz",
  11414 + "integrity": "sha1-/pMPdYIRAg1H44gV9Rlqi+QVB0A=",
  11415 + "requires": {
  11416 + "global": "~4.3.0"
  11417 + }
  11418 + },
11427 11419 "randomatic": {
11428 11420 "version": "3.1.1",
11429 11421 "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
... ... @@ -12899,8 +12891,7 @@
12899 12891 "version": "0.14.5",
12900 12892 "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
12901 12893 "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
12902   - "dev": true,
12903   - "optional": true
  12894 + "dev": true
12904 12895 },
12905 12896 "type-is": {
12906 12897 "version": "1.6.16",
... ...
package.json
  View file @2d80439
... ... @@ -10,6 +10,7 @@
10 10 "build": "node build/build.js"
11 11 },
12 12 "dependencies": {
  13 + "animate": "^1.0.0",
13 14 "animate.css": "^4.1.1",
14 15 "callapp-lib": "^2.1.8",
15 16 "crypto-js": "^3.1.9-1",
... ...
src/main.js
  View file @2d80439
... ... @@ -156,9 +156,9 @@ Vue.prototype.SIGN = {
156 156  
157 157 /* 根据模式，获取相关请求参数 开始 */
158 158 Vue.prototype.getParams = function(mode) {
159   -
  159 +
160 160 // 随机生成字符串
161   - function randomString(e) {
  161 + function randomString(e) {
162 162 e = e || 8;
163 163 let t = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678";
164 164 let a = t.length;
... ... @@ -391,7 +391,7 @@ Vue.prototype.http = function(path, data, callback, ext) {
391 391 }
392 392 },
393 393 err => {
394   -
  394 +
395 395 /* 加载错误处理 开始 */
396 396  
397 397 Indicator.close();
... ... @@ -448,7 +448,7 @@ Vue.prototype.http = function(path, data, callback, ext) {
448 448 }
449 449 },
450 450 err => {
451   -
  451 +
452 452 /* 加载错误处理 开始 */
453 453  
454 454 Indicator.close();
... ... @@ -467,7 +467,7 @@ Vue.prototype.http = function(path, data, callback, ext) {
467 467 }
468 468  
469 469 if (path) {
470   -
  470 +
471 471 // 上下文
472 472 let context = this;
473 473  
... ...
src/pages/newDaren/newDaren.vue
  View file @2d80439
... ... @@ -22,7 +22,7 @@
22 22 }"
23 23 >
24 24 </swiper> -->
25   -
  25 +
26 26 <!--达人信息-->
27 27 <!-- <shop-daten-top v-if="shopDatenTop" @userJump="userJump" :shopDatenTop="shopDatenTop"></shop-daten-top> -->
28 28  
... ... @@ -67,7 +67,7 @@
67 67 </div>
68 68  
69 69 <!--推荐达人-->
70   -
  70 +
71 71 <!-- 最新动态标题 -->
72 72 <text-title-box v-if="shopDarenHot && shopDarenHot.length" slot="title-box" @more="recommendedDaren"
73 73 :titles="{
... ... @@ -99,7 +99,7 @@
99 99 <div infinite-scroll-immediate-check="true" v-infinite-scroll="getNewDynamicList" infinite-scroll-disabled="loading" :infinite-scroll-distance="50">
100 100 <daren-list-box class="daren-list" @userJump="userJump" @jump="jump" @goodsJump="goodsJump" @goodsPrimary="goodsPrimary" @fansShop="fansShop" @toDarenShop="userJump"
101 101 :lists="shopFnsDynamic">
102   -
  102 +
103 103 <!--最新达人动态-->
104 104 <text-title-box v-if="shopFnsDynamic && shopFnsDynamic.length" slot="title-box"
105 105 :titles="{
... ... @@ -125,7 +125,7 @@
125 125 import shopDatenTop from "@/components/shopDatenTop/shopDatenTop";
126 126 import horizList from "@/components/horizList/horizList";
127 127 import dresserList from "@/components/dresserList/dresserList";
128   -
  128 +
129 129 export default {
130 130 name: "newDaren",
131 131 data () {
... ... @@ -156,13 +156,13 @@
156 156 dresserList
157 157 },
158 158 created () {
159   -
  159 +
160 160 // 设置标题
161 161 this.$set(this, "title", "达人");
162   -
  162 +
163 163 // 判断是否在App内
164 164 if (this.isCNLive.value) {
165   -
  165 +
166 166 // 添加后退按钮组“后退”和“分享”按钮
167 167 this.$set(this, 'backs', {
168 168 title: this.title,
... ... @@ -185,7 +185,7 @@
185 185  
186 186 // 根据平台，判断是否符合版本，显示搜索和其它导航菜单
187 187 if ((this.isiPhone.value && this.$parent.compareVersion(version, '1.9.6')) || (this.isAndroid.value && this.$parent.compareVersion(version, '1.8.5.3'))) {
188   -
  188 +
189 189 // 设置显示nav模块
190 190 this.$set(this, 'showBack', true);
191 191 }
... ... @@ -204,14 +204,14 @@
204 204 * 达人最新动态
205 205 */
206 206 getNewDynamicList() {
207   -
  207 +
208 208 // 设置加载中和页码
209 209 this.$set(this, 'loading', true);
210 210 this.$set(this, 'pages', ++this.pages);
211   -
  211 +
212 212 // 加载中提示
213 213 Indicator.open("加载中...");
214   -
  214 +
215 215 // 获取证书请求接口
216 216 this.http("/Api/" + this.getApiVersion().dynamic + "/getNewDynamicList", {
217 217 uid: this.$route.query.uid,
... ... @@ -228,20 +228,20 @@
228 228 * @param {Object} ext [扩展参数]
229 229 */
230 230 getNewDynamicListCallback(res, ext) {
231   -
  231 +
232 232 // 加载完成
233 233 Indicator.close();
234   -
  234 +
235 235 // 返回处理
236 236 if (res.code == 200) {
237   -
  237 +
238 238 // 解构数据
239 239 let { data: datas } = res;
240 240  
241 241 /* 获取达人动态数据 开始 */
242 242  
243 243 if (datas.list && datas.list.length) {
244   -
  244 +
245 245 // 隐藏加载圈
246 246 this.$set(this, 'loading', false);
247 247  
... ... @@ -250,13 +250,13 @@
250 250 } else {
251 251 this.$set(this, "shopFnsDynamic", datas.list);
252 252 }
253   -
  253 +
254 254 // 将视频地址加入到图片数组中
255 255 if (this.shopFnsDynamic && this.shopFnsDynamic.length > 0) {
256 256  
257 257 // 循环项目列表
258 258 for (let item of this.shopFnsDynamic) {
259   -
  259 +
260 260 // 将视频图片加入图片数组，方便循环输出
261 261 if (item.video_img) {
262 262 this.$set(item, "img", [...[item.video_img], ...item.img]);
... ... @@ -268,11 +268,11 @@
268 268 /* 获取达人动态数据 结束 */
269 269  
270 270 } else if (res.code == 400) {
271   -
  271 +
272 272 // 获取达人动态失败
273 273 Toast(res.message);
274 274 } else {
275   -
  275 +
276 276 // 获取优选库精选活动失败
277 277 Toast("获取达人动态失败");
278 278 }
... ... @@ -290,7 +290,7 @@
290 290 * 获取优选库精选活动
291 291 */
292 292 newDarenIndex() {
293   -
  293 +
294 294 // 加载中提示
295 295 Indicator.open("加载中...");
296 296  
... ... @@ -324,26 +324,26 @@
324 324 /* 获取优选库精选活动数据 开始 */
325 325  
326 326 if (datas.title) {
327   -
  327 +
328 328 // 设置标题
329 329 this.$set(this, "title", datas.title);
330 330 }
331 331  
332 332 // 获取“达人列表数据”
333 333 if (datas.list && datas.list.length) {
334   -
  334 +
335 335 // 设置“达人列表数据”数据
336 336 this.$set(this, "dresserList", datas.list.filter((item, index, arr) => { return index < 4 }));
337 337 }
338 338  
339 339 // 设置banner数据
340 340 this.banner.push(datas.shop_daten_ads)
341   -
  341 +
342 342 // 设置shopDatenTop置顶达人数据
343 343 if (datas.shop_daten_top) {
344 344 this.$set(this, "shopDatenTop", datas.shop_daten_top);
345 345 }
346   -
  346 +
347 347 // 设置shopDarenHot达人推荐数据
348 348 if (datas.shop_daren_hot && datas.shop_daren_hot.length) {
349 349 this.$set(this, "shopDarenHot", datas.shop_daren_hot);
... ... @@ -352,10 +352,10 @@
352 352 // 设置fansDaren已关注达人动态数据
353 353 if (datas.shop_fans_dynamic && datas.shop_fans_dynamic.length) {
354 354 this.$set(this, "fansDaren", datas.shop_fans_dynamic);
355   -
  355 +
356 356 // 将视频地址加入到图片数组中
357 357 for (let item of this.fansDaren) {
358   -
  358 +
359 359 // 将视频图片加入图片数组，方便循环输出
360 360 if (item.video_img) {
361 361 this.$set(item, "img", [...[item.video_img], ...item.img]);
... ... @@ -366,7 +366,7 @@
366 366 /* 获取优选库精选活动数据 结束 */
367 367  
368 368 } else if (res.code == 400) {
369   -
  369 +
370 370 // 获取优选库精选活动失败
371 371 Toast(res.message);
372 372 } else {
... ... @@ -383,10 +383,10 @@
383 383  
384 384 // 加载中
385 385 Indicator.open("加载中...");
386   -
  386 +
387 387 // 判断必要参数
388 388 if (item.id && this.$route.query.uid) {
389   -
  389 +
390 390 // 请求接口
391 391 this.http("/Api/" + this.getApiVersion().dynamic + "/fansShop", {
392 392 id: (item.shop_user ? item.shop_user.id : item.id) || 0,
... ... @@ -404,25 +404,25 @@
404 404 * @param {Object} ext [扩展参数]
405 405 */
406 406 fansShopCallback(res, ext) {
407   -
  407 +
408 408 // 加载完成
409 409 Indicator.close();
410 410  
411 411 if (res.code == 200) {
412   -
  412 +
413 413 // 设置已关注
414 414 if (ext.item.is_fans) {
415   -
  415 +
416 416 // 判断关注结果
417 417 if (ext.item.is_fans == "0") {
418   -
  418 +
419 419 // 关注达人
420 420 this.$set(ext.item, "is_fans", "1");
421   -
  421 +
422 422 // 吐司提示
423 423 Toast("关注成功");
424 424 } else if (ext.item.is_fans == "1") {
425   -
  425 +
426 426 // 取消关注达人
427 427 this.$set(ext.item, "is_fans", "0");
428 428  
... ... @@ -457,12 +457,12 @@
457 457 Toast("关注失败");
458 458 }
459 459 },
460   -
  460 +
461 461 /**
462 462 * 已关注达人动态更多页跳转
463 463 */
464 464 moreDynamic() {
465   -
  465 +
466 466 // 判断并调用通用跳转
467 467 if (typeof this.$parent.gotoDetail === "function") {
468 468  
... ... @@ -515,7 +515,7 @@
515 515 to: (window.location.href.split("#")[0] + "#/recommendMore?uid=" + this.getStore("uid")),
516 516 shop_type: ""
517 517 }
518   -
  518 +
519 519 // 调用通用跳转
520 520 this.$parent.gotoDetail(options);
521 521 }
... ... @@ -546,7 +546,7 @@
546 546 * @param {object} item [数据对象]
547 547 */
548 548 jump(item) {
549   -
  549 +
550 550 // 判断并调用通用跳转
551 551 if (typeof this.$parent.gotoDetail === "function") {
552 552  
... ... @@ -634,7 +634,7 @@
634 634 * 后退
635 635 */
636 636 back() {
637   -
  637 +
638 638 // 判断是否有处理函数
639 639 if (typeof this.$parent.back === 'function') {
640 640  
... ... @@ -665,14 +665,14 @@
665 665 }
666 666 }
667 667 },
668   - mounted() {
669   -
  668 + mounted() {
  669 +
670 670 // 页面切换可见状态监听
671 671 document.addEventListener('visibilitychange', () => {
672   -
  672 +
673 673 // 页面显示出来了
674 674 if (document.hidden === false && this.$route.name == 'newDaren') {
675   -
  675 +
676 676 // 获取优选库精选活动
677 677 this.newDarenIndex();
678 678  
... ... @@ -680,6 +680,9 @@
680 680 this.$set(this, 'loading', false);
681 681 this.$set(this, 'pages', 0);
682 682  
  683 + // 初始化最新达人动态数组
  684 + this.$set(this, "shopFnsDynamic", null);
  685 +
683 686 // 达人最新动态
684 687 this.getNewDynamicList();
685 688 }
... ...