Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5

rqq
Commit 6895d32f455b6003f4651567f0768f82a07b859b 2 parents 825e4468 12fcd166
Showing 9 changed files with 34 additions and 16 deletions
library/Plugin/DataProcess/ShopProcess.php
library/Plugin/Helpers.php
static/dist/myohobuy/1.3.27/index-debug.js
static/dist/myohobuy/1.3.27/index.css
static/dist/myohobuy/1.3.27/index.js
static/js/me/order.js
static/sass/me/_suggest.css
yohobuy/m.yohobuy.com/application/controllers/Home.php
yohobuy/m.yohobuy.com/application/modules/Guang/controllers/Info.php
--- a/library/Plugin/DataProcess/ShopProcess.php
View file @6895d32
+++ b/library/Plugin/DataProcess/ShopProcess.php
View file @6895d32
@@ -70,7 +70,7 @@ class ShopProcess
             //店铺简介页地址
             self::$shopData['shopIntroHref'] = Helpers::url('/product/index/intro', array('shop_id' => self::$shopId));
         } else {
-            self::$shopData['allGoods'] = Helpers::url('', $allGoodsParam, 'search').'&openby:yohobuy={"action":"go.list","params":{"title":"全部商品", "actiontype":"0","shop_id":"'.self::$shopId.'","page":"1"}}';
+            self::$shopData['allGoods'] = Helpers::url('', $allGoodsParam, 'search') . '&openby:yohobuy={"action":"go.list","params":{"title":"全部商品", "actiontype":"0","shop_id":"' . self::$shopId . '","page":"1"}}';
             self::$shopData['shopIntroHref'] = Helpers::url('/product/index/intro', array('shop_id' => self::$shopId, 'app_version' => self::$appVersion));
         }
         //搜索链接
@@ -78,7 +78,7 @@ class ShopProcess
         //人气单品的链接
         self::$shopData['more_url'] = Helpers::url('', array('shop_id' => self::$shopId, 'order' => 's_n_d', 'title' => '人气单品',), 'search');
         if (self::$appVersion) {
-            self::$shopData['more_url'] = 'openby:yohobuy＝{"action":"go.list","params":{"shop_id":"'.self::$shopId.'","title":"人气单品"}}';
+            self::$shopData['more_url'] = 'openby:yohobuy＝{"action":"go.list","params":{"shop_id":"' . self::$shopId . '","title":"人气单品"}}';
         }
     }
@@ -148,11 +148,13 @@ class ShopProcess
             if (empty($val['brandDomain'])) {
                 continue;
             }
-            $brandId .= $val['id'].',';
-            $appSuffix = 'openby:yohobuy={"action":"go.brand","params":{"shop_id":"'.self::$shopId.'","brand_id":"'.$val['id'].'"}}';
-            $brand['url'] = Helpers::url('', '', $val['brandDomain']);
+            $brandId .= $val['id'] . ',';
+            // tar modified 1606031153 跳转当前店铺下的这个品牌的商品列表
+            $appSuffix = 'openby:yohobuy={"action":"go.list","params":{"shop_id":"' . self::$shopId . '","brand_id":"' . $val['id'] . '"}}';
+//            $brand['url'] = Helpers::url('', '', $val['brandDomain']);
+            $brand['url'] = Helpers::url('', array('shop_id' => self::$shopId, 'brand_id' => $val['id']), 'list');
             if (!empty(self::$appVersion)) {
-                $brand['url'] .= '?'.$appSuffix;
+                $brand['url'] .= '?' . $appSuffix;
             }
             $brand['img'] = Images::getImageUrl($val['brandIco'], 640, 400);
             $brand['brandName'] = $val['brandName'];
@@ -178,6 +180,7 @@ class ShopProcess
             self::$shopData['bannerTop']['list'][] = array('url' => $slide['data'][0]['url'], 'img' => $slide['data'][0]['src']);
         }
     }
+
     /**
      * 热门分类
      * @param array $data
@@ -204,8 +207,8 @@ class ShopProcess
                 'url' => Helpers::getUrlBySkc($val['productId'], $val['goodsId'], $val['cnAlphabet']),
                 'img' => Helpers::getImageUrl($val['src'], 235, 314),
                 'productName' => $val['productName'],
-                'salesPrice' => '￥'.$val['salesPrice'],
-                'presentPrice' => '￥'.$val['salesPrice']
+                'salesPrice' => '￥' . $val['salesPrice'],
+                'presentPrice' => '￥' . $val['salesPrice']
             );
             if (!empty(self::$appVersion)) {
                 $goods['url'] .= '?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":' . $val['productSkn'] . '}}';
--- a/library/Plugin/Helpers.php
View file @6895d32
+++ b/library/Plugin/Helpers.php
View file @6895d32
@@ -349,7 +349,7 @@ class Helpers
         $result['showTags'] = $showTag;
         $result['img'] = isset($articleData['src']) ? self::getImageUrl($articleData['src'], 640, 640) : '';
         //逛详情页app跳转url处理 20160601
-        $result['url'] = $articleData['url'] . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' . self::url('/info/index', array(), 'guang') . '","islogin":"N"}}';
+        $result['url'] = self::getUrlSafe($articleData['url'] . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' . self::url('/info/index', array(), 'guang') . '","islogin":"N"}}');
         $result['title'] = $articleData['title'];
         $result['text'] = $articleData['intro'];
         $result['publishTime'] = $articleData['publish_time'];
@@ -377,7 +377,8 @@ class Helpers
                 $articleData['author']['url'] = Helpers::getFilterUrl($articleData['author']['url']);
             }
             //编辑人员 app跳转url处理 20160601
-            $articleData['author']['url'].='&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['author']['author_id'] . '"},"share":"","id":' . $articleData['author']['author_id'] . ',"type":0,"islogin":"N","url":"' . self::url('/author/index', array(), 'guang') . '"}}';
+            $articleData['author']['url'].='&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['author']['author_id'] . '"},"share":"","id":' . $articleData['author']['author_id'] . ',"type":0,"islogin":"N","url":"' . self::transHttpsUrl(self::url('/author/index', array(), 'guang')) . '"}}';
+            $articleData['author']['url'] = self::getUrlSafe($articleData['author']['url']);
             $result['author'] = $articleData['author'];
             if (isset($result['author']['avatar'])) {
                 $result['author']['avatar'] = strtr($result['author']['avatar'], array('http://' => '//'));
@@ -957,4 +958,14 @@ class Helpers
     {
         return preg_replace('/^\/\//', 'http://', $url);
     }
+    
+    /**
+     * http和https转换成//
+     * @param type $url 地址
+     * @return type string 
+     */
+    public static function getUrlSafe($url)
+    {
+        return '//' . strtr($url, array('http://' => '', 'https://' => ''));
+    }
 }
--- a/static/dist/myohobuy/1.3.27/index-debug.js
View file @6895d32
+++ b/static/dist/myohobuy/1.3.27/index-debug.js
View file @6895d32
--- a/static/dist/myohobuy/1.3.27/index.css
View file @6895d32
+++ b/static/dist/myohobuy/1.3.27/index.css
View file @6895d32
--- a/static/dist/myohobuy/1.3.27/index.js
View file @6895d32
+++ b/static/dist/myohobuy/1.3.27/index.js
View file @6895d32
--- a/static/js/me/order.js
View file @6895d32
+++ b/static/js/me/order.js
View file @6895d32
@@ -216,7 +216,6 @@ orderHammer.on('tap', function(e) {
             });
         });
     } else if ($cur.closest('.cancel').length > 0) {
-        console.log('s');
         $reaMask.css('visibility', 'visible');
     } else if ($cur.closest('.order-goods').length > 0) {
--- a/static/sass/me/_suggest.css
View file @6895d32
+++ b/static/sass/me/_suggest.css
View file @6895d32
@@ -158,6 +158,7 @@
     .suggest-sub-form {
         background: #fff;
         width: 100%;
+        min-height: 800px;
         #suggest-textarea {
             box-sizing: border-box;
--- a/yohobuy/m.yohobuy.com/application/controllers/Home.php
View file @6895d32
+++ b/yohobuy/m.yohobuy.com/application/controllers/Home.php
View file @6895d32
@@ -939,10 +939,14 @@ class HomeController extends AbstractAction
         $hasWxShare = strpos($this->server('HTTP_USER_AGENT', ''), 'MicroMessenger') !== false;
         if ($hasWxShare) {
-            $tools = new JsApiPay();
-            $openId = $tools->GetOpenid();
-            if ($openId) {
-                $this->setSession('weixinOpenId', $openId);
+            $openId = $this->getSession('weixinOpenId' . $orderCode);
+            if (empty($openId)) {
+                $tools = new JsApiPay();
+                $openId = $tools->GetOpenid();
+                if ($openId) {
+                    $this->setSession('weixinOpenId', $openId);
+                    $this->setSession('weixinOpenId' . $orderCode, $openId);
+                }
             }
         }
--- a/yohobuy/m.yohobuy.com/application/modules/Guang/controllers/Info.php
View file @6895d32
+++ b/yohobuy/m.yohobuy.com/application/modules/Guang/controllers/Info.php
View file @6895d32
@@ -61,7 +61,7 @@ class InfoController extends AbstractAction
             //guang双头部的问题 20160601
             $authorTmp = explode("?id=", $detail['getAuthor']['url']);
             $authorId=$authorTmp[1];
-            $data['guang']['author']['url'] = $detail['getAuthor']['url'] .'&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $authorId . '"},"share":"","id":' .$authorId . ',"type":0,"islogin":"N","url":"' . Helpers::url('/author/index', array(), 'guang') . '"}}';
+            $data['guang']['author']['url'] = Helpers::getUrlSafe($detail['getAuthor']['url'] .'&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $authorId . '"},"share":"","id":' .$authorId . ',"type":0,"islogin":"N","url":"' . Helpers::transHttpsUrl(Helpers::url('/author/index', array(), 'guang')) . '"}}');
         }
         $data['detail'] = array();