From 74f6db362e1aacb440eacce84e9433de1368a51a Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期六, 07 十月 2023 10:58:36 +0800
Subject: [PATCH] Merge branch 'hotfix/首页猜你喜欢修复'
---
public/html/bottom_price.html | 156 ++++++++++++++-------------------------------------
1 files changed, 44 insertions(+), 112 deletions(-)
diff --git a/public/html/bottom_price.html b/public/html/bottom_price.html
index d12f855..5bf4c5f 100644
--- a/public/html/bottom_price.html
+++ b/public/html/bottom_price.html
@@ -69,7 +69,7 @@
<body>
<div class="box">
<div class="list">
-<div id="app" style="background-color:#e7013a;padding-top:0.5rem" v-cloak>
+<div id="app" style="background-color:#e7013a;padding-top:0.7rem" v-cloak>
<template v-if="isexplain && issource">
<div class="main">
</div>
@@ -102,35 +102,34 @@
</div>
<ul class="shoplist contscore" v-if="fristOrderItems.length>0">
- <li v-for="(item,index) in fristOrderItems">
- <img class="shop-img" v-lazy="item.itempic" v-if="item.itempic">
+ <li v-for="(item,index) in fristOrderItems" v-on:click="getTaocode(item)">
+ <img class="shop-img" v-lazy="item.mainPic" v-if="item.mainPic">
<img class="shop-img" src="http://img.bc.haodanku.com/haodanku-activity/1596092443" v-else>
- <div class="shop-box" v-bind:class="!item.couponurl?'active':''">
- <p class="shop-title">{{item.itemshorttitle}}</p>
+ <div class="shop-box" v-bind:class="!item.couponLink?'active':''">
+ <p class="shop-title">{{item.dtitle}}</p>
<div class="shop-tips">
- <img src="http://img.bc.haodanku.com/haodanku/1613978202">
- <p>棰嗗彇绛惧埌绾㈠寘鍙啀鍙犲姞鎶垫墸锛�</p>
+ <!-- <img src="http://img.bc.haodanku.com/haodanku/1613978202">
+ <p>棰嗗彇绛惧埌绾㈠寘鍙啀鍙犲姞鎶垫墸锛�</p> -->
</div>
<div class="shop-tips row-2">
<img src="http://img.bc.haodanku.com/cms/1627703910">
- <p>搴楅摵锛歿{item.shopname}}</p>
+ <p>搴楅摵锛歿{item.shopName}}</p>
</div>
<div>
- <div class="ticket" v-if="item.couponurl"><span class="name" style="height: 0.3rem;">鍒�</span><span
- class="value" style="height: 0.3rem;">锟{item.couponmoney}}</span></div>
- <div class="ticket" v-if="item.couponurl"><span class="name" style="height: 0.3rem;background:linear-gradient(180deg,#b21db6,#ad25d1)">杩�</span><span
+ <div class="ticket" v-if="item.couponLink"><span class="name" style="height: 0.3rem;">鍒�</span><span
+ class="value" style="height: 0.3rem;">锟{item.couponPrice}}</span></div>
+ <div class="ticket" v-if="item.couponLink"><span class="name" style="height: 0.3rem;background:linear-gradient(180deg,#b21db6,#ad25d1)">杩�</span><span
class="value" style="border:1px solid #b817ce;color:#b817ce;height: 0.3rem;">锟{item.fanli}}</span></div>
</div>
<div class="shop-b">
<div class="shop-b-l">
- <p class="shop-b-m"><i>鍒稿悗浠�</i>锟{parseFloat(item.itemendprice)}}</p>
- <p class="shop-b-label">锟{parseFloat(item.itemprice)}}</p>
+ <p class="shop-b-m"><i>鍒稿悗浠�</i>锟{parseFloat(item.actualPrice)}}</p>
+ <p class="shop-b-label">锟{parseFloat(item.originalPrice)}}</p>
</div>
</div>
- <span class="shop-btn shop-coupon" v-on:click="getTaocode(item,true)" v-if="item.couponurl">绔嬪嵆棰嗗埜</span>
- <span class="shop-btn" v-on:click="getTaocode(item)">鎼滅储涓嬪崟</span>
+ <span class="shop-btn" v-on:click="getTaocode(item)">绔嬪嵆涓嬪崟</span>
</div>
</li>
</ul>
@@ -165,21 +164,7 @@
<img src="http://img.bc.haodanku.com/haodanku-activity/1596032111" alt="">
</div>
- <div class="direct-img" v-show="showDirect" v-on:click="closeDirect">
- <div class="direct-box">
- <div class="box-header">
- 浣跨敤鏁欑▼
- <img
- v-on:click="closeDirect"
- class="btn-close"
- src="http://img-haodanku-com.cdn.fudaiapp.com/FsHmpTJUJxhdJ7X8YL36ix1GduZg"
- alt="">
- </div>
- <div class="box-content">
- <img src="http://img.bc.haodanku.com/cms/1627703471?t=1" alt="">
- </div>
- </div>
- </div>
+
<transition name="fade">
<div class="snapped-up" v-show="snappedUp.show">
<div class="box">
@@ -268,7 +253,8 @@
active:0,
nav:[
],
- posturl:"http://dfg.shop.com",
+ //posturl:"http://dfg.shop.com",
+ posturl:"http://dfgapp.ushopvip.com",
//posturl:"http://appapitest.ushopvip.com",
showDirect: false,
codeId: vmRequest("code"),
@@ -291,22 +277,22 @@
{
name: "浣ｉ噾姣斾緥",
bool: false,
- max: 2,
- min: 2,
+ max: 4,
+ min: 4,
number: 4
},
{
name: "閿�閲�",
bool: false,
- max: 5,
- min: 5,
+ max: 2,
+ min: 2,
number: 2
},
{
name: "棰嗗埜閲�",
bool: false,
- max: 5,
- min: 5,
+ max: 3,
+ min: 3,
number: 3
}
],
@@ -368,8 +354,13 @@
var _this = this;
$(document).scrollTop(0);
this.active = key;
+ this.page = 1;
+ this.loadmsg = true;
+ this.loadshow = true;
+ this.sigclick = true;
+ this.sortNumber=0;
setTimeout(function () {
- //_this.getGoodsList();
+ _this.ajaxFristOrderItems();
}, 200)
},
@@ -452,12 +443,6 @@
}
})
},
- toSignIn: function() {
- if(!this.sign_info.tpwd) {
- return;
- }
- SpaUtils.copy(this.sign_info.tpwd, "澶嶅埗鍙ｄ护鎴愬姛锛岃鎵撳紑娣樺疂娴忚棰嗗彇绛惧埌绾㈠寘");
- },
getUrlPar:function(name)
{
var reg=new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
@@ -503,32 +488,29 @@
headers:{
"token":that.getUrlPar("token")
},
- url:that.posturl+'/api/activity/signRed',
+ url:'/api/activity/bottomPrice',
type:"post",
dataType:"json",
data:{
- apikey: '0F92EBA7AADA', //蹇呭～
- min_size: 20,
+ pageSize: 20,
sort: that.sortId,
- min_id: that.page,
- keyword: that.keyword,
- pure_tpwd: vmRequest("pure_tpwd") ? 1 : undefined
+ pageId: that.page,
+ cids: that.active,
}
}).done(function(res){
- var data=res.data;
+ var data=res.data.data;
if(res.code == 0) {
- that.help_info = data.help_info || [];
- that.sign_info = data.sign_info || {};
if(that.sigclick) {
- that.fristOrderItems = data.data;
+ that.fristOrderItems = data.list;
} else {
- that.fristOrderItems = that.fristOrderItems.concat(data.data);
+ that.fristOrderItems = that.fristOrderItems.concat(data.list);
}
- that.topArr = data.top_data;
- if(that.page != data.min_id) {
+ //鑾峰彇鎬绘暟
+
+ if(that.page*20 < data.totalNum) {
that.loadmsg = true;
that.loadshow = true;
- that.page = data.min_id;
+ that.page ++;
} else {
that.loadmsg = false;
that.loadshow = false;
@@ -586,60 +568,10 @@
content: $(classname)
});
},
- getTaocode: function(item, isCoupon) {
- // if(!isCoupon && vmRequest("pure_tpwd")) {
- // // 鐩存帴澶嶅埗
- // copy(item.tpwd, "澶嶅埗鍙ｄ护鎴愬姛,璇锋墦寮�娣樺疂涓嬪崟");
- if(!isCoupon) {
- // 鐩存帴澶嶅埗
- SpaUtils.copy(item.itemtitle, false);
- this.titleCopyTipsVisible = true;
- return;
- }
- var that = this;
- var load = layer.load(1, {shade: 0.3});
- $.ajax({
- type: "Post",
- url: that.vmHttp + "://v2.api.haodanku.com/ratesurl",
- data: {
- apikey: '0F92EBA7AADA', //蹇呭～
- itemid: item.itemid,
- activityid: isCoupon ? item.activityid : undefined,
- title: item.itemshorttitle,
- itemtitle: item.itemtitle,
- pid: 'mm_4091757048_2861600076_114781900494', //蹇呭～
- tb_name: 'tb108547775155', //蹇呭～
- get_taoword: 1,
- },
- dataType: "json",
- timeout: 5000,
- success: function(data) {
- layer.close(load);
- if(data.code == "1") {
- if(!isCoupon) {
- }
- that.taoToken = data.data.taoword;
- if(isCoupon) {
- //that.popupFun(".tokenbox1");
- uni.postMessage({
- data: {
- action: 'totb',
- tburl:data.data.link
- }
- })
- } else {
- that.openSnappedUpDialog();
- }
- } else {
- that.msgFun(data.msg);
- }
-
- },
- error: function() {
- layer.close(load);
- that.msgFun("缃戠粶閿欒锛岃妫�鏌ョ綉缁滈噸璇�");
- }
- });
+ getTaocode: function(item) {
+ uni.navigateTo({
+ url: '/pages/goods/goodsDetail?id=' + item.goodsId
+ });
},
msgFun: function(val) {
layer.msg(val, {
--
Gitblit v1.9.3