From 94552bf5ddcf778729b16d65d57a67418881f36b Mon Sep 17 00:00:00 2001
From: liaozetao <1107136310@qq.com>
Date: Mon, 15 Apr 2024 20:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BC=E7=89=A9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/GiftManageView.vue   | 50 ++++++++++++++--------------
 src/views/users/MessageAdminView.vue | 31 +++++++++++++++++
 2 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/src/views/users/GiftManageView.vue b/src/views/users/GiftManageView.vue
index 5008c32..5414527 100644
--- a/src/views/users/GiftManageView.vue
+++ b/src/views/users/GiftManageView.vue
@@ -1371,35 +1371,35 @@ export default {
                     });
                 });
 
-                $("#save").click(function () {
-                    // 获取序列化字符串并转换为对象
-                    let formData = $('#giftForm').serializeArray().reduce(function(obj, item) {
-                        obj[item.name] = item.value;
-                        return obj;
-                    }, {});
-
-                    var name = $("#giftName").val();
-                    // 阿语名称
-                    var ar_name = $("#giftArName").val();
-                    // 英语名称
-                    var en_name = $("#giftEnName").val();
-                    // 国际化字段
-                    var jsonName = {"zh":name,"ar":ar_name,"en":en_name}
-                    const nameValue = JSON.stringify(jsonName);
-                    // 修改属性值
-                    formData.giftName = nameValue; // 将giftName修改为"newGiftName"
-                    //分区
-                    const partitionFlagArray = $("input:checkbox[name='partitionFlag']:checked").serializeArray();
-                    let partitionFlag = 0;
-                    for (let i = 0, len = partitionFlagArray.length; i < len; i++) {
-                        console.log(partitionFlagArray[i]);
-                        partitionFlag |= partitionFlagArray[i].value;
-                    }
-                    formData.partitionFlag = partitionFlag;
+                $("#save").click(function () { 
                     // 将修改后的对象转换回序列化字符串
                     let newSerializeStr = $.param(formData);
                     if ($("#giftForm").validationEngine('validate')) {
                         $("#consumeType").removeAttr("disabled");
+                        // 获取序列化字符串并转换为对象
+                        let formData = $('#giftForm').serializeArray().reduce(function(obj, item) {
+                            obj[item.name] = item.value;
+                            return obj;
+                        }, {});
+
+                        var name = $("#giftName").val();
+                        // 阿语名称
+                        var ar_name = $("#giftArName").val();
+                        // 英语名称
+                        var en_name = $("#giftEnName").val();
+                        // 国际化字段
+                        var jsonName = {"zh":name,"ar":ar_name,"en":en_name}
+                        const nameValue = JSON.stringify(jsonName);
+                        // 修改属性值
+                        formData.giftName = nameValue; // 将giftName修改为"newGiftName"
+                        //分区
+                        const partitionFlagArray = $("input:checkbox[name='partitionFlag']:checked").serializeArray();
+                        let partitionFlag = 0;
+                        for (let i = 0, len = partitionFlagArray.length; i < len; i++) {
+                            console.log(partitionFlagArray[i]);
+                            partitionFlag |= partitionFlagArray[i].value;
+                        }
+                        formData.partitionFlag = partitionFlag;
                         $.ajax({
                             type: "post",
                             url: "/admin/gift/save.action",
diff --git a/src/views/users/MessageAdminView.vue b/src/views/users/MessageAdminView.vue
index 396a457..469d9eb 100644
--- a/src/views/users/MessageAdminView.vue
+++ b/src/views/users/MessageAdminView.vue
@@ -46,6 +46,17 @@
                 </div>
                 <div class="modal-body">
                     <form id="addMsgForm" class="form-horizontal">
+                        <div class="form-group">
+                            <label for="receiver" class="col-sm-3 control-label">选择地区：</label>
+                            <div class="col-sm-8">
+                                <select name="partitionId" id="partitionId" class="col-sm-3 form-control">
+                                    <option value="1">英语区</option>
+                                    <option value="2">阿拉伯语区</option>
+                                    <option value="4">华语区</option>
+                                </select>
+                            </div>
+                        </div>
+
                         <div class="form-group">
                             <label for="receiver" class="col-sm-3 control-label">接收者：</label>
                             <div class="col-sm-8">
@@ -186,6 +197,25 @@ export default {
                         { field: 'recordId', title: 'id', align: 'center', valign: 'middle', width: '0%' },
                         { field: 'fromAccid', title: '发送人', align: 'center', valign: 'middle', width: '10%' },
                         { field: 'toAccids', title: '接收人', align: 'center', valign: 'middle', width: '10%' },
+                        {
+                            field: 'partitionId', 
+                            title: '地区', 
+                            align: 'center', 
+                            width: '10%',
+                            formatter: function (val, row, index) {
+                                let value = '';
+                                if (val & 1 != 0) {
+                                    value += '英语区<br>';
+                                }
+                                if (val & 2 != 0) {
+                                    value += '阿拉伯语区<br>';
+                                }
+                                if (val & 4 != 0) {
+                                    value += '华语区<br>';
+                                }
+                                return value;
+                            }
+                        },
                         {
                             field: 'appId', title: 'app', align: 'center', valign: 'middle', width: '5%',
                             formatter: function (val, row, index) {
@@ -391,6 +421,7 @@ export default {
                                     pushTime: $("#pushTime").val(),
                                     ignoreVersion: $('#ignoreVersion').val(),
                                     ignoreChannel: $('#ignoreChannel').val(),
+                                    partitionId: $('#partitionId').val(),
                                 },
                                 dataType: 'json',
                                 success: function (data) {