Merge branch 'feature/code-style' of http://git.yoho.cn/fe/yoho-luck into feature/code-style

@@ -74,7 +74,7 @@ const pageOpen = data => {
     PAGE_PARAM: _pageParam(options, path),
     PAGE_PARAM: _pageParam(options, path),
     PAGE_NAME: _pageName(options, path),
     PAGE_NAME: _pageName(options, path),
     FROM_PAGE_NAME: _pageName(options, fromPath),
     FROM_PAGE_NAME: _pageName(options, fromPath),
-    FROM_PAGE_PARAM: _pageParam(fromOptions, fromPath)
+    FROM_PAGE_PARAM: options.fromPageParam || _pageParam(fromOptions, fromPath)
   });
   });
 };
 };
 
 

@@ -58,6 +58,7 @@ Component({
       } else {
       } else {
         router.go('detail', {
         router.go('detail', {
           tabIdx: +this.data.tabIdx + 1,
           tabIdx: +this.data.tabIdx + 1,
+          fromPageParam: +this.data.tabIdx + 1,  
           actPrizeId: this.properties.item.act_prize_id
           actPrizeId: this.properties.item.act_prize_id
         });
         });
       }
       }

@@ -11,6 +11,7 @@ Component({
     onClick() {
     onClick() {
       router.go('detail', {
       router.go('detail', {
         tabIdx: +this.data.tabIdx + 1,
         tabIdx: +this.data.tabIdx + 1,
+        fromPageParam: +this.data.tabIdx + 1,  
         actPrizeId: this.properties.product.id
         actPrizeId: this.properties.product.id
       });
       });
     }
     }

@@ -13,6 +13,7 @@ Component({
     goDetail() {
     goDetail() {
       router.go('detail', {
       router.go('detail', {
         tabIdx: +this.data.tabIdx + 1,
         tabIdx: +this.data.tabIdx + 1,
+        fromPageParam: +this.data.tabIdx + 1,
         actPrizeId: this.properties.product.id
         actPrizeId: this.properties.product.id
       });
       });
     }
     }