From a5241e5bc6e2afa14fb33a8223c897c8384b8c89 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Mon, 22 Oct 2018 11:22:08 +0800
Subject: [PATCH] =?UTF-8?q?[=E8=A7=A3=E9=99=A4=E6=B3=A8=E9=87=8A][?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E8=A7=A3=E9=99=A4=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/index.js | 14 +-------------
pages/index/index.wxml | 2 +-
pages/user/index.wxml | 5 ++---
pages/user/index.wxss | 1 -
4 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/pages/index/index.js b/pages/index/index.js
index 1f5cc9b..b7848d6 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -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();
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7e71aea..32a4334 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -9,5 +9,5 @@
独家福利,抢完即止
-->
-
+
\ No newline at end of file
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index bd5c4b8..266c206 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -13,9 +13,8 @@
-
-
-
+
+ 编辑
diff --git a/pages/user/index.wxss b/pages/user/index.wxss
index e5b65f3..5cb7fcc 100644
--- a/pages/user/index.wxss
+++ b/pages/user/index.wxss
@@ -233,7 +233,6 @@
display: block;
}
.activeimg{
- display: none;
width: 200rpx!important;
position: absolute;
bottom: 0;