浏览代码

debug bargain

stanley-king 7 年之前
父节点
当前提交
8637b06785

+ 6 - 4
data/resource/mobile/bargain/css/main.css

@@ -414,16 +414,18 @@ ul,li {
     z-index: 100;
 }
 .bargain_details .sponsor_name {
-    position: absolute;
-    bottom: -77px;
-    left: 108px;
+    white-space: nowrap;
+    font-size: 24px;
+    color: #000000;
+    position: relative;
+    top: -50px;
 }
 .bargain_details .title {
+    padding-top: 117px;
     position: relative;
     color: #999999;
     font-size: 34px;
     text-align: center;
-    padding-top: 117px;
     background:rgba(255,255,255,0.8);
     border-top-left-radius: 30px;
     border-top-right-radius: 30px;

+ 26 - 18
mobile/control/bargain.php

@@ -100,6 +100,26 @@ class bargainControl extends mobileControl
         }
     }
 
+    public function detailOp()
+    {
+        if (!session_helper::logined()) {
+            throw new UnloginException();
+        }
+
+        $bargain_id = intval($_GET['bargain_id']);
+        if(!$this->validate($bargain_id)) {
+            return self::outerr(errcode::ErrParamter);
+        }
+        else {
+            $tpl = new tpl_bargain($bargain_id);
+            $ret = room\factory_client::instance()->invite($tpl->room(),session_helper::memberid());
+            if($ret != false) {
+                $ret['addr'] = $this->mAccAddr;
+            }
+            return self::outsuccess(['tpl' => new tpl_bargain($bargain_id),'room' => $ret],'bargain/bargain');
+        }
+    }
+
     public function mine_listOp()
     {
         if (!session_helper::logined()) {
@@ -163,22 +183,6 @@ class bargainControl extends mobileControl
         }
     }
 
-    public function detailOp()
-    {
-        if (!session_helper::logined()) {
-            throw new UnloginException();
-        }
-
-        $bargain_id = intval($_GET['bargain_id']);
-        if(!$this->validate($bargain_id)) {
-            return self::outerr(errcode::ErrParamter);
-        }
-        else {
-            return self::outsuccess(['tpl' => new tpl_bargain($bargain_id)],'bargain/bargain');
-        }
-    }
-
-
     private function share_detail($bargain_id,$summary) {
         $result = [];
         $result['url'] = url_helper::bargain_open_url($bargain_id);
@@ -360,8 +364,12 @@ class tpl_bargain
             $minfo = new member_info($this->mBargain->creator());
             $avatar = $minfo->avatar();
             $name = $minfo->nickname();
-            $str = "<img class=\"head_portrait\" src=\"{$avatar}\">
-                <span class=\"sponsor_name\">{$name}</span>";
+            $str = "<div class=\"sponsor\">
+                        <img class=\"head_portrait\" src=\"{$avatar}\">
+                    </div>
+                    <header class=\"title\">
+                        <span class=\"sponsor_name\">{$name}</span>
+                    </header>";
             return $str;
         }
         catch (Exception $ex)

+ 2 - 2
mobile/control/control.php

@@ -300,9 +300,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018013002";
+    return "v=20180131";
 }
 function shop_version()
 {
-    return "v=20180130";
+    return "v=20180131";
 }

+ 1 - 5
mobile/templates/default/bargain/bargain.php

@@ -15,10 +15,7 @@
     <div class="main">
         <div class="content">
             <div class="bargain_details">
-                <div class="sponsor">
-                    <?php echo $output['tpl']->show_creator();?>">
-                </div>
-                <header class="title"></header>
+                <?php echo $output['tpl']->show_creator();?>
                 <?php $output['tpl']->show_goods(); ?>
             </div>
 
@@ -31,7 +28,6 @@
                     <span class="bargain_btn" id="bargain_btn"></span>
                     <span class="join_btn hide" id="join_btn"></span>
                 <?php }?>
-<!--                <p><span class="just_buy">懒得砍 直接买也优惠 >></span></p>-->
             </div>
 
             <div class="bargain_users">