diff --git a/components/banner/index.js b/components/banner/index.js
index 5b75f25..98b1996 100644
--- a/components/banner/index.js
+++ b/components/banner/index.js
@@ -28,10 +28,17 @@ Component({
// 小程序路径
let indexOf = (e.currentTarget.dataset.data.pagePath).indexOf("=");
let id = (e.currentTarget.dataset.data.pagePath).substring(indexOf);
- console.log(id);
- wx.redirectTo({
- url: `/pages/radetail/index?id=${id}`,
- })
+ let type = (e.currentTarget.dataset.data.pagePath).substr(23,2)
+ console.log(indexOf, id, type);
+ if(type == 'cd'){
+ wx.navigateTo({
+ url: `/${e.currentTarget.dataset.data.pagePath}`,
+ })
+ } else if (type == 'ra'){
+ wx.navigateTo({
+ url: `/pages/radetail/index?id=${id}`,
+ })
+ }
}else if(e.currentTarget.dataset.data.type==2){
// 自由图文
wx.navigateTo({
diff --git a/index/index.js b/index/index.js
index 7b110af..3937e07 100644
--- a/index/index.js
+++ b/index/index.js
@@ -96,7 +96,7 @@ Page({
duration: 2000
})
this.setData({
- alphaData: animation.export()
+ alphaData1: animation.export()
})
},
// 我的卡包
@@ -295,6 +295,7 @@ Page({
}, 8000)
// 如果有广告
setTimeout(function () {
+ // debugger
that.alphaClick1();
}, 8000)
},
diff --git a/index/index.wxml b/index/index.wxml
index 36918e7..c80b793 100644
--- a/index/index.wxml
+++ b/index/index.wxml
@@ -108,7 +108,7 @@
-
+
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 31b577f..486584e 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -931,6 +931,7 @@ Page({
})
},
onShow() {
+ app.globalData.havePlayEd1 = true;
this.setData({
showbutton: false,
showbutton1: false