diff --git a/components/advertisement/advertisement.js b/components/advertisement/advertisement.js
index 81cff5b..473a67d 100644
--- a/components/advertisement/advertisement.js
+++ b/components/advertisement/advertisement.js
@@ -16,7 +16,7 @@ Component({
gotoGg: function (e) {
let that = this;
wx.navigateTo({
- url: '/pages/coupon/detail/index?couponChannelId=' + e.currentTarget.dataset.data.produceId,
+ url: '/pages/coupon/detail/index?couponChannelId=' + e.currentTarget.dataset.data.produceId+'&g=1',
})
},
a: function () {
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 486584e..482b204 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -384,6 +384,9 @@ Page({
*/
onLoad(options) {
let that = this;
+ if (options.g){
+ app.globalData.havePlayEd1 = true;
+ }
wx.showLoading({
title: "加载中..."
});
@@ -931,7 +934,6 @@ Page({
})
},
onShow() {
- app.globalData.havePlayEd1 = true;
this.setData({
showbutton: false,
showbutton1: false
diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js
index 131e631..511df7d 100644
--- a/pages/integralmall/index.js
+++ b/pages/integralmall/index.js
@@ -30,9 +30,8 @@ Page({
reloadIf: false,
creditAmount: 0,
score: '0',
- sort:imgurl.sort.url,
- up:imgurl.up.url,
- down:imgurl.down.url
+ sort:'',
+ hidden:false
},
qrcodeH: function () {
var that = this;
@@ -192,16 +191,28 @@ Page({
},
//所需积分
- need(e){
+ need: function (e) {
+ console.log(this.data.hidden)
var that = this;
- // if()
- console.log(e.target)
- let clickNum = []
+ var hid = this.data.hidden;
+ if (hid == true) {
+ hid = false;
+ that.setData({
+ sort :imgurl.up.url
+ })
- that.setData({
- sort :imgurl.down.url
+ }
+ else {
+ hid = true;
+ that.setData({
+ sort: imgurl.down.url
+ })
+ }
+ this.setData({
+ hidden: hid // 改变状态
})
},
+ //sortColumn=shopNumber&sortOrder=desc
getList(pageNum) {
var that = this;
if (that.data.allow_load) {
@@ -307,5 +318,9 @@ Page({
let that = this;
that.getList(1);
that.getPoints();
+ that.setData({
+ sort : ''
+ })
+
}
})
\ No newline at end of file
diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml
index 233579d..35c796f 100644
--- a/pages/integralmall/index.wxml
+++ b/pages/integralmall/index.wxml
@@ -45,7 +45,7 @@
我可换购
所需积分
-
+
diff --git a/pages/orderquanma/index.wxss b/pages/orderquanma/index.wxss
index 5b95632..a818b52 100644
--- a/pages/orderquanma/index.wxss
+++ b/pages/orderquanma/index.wxss
@@ -4,6 +4,10 @@
height: 100%;
background:linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
}
+page {
+ background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
+ height: auto !important;
+}
.couponbg {
position: relative;
background: #fff;