diff --git a/components/diy_searchbox/diy_searchbox.wxml b/components/diy_searchbox/diy_searchbox.wxml index b662c14..cb77060 100644 --- a/components/diy_searchbox/diy_searchbox.wxml +++ b/components/diy_searchbox/diy_searchbox.wxml @@ -26,7 +26,7 @@ - 在店铺内搜索-{{object.is_top}} + 在店铺内搜索 diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index bb3a0f7..7277b7e 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -94,9 +94,10 @@ Page({ //--- 看后台是不是有开通等级卡 --- if(conf.switch_list){ var s_list=JSON.parse(conf.switch_list); + var user=getApp().globalData.userInfo; //如果后台有开启等级价的功能 - if(parseInt(s_list.rank_switch)==2){ - var user=getApp().globalData.userInfo; + if(user && parseInt(s_list.rank_switch)==2 && user['card_expiredate']){ + var str = user['card_expiredate'].replace(/-/g, '/'); var end = new Date(str); end = Date.parse(end) / 1000; diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index fd4e63f..0961c40 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -613,7 +613,7 @@ Page({ t.data.data['disc'] = txt; if (t.data.data.original_img.indexOf(o.imghost) == -1) - t.data.data.original_img = o.imghost + t.data.data.original_img; + t.data.data.original_img = o.imghost + t.data.data.original_img; if (t.data.data.goods_content == null) t.data.data.goods_content = ""; @@ -1471,6 +1471,8 @@ Page({ gb++; } item.gg = gg; + item.original_img=os.imghost+item.spec_img; + if (item.goods_id == g_id) { gitem = item; } else {