统一调整H5中的桥

mobile/control/bonusex.php

@@ -182,7 +182,11 @@ class bonusexControl extends mobileControl
             $mine_bonus = bonus_helper::filter_bonus($mine_bonus);
 
             if($bonus_obj->isBinded()) {
-                return self::outsuccess(array('type_info' => $type_info, 'mine_bonus' => $mine_bonus,'binded_info' => $binded_info,'avatars' => $avatars),"bonus/content");
+                return self::outsuccess(array('type_info' => $type_info,
+                    'mine_bonus' => $mine_bonus,
+                    'binded_info' => $binded_info,
+                    'avatars' => $avatars),
+                    "bonus/content");
             }
             elseif($type->isEnd()) {
                  return self::outsuccess(array('type_info' => $type_info),"bonus/end");
@@ -194,7 +198,11 @@ class bonusexControl extends mobileControl
                     $ret = bonus_helper::bind_bonus($bonus_obj->bonus_sn(),$_SESSION['MPHPSESSID'],session_helper::cur_mobile(),$new_sn);
                     if($ret == true) {
                         $mine_bonus = bonus_helper::get_mine_by_bonussn($new_sn);
-                        return self::outsuccess(array('type_info' => $type_info, 'mine_bonus' => $mine_bonus,'binded_info' => $binded_info,'avatars' => $avatars),"bonus/content");
+                        return self::outsuccess(array('type_info' => $type_info,
+                            'mine_bonus' => $mine_bonus,
+                            'binded_info' => $binded_info,
+                            'avatars' => $avatars),
+                            "bonus/content");
                     } else {
                         return self::outsuccess(array('type_info' => $type_info, 'mine_bonus' => $mine_bonus,'binded_info' => $binded_info,'avatars' => $avatars),"bonus/bind");
                     }
@@ -228,7 +236,10 @@ class bonusexControl extends mobileControl
                             return self::outerr(errcode::ErrBonus,"无此红包.");
                         }
                         $this->fileter_typeinfos($type_infos,$type_info,$binded_info,$avatars);
-                        $data = array('type_info' => $type_info, 'mine_bonus' => $mine_bonus,'binded_info' => $binded_info,'avatars' => $avatars);
+                        $data = array('type_info' => $type_info,
+                            'mine_bonus' => $mine_bonus,
+                            'binded_info' => $binded_info,
+                            'avatars' => $avatars);
                         return self::outsuccess($data,"bonus/content");
                     } else {
                         $data = array('type_info' => $type_info, 'mine_bonus' => $mine_bonus,'binded_info' => $binded_info,'avatars' => $avatars);
@@ -785,6 +796,8 @@ function bonus_brands()
 function bonus_caninvite($output)
 {
     $type_info = $output['type_info'];
+    if(empty($type_info)) return false;
+
     $type = \bonus\type::create_by_paramer($type_info);
     if($type->binded_over() == false) {
         return true;
@@ -792,6 +805,17 @@ function bonus_caninvite($output)
         return false;
     }
 }
+function bonus_canshare($output)
+{
+    $type_info = $output['type_info'];
+    if(empty($type_info)) return false;
 
+    $type = \bonus\type::create_by_paramer($type_info);
+    if($type->binded_over() || $type->isEnd()) {
+        return false;
+    } else {
+        return true;
+    }
+}
 
 

mobile/control/control.php

@@ -254,4 +254,8 @@ class mbMemberControl extends mobileControl
 function bonus_version()
 {
     return "v=20161222";
+}
+function shop_version()
+{
+    return "v=20161226";
 }

mobile/control/member_feedback.php

@@ -19,9 +19,10 @@ class member_feedbackControl extends mobileControl
         parent::__construct();
     }
 
-    /**
-     * 添加反馈
-     */
+    public function pageOp()
+    {
+        self::outsuccess(NULL,'shop/feedback','wap');
+    }
     public function addOp()
     {
         $mb_feedback = Model('mb_feedback');

mobile/templates/default/bonus/content.php

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <title>熊猫美妆红包</title>
     <meta name="format-detection" content="telephone=no" />
-    <script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/flexible.js??<?php echo bonus_version(); ?>"></script>
+    <script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/flexible.js?<?php echo bonus_version(); ?>"></script>
     <link rel="stylesheet" href="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/css/common_rem.css?<?php echo bonus_version(); ?>"/>
     <link rel="stylesheet" href="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/css/content_rem.css?<?php echo bonus_version(); ?>"/>
 </head>
@@ -36,6 +36,7 @@
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/wx_share.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/zepto.min.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/tel.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/bridge.js?<?php echo bonus_version(); ?>"></script>
 <script>
     function app()
     {
@@ -81,9 +82,8 @@
     }
     window.onload = function ()
     {
-        var binded_over = <?php echo bonus_binded_over($output); ?>
-        alert(binded_over);
-//        call_native_handler('on_native_init','{"action":"goods_detail","params":{"goods_id":"' + goods_id + '"}}');
+        var can_share = <?php echo bonus_canshare($output); ?>;
+        call_native_handler('on_native_click','{"action":"view_init","params":{"can_share":"' + can_share + '"}}');
     }
 
 </script>

mobile/templates/default/bonus/detail.php

@@ -37,7 +37,6 @@
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/zepto.min.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/tel.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/bridge.js?<?php echo bonus_version(); ?>"></script>
-
 <script>
     function app()
     {
@@ -80,12 +79,12 @@
     } else if (isMobile.Android) {
         init_android_bridge();
     } else {
-        alert("本设备不支持摇一摇功能");
     }
+
     window.onload = function ()
     {
-        var can_invite = <?php echo bonus_caninvite($output); ?>;
-        call_native_handler('on_native_click','{"action":"view_init","params":{"can_invite":"' + can_invite + '"}}');
+        var can_share = <?php echo bonus_canshare($output); ?>;
+        call_native_handler('on_native_click','{"action":"view_init","params":{"can_share":"' + can_share + '"}}');
     }
 </script>
 </body>

mobile/templates/default/bonus/invite.php

@@ -131,7 +131,6 @@
     } else if (isMobile.Android) {
         init_android_bridge();
     } else {
-        alert("本设备不支持摇一摇功能");
     }
 
     var can_invite = true;

mobile/templates/default/game/shake_bonus.php

@@ -65,6 +65,8 @@
                     $('.top_border').removeClass('border_opacity');
                     $('.bottom_border').removeClass('border_opacity');
                     call_native_handler('onSendRequestor',speed,null);
+                    call_native_handler('on_native_click','{"action":"send_req","params":{"speed":' + speed +'}}',null);
+
                     $('.loading_icon').css('display','block');
                 },1500);
             }

mobile/templates/default/shop/feedback.php

@@ -0,0 +1,238 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>意见反馈</title>
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">
+    <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/mshop/js/common/zepto.min.js?<?php echo shop_version(); ?>"></script>
+
+    <style type="text/css">
+        html,
+        body,
+        form,
+        p,
+        textarea,
+        input{
+            padding: 0;
+            margin: 0;
+            font-size: 14px;
+        }
+        html {
+            width: 100%;
+            height: 100%;
+            position: relative;
+            background: #f6f6f6;
+        }
+        input,textarea {
+            border: none;
+            background: #fff;
+            -webkit-appearance: none;
+            outline:none;
+            color:#454545;
+        }
+        textarea{resize:none}
+        .text {
+            width: 90%;
+            height: 160px;
+            margin:10px auto;
+            margin-top: 20px;
+            border: none;
+            border-radius: 5px;
+        }
+        .text textarea {
+            width: 92%;
+            height: 84%;
+            padding: 4%;
+        }
+        .input_msg {
+            background: #fff;
+            margin: 0 auto;
+            margin-bottom: 10px;
+            width: 86%;
+            padding-left: 4%;
+            height: 40px;
+            line-height: 40px;
+            border-radius: 5px;
+        }
+        input {
+            width: 80%;
+        }
+        span {
+            color: #858585;
+        }
+        .prompt {
+            width: 88%;
+            margin: 0 auto;
+            color: #858585;
+        }
+        .prompt p {
+            font-size: 12px;
+        }
+        input.submit {
+            width: 90%;
+            height: 40px;
+            background: #ff4e4e;
+            display: block;
+            margin: 15px auto;
+            border-radius: 5px;
+            color: #fff;
+        }
+        .layer_box {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background: rgba(0,0,0,0.3);
+            display: none;
+        }
+        .layer {
+            text-align: center;
+            width: 80%;
+            height: 193px;
+            border-radius: 5px;
+            background: #fff;
+            position: absolute;
+            left: 50%;
+            top: 25%;
+            margin-left: -40%;
+        }
+        .layer .title {
+
+            font-size: 20px;
+            height: 48px;
+        }
+        .title p {
+            font-size: 19px;
+            line-height: 49px;
+            color: #454545;
+        }
+        .close {
+            border-top: 1px solid #f6f6f6;
+            height: 50px;
+            line-height: 50px;
+        }
+        .close button{
+            width: 100%;
+            color: #ff4e4e;
+            font-size: 18px;
+            outline:none;
+            border:0;
+            background: #fff;
+            -webkit-appearance: none;
+        }
+        .return_msg {
+            margin: 10px 0;
+            line-height: 20px;
+        }
+        .return_msg p{
+            color: #959595;
+            padding-bottom: 10px;
+            height: 12px;
+        }
+        .img img {
+            width: 50px;
+            height: 50px;
+        }
+        input::-webkit-input-placeholder  {
+            color: #858585 !important;
+        }
+        textarea::-webkit-input-placeholder  {
+            color: #858585 !important;
+        }
+    </style>
+</head>
+
+<body>
+<div class="maincontent">
+    <form>
+        <div class="text">
+            <textarea placeholder="请输入150字" name="message" id="msg"></textarea>
+        </div>
+        <div class="input_msg">
+            <label><span>电话：</span><input type="tel" placeholder="请输入您的电话号码" name="tel" id="tel"/></label>
+        </div>
+        <div class="prompt">
+            <p>您可以留下联系方式方便我们及时反馈您的问题</p>
+        </div>
+        <div>
+            <input type="button" value="提交" class="submit" id="submit" />
+        </div>
+    </form>
+
+</div>
+<div class="layer_box">
+    <div class="layer">
+        <div class="title">
+            <p>反馈成功</p>
+        </div>
+        <div class="img">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/mshop/images/right.png"/>
+        </div>
+        <div class="return_msg">
+            <p>感谢你的反馈，我们会做的更好!</p>
+        </div>
+        <div class="close">
+            <button>确定</button>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/bridge.js?<?php echo bonus_version(); ?>"></script>
+<script>
+    $(function()
+    {
+        $('#submit').on('touchstart',function(e){
+            var msg=$('#msg').val(),
+                msgLength=msg.length,
+                tel=$('#tel').val();
+            if(msgLength>150){
+                alert("亲!最多可填150个字哦！");
+                return;
+            }
+            if(msgLength==''){
+                alert("亲！你的意见对我们很重要哦！");
+                return;
+            }
+
+            var url_host=window.location.hostname;
+
+            $('input').blur();
+            $.ajax({
+                type:'GET',
+                dataType:'jsonp',
+                jsonp:'callback',
+                url:'/mobile/index.php?act=member_feedback&op=add&client_type=ajax',
+                data:{
+                    feedback:msg,
+                    mobile:tel
+                },
+                success:function(data) {
+                    if(data.code=="200"){
+                        $('.layer_box').css('display','block');
+                    }
+                    else {
+                        return false;
+                    }
+                }
+            })
+        });
+
+        $('.close').on('touchend',function(){
+            event.preventDefault();
+            $('.layer_box').css('display','none');
+            call_native_handler('on_native_click','{"action":"back","params":null}');
+        });
+
+        if(isMobile.iOS()) {
+            init_ios_bridge(function(bridge) { });
+        } else if (isMobile.Android) {
+            init_android_bridge();
+        } else {
+        }
+    })
+</script>
+
+</body>
+</html>
+

test/queueTest.php

@@ -21,6 +21,14 @@ class queueTest extends PHPUnit_Framework_TestCase
 
     public function testPush()
     {
+        //{"action":"sendreq","params":null}
+        $x['action'] = 'sendreq';
+        $x['params'] = array('speed' => 30);
+
+        $y = json_encode($x);
+
+
+
         $param['member_id'] = 36490;
         $param['text']      = "红包退还通知:您发送的红包已超过24小时,退还未被领取的金额1234元，请在收支明细中查看.";
         $param['go_type']   = '';