Merge remote-tracking branch 'origin/release/5.1' into release/5.1

@@ -50,7 +50,7 @@ const banner = () => {
         cache: true,
         code: 200
     }).then((result) => {
-        console.log(result)
+
         if (result && result.data) {
             return result.data[0];
         }

@@ -109,10 +109,13 @@ const packageData = (id, isApp) => {
         }
 
         return Promise.all(promises).then(datas => {
+
+            let getArticleContent = {};
+
             if (datas) {
                 if (datas[1]) {
 
-                    let getArticleContent = datas[1].data;
+                    getArticleContent = datas[1].data;
 
                     result.getArticleContent = getArticleContent;
 

@@ -256,6 +256,14 @@ const getRelatedEditorial = (brandId, uid, udid, clientType, isApp) => {
     });
 };
 
+const privateKeyList = {
+    android: 'fd4ad5fcfa0de589ef238c0e7331b585',
+    iphone: 'a85bb0674e08986c6b115d5e3a4884fa',
+    ipad: 'ad9fcda2e679cf9229e37feae2cdcf80',
+    web: '0ed29744ed318fd28d2c07985d3ba633',
+    h5: 'fd4ad5fcfa0de589ef238c0e7331b585'
+};
+
 // 是否收藏
 const isCollection = (uid, brandId, clientType) => {
     return serviceAPI.get('shops/service/v1/favorite/getUidBrandFav', {
@@ -264,7 +272,6 @@ const isCollection = (uid, brandId, clientType) => {
         client_type: clientType,
         private_key: privateKeyList[clientType]
     }).then((result) => {
-
         if (result && result.code === 200) {
 
             let isLike = true;
@@ -319,6 +326,7 @@ const getDetailData = (id, uid, udid, gender, isApp, clientType) => {
                     shareTitle: list.brandName,
                     shareImg: list.brandIco,
                     shareDesc: htmlProcess.removeHtml(list.brandIntro)
+
                 });
 
                 return list;

@@ -30,5 +30,12 @@
                 <span class="iconfont icon-yoho-enter">&#xe604;</span>
             </a>
         </div>
+        <div class="connect-item connect-online">
+            <a href="tel:4008869646" target="_blank" title="热线客服">
+                <span class="icon iconfont icon-chat">&#xe63e;</span>
+                热线客服 <span class="call-time">(9:00-22:30)</span>
+                <span class="iconfont icon-yoho-enter call-number">400-886-9646</span>
+            </a>
+        </div>
     </div>
 </div>
\ No newline at end of file

@@ -225,7 +225,7 @@ $.extend({
 }(window, document, 'script', (document.location.protocol === 'https:' ? 'https' : 'http') + '://cdn.yoho.cn/yas-jssdk/1.0.18/yas.js', '_yas'));
 
 (function() {
-    var uid = getUid();
+    var uid = getUid() || queryString().uid;
 
     uid = uid === 0 ? '' : uid;
 

@@ -206,6 +206,8 @@ function loadMore($container, opt, url) {
         loading.showLoadingMask();
     }
 
+    opt.app_version = '1';
+
     num = $container.find('.guang-info').length;
     searching = true;
     $.ajax({
@@ -258,6 +260,7 @@ function loadMore($container, opt, url) {
             delete opt.isTab;
         },
         error: function() {
+            console.log('error');
             tip.show('网络断开连接了~');
             searching = false;
             delete opt.isTab;

@@ -126,6 +126,15 @@
             &.highlight {
                 background: #eee;
             }
+
+            .call-time {
+                color: #ccc;
+                font-size: 24px;
+            }
+
+            .call-number {
+                color: #444;
+            }
         }
         .icon {
             display: inline-block;