modify bonus text and inoherb author

mobile/control/bonusex.php

@@ -138,7 +138,7 @@ class bonusexControl extends mobileControl
                     return self::outsuccess(array('type_info' => $type_info),"bonus/end");
                 }
                 else if($type->binded_over()) {
-                    return self::outsuccess(array('type_info' => $type_info,'msg' => "手慢了，红包派完了"),"bonus/over");
+                    return self::outsuccess(array('type_info' => $type_info,'msg' => "手慢了，红包已派完～"),"bonus/over");
                 } else {
                     return self::outsuccess(array('type_info' => $type_info,'relay_id' =>$relay_id),"bonus/open");
                 }
@@ -268,13 +268,13 @@ class bonusexControl extends mobileControl
                 return self::outsuccess(array('type_info' => $type_info),"bonus/end");
             }
             elseif($type->binded_over()) {
-                return self::outsuccess(array('type_info' => $type_info,'msg' => "手慢了，红包派完了"),"bonus/over");
+                return self::outsuccess(array('type_info' => $type_info,'msg' => "手慢了，红包已派完～"),"bonus/over");
             }
             else
             {
                 $bonus = bonus_helper::grab_bonus($type_sn);
                 if($bonus == false) {
-                    return self::outsuccess(array('type_info' => $type_info,'msg' => "手慢了，红包派完了"),"bonus/over");
+                    return self::outsuccess(array('type_info' => $type_info,'msg' => "手慢了，红包已派完～"),"bonus/over");
                 }
                 else
                 {
@@ -1023,11 +1023,11 @@ function bonus_out_rule()
         <p class="pro">红包使用方法</p>
     </div>
     <div class="briefing text_left">
-        <p><span>1.</span> 在熊猫美妆APP或微商城中，购物即可使用。</p>
-        <p><span>2.</span> 购物时,系统优先使用完折扣率大的再使用折扣率小的红包。</p>
+        <p><span>1.</span> 在熊猫美妆APP或微信商城中购物，即可使用。</p>
+        <p><span>2.</span> 购物时,系统优先使用折扣率大的红包。</p>
         <p><span>3.</span> 不同折扣红包自动叠加使用，福利更实在。</p>
         <p><span>4.</span> 也可以在APP中，把红包分享给亲友。</p>
-        <p><span>5.</span> 红包是丽人员工福利，请勿分享给非亲非故之人。</p>
+        <p><span>5.</span> 红包是丽人员工福利，请勿分享给亲友以外的人。</p>
   
         <div class="center briefing_address">
             公司地址：上海市徐汇区番禺路876号

mobile/control/index.php

@@ -67,16 +67,18 @@ class indexControl extends specialControl
 
     public function inoherbOp()
     {
-        if(session_helper::need_wechat_author())
-        {
-            $author = new thrid_author\wxauthor();
-            $url = "http://p.lrlz.com/hfive/inoherb/index.html?2";
-            $author->enter($url);
-            return;
-        }
-        else {
-            fcgi_header('location:http://p.lrlz.com/hfive/inoherb/index.html?2');
-        }
+        fcgi_header('location:http://p.lrlz.com/hfive/inoherb/index.html?2');
+
+//        if(session_helper::need_wechat_author())
+//        {
+//            $author = new thrid_author\wxauthor();
+//            $url = "http://p.lrlz.com/hfive/inoherb/index.html?2";
+//            $author->enter($url);
+//            return;
+//        }
+//        else {
+//            fcgi_header('location:http://p.lrlz.com/hfive/inoherb/index.html?2');
+//        }
     }
 
     public function memberOp()

mobile/control/inoherb.php

@@ -32,16 +32,9 @@ class inoherbControl extends mobileControl
             $url = "http://p.lrlz.com/hfive/inoherb/index.html?2";
         }
 
-        if(session_helper::need_wechat_author())
-        {
-            $author = new thrid_author\wxauthor();
-            $author->enter($url);
-            return;
-        }
-        else {
-            fcgi_header("location:{$url}");
-        }
+        fcgi_header("location:{$url}");
     }
+
     public function listOp()
     {
         $items = $this->items($this->page_size(),false);
@@ -61,6 +54,15 @@ class inoherbControl extends mobileControl
         if(empty($content)) {
             return self::outerr(errcode::ErrParamter,"填写的内容不能为空.");
         }
+        $flower_type = intval($_GET['flower_type']);
+
+        $url = BASE_SITE_URL . "/mobile/index.php?act=inoherb&op=add&content={$content}&flower_type={$flower_type}";
+        if(session_helper::need_wechat_author())
+        {
+            $author = new thrid_author\wxauthor();
+            $author->enter($url);
+            return;
+        }
 
         $content = urldecode($content);
         $trans = new trans_wapper($this->mModInoherb,__METHOD__);
@@ -180,10 +182,17 @@ class inoherbControl extends mobileControl
         if($inoherb_id < 0) {
             return self::outerr(errcode::ErrParamter,'错误的文章序列号.');
         }
+        if(empty(session_helper::unionid()))
+        {
+            return self::outsuccess(['articles' => null,
+                'mobile_page' => mobile_page(0)]);
+        }
+
         $item = $this->item(['unionid' => session_helper::unionid()],true);
         if(empty($item)) {
             return self::outsuccess(['articles' => null,
-                'mobile_page' => mobile_page(0)]);        }
+                'mobile_page' => mobile_page(0)]);
+        }
         else
         {
             $articles = $this->format($item);

mobile/templates/default/bonus/unstart.php

@@ -15,7 +15,7 @@
     <div class="bg_position dot_right"></div>
     <div class="content center">
         <div class="msg_box">
-            <p class="name">让红包飞一会</p>
+            <p class="name">让红包飞一会儿</p>
             <p class="name">距离开抢时间还有</p>
         </div>
         <div class="time_box">
@@ -26,8 +26,7 @@
     </div>
     <div class="line line_1"></div>
     <div class="bottom_pro center">
-        <p class="">独家运营70多个知名化妆品品牌的天猫官方旗舰店</p>
-        <p><s class="icon_logo"></s>上海丽人丽妆化妆品股份有限公司出品</p>
+        <p><s class="icon_logo"></s>上海丽人丽妆化妆品股份有限公司</p>
     </div>
     <?php bonus_output_unstart($output); ?>
 </div>