Merge branch 'develop/wap' into beta/wap

Conflicts:
	static/dist/myohobuy/1.3.8/index.css
	static/dist/myohobuy/1.3.8/lib.js

@@ -237,7 +237,7 @@ gulp.task('concat-min-libs', ['pre-libs'], function() {
 
 
     fs.writeFileSync(path, jsStr.substr(jsStr.indexOf('});') + 4));
     fs.writeFileSync(path, jsStr.substr(jsStr.indexOf('});') + 4));
 
 
-    return gulp.src(['plugin/sea.js', distDir.js + '/libs.js'])
+    return gulp.src(['js/plugin/sea.js', distDir.js + '/libs.js'])
         .pipe(concat('lib.js'))
         .pipe(concat('lib.js'))
         .pipe(uglify())
         .pipe(uglify())
         .pipe(gulp.dest(distDir.js));
         .pipe(gulp.dest(distDir.js));

@@ -12,21 +12,20 @@ class XinshiliController extends HuodongAction
     // const STATIC_FILE = 'http://localhost:2222/1.0.3';
     // const STATIC_FILE = 'http://localhost:2222/1.0.3';
     const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.3';
     const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.3';
 
 
+    private $_uid;
+
 
 
     /**
     /**
      * 检测登录状态
      * 检测登录状态
      *
      *
-     * @return int
      */
      */
     private function getLoggedUid()
     private function getLoggedUid()
     {
     {
         if ($this->_isApp) {
         if ($this->_isApp) {
-            $uid = $this->get('uid');
+            $this->_uid = $this->get('uid');
         } else {
         } else {
-            $uid = $this->getUid();
+            $this->_uid = $this->getUid();
         }
         }
-
-        return $uid;
     }
     }
 
 
     /**
     /**
@@ -36,8 +35,8 @@ class XinshiliController extends HuodongAction
     {
     {
         $playUrl = Helpers::url('/cuxiao/xinshili/index');
         $playUrl = Helpers::url('/cuxiao/xinshili/index');
 
 
-        $uid = $this->getLoggedUid();
-        if (!$uid) {
+        $this->getLoggedUid();
+        if (!$this->_uid) {
             if (!$this->_isApp) {
             if (!$this->_isApp) {
                 $this->go(Helpers::url('/signin.html', array('refer' => $playUrl), 'default'));
                 $this->go(Helpers::url('/signin.html', array('refer' => $playUrl), 'default'));
             } else {
             } else {
@@ -90,8 +89,7 @@ class XinshiliController extends HuodongAction
             }
             }
 
 
             $activityId = $this->getActivityId();
             $activityId = $this->getActivityId();
-            $uid = $this->getLoggedUid();
-            $result = XinshiliModel::getXinshiliCoupon($uid, $activityId);
+            $result = XinshiliModel::getXinshiliCoupon($this->_uid, $activityId);
         } while (false);
         } while (false);
 
 
         $this->echoJson($result);
         $this->echoJson($result);