Commit fef4a4faa1a6cd1faee0f385f13e652cee15c543
1 parent
28b83325
1、可分享页面设置分享type
2、优选主页细节优化和代码整理
Showing
11 changed files
with
29 additions
and
40 deletions
src/components/iconsCom/iconsCom.vue
| 1 | 1 | <template> |
| 2 | - <div class="icons-com" v-if="item && item.title && item.id" @click="jump(item)"> | |
| 3 | - <img v-lazy="item.logo" class="icons-img" /> | |
| 2 | + <div class="icons-com" v-if="item && item.title" @click="jump(item)"> | |
| 3 | + <img v-lazy="item.logo || item.simg" class="icons-img" /> | |
| 4 | 4 | <div class="title">{{item.title}}</div> |
| 5 | 5 | </div> |
| 6 | 6 | </template> | ... | ... |
src/pages/discountList/discountList.vue
| ... | ... | @@ -461,7 +461,7 @@ |
| 461 | 461 | |
| 462 | 462 | // 判断分享 |
| 463 | 463 | if (typeof this.$parent.toShare === 'function') { |
| 464 | - this.$parent.toShare(38, this.$route.query.id || 0); | |
| 464 | + this.$parent.toShare(49, this.$route.query.id || 0); | |
| 465 | 465 | } |
| 466 | 466 | }, |
| 467 | 467 | |
| ... | ... | @@ -508,7 +508,7 @@ |
| 508 | 508 | // 唤起详情页 |
| 509 | 509 | if (typeof this.$parent.getOpenApp === "function") { |
| 510 | 510 | this.$parent.getOpenApp({ |
| 511 | - type: 38, | |
| 511 | + type: 49, | |
| 512 | 512 | id: this.$route.query.id || 1, |
| 513 | 513 | url: "" |
| 514 | 514 | }); |
| ... | ... | @@ -517,7 +517,7 @@ |
| 517 | 517 | // 分享详情页 |
| 518 | 518 | if (typeof this.$parent.getShareData === "function") { |
| 519 | 519 | this.$parent.getShareData({ |
| 520 | - type: 38, | |
| 520 | + type: 49, | |
| 521 | 521 | id: this.$route.query.id || 1, |
| 522 | 522 | url: "" |
| 523 | 523 | }); | ... | ... |
src/pages/hotSaleList/hotSaleList.vue
| ... | ... | @@ -225,7 +225,7 @@ |
| 225 | 225 | |
| 226 | 226 | // 判断分享 |
| 227 | 227 | if (typeof this.$parent.toShare === 'function') { |
| 228 | - this.$parent.toShare(38, this.$route.query.id || 0); | |
| 228 | + this.$parent.toShare(48, this.$route.query.id || 0); | |
| 229 | 229 | } |
| 230 | 230 | }, |
| 231 | 231 | |
| ... | ... | @@ -272,7 +272,7 @@ |
| 272 | 272 | // 唤起详情页 |
| 273 | 273 | if (typeof this.$parent.getOpenApp === "function") { |
| 274 | 274 | this.$parent.getOpenApp({ |
| 275 | - type: 38, | |
| 275 | + type: 48, | |
| 276 | 276 | id: this.$route.query.id || 1, |
| 277 | 277 | url: "" |
| 278 | 278 | }); |
| ... | ... | @@ -281,7 +281,7 @@ |
| 281 | 281 | // 分享详情页 |
| 282 | 282 | if (typeof this.$parent.getShareData === "function") { |
| 283 | 283 | this.$parent.getShareData({ |
| 284 | - type: 38, | |
| 284 | + type: 48, | |
| 285 | 285 | id: this.$route.query.id || 1, |
| 286 | 286 | url: "" |
| 287 | 287 | }); | ... | ... |
src/pages/optimization2/optimization2.vue
| ... | ... | @@ -18,7 +18,7 @@ |
| 18 | 18 | <div class="main-box"> |
| 19 | 19 | |
| 20 | 20 | <!-- 折扣专区 --> |
| 21 | - <div class="section shop-list"> | |
| 21 | + <div class="section shop-list" v-if="false"> | |
| 22 | 22 | |
| 23 | 23 | <!-- 标题 --> |
| 24 | 24 | <text-bg-title-com @more="toDiscountList" |
| ... | ... | @@ -97,7 +97,7 @@ |
| 97 | 97 | <!-- 标题 --> |
| 98 | 98 | <text-bg-title-com |
| 99 | 99 | :titles="{ |
| 100 | - bg: 'static/img/text_bg_title_bg.jpg' | |
| 100 | + bg: 'static/img/text_bg_title_bg_2.png' | |
| 101 | 101 | }"> |
| 102 | 102 | </text-bg-title-com> |
| 103 | 103 | |
| ... | ... | @@ -199,6 +199,7 @@ |
| 199 | 199 | |
| 200 | 200 | // 添加后退按钮组“后退”和“分享”按钮 |
| 201 | 201 | this.$set(this, 'backs', { |
| 202 | + title: '优选', | |
| 202 | 203 | funcs: { |
| 203 | 204 | back: { |
| 204 | 205 | icon: "static/img/icon_back.png" |
| ... | ... | @@ -211,9 +212,6 @@ |
| 211 | 212 | ] |
| 212 | 213 | } |
| 213 | 214 | }); |
| 214 | - | |
| 215 | - // 设置标题 | |
| 216 | - this.$set(this.backs, 'title', '优选'); | |
| 217 | 215 | } |
| 218 | 216 | |
| 219 | 217 | |
| ... | ... | @@ -258,27 +256,27 @@ |
| 258 | 256 | |
| 259 | 257 | |
| 260 | 258 | |
| 261 | - // 临时,设置锚点定位数据 | |
| 259 | + // 设置锚点定位数据 | |
| 262 | 260 | this.$set(this, 'navs', [ |
| 263 | 261 | { |
| 264 | 262 | ref: 'optimizationBox', |
| 265 | - simg: "https://wjjtest.ys2.cnliveimg.com/802shop/img/2020/04/23/5ea15e31d986d.jpg", | |
| 266 | - title: "品质优选" | |
| 263 | + simg: 'static/img/icon_nav_optimization.png', | |
| 264 | + title: '品质优选' | |
| 267 | 265 | }, |
| 268 | 266 | { |
| 269 | 267 | ref: 'hotBox', |
| 270 | - simg: "https://wjjtest.ys2.cnliveimg.com/802shop/img/2020/04/23/5ea15e31d986d.jpg", | |
| 271 | - title: "热销排行" | |
| 268 | + simg: 'static/img/icon_nav_hot_sale.png', | |
| 269 | + title: '热销排行' | |
| 272 | 270 | }, |
| 273 | 271 | { |
| 274 | 272 | ref: 'integralMallBox', |
| 275 | - simg: "https://wjjtest.ys2.cnliveimg.com/802shop/img/2020/04/23/5ea15e31d986d.jpg", | |
| 276 | - title: "积分商城" | |
| 273 | + simg: 'static/img/icon_nav_points_mall.png', | |
| 274 | + title: '积分商城' | |
| 277 | 275 | }, |
| 278 | 276 | { |
| 279 | 277 | ref: 'guessLikeBox', |
| 280 | - simg: "https://wjjtest.ys2.cnliveimg.com/802shop/img/2020/04/23/5ea15e31d986d.jpg", | |
| 281 | - title: "猜你喜欢" | |
| 278 | + simg: 'static/img/icon_guess_like.png', | |
| 279 | + title: '猜你喜欢' | |
| 282 | 280 | } |
| 283 | 281 | ]); |
| 284 | 282 | |
| ... | ... | @@ -508,9 +506,6 @@ |
| 508 | 506 | */ |
| 509 | 507 | shopGoodsListCallback(res, ext) { |
| 510 | 508 | |
| 511 | - // 下拉刷新结束 | |
| 512 | - this.$set(this, "isLoading", false); | |
| 513 | - | |
| 514 | 509 | // 返回处理 |
| 515 | 510 | if (res.code == 200) { |
| 516 | 511 | |
| ... | ... | @@ -659,27 +654,21 @@ |
| 659 | 654 | // 判断通用跳转函数是否存在 |
| 660 | 655 | if (typeof this.$parent.gotoDetail === 'function') { |
| 661 | 656 | |
| 662 | - | |
| 663 | - console.log('toDetail', item); | |
| 664 | - | |
| 665 | - | |
| 666 | 657 | // 通用跳转 |
| 667 | 658 | this.$parent.gotoDetail(item); |
| 668 | 659 | } |
| 669 | 660 | }, |
| 661 | + | |
| 670 | 662 | /** |
| 671 | 663 | * 列表加号按钮事件 |
| 672 | 664 | * @param {Object} item [数据对象] |
| 673 | 665 | */ |
| 674 | 666 | primary(item) { |
| 667 | + | |
| 668 | + // 跳转详情页面 | |
| 675 | 669 | this.toDetail(item); |
| 676 | 670 | }, |
| 677 | 671 | |
| 678 | - | |
| 679 | - | |
| 680 | - | |
| 681 | - | |
| 682 | - | |
| 683 | 672 | /** |
| 684 | 673 | * 分享 |
| 685 | 674 | */ |
| ... | ... | @@ -687,7 +676,7 @@ |
| 687 | 676 | |
| 688 | 677 | // 判断分享 |
| 689 | 678 | if (typeof this.$parent.toShare === 'function') { |
| 690 | - this.$parent.toShare(38, this.$route.query.id || 0); | |
| 679 | + this.$parent.toShare(0, this.$route.query.id || 0); | |
| 691 | 680 | } |
| 692 | 681 | }, |
| 693 | 682 | |
| ... | ... | @@ -734,7 +723,7 @@ |
| 734 | 723 | // 唤起详情页 |
| 735 | 724 | if (typeof this.$parent.getOpenApp === "function") { |
| 736 | 725 | this.$parent.getOpenApp({ |
| 737 | - type: 38, | |
| 726 | + type: 0, | |
| 738 | 727 | id: this.$route.query.id || 1, |
| 739 | 728 | url: "" |
| 740 | 729 | }); |
| ... | ... | @@ -743,7 +732,7 @@ |
| 743 | 732 | // 分享详情页 |
| 744 | 733 | if (typeof this.$parent.getShareData === "function") { |
| 745 | 734 | this.$parent.getShareData({ |
| 746 | - type: 38, | |
| 735 | + type: 0, | |
| 747 | 736 | id: this.$route.query.id || 1, |
| 748 | 737 | url: "" |
| 749 | 738 | }); | ... | ... |
src/pages/optimizationList/optimizationList.vue
| ... | ... | @@ -193,7 +193,7 @@ |
| 193 | 193 | |
| 194 | 194 | // 判断分享 |
| 195 | 195 | if (typeof this.$parent.toShare === 'function') { |
| 196 | - this.$parent.toShare(38, this.$route.query.id || 0); | |
| 196 | + this.$parent.toShare(47, this.$route.query.id || 0); | |
| 197 | 197 | } |
| 198 | 198 | }, |
| 199 | 199 | |
| ... | ... | @@ -240,7 +240,7 @@ |
| 240 | 240 | // 唤起详情页 |
| 241 | 241 | if (typeof this.$parent.getOpenApp === "function") { |
| 242 | 242 | this.$parent.getOpenApp({ |
| 243 | - type: 38, | |
| 243 | + type: 47, | |
| 244 | 244 | id: this.$route.query.id || 1, |
| 245 | 245 | url: "" |
| 246 | 246 | }); |
| ... | ... | @@ -249,7 +249,7 @@ |
| 249 | 249 | // 分享详情页 |
| 250 | 250 | if (typeof this.$parent.getShareData === "function") { |
| 251 | 251 | this.$parent.getShareData({ |
| 252 | - type: 38, | |
| 252 | + type: 47, | |
| 253 | 253 | id: this.$route.query.id || 1, |
| 254 | 254 | url: "" |
| 255 | 255 | }); | ... | ... |
static/img/header_img_default.png
static/img/icon_guess_like.png
0 → 100644
6.97 KB
static/img/icon_nav_hot_sale.png
0 → 100644
6.24 KB
static/img/icon_nav_optimization.png
0 → 100644
6.22 KB
static/img/icon_nav_points_mall.png
0 → 100644
7.48 KB
static/img/text_bg_title_bg_2.png
0 → 100644
17.8 KB