Browse Source

[解除注释][修改]:解除注释

tags/2.2.5
meo 6 years ago
parent
commit
a5241e5bc6
4 changed files with 4 additions and 18 deletions
  1. +1
    -13
      pages/index/index.js
  2. +1
    -1
      pages/index/index.wxml
  3. +2
    -3
      pages/user/index.wxml
  4. +0
    -1
      pages/user/index.wxss

+ 1
- 13
pages/index/index.js View File

@@ -32,21 +32,16 @@ Page({
* 生命周期函数--监听页面初次渲染完成
*/
onLoad: function(options) {
console.log(options,2222222)
if(options.played=="true"){
this.setData({
played:true
})
}
var that = this;
console.log(options);
console.log("这是options")
var scene = decodeURIComponent(options.scene);
that.setData({
scene:scene
});
// console.log(that.data.scene)
// console.log(scene);
app.getLocation();
if (options.couponChannelId && options.couponId){
that.userLogin(options.couponChannelId, options.couponId);
@@ -60,9 +55,7 @@ Page({
}
})
.then(res=>{
// console.log(res.data.weapNote);
let weapNote = JSON.parse(res.data.weapNote);
// console.log(weapNote.firstpage);
that.setData({
desc: weapNote.firstpage.desc,
title: weapNote.firstpage.title
@@ -70,7 +63,6 @@ Page({
})
},
onShow:function(){
// console.log(app.globalData.havePlayEd)
this.setData({
havePlayEd: app.globalData.havePlayEd ? app.globalData.havePlayEd:false
})
@@ -118,7 +110,6 @@ Page({
}) => {
wx.getSystemInfo({
success: function (res) {
// console.log(JSON.stringify(res))
that.setData({
systemInfo: JSON.stringify(res)
})
@@ -157,10 +148,7 @@ Page({
that.setData({
showGame: true
})
/**
* 暂时注释
*/
// that.getGameOne(res.data.token)
that.getGameOne(res.data.token)
}
Http.setToken(res.data.token);
that.checkUserCarStatus();


+ 1
- 1
pages/index/index.wxml View File

@@ -9,5 +9,5 @@
<text>独家福利,抢完即止</text>
</view> -->
<c-coupons id="lists" bind:myevent="onGetCode" />
<!-- <g-entry id="listss" wx:if="{{showGame&&!played&&!havePlayEd}}" gamedata="{{gamedata}}" bind:myevent="" /> -->
<g-entry id="listss" wx:if="{{showGame&&!played&&!havePlayEd}}" gamedata="{{gamedata}}" bind:myevent="" />
</view>

+ 2
- 3
pages/user/index.wxml View File

@@ -13,9 +13,8 @@
<image src='./../../assets/img/redirect.png' mode='widthFix'></image>
</view>
</view>
<!-- <view class='chengzhang1' bindtap='gotoedit'> -->
<view class='chengzhang1'>
<!-- <text style="color:#01bffe;">编辑</text> -->
<view class='chengzhang1' bindtap='gotoedit'>
<text style="color:#01bffe;">编辑</text>
<image class='activeimg' src='./../../assets/img/active.gif' mode='widthFix'></image>
</view>
</view>


+ 0
- 1
pages/user/index.wxss View File

@@ -233,7 +233,6 @@
display: block;
}
.activeimg{
display: none;
width: 200rpx!important;
position: absolute;
bottom: 0;


Loading…
Cancel
Save