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 @@
+
diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss
index 07d0090..1580508 100644
--- a/pages/bargain/bargain.wxss
+++ b/pages/bargain/bargain.wxss
@@ -506,4 +506,26 @@ page{
font-weight:500;
color:rgba(255,253,245,1);
opacity: 1;
-}
\ No newline at end of file
+}
+button::after{ border: none; }
+.goback{
+ position: fixed;
+ right: 50rpx;
+ bottom: 60rpx;
+ width:100rpx!important;
+ height:100rpx;
+ z-index: 100;
+ background:rgba(255,255,255,1);
+ line-height: 95rpx;
+ border:1rpx solid rgba(227,227,227,1);
+ border-radius:50%;
+}
+.goback image{
+ position: absolute;
+ width: 60rpx;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+}
diff --git a/pages/bargain/bargainDatail/bargainDatail.json b/pages/bargain/bargainDatail/bargainDatail.json
index 6897937..6a4e232 100644
--- a/pages/bargain/bargainDatail/bargainDatail.json
+++ b/pages/bargain/bargainDatail/bargainDatail.json
@@ -1,5 +1,6 @@
{
"navigationBarTitleText": "砍价详情",
"navigationBarBackgroundColor":"#FF6F03",
+ "navigationBarTextStyle": "white",
"enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js
index 5720dd7..fb30253 100644
--- a/pages/cardorder/index/index.js
+++ b/pages/cardorder/index/index.js
@@ -7,6 +7,8 @@ Page({
data: {
couponUrl: imgurl.coupon.url,
linessUrl: imgurl.liness.url,
+ wmhome: imgurl.wmhome.url,
+ wmdiscount: imgurl.wmdiscount.url,
loadingUrl: imgurl.loading.url,
canTransferred: imgurl.canTransferred.url,
weixinTitle: imgurl.weixinTitle.url,
@@ -30,6 +32,11 @@ Page({
mystatus: '',
showPage: false
},
+ goback: function () {
+ wx.switchTab({
+ url: '/pages/main/index',
+ })
+ },
onShow: function() {
let that = this;
console.log("onShow")
diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml
index c9a95b1..596ab74 100644
--- a/pages/cardorder/index/index.wxml
+++ b/pages/cardorder/index/index.wxml
@@ -1,3 +1,4 @@
+
diff --git a/pages/cardorder/index/index.wxss b/pages/cardorder/index/index.wxss
index 40546d6..005beae 100644
--- a/pages/cardorder/index/index.wxss
+++ b/pages/cardorder/index/index.wxss
@@ -276,4 +276,26 @@
width:60rpx;
height:60rpx;
z-index:100;
-}
\ No newline at end of file
+}
+button::after{ border: none; }
+.goback{
+ position: fixed;
+ right: 50rpx;
+ bottom: 60rpx;
+ width:100rpx!important;
+ height:100rpx;
+ z-index: 100;
+ background:rgba(255,255,255,1);
+ line-height: 95rpx;
+ border:1rpx solid rgba(227,227,227,1);
+ border-radius:50%;
+}
+.goback image{
+ position: absolute;
+ width: 60rpx;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+}
diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js
index 8cff4eb..e95bc4a 100644
--- a/pages/couponorder/index/index.js
+++ b/pages/couponorder/index/index.js
@@ -8,6 +8,7 @@ Page({
couponUrl: imgurl.coupon.url,
linessUrl: imgurl.liness.url,
loadingUrl: imgurl.loading.url,
+ wmhome: imgurl.wmhome.url,
wmgive: imgurl.wmgive.url,
tabs: [{
key: 0,
@@ -49,6 +50,11 @@ Page({
index:2
})
},
+ goback: function () {
+ wx.switchTab({
+ url: '/pages/main/index',
+ })
+ },
//点击跳转到券详情页面
gotouse: function (e) {
if (this.data.mystatus == '' || this.data.mystatus == 'undefined') {
diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml
index 38a574e..4e4f0e8 100644
--- a/pages/couponorder/index/index.wxml
+++ b/pages/couponorder/index/index.wxml
@@ -1,3 +1,4 @@
+
diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss
index dbae735..195ffed 100644
--- a/pages/couponorder/index/index.wxss
+++ b/pages/couponorder/index/index.wxss
@@ -4,6 +4,29 @@
/* background: #f5f5f5; */
}
+button::after{ border: none; }
+.goback{
+ position: fixed;
+ right: 50rpx;
+ bottom: 60rpx;
+ width:100rpx!important;
+ height:100rpx;
+ z-index: 100;
+ background:rgba(255,255,255,1);
+ line-height: 95rpx;
+ border:1rpx solid rgba(227,227,227,1);
+ border-radius:50%;
+}
+.goback image{
+ position: absolute;
+ width: 60rpx;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+}
+
.tabs {
width: 100% !important;
height: 88rpx;
diff --git a/pages/discountCardList/discountCardList.js b/pages/discountCardList/discountCardList.js
index 80d29c9..5e52f67 100644
--- a/pages/discountCardList/discountCardList.js
+++ b/pages/discountCardList/discountCardList.js
@@ -21,6 +21,7 @@ Page({
],
couponUrl: imgurl.coupon.url,
loadingUrl: imgurl.loading.url,
+ wmhome: imgurl.wmhome.url,
canTransferred: imgurl.canTransferred.url,
tabs: [],
list: [],
@@ -34,6 +35,11 @@ Page({
showPage: false,
paramData:null
},
+ goback: function () {
+ wx.switchTab({
+ url: '/pages/main/index',
+ })
+ },
onLoad(options) {
this.getList(0, 1);
if(options.fromId){
@@ -52,7 +58,7 @@ Page({
console.log(res)
let businessObj = [{ id: 0, title: "全部", type: 1, createDate: 0}];
that.setData({
- tabs: res.data.list.concat(businessObj).sort(compare("createDate"))
+ tabs: res.data.concat(businessObj).sort(compare("createDate"))
});
console.log(that.data.tabs)
})
diff --git a/pages/discountCardList/discountCardList.wxml b/pages/discountCardList/discountCardList.wxml
index 4489a40..ca2c248 100644
--- a/pages/discountCardList/discountCardList.wxml
+++ b/pages/discountCardList/discountCardList.wxml
@@ -1,3 +1,4 @@
+
diff --git a/pages/discountCardList/discountCardList.wxss b/pages/discountCardList/discountCardList.wxss
index 178befc..5de5c81 100644
--- a/pages/discountCardList/discountCardList.wxss
+++ b/pages/discountCardList/discountCardList.wxss
@@ -244,4 +244,26 @@ button::after{ border: none; }
}
.tabss{
padding: 0 30rpx;
-}
\ No newline at end of file
+}
+button::after{ border: none; }
+.goback{
+ position: fixed;
+ right: 50rpx;
+ bottom: 60rpx;
+ width:100rpx!important;
+ height:100rpx;
+ z-index: 100;
+ background:rgba(255,255,255,1);
+ line-height: 95rpx;
+ border:1rpx solid rgba(227,227,227,1);
+ border-radius:50%;
+}
+.goback image{
+ position: absolute;
+ width: 60rpx;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+}
diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js
index 2eb1a64..3724b26 100755
--- a/pages/getuserinfo/index.js
+++ b/pages/getuserinfo/index.js
@@ -204,7 +204,7 @@ Page({
// }
else if (app.globalData.type == 'ml') {
// 门店
- wx.redirectTo({
+ wx.switchTab({
url: '/pages/index/searchbar/index'
});
} else {
diff --git a/pages/index/index.js b/pages/index/index.js
index cfe549f..64574cc 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -9,6 +9,7 @@ Page({
* 页面的初始数据
*/
data: {
+
},
/**
* 生命周期函数--监听页面加载
@@ -216,7 +217,7 @@ Page({
});
} else if (app.globalData.type == 'ml') {
// 门店
- wx.redirectTo({
+ wx.switchTab({
url: '/pages/index/searchbar/index'
});
} else {
diff --git a/pages/index/searchbar/index.js b/pages/index/searchbar/index.js
index 8b82e2b..54bffe7 100644
--- a/pages/index/searchbar/index.js
+++ b/pages/index/searchbar/index.js
@@ -60,9 +60,8 @@ Page({
console.log(res)
let businessObj = [{ id: 0, title: "全部", type: 1, createDate:0}];
that.setData({
- lists: res.data.list.concat(businessObj).sort(compare("createDate"))
+ lists: res.data.concat(businessObj).sort(compare("createDate"))
});
- console.log(that.data.lists);
})
.catch(err => {
wx.showToast({
diff --git a/pages/index/searchbar/index.json b/pages/index/searchbar/index.json
index 75328d9..10a0a85 100644
--- a/pages/index/searchbar/index.json
+++ b/pages/index/searchbar/index.json
@@ -1,3 +1,5 @@
{
- "navigationBarTitleText": "品牌门店"
+ "navigationBarTitleText": "门店",
+ "navigationBarBackgroundColor": "#b2743d",
+ "navigationBarTextStyle": "white"
}
\ No newline at end of file
diff --git a/pages/index/searchbar/index.wxml b/pages/index/searchbar/index.wxml
index 474ef77..999f6c7 100644
--- a/pages/index/searchbar/index.wxml
+++ b/pages/index/searchbar/index.wxml
@@ -16,7 +16,7 @@
-
+
@@ -28,4 +28,7 @@
+
+ 暂无数据
+
\ No newline at end of file
diff --git a/pages/index/searchbar/index.wxss b/pages/index/searchbar/index.wxss
index d845f4d..d758ab6 100644
--- a/pages/index/searchbar/index.wxss
+++ b/pages/index/searchbar/index.wxss
@@ -6,12 +6,12 @@
position: fixed;
left: 0;
top: 0;
- border-right: 2rpx solid #efefef;
+ border-right: 2rpx solid #b2743d;
}
.left {
- border-top: 1rpx solid #efefef;
- border-right: 1rpx solid #efefef;
+ border-top: 1rpx solid #b2743d;
+ border-right: 1rpx solid #b2743d;
}
.text-style {
@@ -25,14 +25,14 @@
}
.active1 {
- color: #00c0ff;
+ color: #b2743d;
}
.active {
display: block;
width: 50rpx;
height: 6rpx;
- background: #00c0ff;
+ background: #b2743d;
position: relative;
left: 43rpx;
bottom: 30rpx;
@@ -71,6 +71,10 @@
margin-bottom: 20rpx;
overflow: hidden;
}
+.position{
+ text-align: center;
+ margin-top: 100rpx;
+}
.posi_logo view:nth-child(1) {
width: 100rpx;
diff --git a/pages/main/index.js b/pages/main/index.js
index d255100..dfb66a0 100644
--- a/pages/main/index.js
+++ b/pages/main/index.js
@@ -128,11 +128,11 @@ Page({
})
},
//搜索门店
- searchbar:function(){
- wx.navigateTo({
- url: '/pages/index/searchbar/index',
- })
- },
+ // searchbar:function(){
+ // wx.switchTab({
+ // url: '/pages/index/searchbar/index',
+ // })
+ // },
// createQrCode: function(url, canvasId, cavW, cavH) {
// //调用插件中的draw方法,绘制二维码图片
diff --git a/pages/order/index/index.js b/pages/order/index/index.js
index 69cf3f9..3613425 100644
--- a/pages/order/index/index.js
+++ b/pages/order/index/index.js
@@ -7,6 +7,7 @@ Page({
data: {
dingdanUrl: imgurl.dingdan.url,
loadingUrl: imgurl.loading.url,
+ wmhome: imgurl.wmhome.url,
wmdiscount: imgurl.wmdiscount.url,
wmgive: imgurl.wmgive.url,
tabs: [{
@@ -30,6 +31,11 @@ Page({
page: 1,
content: "",
},
+ goback: function () {
+ wx.switchTab({
+ url: '/pages/main/index',
+ })
+ },
onLoad(e) {
this.getList(e.id, 1);
this.setData({
diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml
index abcd4b0..25c7f72 100644
--- a/pages/order/index/index.wxml
+++ b/pages/order/index/index.wxml
@@ -1,3 +1,4 @@
+
diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss
index 924398c..7094d17 100644
--- a/pages/order/index/index.wxss
+++ b/pages/order/index/index.wxss
@@ -249,3 +249,25 @@ text-overflow: ellipsis;
vertical-align: middle;
margin-right: 10rpx;
}
+button::after{ border: none; }
+.goback{
+ position: fixed;
+ right: 50rpx;
+ bottom: 60rpx;
+ width:100rpx!important;
+ height:100rpx;
+ z-index: 100;
+ background:rgba(255,255,255,1);
+ line-height: 95rpx;
+ border:1rpx solid rgba(227,227,227,1);
+ border-radius:50%;
+}
+.goback image{
+ position: absolute;
+ width: 60rpx;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+}
diff --git a/pages/rushToBuy/index.js b/pages/rushToBuy/index.js
index 83dad06..04070ae 100644
--- a/pages/rushToBuy/index.js
+++ b/pages/rushToBuy/index.js
@@ -10,6 +10,7 @@ Page({
data: {
linesUrl: imgurl.lines.url,
loadingUrl: imgurl.loading.url,
+ wmhome: imgurl.wmhome.url,
wmgift: imgurl.wmgift.url,
list: [],
page: 1,
@@ -21,6 +22,11 @@ Page({
content: "",
showPage:false
},
+ goback: function () {
+ wx.switchTab({
+ url: '/pages/main/index',
+ })
+ },
//列表
getList: function (page) {
let that = this;
diff --git a/pages/rushToBuy/index.wxml b/pages/rushToBuy/index.wxml
index 9dc4398..5c8dfa2 100644
--- a/pages/rushToBuy/index.wxml
+++ b/pages/rushToBuy/index.wxml
@@ -1,3 +1,4 @@
+
diff --git a/pages/rushToBuy/index.wxss b/pages/rushToBuy/index.wxss
index 5927084..1c10520 100644
--- a/pages/rushToBuy/index.wxss
+++ b/pages/rushToBuy/index.wxss
@@ -15,7 +15,28 @@
font-size: 26rpx;
color: #999;
}
-
+button::after{ border: none; }
+.goback{
+ position: fixed;
+ right: 50rpx;
+ bottom: 60rpx;
+ width:100rpx!important;
+ height:100rpx;
+ z-index: 100;
+ background:rgba(255,255,255,1);
+ line-height: 95rpx;
+ border:1rpx solid rgba(227,227,227,1);
+ border-radius:50%;
+}
+.goback image{
+ position: absolute;
+ width: 60rpx;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+}
.loading image {
width: 60rpx;
height: 60rpx;
diff --git a/pages/specialcourtesy/specialcourtesy.js b/pages/specialcourtesy/specialcourtesy.js
index cf90a77..c3f018b 100644
--- a/pages/specialcourtesy/specialcourtesy.js
+++ b/pages/specialcourtesy/specialcourtesy.js
@@ -12,6 +12,7 @@ Page({
data: {
myspeacialUrl: imgurl.myspeacial.url,
teliconUrl: imgurl.telicon.url,
+ wmhome: imgurl.wmhome.url,
memberId:"000000"
},
phone: function (e) {
@@ -50,6 +51,11 @@ Page({
})
})
},
+ goback: function () {
+ wx.switchTab({
+ url: '/pages/main/index',
+ })
+ },
/**
* 二维码
*/
diff --git a/pages/specialcourtesy/specialcourtesy.wxml b/pages/specialcourtesy/specialcourtesy.wxml
index ecd4072..15f98c7 100644
--- a/pages/specialcourtesy/specialcourtesy.wxml
+++ b/pages/specialcourtesy/specialcourtesy.wxml
@@ -1,3 +1,4 @@
+
diff --git a/pages/specialcourtesy/specialcourtesy.wxss b/pages/specialcourtesy/specialcourtesy.wxss
index fb920db..18d4976 100644
--- a/pages/specialcourtesy/specialcourtesy.wxss
+++ b/pages/specialcourtesy/specialcourtesy.wxss
@@ -106,6 +106,27 @@ Page{
width: 300rpx;
margin: 40rpx auto 20rpx;
}
+.goback{
+ position: fixed;
+ right: 50rpx;
+ bottom: 60rpx;
+ width:100rpx!important;
+ height:100rpx;
+ z-index: 100;
+ background:rgba(255,255,255,1);
+ line-height: 95rpx;
+ border:1rpx solid rgba(227,227,227,1);
+ border-radius:50%;
+}
+.goback image{
+ position: absolute;
+ width: 60rpx;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+}
.code{
width: 684rpx;
background: #fff;
diff --git a/pages/spellGroup/spellGroup.js b/pages/spellGroup/spellGroup.js
index 9ad32ea..9c1786b 100644
--- a/pages/spellGroup/spellGroup.js
+++ b/pages/spellGroup/spellGroup.js
@@ -10,6 +10,7 @@ Page({
bannerUrl: imgurl.banner.url,
loadingUrl: imgurl.loading.url,
nodata: imgurl.nodata.url,
+ wmhome: imgurl.wmhome.url,
spellList: true,
myspellList: false,
list: [],
@@ -26,6 +27,11 @@ Page({
flag: 'spellList',
reloadIf:false
},
+ goback: function () {
+ wx.switchTab({
+ url: '/pages/main/index',
+ })
+ },
onLoad: function (options) {
let that = this;
that.getBannerlist();
diff --git a/pages/spellGroup/spellGroup.wxml b/pages/spellGroup/spellGroup.wxml
index d8a64ba..4c18248 100644
--- a/pages/spellGroup/spellGroup.wxml
+++ b/pages/spellGroup/spellGroup.wxml
@@ -1,3 +1,4 @@
+
diff --git a/pages/spellGroup/spellGroup.wxss b/pages/spellGroup/spellGroup.wxss
index 2d68d4b..e08eceb 100644
--- a/pages/spellGroup/spellGroup.wxss
+++ b/pages/spellGroup/spellGroup.wxss
@@ -290,4 +290,26 @@ image{
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(0,0,0,1);
-}
\ No newline at end of file
+}
+button::after{ border: none; }
+.goback{
+ position: fixed;
+ right: 50rpx;
+ bottom: 60rpx;
+ width:100rpx!important;
+ height:100rpx;
+ z-index: 100;
+ background:rgba(255,255,255,1);
+ line-height: 95rpx;
+ border:1rpx solid rgba(227,227,227,1);
+ border-radius:50%;
+}
+.goback image{
+ position: absolute;
+ width: 60rpx;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+}