Commit f6ec2830f3876a6de0db57f9184dc338d31d6482

Authored by 后端研发-苏明海
2 parents 9e7f0ca4 a4763fba

Merge branch 'dev' into 'test'

Dev

See merge request !400
components/diy_searchbox/diy_searchbox.wxml
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'> 26 <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'>
27 <navigator url="/pages/goods/search/search" class="s1_gk_a2"> 27 <navigator url="/pages/goods/search/search" class="s1_gk_a2">
28 <image src='/public/static/images/model/select.png'></image> 28 <image src='/public/static/images/model/select.png'></image>
29 - <text>在店铺内搜索-{{object.is_top}}</text> 29 + <text>在店铺内搜索</text>
30 </navigator> 30 </navigator>
31 </view> 31 </view>
32 32
pages/cart/cart/cart.js
@@ -94,9 +94,10 @@ Page({ @@ -94,9 +94,10 @@ Page({
94 //--- 看后台是不是有开通等级卡 --- 94 //--- 看后台是不是有开通等级卡 ---
95 if(conf.switch_list){ 95 if(conf.switch_list){
96 var s_list=JSON.parse(conf.switch_list); 96 var s_list=JSON.parse(conf.switch_list);
  97 + var user=getApp().globalData.userInfo;
97 //如果后台有开启等级价的功能 98 //如果后台有开启等级价的功能
98 - if(parseInt(s_list.rank_switch)==2){  
99 - var user=getApp().globalData.userInfo; 99 + if(user && parseInt(s_list.rank_switch)==2 && user['card_expiredate']){
  100 +
100 var str = user['card_expiredate'].replace(/-/g, '/'); 101 var str = user['card_expiredate'].replace(/-/g, '/');
101 var end = new Date(str); 102 var end = new Date(str);
102 end = Date.parse(end) / 1000; 103 end = Date.parse(end) / 1000;
pages/goods/goodsInfo/goodsInfo.js
@@ -613,7 +613,7 @@ Page({ @@ -613,7 +613,7 @@ Page({
613 t.data.data['disc'] = txt; 613 t.data.data['disc'] = txt;
614 614
615 if (t.data.data.original_img.indexOf(o.imghost) == -1) 615 if (t.data.data.original_img.indexOf(o.imghost) == -1)
616 - t.data.data.original_img = o.imghost + t.data.data.original_img; 616 + t.data.data.original_img = o.imghost + t.data.data.original_img;
617 617
618 if (t.data.data.goods_content == null) t.data.data.goods_content = ""; 618 if (t.data.data.goods_content == null) t.data.data.goods_content = "";
619 619
@@ -1471,6 +1471,8 @@ Page({ @@ -1471,6 +1471,8 @@ Page({
1471 gb++; 1471 gb++;
1472 } 1472 }
1473 item.gg = gg; 1473 item.gg = gg;
  1474 + item.original_img=os.imghost+item.spec_img;
  1475 +
1474 if (item.goods_id == g_id) { 1476 if (item.goods_id == g_id) {
1475 gitem = item; 1477 gitem = item;
1476 } else { 1478 } else {