From 8853be70c4846c145c58a55f1eef2806a327a432 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 20 Apr 2019 18:12:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=97=E8=A1=A8][=E4=BF=AE=E6=94=B9]:[?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E9=A6=96=E9=A1=B5=E6=8C=89?= =?UTF-8?q?=E9=92=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bargain/bargain.js | 6 +++++ pages/bargain/bargain.wxml | 1 + pages/bargain/bargain.wxss | 24 ++++++++++++++++++- .../bargain/bargainDatail/bargainDatail.json | 1 + pages/cardorder/index/index.js | 7 ++++++ pages/cardorder/index/index.wxml | 1 + pages/cardorder/index/index.wxss | 24 ++++++++++++++++++- pages/couponorder/index/index.js | 6 +++++ pages/couponorder/index/index.wxml | 1 + pages/couponorder/index/index.wxss | 23 ++++++++++++++++++ pages/discountCardList/discountCardList.js | 8 ++++++- pages/discountCardList/discountCardList.wxml | 1 + pages/discountCardList/discountCardList.wxss | 24 ++++++++++++++++++- pages/getuserinfo/index.js | 2 +- pages/index/index.js | 3 ++- pages/index/searchbar/index.js | 3 +-- pages/index/searchbar/index.json | 4 +++- pages/index/searchbar/index.wxml | 5 +++- pages/index/searchbar/index.wxss | 14 +++++++---- pages/main/index.js | 10 ++++---- pages/order/index/index.js | 6 +++++ pages/order/index/index.wxml | 1 + pages/order/index/index.wxss | 22 +++++++++++++++++ pages/rushToBuy/index.js | 6 +++++ pages/rushToBuy/index.wxml | 1 + pages/rushToBuy/index.wxss | 23 +++++++++++++++++- pages/specialcourtesy/specialcourtesy.js | 6 +++++ pages/specialcourtesy/specialcourtesy.wxml | 1 + pages/specialcourtesy/specialcourtesy.wxss | 21 ++++++++++++++++ pages/spellGroup/spellGroup.js | 6 +++++ pages/spellGroup/spellGroup.wxml | 1 + pages/spellGroup/spellGroup.wxss | 24 ++++++++++++++++++- 32 files changed, 264 insertions(+), 22 deletions(-) diff --git a/pages/bargain/bargain.js b/pages/bargain/bargain.js index d8449ff..f36a07d 100644 --- a/pages/bargain/bargain.js +++ b/pages/bargain/bargain.js @@ -9,6 +9,7 @@ Page({ bannerUrl: imgurl.banner.url, loadingUrl: imgurl.loading.url, bargaincancel: imgurl.bargaincancel.url, + wmhome: imgurl.wmhome.url, bargainfail: imgurl.bargainfail.url, bargainsuccess: imgurl.bargainsuccess.url, bargaingoods: true, @@ -24,6 +25,11 @@ Page({ loadingUrl: imgurl.loading.url, flag: 'bargaingoods', }, + goback: function () { + wx.switchTab({ + url: '/pages/main/index', + }) + }, onLoad: function (options) { console.log(options) let that = this; diff --git a/pages/bargain/bargain.wxml b/pages/bargain/bargain.wxml index cc2cd11..6bc8201 100644 --- a/pages/bargain/bargain.wxml +++ b/pages/bargain/bargain.wxml @@ -1,3 +1,4 @@ +