zhashaonan 6 年之前
父节点
当前提交
90a39ec892

+ 0 - 1
data/resource/mobile/festival/newYear/css/style.css

@@ -80,7 +80,6 @@ img {
     align-items: center;
     overflow: hidden;
 }
-
 .item .content {
     position: relative;
     width: 100%;

二进制
data/resource/mobile/festival/newYear/image/page2/qian.gif


+ 19 - 8
data/resource/mobile/festival/newYear/js/newYear.js

@@ -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 () {

+ 2 - 2
mobile/control/control.php

@@ -331,9 +331,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018122603";
+    return "v=2018122604";
 }
 function shop_version()
 {
-    return "v=2018122603";
+    return "v=2018122604";
 }

+ 1 - 16
mobile/templates/default/festival/newYear/index.php

@@ -89,8 +89,6 @@ $info = $output['info'];
         var member_id = <?php echo session_helper::memberid(); ?>;
         var session_id = '<?php echo session_helper::session_id(); ?>';
         var from_app = <?php $t = session_helper::isapp(); echo $t ? 'true' : 'false'; ?>;
-//        alert('member_id:' + member_id);
-//        alert('from_app:' + from_app);
         var removeDefault = function (e) {
             e.preventDefault(); //阻止默认的处理方式(阻止下拉滑动的效果)
         };
@@ -194,20 +192,7 @@ $info = $output['info'];
         ]
         var page = new Page(url, from_app, member_id, bridge, loadImages);
         if (from_app) {
-//            page.appInit();
-
-            if (member_id <= 0) {
-                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) {});
-                        return;
-                    }
-                    else {
-//                        this.init();
-                    }
-                });
-            }
+            page.init();
         }
         else {
             page.wapInit();