fix goods push fcode

helper/async_push/status.php

@@ -37,12 +37,12 @@ class status implements IPusher
 
     private function check_present()
     {
-        if($this->mem_info->order_num() > 0) {
-            return false;
-        }
-        if($this->mem_info->first_present() > 0) {
-            return false;
-        }
+//        if($this->mem_info->order_num() > 0) {
+//            return false;
+//        }
+//        if($this->mem_info->first_present() > 0) {
+//            return false;
+//        }
 
         $result = fcode\present_manager::instance()->fetch($this->mem_info->mobile(),null);
         if($result == false) return false;

helper/model/goods_common.php

@@ -131,17 +131,21 @@ class common_spec extends common_base
         }
 
         $attrs = unserialize($this->common_info['goods_attr']);
-        foreach ($attrs as $key => $val)
+        $this->attr_list = [];
+        if(!empty($attrs))
         {
-            foreach ($val as $attr_key => $attr_val)
+            foreach ($attrs as $key => $val)
             {
-                if($attr_key === 'name') {
-                    $name = $attr_val;
-                } else {
-                    $value = $attr_val;
+                foreach ($val as $attr_key => $attr_val)
+                {
+                    if($attr_key === 'name') {
+                        $name = $attr_val;
+                    } else {
+                        $value = $attr_val;
+                    }
                 }
+                $this->attr_list[] = ["name" => $name,"value" => $value];
             }
-            $this->attr_list[] = array("name" => $name,"value" => $value);
         }
     }
 

mobile/control/webpush.php

@@ -21,12 +21,11 @@ class webpushControl extends mobileHomeControl
     public function fcodeOp()
     {
         $fc_id = intval($_GET['fc_id']);
-        return self::outsuccess(['schema' => new wpush_fcode_tpl($fc_id)],"webpush/fcode",'wap');
+        return self::outsuccess(['tpl' => new wpush_fcode_tpl($fc_id)],"webpush/fcode",'wap');
     }
 
     public function bonusOp()
     {
-
     }
 }
 
@@ -39,7 +38,7 @@ class wpush_fcode_tpl
         $this->mFcode = $mod_fcode->getGoodsFCode(['fc_id' => $fc_id],true);
     }
 
-    public function schema() {
+    private function schema() {
         $common_id = $this->mFcode['goods_commonid'];
         $batch_code = $this->mFcode['batch_code'];
         $mobile = $this->mFcode['mobile'];
@@ -48,4 +47,45 @@ class wpush_fcode_tpl
         $schema = schema_helper::openurl("购物首单礼",$url);
         return $schema;
     }
+    private function summary()
+    {
+        $common_id = intval($this->mFcode['goods_commonid']);
+        $helper = new goods_helper(false);
+        $gids = commonid_helper::instance()->goods_ids($common_id);
+        $ret = $helper->get_spu($common_id,$gids[0],$err);
+
+        $summarys = $ret['summary'];
+        foreach ($summarys as $summary)
+        {
+            if($common_id == $summary['goods_commonid'])
+                return $summary;
+        }
+        return false;
+    }
+
+    public function show()
+    {
+        $schema = $this->schema();
+        $summary = $this->summary();
+
+        $price = intval($summary['goods_price'] * 100 + 0.5) / 100;
+        $marketprice = intval($summary['goods_marketprice'] * 100 + 0.5) / 100;
+
+        $str = "<div class=\"push_content\">
+                    <a href=\"{$schema}\" class=\"schema_link\">
+                        <p class=\"push_label\">恭喜您获得新客专享礼</p>
+                        <h3 class=\"push_title\">{$summary['goods_mobile_name']}</h3>
+                        <div class=\"goods_img\">
+                            <img src=\"{$summary['goods_image_url']}\" class=\"img\">
+                            <div class=\"label\">
+                                <p class=\"sale_price\">{$price}元购</p>
+                                <p class=\"original_price\"><span>专柜价{$marketprice}</span></p>
+                            </div>
+                        </div>
+                        <div class=\"btn\"><span class=\"look_btn\">查看详情</span></div>
+                    </a>
+                </div>";
+        return $str;
+    }
+
 }

mobile/templates/default/webpush/fcode.php

@@ -134,29 +134,14 @@
 </head>
 <body>
 <div class="container">
-    <div class="push_content">
-        <a href="<?php echo $output['schema']->schema(); ?>" class="schema_link">
-            <p class="push_label">恭喜您获得新客专享礼</p>
-            <h3 class="push_title">兰芝致美焕颜5件套</h3>
-            <div class="goods_img">
-                <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/push/fcode/push_bg.png" class="img">
-                <div class="label">
-                    <p class="sale_price">0.1元购</p>
-                    <p class="original_price"><span>专柜价267</span></p>
-                </div>
-            </div>
-            <div class="btn"><span class="look_btn">查看详情</span></div>
-        </a>
-    </div>
+    <?php echo $output['tpl']->show(); ?>
     <span class="close_btn"><img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/push/fcode/close.png" class="img"></span>
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/new_bridge.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript">
     window.onload = function ()
     {
-
         var bridge = new Bridge();
-
         var ImgLoad = function (images,callback)
         {
             this.images = images;
@@ -232,7 +217,7 @@
             var jsonobject = {
                 action: "back"
             };
-            call_native_handler('on_native_click', JSON.stringify(jsonobject));
+            bridge.call_native_handler('on_native_click', JSON.stringify(jsonobject));
         });
     }
 </script>