Merge branch 'dev' into 'test'

Dev See merge request !400

Merge branch 'dev' into 'test'
Dev See merge request !400
后端研发-苏明海
2 parents 9e7f0ca4 a4763fba
Showing 3 changed files with 7 additions and 4 deletions
components/diy_searchbox/diy_searchbox.wxml
pages/cart/cart/cart.js
pages/goods/goodsInfo/goodsInfo.js
@@ -26,7 +26,7 @@
     <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'>
         <navigator url="/pages/goods/search/search" class="s1_gk_a2">
         <image src='/public/static/images/model/select.png'></image>
-        <text>在店铺内搜索-{{object.is_top}}</text>
+        <text>在店铺内搜索</text>
         </navigator>
     </view>
@@ -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;
@@ -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 {