From 7701baa10ab10724b2e0a7f83f64bfc0f0249be2 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 28 Jul 2020 13:44:59 +0800
Subject: [PATCH] 1.    在线客服显示图标的问题的修复 2.    再购买时，优惠券选择不使用的时候，没有反应的bug修复

---
 components/diy_service/diy_service.wxml | 2 +-
 pages/cart/cart2/cart2.js               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/diy_service/diy_service.wxml b/components/diy_service/diy_service.wxml
index d287119..73fe0dc 100644
--- a/components/diy_service/diy_service.wxml
+++ b/components/diy_service/diy_service.wxml
@@ -10,7 +10,7 @@
 
    <button wx:else  class="custom-service"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
 	   <view style="text-align: center;">
-         <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+         <image class="cs-img" src="{{object.img}}"></image>
          <view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
 	   </view>	 
     </button>	
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index a204b54..2d87afd 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -2144,7 +2144,7 @@ Page({
     var quan_item=this.data.selected_quan_list[ind];
     var pickid=this.data.selected_quan_pick;  //现在选择的是哪一个门店
     //--如果券是单品使用的时候--
-    if(quan_item.UseObjectType=="20"){
+    if( quan_item && quan_item.UseObjectType && quan_item.UseObjectType=="20"){
         //---只有多件购买的时候才要计算，//购物车购买和搭配勾的时候---
         var gg=getApp().get_b_now();
         if(this.data.is_b_now==0 || gg.prom_type==5){
--
libgit2 0.21.4