diff --git a/components/advertisement/advertisement.js b/components/advertisement/advertisement.js
index b7669e2..81cff5b 100644
--- a/components/advertisement/advertisement.js
+++ b/components/advertisement/advertisement.js
@@ -10,46 +10,14 @@ Component({
},
data: {
flag: false,
- alphaData: null,
- gameUrl: ''
+ alphaData1: null,
},
methods: {
gotoGg: function (e) {
let that = this;
- Http.get({
- url: config.api.checkPhoneStatus,
- data: {}
+ wx.navigateTo({
+ url: '/pages/coupon/detail/index?couponChannelId=' + e.currentTarget.dataset.data.produceId,
})
- .then(res => {
- console.log(e.currentTarget.dataset)
- wx.navigateTo({
- url: '/pages/coupon/detail/index?couponChannelId=' + e.currentTarget.dataset.data.produceId ,
- })
- })
- .catch(err => {
- if (err.code == 11005) {
- // 用户手机未授权
- /**
- * 将值传到用户手机号授权的页面
- *
- */
- wx.redirectTo({
- url: "/pages/getphoneInfo/index?path=index&pagePath=" + e.currentTarget.dataset.data.pagePath + "&id=" + e.currentTarget.dataset.data.id + "&couponChannelId=" + e.currentTarget.dataset.data.produceId
- });
- } else if (err.code == 11006) {
- // 用户手机已加密
- wx.redirectTo({
- url: "/pages/phoneinput/phoneinput?path=index&pagePath=" + e.target.dataset.data.pagePath + "&id=" + e.currentTarget.dataset.data.id + "&couponChannelId=" + e.currentTarget.dataset.data.produceId
- });
- } else {
- wx.showToast({
- title: err.errMsg,
- icon: 'none',
- duration: 2000,
- mask: false
- });
- }
- })
},
a: function () {
this.setData({ flag: false })
@@ -62,7 +30,7 @@ Component({
that.setData({ flag: true })
}, 500)
animation.rotateZ(180).scale(0).opacity(0.5).step({ duration: 1000 })
- that.setData({ alphaData: animation.export() });
+ that.setData({ alphaData1: animation.export() });
},
},
});
diff --git a/index/index.js b/index/index.js
index 2a559fd..7b110af 100644
--- a/index/index.js
+++ b/index/index.js
@@ -55,6 +55,7 @@ Page({
loading: true,
fistLogin: null,
alphaData: null,
+ alphaData1: null,
swiperCurrent: 0,
title: null,
weappShareTitle: '', //分享标题
@@ -68,6 +69,7 @@ Page({
couponId: '', //游戏返回时传回的字段
played: false, //从游戏页面跳回首页返回true
havePlayEd: app.globalData.havePlayEd,
+ havePlayEd1:app.globalData.havePlayEd1,
staticGamedata: {},
showIf: false,
showPages: false,
@@ -79,6 +81,15 @@ Page({
showGg: false,
ggdata:{}
},
+ alphaClick1: function (even) {
+ var animation = wx.createAnimation({})
+ animation.opacity(0).step({
+ duration: 2000
+ })
+ this.setData({
+ alphaData: animation.export()
+ })
+ },
alphaClick: function(even) {
var animation = wx.createAnimation({})
animation.opacity(0).step({
@@ -252,8 +263,10 @@ Page({
}
let that = this;
that.setData({
- havePlayEd: app.globalData.havePlayEd ? app.globalData.havePlayEd : false
+ havePlayEd: app.globalData.havePlayEd ? app.globalData.havePlayEd : false,
+ havePlayEd1:app.globalData.havePlayEd1?app.globalData.havePlayEd1 : false
})
+
/**
* couponNum 是否有普通的优惠券购买
* couponNum2 是否有新买的消费卡
@@ -280,6 +293,10 @@ Page({
setTimeout(function() {
that.alphaClick();
}, 8000)
+ // 如果有广告
+ setTimeout(function () {
+ that.alphaClick1();
+ }, 8000)
},
getmemberId: function(token) {
let that = this;
@@ -663,7 +680,7 @@ Page({
showGg: false
})
that.getGameOne(app.globalData.token)
- that.alphaClick();
+ that.alphaClick1();
})
},
/**
diff --git a/index/index.wxml b/index/index.wxml
index ee80a87..36918e7 100644
--- a/index/index.wxml
+++ b/index/index.wxml
@@ -108,7 +108,7 @@
-
+
diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js
index a2ea8cb..131e631 100644
--- a/pages/integralmall/index.js
+++ b/pages/integralmall/index.js
@@ -30,7 +30,9 @@ Page({
reloadIf: false,
creditAmount: 0,
score: '0',
-
+ sort:imgurl.sort.url,
+ up:imgurl.up.url,
+ down:imgurl.down.url
},
qrcodeH: function () {
var that = this;
@@ -84,7 +86,6 @@ Page({
showEdit: true
})
}
-
that.setData({
score: res.data.score,
levelName: res.data.levelName,
@@ -186,6 +187,21 @@ Page({
url: '/pages/integralmall/integraHistory/index',
})
},
+ //我可换购
+ canSort(){
+
+ },
+ //所需积分
+ need(e){
+ var that = this;
+ // if()
+ console.log(e.target)
+ let clickNum = []
+
+ that.setData({
+ sort :imgurl.down.url
+ })
+ },
getList(pageNum) {
var that = this;
if (that.data.allow_load) {
diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml
index f3af5fe..233579d 100644
--- a/pages/integralmall/index.wxml
+++ b/pages/integralmall/index.wxml
@@ -42,8 +42,11 @@
暂无数据
- 我可换购
- 所需积分
+ 我可换购
+
+ 所需积分
+
+
diff --git a/pages/integralmall/index.wxss b/pages/integralmall/index.wxss
index d1df1e5..a68c19a 100644
--- a/pages/integralmall/index.wxss
+++ b/pages/integralmall/index.wxss
@@ -477,7 +477,6 @@ button::after{ border: none; }
padding: 0 3%
}
.sort view{
- height:60rpx;
width: 180rpx;
line-height: 60rpx;
color: #fff;
@@ -485,4 +484,14 @@ button::after{ border: none; }
text-align: center;
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius: 20rpx;
+}
+.need{
+ justify-content: center;/*水平居中*/
+ align-items: center; /*垂直居中*/
+ display: flex;
+}
+.need image{
+ margin-left:5rpx;
+ width: 40rpx;
+ height: 40rpx;
}
\ No newline at end of file
diff --git a/pages/radetail/index.js b/pages/radetail/index.js
index 7bf3fc7..2855cd5 100644
--- a/pages/radetail/index.js
+++ b/pages/radetail/index.js
@@ -50,7 +50,6 @@ Page({
that.setData({
data: res.data.activity
})
-
that.setData({
activityStartTime: util.formatTime(res.data.activity.activityStartTime, "yyyy-MM-dd hh:mm:ss"),
activityEndTime: util.formatTime(res.data.activity.activityEndTime, "yyyy-MM-dd hh:mm:ss"),
diff --git a/utils/imgurl.js b/utils/imgurl.js
index ed4c66f..7c17ea3 100644
--- a/utils/imgurl.js
+++ b/utils/imgurl.js
@@ -721,4 +721,16 @@ module.exports = {
'url': baseUrl + "we.png",
'name': ''
},
+ "sort":{
+ "url":baseUrl + "noSort.png",
+ 'name':''
+ },
+ 'up':{
+ 'url' : baseUrl + 'up.png',
+ 'name':''
+ },
+ 'down':{
+ 'url' : baseUrl + 'down.png',
+ 'name':''
+ }
}
\ No newline at end of file