From ae945bdaeec0d7bf90a91cf71c180aff9d06c821 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 10 May 2021 14:08:52 +0800
Subject: [PATCH] 1.门店不匹配的优化。 2.信息完善的优化 3、 搜索框的优化

---
 components/diy_searchbox/diy_searchbox.wxml |  4 ++--
 packageA/pages/goodsInfo/goodsInfo.js       | 10 ++++++----
 packageA/pages/goodsInfo/goodsInfo.wxml     |  5 +++--
 packageA/pages/profile/profile.wxml         |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/components/diy_searchbox/diy_searchbox.wxml b/components/diy_searchbox/diy_searchbox.wxml
index b0ddc1e..d5e8e66 100644
--- a/components/diy_searchbox/diy_searchbox.wxml
+++ b/components/diy_searchbox/diy_searchbox.wxml
@@ -22,7 +22,7 @@
 <view style='background-color:{{object.top_bgcolor}}; display: flex; align-items: center; justify-content: space-around; height: 100rpx;' >
     <view class='s2_left'>
         <navigator open-type="switchTab" url="/pages/goods/categoryList/categoryList" class="s1_gk_a1">
-        <image src='/public/static/images/model/nav.png' style="margin:0;position: relative;left: 6rpx"></image>
+        <image src='{{imghost}}/miniapp/images/model/nav.png' style="margin:0;position: relative;left: 6rpx"></image>
         </navigator>
     </view>
     <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'>
@@ -38,7 +38,7 @@
     </view>
     <view class='s2_right'>
         <navigator open-type="switchTab"  url="/pages/cart/cart/cart" class="s1_gk_a1">
-        <image src='/public/static/images/model/car.png' style="margin:0;;"></image>
+        <image src='{{imghost}}/miniapp/images/model/car.png' style="margin:0;;"></image>
         </navigator>
     </view>
 </view>
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 75fe01a..fe075be 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -303,9 +303,10 @@ Page({
       var ee=JSON.parse(JSON.stringify(e));
       //--定时器推迟一下--
       setTimeout(function () {
-        if(th.data.data)  var g_distr_type=th.data.data.distr_type;
+        if(!th.data.data) return false;
+        var ser_card=th.data.data;
         //--如果默认门店不在等级卡的默认们店以内
-        if(that.data.storageId!=null && that.data.storageId!=""  &&  that.data.storageId.indexOf(ee.keyid)==-1){    
+        if(ser_card.storageId!=null && ser_card.storageId!=""  &&  ser_card.storageId.indexOf(ee.keyid)==-1){
 		   ee.is_no_dis=1;
         }
 
@@ -1759,9 +1760,10 @@ Page({
       var index = th.data.sec_pick_index;
       item = th.data.sec_sto.s_arr[index];
     }
-	
+
+    var ser_card=this.data.data;
 	//判断门店的配送方式是不是匹配
-	if(th.data.storageId!=null && th.data.storageId!=""  &&  th.data.storageId.indexOf(item.keyid)==-1){    
+	if(ser_card.storageId!=null && ser_card.storageId!=""  &&  ser_card.storageId.indexOf(item.keyid)==-1){
 		wx.showToast({
 		  title: "门店配送方式不匹配",
 		  icon: 'none',
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index 280e68b..9491caa 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -20,7 +20,8 @@
           <view class="xc-videos-picture rel">
             <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box  swiperContainer rel" duration="{{1000}}" indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange">					
                 <swiper-item>
-                  <image class="wh100" src="{{iurl + data.image_url}}" mode="aspectFit" binderror="bind_bnerr" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image>
+                  <image class="wh100" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}"  binderror="bind_bnerr"
+                         mode="aspectFit"  lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image>
                 </swiper-item>
             </swiper>  
           </view>
@@ -176,7 +177,7 @@
     <view class="pding"> 
       <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
       <view class="spec-goods">
-        <image class="wh100 spec-img" src="{{iurl + data.image_url}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"/>
+        <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"/>
         <view class="spec-goods-info">
 			<view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>      
             <view class="flex ai_end xc-val-money" >
diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml
index f42c7b3..359f88d 100644
--- a/packageA/pages/profile/profile.wxml
+++ b/packageA/pages/profile/profile.wxml
@@ -101,7 +101,7 @@
 
       <view class="user-name flex-vertical" data-type="nickname" wx:if="{{reg_info.idcard_state}}">
          <view class="user-name-txt shrink0">身份证:</view>
-         <input bindinput="getId" bindblur="IdentityIDCard" value="{{user.idcard?user.idcard:''}}"  class="user-txt-right pdl20 f1 t-r" placeholder="请输入身份证号码" value="{{id}}"></input>
+         <input bindinput="getId" bindblur="IdentityIDCard" value="{{user.idcard}}"  class="user-txt-right pdl20 f1 t-r" placeholder="请输入身份证号码"></input>
 		 <block wx:if="{{!user.idcard}}">
 				<view class="c-red pdl20 fs24" wx:if="{{reg_info.idcard && (reg_info.idcard_type == 0)}}">+{{reg_info.idcard}}积分</view>
 				<view class="c-red pdl20 fs24" wx:elif="{{reg_info.idcard && (reg_info.idcard_type == 1)}}">+{{reg_info.idcard}}成长值</view>
--
libgit2 0.21.4