|
@@ -13,32 +13,37 @@ function Page(url,from_app, member_id, bridge, loadImages) {
|
|
|
Page.prototype = {
|
|
|
wapInit: function () {
|
|
|
if (this.member_id <= 0) {
|
|
|
- alert('未登录');
|
|
|
+ alert('请到熊猫美妆APP中体验!');
|
|
|
}
|
|
|
else {
|
|
|
this.init();
|
|
|
+ this.ajaxInit();
|
|
|
}
|
|
|
},
|
|
|
appInit: function () {
|
|
|
+ var self = this;
|
|
|
if (this.member_id <= 0) {
|
|
|
- bridge.call_native_handler('on_native_click', '{"action":"login"}', function (data) {
|
|
|
+ self.bridge.call_native_handler('on_native_click', '{"action":"login"}', function (data) {
|
|
|
var jsdata = JSON.parse(data);
|
|
|
if (!jsdata.login) {
|
|
|
- bridge.call_native_handler('on_native_click', '{"action":"back"}', function (data) {});
|
|
|
+ self.bridge.call_native_handler('on_native_click', '{"action":"back"}', function (data) {});
|
|
|
return;
|
|
|
}
|
|
|
else {
|
|
|
- this.init();
|
|
|
+ self.ajaxInit(function() {
|
|
|
+ self.myslider.next();
|
|
|
+ });
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
else {
|
|
|
- this.init();
|
|
|
+ self.ajaxInit(function() {
|
|
|
+ self.myslider.next();
|
|
|
+ });
|
|
|
}
|
|
|
},
|
|
|
init: function () {
|
|
|
var self = this;
|
|
|
- self.ajaxInit();
|
|
|
this.myslider = new iSlider({
|
|
|
wrap: '.wrap',
|
|
|
item: '.item',
|
|
@@ -81,7 +86,7 @@ Page.prototype = {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- ajaxInit: function () {
|
|
|
+ ajaxInit: function (callback) {
|
|
|
var self = this;
|
|
|
$.ajax({
|
|
|
type: "get",
|
|
@@ -96,6 +101,7 @@ Page.prototype = {
|
|
|
if (res.code == 200) {
|
|
|
self.nickname = res.datas.nickname;
|
|
|
self.bestWish = res.datas.bestWish;
|
|
|
+ callback&&callback();
|
|
|
}
|
|
|
else {
|
|
|
alert(res.message);
|
|
@@ -109,7 +115,12 @@ Page.prototype = {
|
|
|
pageOneStart: function () {
|
|
|
var self = this;
|
|
|
$('.page1 .btn').on('click', function () {
|
|
|
- self.myslider.next();
|
|
|
+ if (self.fromApp) {
|
|
|
+ self.appInit();
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ self.myslider.next();
|
|
|
+ }
|
|
|
});
|
|
|
},
|
|
|
pageTwoStart: function () {
|