From fbf3cd3176f6035436f0f0bf94dc01d44e712128 Mon Sep 17 00:00:00 2001
From: heyuntao <heyuntao@LAPTOP-MP4HD5NS>
Date: 星期五, 14 七月 2023 11:00:06 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.4开发' of http://60.204.153.149:8081/r/dfgApi into feature/v1.1.4开发
---
public/html/compareprice.html | 84 ++++++++++++++++++++++++++++--------------
1 files changed, 56 insertions(+), 28 deletions(-)
diff --git a/public/html/compareprice.html b/public/html/compareprice.html
index 150456d..8d55243 100644
--- a/public/html/compareprice.html
+++ b/public/html/compareprice.html
@@ -309,6 +309,12 @@
font-size: .35rem;
color: #fff;
}
+ .showshop
+ {
+ font-size: .28rem;
+ color: #787070;
+ margin-top: 0.15rem;
+ }
</style>
</head>
@@ -347,11 +353,12 @@
<div class="other___2Mv8Q">
<h2>
<div class="shoplabel___1_Nv0"><img
- src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAaCAYAAADIUm6MAAAE60lEQVRYw9WYbVBUVRjHz+gH/OCHdCY/WE1OGTNWU40ibIqSE6IGZpoGgrGUyAjrYkrI2yqIKGjN+FLONOk4aI6azZqZmu+ama9oElmOGApqvrK6KjBp8uvDc5a7d3eBJZsp78xv9p7/eZ7/8+y95yxnUEopRZ4tFIfdicPuxjGFoCnQODqKXdOhHDcOu5M8W6hqaTonw0VOBo8ILvJsoYqsdCfTJ/NIkZXuVNjT3NgnEZg0H9qLm/Qv01r9NLdi8kRMzMyFBw/+OWfPGF6VJ6GpEepqwbkebGnmWtVnAKCsxKzv3in6mi/w60+jmPgeJvJyeKjrbLXhVVVlnvthv+hfroWfK+HuXdGrq2Xs4fp10S9elHHpXHz7VCRbwZpsJiUlMA6HGNbVtR5jTYHkZMFqhdRUKJsPDY3Q3AxTbHDgQMcexpIlkGz1IhlF4gRaGN8OM/LEqLaONvMSA3DqlOQWzobsXJhXBnUXRCtfJWMPRytE37ZdxpMz/HwV4xIJmiy9jM7XBp8TPwFWrITGRsktKjHmDh6CK1fhw1xzzrqvRF+8tFVfxVsJ+BOv8dGnZkvxc7UEzvMhv0i+pPflKG7dv736Xihix2HiSAVU/WrmF03171K8qSnwvIdl5eK1co3EX7gEly7LfV4RrHNCzbngKSiG2He8GIci5m1MuG/z0Nem78QrNgE+WQax8VBxUuayC2Hnvo75FX+Eb5+KIaMxYcuBzHxhqsYz3uFVsHSRofuSlG72HJ4A1TWSN20mbN8r95+VQ4pdOHRMtKUrDO3Icb2h5+PbpyJyFEExaBTUeK3Xz1d7zb/pg5deUAqXrxp59nzYtkdv1I+NWM9DmbXA0HbtF62gzFxn0CgUEXFgaYUIjSUO8krFpEH/OtTfhOh4HTvSB52zeoPRcHOzfKbnwtbdcj9zgeG/Tb+F/DIjf4duPHeeX1+Kfm/QLjFJcL1eP6WFcPiE3G/Z03ZeUibccEHxIjiq13jqDNi8S+5dt+CPq0JjU+ta9lw/b8VLw2mTV8dA1WkxOHgcXh4Bce/DnQbRPl3Zdn7YSPk8Vinx1izYtKtjm3P6HD9fRZ+h0CdGM9TM4Hij6TPnYMBYWuJthXD/L73e18LzAfI9vBIHt/Sv1ZBE2KgPUcVLICoBosbDTn0MKFyktQTYfVC0zNk+njEoer9OQJKy4Io+7FSfB8tY/5hpc+HefYnZexgiAsQ8Fw3rt0pMRZVoX++Q8QclRtw3+i1kFhvaZr2JbUV+voqnh2DixTgo3yBHVIDvj0Lf0fjFeUiYJusS4MZNmFoCvfTcC7HwrS5+pwFGpIq+aqNoC8sNH89byJgt42ejoVK/7Xez/eoqeg6GnlEGx/Vh6N59mL8cnnzNPN8zCsnxou8Y2HfM68/6Yolbu0XGN90wxg5PRAmj7fJgmpvly15zQdOfEuu+A9fq4bY+8l68Ar2H+dVX9IikhccjIXUW/PgTRE6QcSC841u0QWCbA7/VQO8RMm8ZDwdOQP94THV6RMKUEqi/1famrDwNUdaA9RXdBrjpNgAzA/HXvHhME2iu+0D/uNbiuw+EXsPgmeH+PBXdVg9uRVeLk64WhAiN5T8i6PpORUh4KF3CXYT0xyDch/7tEGxcsP5tzHcJdxESrv+3EhIeSucwJ53C3HTqx/+TMDedw5yepv8GV1+TBUuIRhcAAAAASUVORK5CYII=">
+ :src="g.labelImg">
</div>
<span>{{g.title}}</span></h2>
- <div class="coupon___2SVZi" style="float: left; margin-right:10px"><span>鍒�</span>{{g.couponPrice}}鍏�</div>
+ <div v-if="g.couponPrice" class="coupon___2SVZi" style="float: left; margin-right:10px"><span>鍒�</span>{{g.couponPrice}}鍏�</div>
<div class="coupon___2SVZi" style="background: #A429F3;"><span style="color: #A429F3;">杩�</span>{{g.fanli}}鍏�</div>
+ <div class="showshop">{{g.shopName}}</div>
</div>
<div class="price___dfbCD">楼<span>{{g.actualPrice}}</span><u style="text-decoration:line-through">楼{{g.originalPrice}}</u></div>
<div class="operation___3KazI">
@@ -396,8 +403,8 @@
var app= new Vue({
el: '#comprice',
data:{
- posturl:'http://dfg.shop.com',
- //posturl:'http://appapitest.ushopvip.com',
+ //posturl:'http://dfg.shop.com',
+ posturl:'https://appapitest.ushopvip.com',
//posturl:'http://dfgapp.ushopvip.com',
goodsItem:[],
loading:false,
@@ -415,6 +422,49 @@
}
this.showTxt="鏌ヨ鎺掕";
this.goodsItem=[];
+ var that = this;
+ this.loading = true
+ $.ajax({
+ headers:{
+ "token":this.getUrlPar("token")
+ },
+ url:this.posturl+'/api/taoke/compare_good',
+ type:"post",
+ dataType:"json",
+ data:{
+ content:that.txtareatxt
+ }
+ }).done(function(res){
+ that.loading = false;
+ if(res.code == 0){
+ that.goodsItem=res.data.list;
+ }
+ })
+
+ },
+ Infoformat: function(info){
+ info = info.replace(/\%/g,"%25")
+ info = info.replace(/\#/g,"%23")
+ info = info.replace(/\&/g,"%26")
+ info = info.replace(/\?/g,"%3F")
+ return info;
+ },
+ handleCdetailFavorite:function(item)
+ {
+ switch(item.sourceType)
+ {
+ case "tb":
+ uni.navigateTo({
+ url: '/pages/goods/goodsDetail?id=' + item.goodsId+'&frompage=freebuy'
+ });
+ break;
+ default:
+ var itemsStr=this.Infoformat(JSON.stringify(item));
+ uni.navigateTo({
+ url: '/pages/goods/goodsDetail?sourcefrom=compareprice&info=' + itemsStr+'&frompage=compareprice'
+ });
+ break;
+ }
},
likeDataGet:function(postData)
{
@@ -473,35 +523,13 @@
if(r !=null)return unescape(r[2]);
return null;
},
-
- getGoodsList: function () {
- var that = this;
- this.loading = true
- $.ajax({
- headers:{
- "token":this.getUrlPar("token")
- },
- url:this.posturl+'/api/Activity/zsz_goods_list',
- type:"post",
- dataType:"json",
- data:{
- cid:0,
- app_key: 'zsccir',
- }
- }).done(function(res){
- if(res.code == 0){
- that.goodsItem = res.data.data.data.list;
-
- }
- })
- },
},
mounted:function(){
- var postData={
+ /* var postData={
postData:'OAID',
deviceValue:''
};
- this.likeDataGet(postData);
+ this.likeDataGet(postData); */
var that=this;
document.addEventListener('UniAppJSBridgeReady', function() {
that.getLikeGoods();
--
Gitblit v1.9.3