w-front-end / select_good · Commits

Commit fef4a4faa1a6cd1faee0f385f13e652cee15c543

Authored by 王强
1 parent 28b83325

1、可分享页面设置分享type 

2、优选主页细节优化和代码整理
Inline Side-by-side
Showing 11 changed files with 29 additions and 40 deletions
src/components/iconsCom/iconsCom.vue
  View file @fef4a4f
1 <template> 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 <div class="title">{{item.title}}</div> 4 <div class="title">{{item.title}}</div>
5 </div> 5 </div>
6 </template> 6 </template>
src/pages/discountList/discountList.vue
  View file @fef4a4f
@@ -461,7 +461,7 @@ @@ -461,7 +461,7 @@
461 461
462 // 判断分享 462 // 判断分享
463 if (typeof this.$parent.toShare === 'function') { 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,7 +508,7 @@
508 // 唤起详情页 508 // 唤起详情页
509 if (typeof this.$parent.getOpenApp === "function") { 509 if (typeof this.$parent.getOpenApp === "function") {
510 this.$parent.getOpenApp({ 510 this.$parent.getOpenApp({
511 - type: 38, 511 + type: 49,
512 id: this.$route.query.id || 1, 512 id: this.$route.query.id || 1,
513 url: "" 513 url: ""
514 }); 514 });
@@ -517,7 +517,7 @@ @@ -517,7 +517,7 @@
517 // 分享详情页 517 // 分享详情页
518 if (typeof this.$parent.getShareData === "function") { 518 if (typeof this.$parent.getShareData === "function") {
519 this.$parent.getShareData({ 519 this.$parent.getShareData({
520 - type: 38, 520 + type: 49,
521 id: this.$route.query.id || 1, 521 id: this.$route.query.id || 1,
522 url: "" 522 url: ""
523 }); 523 });
src/pages/hotSaleList/hotSaleList.vue
  View file @fef4a4f
@@ -225,7 +225,7 @@ @@ -225,7 +225,7 @@
225 225
226 // 判断分享 226 // 判断分享
227 if (typeof this.$parent.toShare === 'function') { 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,7 +272,7 @@
272 // 唤起详情页 272 // 唤起详情页
273 if (typeof this.$parent.getOpenApp === "function") { 273 if (typeof this.$parent.getOpenApp === "function") {
274 this.$parent.getOpenApp({ 274 this.$parent.getOpenApp({
275 - type: 38, 275 + type: 48,
276 id: this.$route.query.id || 1, 276 id: this.$route.query.id || 1,
277 url: "" 277 url: ""
278 }); 278 });
@@ -281,7 +281,7 @@ @@ -281,7 +281,7 @@
281 // 分享详情页 281 // 分享详情页
282 if (typeof this.$parent.getShareData === "function") { 282 if (typeof this.$parent.getShareData === "function") {
283 this.$parent.getShareData({ 283 this.$parent.getShareData({
284 - type: 38, 284 + type: 48,
285 id: this.$route.query.id || 1, 285 id: this.$route.query.id || 1,
286 url: "" 286 url: ""
287 }); 287 });
src/pages/optimization2/optimization2.vue
  View file @fef4a4f
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <div class="main-box"> 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 <text-bg-title-com @more="toDiscountList" 24 <text-bg-title-com @more="toDiscountList"
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 <!-- 标题 --> 97 <!-- 标题 -->
98 <text-bg-title-com 98 <text-bg-title-com
99 :titles="{ 99 :titles="{
100 - bg: 'static/img/text_bg_title_bg.jpg' 100 + bg: 'static/img/text_bg_title_bg_2.png'
101 }"> 101 }">
102 </text-bg-title-com> 102 </text-bg-title-com>
103 103
@@ -199,6 +199,7 @@ @@ -199,6 +199,7 @@
199 199
200 // 添加后退按钮组“后退”和“分享”按钮 200 // 添加后退按钮组“后退”和“分享”按钮
201 this.$set(this, 'backs', { 201 this.$set(this, 'backs', {
  202 + title: '优选',
202 funcs: { 203 funcs: {
203 back: { 204 back: {
204 icon: "static/img/icon_back.png" 205 icon: "static/img/icon_back.png"
@@ -211,9 +212,6 @@ @@ -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,27 +256,27 @@
258 256
259 257
260 258
261 - // 临时，设置锚点定位数据 259 + // 设置锚点定位数据
262 this.$set(this, 'navs', [ 260 this.$set(this, 'navs', [
263 { 261 {
264 ref: 'optimizationBox', 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 ref: 'hotBox', 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 ref: 'integralMallBox', 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 ref: 'guessLikeBox', 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,9 +506,6 @@
508 */ 506 */
509 shopGoodsListCallback(res, ext) { 507 shopGoodsListCallback(res, ext) {
510 508
511 - // 下拉刷新结束  
512 - this.$set(this, "isLoading", false);  
513 -  
514 // 返回处理 509 // 返回处理
515 if (res.code == 200) { 510 if (res.code == 200) {
516 511
@@ -659,27 +654,21 @@ @@ -659,27 +654,21 @@
659 // 判断通用跳转函数是否存在 654 // 判断通用跳转函数是否存在
660 if (typeof this.$parent.gotoDetail === 'function') { 655 if (typeof this.$parent.gotoDetail === 'function') {
661 656
662 -  
663 - console.log('toDetail', item);  
664 -  
665 -  
666 // 通用跳转 657 // 通用跳转
667 this.$parent.gotoDetail(item); 658 this.$parent.gotoDetail(item);
668 } 659 }
669 }, 660 },
  661 +
670 /** 662 /**
671 * 列表加号按钮事件 663 * 列表加号按钮事件
672 * @param {Object} item [数据对象] 664 * @param {Object} item [数据对象]
673 */ 665 */
674 primary(item) { 666 primary(item) {
  667 +
  668 + // 跳转详情页面
675 this.toDetail(item); 669 this.toDetail(item);
676 }, 670 },
677 671
678 -  
679 -  
680 -  
681 -  
682 -  
683 /** 672 /**
684 * 分享 673 * 分享
685 */ 674 */
@@ -687,7 +676,7 @@ @@ -687,7 +676,7 @@
687 676
688 // 判断分享 677 // 判断分享
689 if (typeof this.$parent.toShare === 'function') { 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,7 +723,7 @@
734 // 唤起详情页 723 // 唤起详情页
735 if (typeof this.$parent.getOpenApp === "function") { 724 if (typeof this.$parent.getOpenApp === "function") {
736 this.$parent.getOpenApp({ 725 this.$parent.getOpenApp({
737 - type: 38, 726 + type: 0,
738 id: this.$route.query.id || 1, 727 id: this.$route.query.id || 1,
739 url: "" 728 url: ""
740 }); 729 });
@@ -743,7 +732,7 @@ @@ -743,7 +732,7 @@
743 // 分享详情页 732 // 分享详情页
744 if (typeof this.$parent.getShareData === "function") { 733 if (typeof this.$parent.getShareData === "function") {
745 this.$parent.getShareData({ 734 this.$parent.getShareData({
746 - type: 38, 735 + type: 0,
747 id: this.$route.query.id || 1, 736 id: this.$route.query.id || 1,
748 url: "" 737 url: ""
749 }); 738 });
src/pages/optimizationList/optimizationList.vue
  View file @fef4a4f
@@ -193,7 +193,7 @@ @@ -193,7 +193,7 @@
193 193
194 // 判断分享 194 // 判断分享
195 if (typeof this.$parent.toShare === 'function') { 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,7 +240,7 @@
240 // 唤起详情页 240 // 唤起详情页
241 if (typeof this.$parent.getOpenApp === "function") { 241 if (typeof this.$parent.getOpenApp === "function") {
242 this.$parent.getOpenApp({ 242 this.$parent.getOpenApp({
243 - type: 38, 243 + type: 47,
244 id: this.$route.query.id || 1, 244 id: this.$route.query.id || 1,
245 url: "" 245 url: ""
246 }); 246 });
@@ -249,7 +249,7 @@ @@ -249,7 +249,7 @@
249 // 分享详情页 249 // 分享详情页
250 if (typeof this.$parent.getShareData === "function") { 250 if (typeof this.$parent.getShareData === "function") {
251 this.$parent.getShareData({ 251 this.$parent.getShareData({
252 - type: 38, 252 + type: 47,
253 id: this.$route.query.id || 1, 253 id: this.$route.query.id || 1,
254 url: "" 254 url: ""
255 }); 255 });
static/img/header_img_default.png
View file @fef4a4f

108 KB | W: | H:

116 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
static/img/icon_guess_like.png 0 → 100644
View file @fef4a4f

6.97 KB
static/img/icon_nav_hot_sale.png 0 → 100644
View file @fef4a4f

6.24 KB
static/img/icon_nav_optimization.png 0 → 100644
View file @fef4a4f

6.22 KB
static/img/icon_nav_points_mall.png 0 → 100644
View file @fef4a4f

7.48 KB
static/img/text_bg_title_bg_2.png 0 → 100644
View file @fef4a4f

17.8 KB