Commit ae945bdaeec0d7bf90a91cf71c180aff9d06c821

Authored by yvan.ni
1 parent c260f2e4

1.门店不匹配的优化。

2.信息完善的优化
3、 搜索框的优化
components/diy_searchbox/diy_searchbox.wxml
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <view style='background-color:{{object.top_bgcolor}}; display: flex; align-items: center; justify-content: space-around; height: 100rpx;' > 22 <view style='background-color:{{object.top_bgcolor}}; display: flex; align-items: center; justify-content: space-around; height: 100rpx;' >
23 <view class='s2_left'> 23 <view class='s2_left'>
24 <navigator open-type="switchTab" url="/pages/goods/categoryList/categoryList" class="s1_gk_a1"> 24 <navigator open-type="switchTab" url="/pages/goods/categoryList/categoryList" class="s1_gk_a1">
25 - <image src='/public/static/images/model/nav.png' style="margin:0;position: relative;left: 6rpx"></image> 25 + <image src='{{imghost}}/miniapp/images/model/nav.png' style="margin:0;position: relative;left: 6rpx"></image>
26 </navigator> 26 </navigator>
27 </view> 27 </view>
28 <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'> 28 <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'>
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 </view> 38 </view>
39 <view class='s2_right'> 39 <view class='s2_right'>
40 <navigator open-type="switchTab" url="/pages/cart/cart/cart" class="s1_gk_a1"> 40 <navigator open-type="switchTab" url="/pages/cart/cart/cart" class="s1_gk_a1">
41 - <image src='/public/static/images/model/car.png' style="margin:0;;"></image> 41 + <image src='{{imghost}}/miniapp/images/model/car.png' style="margin:0;;"></image>
42 </navigator> 42 </navigator>
43 </view> 43 </view>
44 </view> 44 </view>
packageA/pages/goodsInfo/goodsInfo.js
@@ -303,9 +303,10 @@ Page({ @@ -303,9 +303,10 @@ Page({
303 var ee=JSON.parse(JSON.stringify(e)); 303 var ee=JSON.parse(JSON.stringify(e));
304 //--定时器推迟一下-- 304 //--定时器推迟一下--
305 setTimeout(function () { 305 setTimeout(function () {
306 - if(th.data.data) var g_distr_type=th.data.data.distr_type; 306 + if(!th.data.data) return false;
  307 + var ser_card=th.data.data;
307 //--如果默认门店不在等级卡的默认们店以内 308 //--如果默认门店不在等级卡的默认们店以内
308 - if(that.data.storageId!=null && that.data.storageId!="" && that.data.storageId.indexOf(ee.keyid)==-1){ 309 + if(ser_card.storageId!=null && ser_card.storageId!="" && ser_card.storageId.indexOf(ee.keyid)==-1){
309 ee.is_no_dis=1; 310 ee.is_no_dis=1;
310 } 311 }
311 312
@@ -1759,9 +1760,10 @@ Page({ @@ -1759,9 +1760,10 @@ Page({
1759 var index = th.data.sec_pick_index; 1760 var index = th.data.sec_pick_index;
1760 item = th.data.sec_sto.s_arr[index]; 1761 item = th.data.sec_sto.s_arr[index];
1761 } 1762 }
1762 - 1763 +
  1764 + var ser_card=this.data.data;
1763 //判断门店的配送方式是不是匹配 1765 //判断门店的配送方式是不是匹配
1764 - if(th.data.storageId!=null && th.data.storageId!="" && th.data.storageId.indexOf(item.keyid)==-1){ 1766 + if(ser_card.storageId!=null && ser_card.storageId!="" && ser_card.storageId.indexOf(item.keyid)==-1){
1765 wx.showToast({ 1767 wx.showToast({
1766 title: "门店配送方式不匹配", 1768 title: "门店配送方式不匹配",
1767 icon: 'none', 1769 icon: 'none',
packageA/pages/goodsInfo/goodsInfo.wxml
@@ -20,7 +20,8 @@ @@ -20,7 +20,8 @@
20 <view class="xc-videos-picture rel"> 20 <view class="xc-videos-picture rel">
21 <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box swiperContainer rel" duration="{{1000}}" indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange"> 21 <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box swiperContainer rel" duration="{{1000}}" indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange">
22 <swiper-item> 22 <swiper-item>
23 - <image class="wh100" src="{{iurl + data.image_url}}" mode="aspectFit" binderror="bind_bnerr" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image> 23 + <image class="wh100" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}" binderror="bind_bnerr"
  24 + mode="aspectFit" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image>
24 </swiper-item> 25 </swiper-item>
25 </swiper> 26 </swiper>
26 </view> 27 </view>
@@ -176,7 +177,7 @@ @@ -176,7 +177,7 @@
176 <view class="pding"> 177 <view class="pding">
177 <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon> 178 <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
178 <view class="spec-goods"> 179 <view class="spec-goods">
179 - <image class="wh100 spec-img" src="{{iurl + data.image_url}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"/> 180 + <image class="wh100 spec-img" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}" binderror="pop_err_img" data-errorimg="data.image_url"/>
180 <view class="spec-goods-info"> 181 <view class="spec-goods-info">
181 <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view> 182 <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>
182 <view class="flex ai_end xc-val-money" > 183 <view class="flex ai_end xc-val-money" >
packageA/pages/profile/profile.wxml
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 101
102 <view class="user-name flex-vertical" data-type="nickname" wx:if="{{reg_info.idcard_state}}"> 102 <view class="user-name flex-vertical" data-type="nickname" wx:if="{{reg_info.idcard_state}}">
103 <view class="user-name-txt shrink0">身份证:</view> 103 <view class="user-name-txt shrink0">身份证:</view>
104 - <input bindinput="getId" bindblur="IdentityIDCard" value="{{user.idcard?user.idcard:''}}" class="user-txt-right pdl20 f1 t-r" placeholder="请输入身份证号码" value="{{id}}"></input> 104 + <input bindinput="getId" bindblur="IdentityIDCard" value="{{user.idcard}}" class="user-txt-right pdl20 f1 t-r" placeholder="请输入身份证号码"></input>
105 <block wx:if="{{!user.idcard}}"> 105 <block wx:if="{{!user.idcard}}">
106 <view class="c-red pdl20 fs24" wx:if="{{reg_info.idcard && (reg_info.idcard_type == 0)}}">+{{reg_info.idcard}}积分</view> 106 <view class="c-red pdl20 fs24" wx:if="{{reg_info.idcard && (reg_info.idcard_type == 0)}}">+{{reg_info.idcard}}积分</view>
107 <view class="c-red pdl20 fs24" wx:elif="{{reg_info.idcard && (reg_info.idcard_type == 1)}}">+{{reg_info.idcard}}成长值</view> 107 <view class="c-red pdl20 fs24" wx:elif="{{reg_info.idcard && (reg_info.idcard_type == 1)}}">+{{reg_info.idcard}}成长值</view>