Add F码使用时间

data/logic/queue.logic.php

@@ -151,12 +151,13 @@ class queueLogic
      */
     public function updateGoodsFCode($fc_ids)
     {
-        $update = Model('goods_fcode')->editGoodsFCode(array('fc_state' => 1), array('fc_id' => array('in',$fc_ids)));
+        $update = Model('goods_fcode')->editGoodsFCode(array('fc_state' => 1,'consume_time' => time()), array('fc_id' => array('in',$fc_ids)));
         if (!$update) {
             return callback(false, '更新F码使用状态失败fc_ids:' . implode(',',$fc_ids));
         } else {
             return callback(true);
-        }    }
+        }
+    }
 
     /**
      * 删除购物车

helper/model/goods_summary.php

@@ -14,14 +14,11 @@ class goods_summary
     private $goods_commonid;
     private $goods_info;
     private $bundles;
-
     const new_goods_speriod = 10 * 3600 * 24;
-    private $mStartTm;
 
 
     public function __construct($param)
     {
-        $this->mStartTm = time();
         if(is_array($param)) {
             $this->goods_info = $param;
             $this->goods_id = intval($this->goods_info['goods_id']);
@@ -73,10 +70,8 @@ class goods_summary
     private function is_new()
     {
         $add_time  = intval($this->goods_info['goods_addtime']);
-        $edit_time = intval($this->goods_info['goods_edittime']);
-
-        $start = $this->mStartTm - self::new_goods_speriod;
-        return ($add_time > $start || $edit_time > $start);
+        $start = time() - self::new_goods_speriod;
+        return ($add_time > $start);
     }
 
     public function format(&$act_type, &$act_id,user_session\favorite $favorate,user_session\anotice $anotice,$main_page)

mobile/control/member_ugc.php

@@ -698,4 +698,24 @@ class member_ugcControl extends specialControl
         $success = ugc_helper::subscribe($memberid,$special_id);
         return self::outsuccess(['success' => $success]);
     }
+    public function report_pageOp()
+    {
+        $special_id = intval($_GET['special_id']);
+        if($special_id < 0) {
+            return self::outerr(errcode::ErrParamter,"该专题不存在");
+        }
+
+        return self::outsuccess(['special_id' => $special_id],'ugc/report');
+    }
+    public function reportOp()
+    {
+        $special_id = intval($_GET['special_id']);
+        $content = urldecode($_GET['content']);
+        if($special_id > 0 && !empty($content)) {
+            $content = text_filter::filter_input($content);
+            $mod_report = Model();
+            $mod_report->table('special_report')->insert(['special_id' => $special_id,'reporter_id' => session_helper::memberid(),'content' => $content]);
+        }
+        return self::outsuccess([]);
+    }
 }

mobile/control/special.php

@@ -127,6 +127,7 @@ class specialControl extends mobileHomeControl
                 'mobile_page' => mobile_page(1));
         }
     }
+
     protected function pri_special($special_id)
     {
         $result = special_manager::instance()->special($special_id,$goods_ids,false);
@@ -397,6 +398,7 @@ class tpl_ugc
 
     private function show_comment_header()
     {
+        $report_url = BASE_SITE_URL . "/mobile/index.php?act=member_ugc&op=report_page&special_id={$this->special_id()}";
         $str = '';
         $clicks = $this->special->clicks();
         if(!$this->preview())
@@ -406,7 +408,7 @@ class tpl_ugc
                             <div class=\"pro_title\">评论</div>
                             <div class=\"reading\">阅读量 {$clicks}</div>
                             <div class=\"complaint\">
-                                <a href=\"#\">投诉</a>
+                                <a href=\"{$report_url}\">投诉</a>
                             </div>
                         </div>
                         <div class=\"comment_list\"></div>
@@ -475,23 +477,36 @@ class tpl_ugc
         } else {
             $url = BASE_SITE_URL . "/mshop/goods_detail?goods_id={$goods_id}";
         }
-//            <span class="badge_null">已经售罄</span>
-//            <span class="badge_hot">人气热卖</span>
-//            <span class="badge_new">熊猫新品</span>
-//            <span class="badge_low">好物低价</span>
-//            <span class="badge_limit">限时特价</span>
+
+        if($summary['goods_storage'] <= 0) {
+            $state = '<span class="badge_null">已经售罄</span>';
+        }
+        elseif($summary['act_id'] > 0) {
+            $state = '<span class="badge_limit">限时特价</span>';
+        }
+        elseif($summary['is_new']) {
+            $state = '<span class="badge_new">熊猫新品</span>';
+        }
+        else {
+            $state = '';
+        }
+
+        $goods_price = $summary['goods_price'];
+        $bonus_price = $summary['bonus_price'];
+        $discount = $goods_price - $bonus_price;
+
         $str = "<div class=\"recommend_goods\">
                     <div class=\"goods_item\">
                         <a href=\"{$url}\">
-                            <span class=\"badge_new\">熊猫新品</span>
+                            {$state}
                             <div class=\"goods\">
                                 <div class=\"goods_img\"><img src=\"{$summary['goods_image_url']}\" alt=\"熊猫美妆\"></div>
                                 <div class=\"goods_desc\">
                                     <p class=\"goods_title\">{$summary['goods_mobile_name']}</p>
                                     <p class=\"goods_pro\">{$summary['goods_jingle']}</p>
                                     <p class=\"goods_price\">
-                                        ¥{$summary['goods_price']}
-                                        <span class=\"shoppe\">专柜价 205 / 红包抵<span class=\"bonus_price\">169.6</span>元</span>
+                                        ¥{$bonus_price}
+                                        <span class=\"shoppe\">专柜价 {$goods_price} / 红包抵<span class=\"bonus_price\">{$discount}</span>元</span>
                                     </p>
                                 </div>
                             </div>";

mobile/templates/default/ugc/complaint.php

@@ -7,7 +7,7 @@
     <meta name="format-detection" content="telephone=no">
     <link rel="stylesheet" href="<?php echo RESOURCE_SITE_URL; ?>/mobile/ugc/css/complaint.css?<?php echo bonus_version(); ?>">
 </head>
-<body data-special_id="">
+<body data-special_id="<?php echo $output['special_id'];?>">
     <div class="maincontent">
         <p class="prompt">请选择投诉原因</p>
         <div class="grup">
@@ -73,7 +73,8 @@
                    complaint.set_option(option);
                }
            });
-           $('.submit_btn').on('touchstart',function () {
+           $('.submit_btn').on('touchstart',function ()
+           {
                $('.shade').show();
                var options = complaint.get_options();
                if(options.length <= 0)
@@ -82,7 +83,7 @@
                    alert('请选择您的投诉原因');
                    return;
                }
-               var url = host + '/mobile/index.php?act=member_ugc&op=complaint&client_type=ajax&special_id=' + specialId + '&options=' + encodeURI(complaint.get_options());
+               var url = host + '/mobile/index.php?act=member_ugc&op=report&client_type=ajax&special_id=' + specialId + '&content=' + encodeURI(complaint.get_options());
                $.ajax({
                    type: "get",
                    async: false,