Merge branch 'feature/usercenter' of git.yoho.cn:fe/yohobuywap-node into feature/usercenter

@@ -36,7 +36,7 @@ let favProduct = (req, res, next) => {
 
 
     favoriteModel.favProduct(uid, page, limit).then((result) => {
     favoriteModel.favProduct(uid, page, limit).then((result) => {
 
 
-        if (typeof(result.total) === "undefined") {
+        if (typeof(result.total) === "undefined" && typeof(result.more) === "undefined") {
             res.render('favorite/favorite-product', {
             res.render('favorite/favorite-product', {
                 layout: false,
                 layout: false,
                 hasFavProduct: result.hasFavProduct
                 hasFavProduct: result.hasFavProduct
@@ -54,7 +54,7 @@ let favfavBrand = (req, res, next) => {
 
 
     favoriteModel.favfavBrand(uid, page, limit).then((result) => {
     favoriteModel.favfavBrand(uid, page, limit).then((result) => {
 
 
-        if (typeof(result.total) === "undefined") {
+        if (typeof(result.total) === "undefined" && typeof(result.more) === "undefined") {
             res.render('favorite/favorite-brand', {
             res.render('favorite/favorite-brand', {
                 layout: false,
                 layout: false,
                 hasFavBrand: result.hasFavBrand
                 hasFavBrand: result.hasFavBrand

@@ -104,7 +104,7 @@ const favProduct = (uid, page, limit) => {
                 });
                 });
 
 
             } else {
             } else {
-                resu.end = true;
+                resu.more = true;
             }
             }
 
 
             return resu;
             return resu;
@@ -122,7 +122,7 @@ const favfavBrand = (uid, page, limit) => {
         page: page,
         page: page,
         limit: limit
         limit: limit
     }).then((result) => {
     }).then((result) => {
-        console.log(result)
+
         let resu = {
         let resu = {
             hasFavBrand: []
             hasFavBrand: []
         }
         }
@@ -188,10 +188,9 @@ const favfavBrand = (uid, page, limit) => {
                 });       
                 });       
                
                
             } else {
             } else {
-                resu.end = true;
+                resu.more = true;
             }
             }
 
 
-            console.log(resu);
             return resu;
             return resu;
         } else {
         } else {
             logger.error('收藏品牌 cood 不是 200');
             logger.error('收藏品牌 cood 不是 200');

@@ -38,4 +38,8 @@
     </div>
     </div>
     {{/if}}
     {{/if}}
 </div>
 </div>
-{{/ hasFavBrand}}
+{{/ hasFavBrand}}
+
+{{!-- {{#if more}}
+    <div class="fav-brand-load-more">没有更多了</div>
+{{/if}} --}}

@@ -30,4 +30,7 @@
         </div>
         </div>
     </a>
     </a>
 </li>
 </li>
-{{/ hasFavProduct}}
+{{/ hasFavProduct}}
+{{!-- {{#if more}}
+    <div class="fav-brand-load-more">没有更多了</div>
+{{/if}} --}}

@@ -18,8 +18,8 @@ module.exports = {
         // api: 'http://devapi.yoho.cn:58078/',
         // api: 'http://devapi.yoho.cn:58078/',
         // service: 'http://devservice.yoho.cn:58077/',
         // service: 'http://devservice.yoho.cn:58077/',
 
 
-        api: 'http://testapi.yoho.cn:28078/',
-        service: 'http://testservice.yoho.cn:28077/',
+        api: 'http://api.yoho.cn/',
+        service: 'http://service.yoho.cn/',
         singleApi: 'http://192.168.102.31:8092/'
         singleApi: 'http://192.168.102.31:8092/'
     },
     },
     subDomains: {
     subDomains: {

@@ -96,7 +96,8 @@ function loadData($parent, url, page) {
                 $loadingMask.addClass('hide');
                 $loadingMask.addClass('hide');
                 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
                 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
                 window.rePosFooter();
                 window.rePosFooter();
-            } else if (data.end === true) {
+            } else if (data.more === true) {
+                console.log(0)
 
 
                 //处理data等于end时如果loadingMask存在且没有hide样式的情况
                 //处理data等于end时如果loadingMask存在且没有hide样式的情况
                 if ($loadingMask && !$loadingMask.hasClass('hide')) {
                 if ($loadingMask && !$loadingMask.hasClass('hide')) {
@@ -204,6 +205,7 @@ favContentHammer.on('tap', function(e) {
                     dialogText: '已经取消收藏'
                     dialogText: '已经取消收藏'
                 });
                 });
                 $(e.target).closest('li').remove();
                 $(e.target).closest('li').remove();
+                location.reload();
             } else if (data.code === 400) {
             } else if (data.code === 400) {
                 diaLog.showDialog({
                 diaLog.showDialog({
                     autoHide: true,
                     autoHide: true,