Commit 166aae066230f9639ea6cb4dc68418b4bd28f46b
1 parent
d85c66d3
Bug修复~
Showing
5 changed files
with
57 additions
and
27 deletions
src/pages/discountList/discountList.vue
src/pages/hotSaleList/hotSaleList.vue
src/pages/mall2/mall2.vue
| ... | ... | @@ -314,7 +314,7 @@ |
| 314 | 314 | // 设置跳转参数 |
| 315 | 315 | let params = { |
| 316 | 316 | type: '34', |
| 317 | - to: window.location.origin + '/html/new_mall/shop?shop_id=' + item.id, | |
| 317 | + to: window.location.origin + '/html/new_mall/1/#/shop?shop_id=' + item.id, | |
| 318 | 318 | shop_type: '' |
| 319 | 319 | }; |
| 320 | 320 | |
| ... | ... | @@ -330,7 +330,7 @@ |
| 330 | 330 | |
| 331 | 331 | // 判断分享 |
| 332 | 332 | if (typeof this.$parent.toShare === 'function') { |
| 333 | - this.$parent.toShare(38, this.$route.query.id || 0); | |
| 333 | + this.$parent.toShare(38, this.$route.query.id || 1); | |
| 334 | 334 | } |
| 335 | 335 | }, |
| 336 | 336 | ... | ... |
src/pages/optimization2/optimization2.vue
| ... | ... | @@ -105,7 +105,7 @@ |
| 105 | 105 | <div class="list-box"> |
| 106 | 106 | |
| 107 | 107 | <!-- 商品展示样式 2 --> |
| 108 | - <goods-item-2 class="item" v-for="(item, index) in pointsLists" :key="index" @jump="pointsMore" | |
| 108 | + <goods-item-2 class="item" v-for="(item, index) in pointsLists" :key="index" @jump="pointsDetail" | |
| 109 | 109 | :item="item" |
| 110 | 110 | pid="5"> |
| 111 | 111 | </goods-item-2> |
| ... | ... | @@ -391,16 +391,17 @@ |
| 391 | 391 | toDiscountList(item) { |
| 392 | 392 | |
| 393 | 393 | // 跳转封装 |
| 394 | - if (typeof this.$parent.navBarJump === 'function') { | |
| 394 | + if (typeof this.$parent.gotoDetail === 'function') { | |
| 395 | 395 | |
| 396 | 396 | // 设置跳转参数 |
| 397 | 397 | let params = { |
| 398 | - url: 'discountList', | |
| 399 | - query: {} | |
| 398 | + type: "34", | |
| 399 | + to: window.location.origin + '/html/select_good/1/#/discountList', | |
| 400 | + shop_type: '' | |
| 400 | 401 | }; |
| 401 | 402 | |
| 402 | 403 | // 页面跳转 |
| 403 | - this.$parent.navBarJump(params); | |
| 404 | + this.$parent.gotoDetail(params); | |
| 404 | 405 | } |
| 405 | 406 | }, |
| 406 | 407 | |
| ... | ... | @@ -437,16 +438,17 @@ |
| 437 | 438 | toOptimizationList(item) { |
| 438 | 439 | |
| 439 | 440 | // 跳转封装 |
| 440 | - if (typeof this.$parent.navBarJump === 'function') { | |
| 441 | + if (typeof this.$parent.gotoDetail === 'function') { | |
| 441 | 442 | |
| 442 | 443 | // 设置跳转参数 |
| 443 | 444 | let params = { |
| 444 | - url: 'optimizationList', | |
| 445 | - query: {} | |
| 445 | + type: "34", | |
| 446 | + to: window.location.origin + '/html/select_good/1/#/optimizationList', | |
| 447 | + shop_type: '' | |
| 446 | 448 | }; |
| 447 | 449 | |
| 448 | 450 | // 页面跳转 |
| 449 | - this.$parent.navBarJump(params); | |
| 451 | + this.$parent.gotoDetail(params); | |
| 450 | 452 | } |
| 451 | 453 | }, |
| 452 | 454 | |
| ... | ... | @@ -457,16 +459,38 @@ |
| 457 | 459 | toHotSaleList(item) { |
| 458 | 460 | |
| 459 | 461 | // 跳转封装 |
| 460 | - if (typeof this.$parent.navBarJump === 'function') { | |
| 462 | + if (typeof this.$parent.gotoDetail === 'function') { | |
| 461 | 463 | |
| 462 | 464 | // 设置跳转参数 |
| 463 | 465 | let params = { |
| 464 | - url: 'hotSaleList', | |
| 465 | - query: {} | |
| 466 | + type: "34", | |
| 467 | + to: window.location.origin + '/html/select_good/1/#/hotSaleList', | |
| 468 | + shop_type: '' | |
| 466 | 469 | }; |
| 467 | 470 | |
| 468 | 471 | // 页面跳转 |
| 469 | - this.$parent.navBarJump(params); | |
| 472 | + this.$parent.gotoDetail(params); | |
| 473 | + } | |
| 474 | + }, | |
| 475 | + | |
| 476 | + /** | |
| 477 | + * 查看积分详情 | |
| 478 | + * @param {Object} item [数据对象] | |
| 479 | + */ | |
| 480 | + pointsDetail(item) { | |
| 481 | + | |
| 482 | + // 跳转封装 | |
| 483 | + if (typeof this.$parent.gotoDetail === 'function') { | |
| 484 | + | |
| 485 | + // 设置跳转参数 | |
| 486 | + let params = { | |
| 487 | + type: "34", | |
| 488 | + to: window.location.origin + '/html/select_good/1/#/goodDetails?goodsId=' + item.id, | |
| 489 | + shop_type: '' | |
| 490 | + }; | |
| 491 | + | |
| 492 | + // 页面跳转 | |
| 493 | + this.$parent.gotoDetail(params); | |
| 470 | 494 | } |
| 471 | 495 | }, |
| 472 | 496 | |
| ... | ... | @@ -477,18 +501,17 @@ |
| 477 | 501 | pointsMore(item) { |
| 478 | 502 | |
| 479 | 503 | // 跳转封装 |
| 480 | - if (typeof this.$parent.navBarJump === 'function') { | |
| 504 | + if (typeof this.$parent.gotoDetail === 'function') { | |
| 481 | 505 | |
| 482 | 506 | // 设置跳转参数 |
| 483 | 507 | let params = { |
| 484 | - url: 'pointsMall', | |
| 485 | - query: { | |
| 486 | - uid: this.getStore('uid') || 0 | |
| 487 | - } | |
| 508 | + type: "34", | |
| 509 | + to: window.location.origin + '/html/select_good/1/#/pointsMall', | |
| 510 | + shop_type: '' | |
| 488 | 511 | }; |
| 489 | 512 | |
| 490 | 513 | // 页面跳转 |
| 491 | - this.$parent.navBarJump(params); | |
| 514 | + this.$parent.gotoDetail(params); | |
| 492 | 515 | } |
| 493 | 516 | }, |
| 494 | 517 | |
| ... | ... | @@ -518,8 +541,15 @@ |
| 518 | 541 | // 判断通用跳转函数是否存在 |
| 519 | 542 | if (typeof this.$parent.gotoDetail === 'function') { |
| 520 | 543 | |
| 544 | + // 构建通用跳转数据 | |
| 545 | + let params = { | |
| 546 | + type: '2', | |
| 547 | + to: item.id, | |
| 548 | + shop_type: item.shop_type | |
| 549 | + }; | |
| 550 | + | |
| 521 | 551 | // 通用跳转 |
| 522 | - this.$parent.gotoDetail(item); | |
| 552 | + this.$parent.gotoDetail(params); | |
| 523 | 553 | } |
| 524 | 554 | }, |
| 525 | 555 | |
| ... | ... | @@ -540,7 +570,7 @@ |
| 540 | 570 | |
| 541 | 571 | // 判断分享 |
| 542 | 572 | if (typeof this.$parent.toShare === 'function') { |
| 543 | - this.$parent.toShare(0, this.$route.query.id || 0); | |
| 573 | + this.$parent.toShare(0, this.$route.query.id || 1); | |
| 544 | 574 | } |
| 545 | 575 | }, |
| 546 | 576 | |
| ... | ... | @@ -580,7 +610,7 @@ |
| 580 | 610 | } |
| 581 | 611 | }, |
| 582 | 612 | mounted() { |
| 583 | - | |
| 613 | + | |
| 584 | 614 | // 如果是App外,设置唤起App和微信内分享参数 |
| 585 | 615 | if (!this.isCNLive.value) { |
| 586 | 616 | ... | ... |
src/pages/optimizationList/optimizationList.vue