From a80a07d3507c383864f3b28313b287e636545c5a Mon Sep 17 00:00:00 2001 From: luqc Date: Thu, 9 May 2019 14:00:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=94=AF=E4=BB=98=E6=8F=90=E9=86=92][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8F=90=E9=86=92=E8=AF=AD=E5=8F=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bargain/bargainDatail/bargainDatail.js | 22 +++++++++++++--- pages/cardListDetail/cardListDetail.js | 9 ++++++- pages/coupon/detail/index.js | 9 ++++++- pages/index/detail/index.js | 13 +++++++++- pages/index/detail/index.wxml | 25 +++++++++++++++++-- pages/index/detail/index.wxss | 14 +++++++++++ .../payIntegcoupondetail/index.js | 9 ++++++- pages/joinFrDpell/index.js | 9 ++++++- pages/spellGroup/mySpellGroup/index.js | 9 ++++++- 9 files changed, 107 insertions(+), 12 deletions(-) diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js index a756957..1c5f94d 100644 --- a/pages/bargain/bargainDatail/bargainDatail.js +++ b/pages/bargain/bargainDatail/bargainDatail.js @@ -349,7 +349,7 @@ Page({ }); } else if (err.code == 3001) { wx.showToast({ - title: "超过限购条件", + title: "您已超过限购", image: './../../../assets/images/fail.png', duration: 2000, mask: false @@ -382,7 +382,14 @@ Page({ duration: 2000, mask: false }); - } else if (err.code == 11005) { + } else if (err.code == 3012) { + wx.showToast({ + title: "您有未支付订单", + image: './../../../assets/images/fail.png', + duration: 2000, + mask: false + }); + }else if (err.code == 11005) { /** * 将值传到用户手机号授权的页面 * @@ -639,7 +646,7 @@ Page({ }); } else if (err.code == 3001) { wx.showToast({ - title: "超过限购条件", + title: "您已超过限购", image: './../../../assets/images/fail.png', duration: 2000, mask: false @@ -672,7 +679,14 @@ Page({ duration: 2000, mask: false }); - } else if (err.code == 11005) { + } else if (err.code == 3012) { + wx.showToast({ + title: "您已超过限购", + image: './../../../assets/images/fail.png', + duration: 2000, + mask: false + }); + }else if (err.code == 11005) { /** * 将值传到用户手机号授权的页面 * diff --git a/pages/cardListDetail/cardListDetail.js b/pages/cardListDetail/cardListDetail.js index 913cf36..8dcd0ba 100644 --- a/pages/cardListDetail/cardListDetail.js +++ b/pages/cardListDetail/cardListDetail.js @@ -363,7 +363,7 @@ Page({ }); } else if (err.code == "3001") { wx.showToast({ - title: "超过限购条件", + title: "您已超过限购", image: imgurl.fail.url, duration: 2000, mask: false @@ -396,6 +396,13 @@ Page({ duration: 2000, mask: false }); + } else if (err.code == 3012) { + wx.showToast({ + title: "您有未支付订单", + image: './../../../assets/images/fail.png', + duration: 2000, + mask: false + }); } else if (err.code == 11005) { /** * 将值传到用户手机号授权的页面 diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 62f1841..7847711 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -664,7 +664,7 @@ Page({ }); } else if (err.code == 3001) { wx.showToast({ - title: "超过限购条件", + title: "您已超过限购", image: './../../../assets/images/fail.png', duration: 2000, mask: false @@ -697,6 +697,13 @@ Page({ duration: 2000, mask: false }); + } else if (err.code == 3012) { + wx.showToast({ + title: "您有未支付订单", + image: './../../../assets/images/fail.png', + duration: 2000, + mask: false + }); } else if (err.code == 11005) { /** * 将值传到用户手机号授权的页面 diff --git a/pages/index/detail/index.js b/pages/index/detail/index.js index a16c82d..22161e8 100644 --- a/pages/index/detail/index.js +++ b/pages/index/detail/index.js @@ -12,7 +12,9 @@ Page({ page: 1, imglist:null, shopVoList:[], - data:{}, + data:{ + currentTabsIndex:0, + }, id:null }, @@ -27,6 +29,15 @@ Page({ }); that.getList(options.id); } + }, + /** + * tab切换 + */ + onTabsItemTap:function(e){ + var index=product.getDataSet(e,'index'); + this.setData({ + currentTabsIndex:index + }) }, /** * 拨打电话 diff --git a/pages/index/detail/index.wxml b/pages/index/detail/index.wxml index 9f9d6a5..161f0c5 100644 --- a/pages/index/detail/index.wxml +++ b/pages/index/detail/index.wxml @@ -44,13 +44,34 @@ - + + +    全部 +    找人 +    找车 +    +      全部 +    +    +      找人 +    +    +      找车 +    + + + \ No newline at end of file diff --git a/pages/index/detail/index.wxss b/pages/index/detail/index.wxss index 971841f..923a586 100644 --- a/pages/index/detail/index.wxss +++ b/pages/index/detail/index.wxss @@ -143,4 +143,18 @@ } .merchant-brand{ border: none!important; +} +.tabs-item.selected { + color:rgba(171,149,109,.8); + border-bottom:2px solid rgba(171,149,109,.8); +} +.tabs-item { + width:33.3%; + color:#C7C7CB; + font-size:28rpx; + display:flex; + align-items:center; + justify-content:center; + display:flex; + border-bottom:1rpx solid #D0D0D7; } \ No newline at end of file diff --git a/pages/integralmall/payIntegcoupondetail/index.js b/pages/integralmall/payIntegcoupondetail/index.js index 7041ae1..0992e29 100644 --- a/pages/integralmall/payIntegcoupondetail/index.js +++ b/pages/integralmall/payIntegcoupondetail/index.js @@ -118,7 +118,7 @@ Page({ }); } else if (err.code == 3001) { wx.showToast({ - title: "超过限购条件", + title: "您已超过限购", image: './../../../assets/images/fail.png', duration: 2000, mask: false @@ -151,6 +151,13 @@ Page({ duration: 2000, mask: false }); + } else if (err.code == 3012) { + wx.showToast({ + title: "您有未支付订单", + image: './../../../assets/images/fail.png', + duration: 2000, + mask: false + }); } else if (err.code == 11005) { /** * 将值传到用户手机号授权的页面 diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js index 4302a7e..f964861 100644 --- a/pages/joinFrDpell/index.js +++ b/pages/joinFrDpell/index.js @@ -327,7 +327,7 @@ Page({ }); } else if (err.code == 3001) { wx.showToast({ - title: "超过限购条件", + title: "您已超过限购", image: './../../assets/images/fail.png', duration: 2000, mask: false @@ -360,6 +360,13 @@ Page({ duration: 2000, mask: false }); + } else if (err.code == 3012) { + wx.showToast({ + title: "您有未支付订单", + image: './../../../assets/images/fail.png', + duration: 2000, + mask: false + }); } else if (err.code == 11005) { /** * 将值传到用户手机号授权的页面 diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index eeb1f79..c39dd26 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -312,7 +312,7 @@ Page({ }); } else if (err.code == 3001) { wx.showToast({ - title: "超过限购条件", + title: "您已超过限购", image: './../../../assets/images/fail.png', duration: 2000, mask: false @@ -345,6 +345,13 @@ Page({ duration: 2000, mask: false }); + }else if (err.code == 3012) { + wx.showToast({ + title: "您有未支付订单", + image: './../../../assets/images/fail.png', + duration: 2000, + mask: false + }); } else if (err.code == 11005) { /** * 将值传到用户手机号授权的页面