From c5f6d75989a32a99f975e552f760fb4c68609167 Mon Sep 17 00:00:00 2001
From: liaozetao <1107136310@qq.com>
Date: Thu, 18 Apr 2024 16:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=8F=E8=A2=8B=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/luckybag/LuckyBagRecordView.vue | 57 +++++++++++++++--------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/src/views/luckybag/LuckyBagRecordView.vue b/src/views/luckybag/LuckyBagRecordView.vue
index 2c5367e..51e3764 100644
--- a/src/views/luckybag/LuckyBagRecordView.vue
+++ b/src/views/luckybag/LuckyBagRecordView.vue
@@ -9,24 +9,38 @@
                 <div id="toolbar">
 
                     <form id="searchForm" action="/admin/luckyBagRecord/recordExport" method="get" target="_blank">
-                        <div class="col-sm-10">
-                            福袋：
-                            <select name="luckyBagId" id="qLuckyBagId" class="form-control">
-                            </select>
-                            送礼人地区：
-                            <select name="sendPartitionId" id="sendPartitionId" class="form-control">
-                            </select>
-                            收礼人地区：
-                            <select name="receivePartitionId" id="receivePartitionId" class="form-control">
-                            </select>
-                            购买人平台号：
-                            <input type="text" name="erbanNo" id="qErbanNo" class="input-sm form-control" placeholder="" />
-                            开出礼物名称：
-                            <input type="text" name="giftName" id="qGiftName" class="input-sm form-control" placeholder="" />
-                            日期：
-                            <input type="text" name="startDate" id="qStartDate" class="input-sm datetime form-control" placeholder="">
-                            - 
-                            <input type="text" name="endDate" id="qEndDate" class="input-sm datetime form-control" placeholder="">
+                        <div class="col-sm-12">
+                            <label for="luckyBagId" class="col-sm-1 control-label">福袋：</label>
+                            <div class="col-sm-2">
+                                <select name="luckyBagId" id="qLuckyBagId" class="form-control">
+                                </select>
+                            </div>
+                            <label for="sendPartitionId" class="col-sm-1 control-label">送礼人地区：</label>
+                            <div class="col-sm-2">
+                                <select name="sendPartitionId" id="sendPartitionId" class="form-control">
+                                </select>
+                            </div>
+                            <label for="receivePartitionId" class="col-sm-1 control-label">收礼人地区：</label>
+                            <div class="col-sm-2">
+                                <select name="receivePartitionId" id="receivePartitionId" class="form-control">
+                                </select>
+                            </div>
+                            <label for="erbanNo" class="col-sm-1 control-label">购买人平台号：</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="erbanNo" id="qErbanNo" class="input-sm form-control" placeholder="" />
+                            </div>
+                            <label for="giftName" class="col-sm-1 control-label">开出礼物名称：</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="giftName" id="qGiftName" class="input-sm form-control" placeholder="" />
+                            </div>
+                            <label for="startDate" class="col-sm-1 control-label">日期：</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="startDate" id="qStartDate" class="input-sm datetime form-control" placeholder="">
+                            </div>
+                            <label for="endDate" class="col-sm-1 control-label">-</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="endDate" id="qEndDate" class="input-sm datetime form-control" placeholder="">
+                            </div>
                         </div>
                     </form>
                     <div class="col-sm-2">
@@ -190,9 +204,12 @@ function getLuckyBagGift() {
                 var data = res.data;
                 var options = [];
                 for (var i = 0, len = data.length; i < len; i++) {
-                    var item = data[i];
+                    let giftName = item.giftName;
+                    if (giftName.startsWith('{') && giftName.endsWith('}')) {
+                        giftName = JSON.parse(giftName).zh;
+                    }
                     //拼接成多个<option><option/>
-                    options.push('<option value="' + item.giftId + '">' + item.giftName + '</option>')
+                    options.push('<option value="' + item.giftId + '">' + giftName + '</option>');
                 }
                 $("#qLuckyBagId").html(options.join(' '));    //填充到select标签中
             }