From e7889e656ac06930088e2a751ad28dbd57edf3c8 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 1 Jul 2024 13:00:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E5=93=81=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lang/en.json                           |  3 +++
 lang/zh.json                           |  3 +++
 pages/plugins/giftcard/index/index.vue | 24 +++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/lang/en.json b/lang/en.json
index 4b54c6c7..5c1a5232 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -323,6 +323,7 @@
 			"hpq62x": "The pickup code does not exist. Please contact the administrator",
 			"io6p5k": "Order Mode",
 			"n18sd2": "Order number",
+            "yghjkf": "Order Goods",
 			"yxwu8n": "Order Status",
 			"23qj7m": "Payment status",
 			"vg4jb1": "Order unit price",
@@ -1865,7 +1866,9 @@
     	"giftcard-index": {
     		"hfg2fg": "Cami key",
     		"fyjnsd": "Card security data",
+            "87yyj3": "Redemption time",
             "8tfgh2": "Card exchange",
+            "6redfg": "Use data",
             "fu3rf1": "Please enter the card password key"
     	}
     }
diff --git a/lang/zh.json b/lang/zh.json
index 74c24f11..369003c6 100644
--- a/lang/zh.json
+++ b/lang/zh.json
@@ -313,6 +313,7 @@
 			"hpq62x": "取货码不存在、请联系管理员",
 			"io6p5k": "订单模式",
 			"n18sd2": "订单编号",
+            "yghjkf": "订单商品",
 			"yxwu8n": "订单状态",
 			"23qj7m": "支付状态",
 			"vg4jb1": "订单单价",
@@ -1847,7 +1848,9 @@
     	"giftcard-index": {
     		"hfg2fg": "卡密key",
     		"fyjnsd": "卡密数据",
+            "87yyj3": "兑换时间",
             "8tfgh2": "卡密兑换",
+            "6redfg": "使用数据",
             "fu3rf1": "请输入卡密key"
     	}
     }
diff --git a/pages/plugins/giftcard/index/index.vue b/pages/plugins/giftcard/index/index.vue
index 2e4c3a33..2b50581b 100644
--- a/pages/plugins/giftcard/index/index.vue
+++ b/pages/plugins/giftcard/index/index.vue
@@ -11,6 +11,23 @@
                                     <text class="cr-black">{{ item[fv.field] }}</text>
                                     <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
                                 </view>
+                            </view>
+                            <view v-if="(item.use_data || null) != null && item.use_data.length > 0">
+                                <view class="margin-top-sm">{{$t('giftcard-index.giftcard-index.6redfg')}}</view>
+                                <view v-for="(uv, uk) in item.use_data" :key="uk">
+                                    <view>
+                                        <text class="cr-grey-9 margin-right-main">{{$t('user-order-detail.user-order-detail.n18sd2')}}:</text>
+                                        <text data-event="copy" :data-value="uv.order_no" @tap="text_event">{{uv.order_no}}</text>
+                                    </view>
+                                    <view>
+                                        <text class="cr-grey-9 margin-right-main">{{$t('user-order-detail.user-order-detail.yghjkf')}}:</text>
+                                        <text :data-value="uv.goods_url" @tap="url_event">{{uv.goods_title}}</text>
+                                    </view>
+                                    <view>
+                                        <text class="cr-grey-9 margin-right-main">{{$t('common.use_time')}}:</text>
+                                        <text>{{uv.use_time}}</text>
+                                    </view>
+                                </view>
                             </view>
                         </view>
                     </view>
@@ -54,7 +71,7 @@
                 content_list: [
                     { name: this.$t('giftcard-index.giftcard-index.hfg2fg'), field: 'secret_key' },
                     { name: this.$t('giftcard-index.giftcard-index.fyjnsd'), field: 'secret_value_text' },
-                    { name: this.$t('common.use_time'), field: 'use_time' },
+                    { name: this.$t('giftcard-index.giftcard-index.87yyj3'), field: 'exchange_time' },
                     { name: this.$t('common.add_time'), field: 'add_time' },
                     { name: this.$t('common.upd_time'), field: 'upd_time' },
                 ],
@@ -208,6 +225,11 @@
             // url事件
             url_event(e) {
                 app.globalData.url_event(e);
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
             }
         },
     };