Authored by lijing

合并release/guang

... ... @@ -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;
... ...
... ... @@ -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;
... ...