From 154148656c61ab60d8d6af3f2299f2828a8fdba5 Mon Sep 17 00:00:00 2001
From: abson <antploy.ni@meidd.com>
Date: Mon, 6 Dec 2021 11:21:01 +0800
Subject: [PATCH] 专享礼包单品核销

---
 pages/giftpack/giftpacklist/giftpacklist.js   | 10 +++++++---
 pages/giftpack/giftpacklist/giftpacklist.wxml | 16 +++++++++++-----
 pages/user/plus/plus.js                       |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 53b28b0..b300c4b 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -340,13 +340,17 @@ Page({
     qc_com.open(obj)
   },
   //获取核销码
-  getcode: function() {
+  getcode: function(e) {
     var th = this;
     var orderSn = th.data.orderSn; //订单号
+    let codeId=e.currentTarget.dataset.codeid;
     var json = {
       "storeId": a.stoid,
-      "orderSn": orderSn
-    };
+      "orderSn": orderSn,
+    }
+    if(codeId && codeId !=="" ){
+      json.id=codeId
+    }
     var data = JSON.stringify(json);
     var url = th.data.url + "/api/weshop/marketing/gift/goods/verify/code/get"; //预约接口地址
     getApp().request.json_post(url, json,
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 42fac24..949db0b 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -47,7 +47,7 @@
     <view class="box_ware_title data-v-3a5b7e36">
       <text class="data-v-3a5b7e36">礼包内容</text>
     </view>
-    <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+    <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="Id">
       <view wx:if="{{item.couponName!=undefined}}" class="box_ware_box data-v-3a5b7e36">
         <view class="box_ware_img data-v-3a5b7e36">
           <block wx:if="{{item.lbType==1}}">
@@ -73,15 +73,21 @@
           <view class="box_ware_item_price data-v-3a5b7e36">
             <text class="data-v-3a5b7e36"></text>
           </view>
-          <view class="box_ware_item_qty data-v-3a5b7e36">
+          <view class="box_ware_item_qty data-v-3a5b7e36 flex">
             <text class="data-v-3a5b7e36 ellipsis-1">
-			    {{"数量:"+item.num}}
-			</text>
+			        {{"数量:"+item.num}}
+			      </text>
+            <text style="margin-left:10rpx" wx:if="{{item.useState}}">
+              已核销
+            </text>
+            <text style="margin-left:10rpx" wx:else>
+              未核销
+            </text>
           </view>
           <view class="box_ware_code data-v-3a5b7e36">
             <!-- <block wx:if="{{c_state==0}}"> -->
               <block wx:if="{{isBuy==0&item.lbType==1}}">
-                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image>
+                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" data-codeId="{{item.Id}}" class="data-v-3a5b7e36"></image>
               </block>
             <!-- </block> -->
 			<!--
diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index 4cd9655..2b4b28b 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -289,7 +289,7 @@ Page({
   select_serviceman(e) {
     let StaffNo = e.currentTarget.dataset.staffno;
     let {req_data,req} = this.data;
-    if (StaffNo || StaffNo !== "") {
+    if (StaffNo && StaffNo !== "") {
       req_data.staffNo = StaffNo;
       req.serviceman = StaffNo;
     };
--
libgit2 0.21.4