From 7a5460a1de78161e079da083c449eb3b0487f5a6 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 18 Jan 2019 18:38:26 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7][=E7=A0=8D=E4=BB=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85]=EF=BC=9A[=E7=A0=8D=E4=BB=B7=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bargain/bargain.js | 20 +++++++++---------- pages/bargain/bargain.wxml | 8 ++++---- pages/bargain/bargainDatail/bargainDatail.js | 7 ++++++- .../bargain/bargainDatail/bargainDatail.wxml | 5 ++++- .../bargain/bargainDatail/bargainDatail.wxss | 12 ++++++----- 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/pages/bargain/bargain.js b/pages/bargain/bargain.js index 2de09d0..1f662b4 100644 --- a/pages/bargain/bargain.js +++ b/pages/bargain/bargain.js @@ -1,9 +1,7 @@ var config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); - Page({ - /** * 页面的初始数据 */ @@ -21,7 +19,7 @@ Page({ myorder: false, actUrl: imgurl.act.url, loadingUrl: imgurl.loading.url, - flag: null, + flag: 'bargaingoods', }, onShow: function () { let that = this; @@ -65,6 +63,7 @@ Page({ }, getList(pageNum, flag) { var that = this; + console.log(pageNum) if (that.data.allow_load) { /** * mybargain: 我的砍价 @@ -81,7 +80,7 @@ Page({ }) var param = { pageNum: pageNum, - pageSize: 6 + pageSize: 10 }; var url = config.api.pressOrderList; } else if (flag == 'bargaingoods') { @@ -90,7 +89,7 @@ Page({ }) var param = { pageNum: pageNum, - pageSize: 6, + pageSize: 10, targetAd: 6 }; var url = config.api.couponChannelList; @@ -132,7 +131,7 @@ Page({ }) .catch(err => { wx.showToast({ - title: err.errMsg, + title: err.message, icon: 'none', duration: 2000, mask: false @@ -158,7 +157,7 @@ Page({ /** * 如果是重新砍价,需要重新下单 */ - orderSave: function (couponId,orderId,couponChannelId) { + orderSave: function (couponId,couponChannelId) { Http.post({ url: config.api.orderSave, data: { @@ -170,7 +169,7 @@ Page({ .then(res => { console.log(res) wx.navigateTo({ - url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${orderId}` + url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${res.data.orderNumber}` }) }) .catch(err => { @@ -193,8 +192,8 @@ Page({ console.log(e) let couponId = e.currentTarget.dataset.couponid; let couponChannelId = e.currentTarget.dataset.couponchannelid; - let orderId = e.currentTarget.dataset.id; - that.orderSave(couponId,orderId,couponChannelId) + // let orderId = e.currentTarget.dataset.id; + that.orderSave(couponId,couponChannelId) }, mybargain: function () { let that = this; @@ -232,7 +231,6 @@ Page({ * @param {砍价} 邀请好友砍价 */ invite: function (e) { - console.log(e.currentTarget.dataset.id); let couponChannelId = e.currentTarget.dataset.id; let couponId = e.currentTarget.dataset.couponid; if (couponChannelId && couponId) { diff --git a/pages/bargain/bargain.wxml b/pages/bargain/bargain.wxml index 2a8b892..d40c750 100644 --- a/pages/bargain/bargain.wxml +++ b/pages/bargain/bargain.wxml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ {{item.priceStr}}元 可砍至{{item.salePriceStr}} - 发起砍价 + 发起砍价 @@ -25,13 +25,13 @@ - + {{item.title}} {{item.subTitle}} - 距砍价到{{item.salePrice/100}}元还差:{{item.pressCurrentValue/100}}元 + 距砍价到{{item.salePrice/100}}元还差:{{item.pressCurrentValue/100}}元 已砍价到底价:{{item.salePrice/100}}元 邀请好友砍价 diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js index 112487f..4e04553 100644 --- a/pages/bargain/bargainDatail/bargainDatail.js +++ b/pages/bargain/bargainDatail/bargainDatail.js @@ -499,5 +499,10 @@ function diffTime(startDate) { if (days > 0) { returnStr = days + "天" + returnStr; } - return returnStr; + + if (returnStr.indexOf('-1')==-1){ + return returnStr; + }else{ + return '1秒' + } } \ No newline at end of file diff --git a/pages/bargain/bargainDatail/bargainDatail.wxml b/pages/bargain/bargainDatail/bargainDatail.wxml index 7acde24..9d7ce7c 100644 --- a/pages/bargain/bargainDatail/bargainDatail.wxml +++ b/pages/bargain/bargainDatail/bargainDatail.wxml @@ -22,6 +22,9 @@ 好友的砍价已过期 + + 您的砍价已过期 + @@ -50,7 +53,7 @@ - + {{data.price/100}}元 立即购买 diff --git a/pages/bargain/bargainDatail/bargainDatail.wxss b/pages/bargain/bargainDatail/bargainDatail.wxss index 2b01555..8b81d41 100644 --- a/pages/bargain/bargainDatail/bargainDatail.wxss +++ b/pages/bargain/bargainDatail/bargainDatail.wxss @@ -221,10 +221,12 @@ width: 200rpx; height: 200rpx; border-radius:50%; - font-size: 24rpx; + font-size: 26rpx; text-align: center; line-height: 200rpx; margin-top: 30rpx; + background: #EC3B2D; + color: #fff!important; } .helpDiscount::after{ border: none; } .success{ @@ -284,17 +286,17 @@ text-align: center; border: none; } +.status button::after{ border: none; } .status button:nth-of-type(1){ background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%); - border:1rpx solid rgba(236,59,45,1); + border:1px solid rgba(236,59,45,1); border-radius:48rpx; margin-bottom: 38rpx; color: #fff; } .status button:nth-of-type(2){ - background:rgba(255,255,255,1); - border:1rpx solid rgba(190,190,190,1); + background:rgba(190,190,190,1); + border:1px solid rgba(190,190,190,1); border-radius:48rpx; - width:520rpx; color: #333; } \ No newline at end of file