From d3b48eea861b2b8646ab3ae328de7ee10d80c74f Mon Sep 17 00:00:00 2001 From: dragon <3013557874@qq.com> Date: Mon, 11 Nov 2024 18:28:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=9F=E8=80=B3=E5=85=B6?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GiftPanelManagement.vue | 4 + src/views/chatbubble/ChatbubbleManageView.vue | 20 +- src/views/dressShop/DressShopAdminView.vue | 1 + src/views/headwear/HeadwearAdminView.vue | 17 +- src/views/infocard/InfocardManageView.vue | 1413 ++++++++++------- src/views/medal/MedalInfo.vue | 53 +- src/views/nameplate/NameplateInfoView.vue | 45 +- src/views/room/RoomtagAdminView.vue | 16 +- src/views/system/I18nMessageAdminView.vue | 10 + .../ChargeRecordTrPartitionStatisticsView.vue | 161 ++ src/views/users/GiftManageView.vue | 5 + 11 files changed, 1131 insertions(+), 614 deletions(-) create mode 100644 src/views/users/ChargeRecordTrPartitionStatisticsView.vue diff --git a/src/views/GiftPanelManagement/GiftPanelManagement.vue b/src/views/GiftPanelManagement/GiftPanelManagement.vue index 52b8c29..8f48f62 100644 --- a/src/views/GiftPanelManagement/GiftPanelManagement.vue +++ b/src/views/GiftPanelManagement/GiftPanelManagement.vue @@ -121,6 +121,7 @@ export default { { desc: "英语区", id: 1 }, { desc: "阿拉伯区", id: 2 }, { desc: "华语区", id: 4 }, + { desc: "土耳其区", id: 8 }, ], }, // 表格 @@ -206,6 +207,9 @@ export default { } else if (val == 4) { this.eidDialogTitle = `编辑礼物面板信息-华语区`; this.eidText = `华语区`; + }else if (val == 8) { + this.eidDialogTitle = `编辑礼物面板信息-土耳其区`; + this.eidText = `土耳其区`; } this.getData(); }, diff --git a/src/views/chatbubble/ChatbubbleManageView.vue b/src/views/chatbubble/ChatbubbleManageView.vue index f3e0bf5..13f76c7 100644 --- a/src/views/chatbubble/ChatbubbleManageView.vue +++ b/src/views/chatbubble/ChatbubbleManageView.vue @@ -63,6 +63,7 @@ 英语区
阿拉伯语区
华语区
+ 土耳其区
@@ -93,6 +94,12 @@
+
+ +
+ +
+
@@ -216,12 +223,16 @@ export default { if ((val & 4) != 0) { value += '华语区
'; } + if ((val & 8) != 0) { + value += '土耳其区
'; + } return value; } }, {field: 'name.zh', title: '装扮名称', align: 'middle', width: '5%'}, {field: 'name.ar', title: '阿语装扮名称', align: 'middle', width: '5%'}, {field: 'name.en', title: '英语装扮名称', align: 'middle', width: '5%'}, + {field: 'name.tr', title: '土耳其扮名称', align: 'middle', width: '5%'}, { field: 'iosUrl', title: '装扮图片', @@ -374,12 +385,16 @@ export default { $("#ar_modal_name").val(row.name.ar); // 英语名称 $("#en_modal_name").val(row.name.en); + // 土耳其名称 + $("#tr_modal_name").val(row.name.tr); } else { $("#modal_name").val(name); // 阿语名称 $("#ar_modal_name").val(name); // 英语名称 $("#en_modal_name").val(name); + // 土耳其名称 + $("#tr_modal_name").val(name); } $('#addAndroidIconPicUrl').attr("src", row.androidUrl); $("#addForm #androidUrl").val(row.androidUrl); @@ -454,8 +469,10 @@ export default { var ar_name = $("#ar_modal_name").val(); // 英语名称 var en_name = $("#en_modal_name").val(); + // 土耳其名称 + var tr_name = $("#tr_modal_name").val(); // 国际化字段 - var jsonName = {"zh":name,"ar":ar_name,"en":en_name} + var jsonName = {"zh":name,"ar":ar_name,"en":en_name,"tr":tr_name} const nameValue = JSON.stringify(jsonName); // 修改属性值 formData.name = nameValue; // 将giftName修改为"newGiftName" @@ -528,6 +545,7 @@ export default { $('#modal_name').val(''); $('#ar_modal_name').val(''); $('#en_modal_name').val(''); + $('#tr_modal_name').val(''); $('input[name="partitionFlag"]').each(function() { $(this).checked = false; }); diff --git a/src/views/dressShop/DressShopAdminView.vue b/src/views/dressShop/DressShopAdminView.vue index a9113dc..99998bd 100644 --- a/src/views/dressShop/DressShopAdminView.vue +++ b/src/views/dressShop/DressShopAdminView.vue @@ -158,6 +158,7 @@ export default { { field: 'name.zh', title: '装扮名称', align: 'left', valign: 'middle', width: '10%' }, { field: 'name.ar', title: '阿语装扮名称', align: 'left', valign: 'middle', width: '10%' }, { field: 'name.en', title: '英语装扮名称', align: 'left', valign: 'middle', width: '10%' }, + { field: 'name.tr', title: '土耳其装扮名称', align: 'left', valign: 'middle', width: '10%' }, { field: 'pic', title: '装扮图片', align: 'left', valign: 'middle', width: '10%', formatter: function (val, row, index) { diff --git a/src/views/headwear/HeadwearAdminView.vue b/src/views/headwear/HeadwearAdminView.vue index 879ffad..a633325 100644 --- a/src/views/headwear/HeadwearAdminView.vue +++ b/src/views/headwear/HeadwearAdminView.vue @@ -73,6 +73,7 @@ 英语区
阿拉伯语区
华语区
+ 土耳其区
@@ -93,6 +94,12 @@
+
+ +
+ +
+
@@ -385,6 +392,7 @@ export default { {field: 'name.zh', title: '头饰名称', align: 'center', width: '5%'}, {field: 'name.ar', title: '阿语头饰名称', align: 'center', width: '5%'}, {field: 'name.en', title: '英语头饰名称', align: 'center', width: '5%'}, + {field: 'name.tr', title: '土耳其头饰名称', align: 'center', width: '5%'}, { field: 'partitionFlag', title: '地区', @@ -401,6 +409,9 @@ export default { if ((val & 4) != 0) { value += '华语区
'; } + if ((val & 8) != 0) { + value += '土耳其
'; + } return value; } }, @@ -643,6 +654,7 @@ export default { $("#headwearName").val(""); $("#headwearArName").val(""); $("#headwearEnName").val(""); + $("#headwearTrName").val(""); $("#price").val(""); $("#renewPrice").val(""); $("#originalPrice").val(""); @@ -688,8 +700,9 @@ export default { var headwearName = $("#headwearName").val(); var headwearArName = $("#headwearArName").val(); var headwearEnName = $("#headwearEnName").val(); + var headwearTrName = $("#headwearTrName").val(); // 国际化字段 - var jsonName = {"zh":headwearName,"ar":headwearArName,"en":headwearEnName} + var jsonName = {"zh":headwearName,"ar":headwearArName,"en":headwearEnName,"tr":headwearTrName} const nameValue = JSON.stringify(jsonName); var price = $("#price").val(); var renewPrice = $("#renewPrice").val(); @@ -825,10 +838,12 @@ export default { $("#headwearName").val(jsonName.zh); $("#headwearArName").val(jsonName.ar); $("#headwearEnName").val(jsonName.en); + $("#headwearTrName").val(jsonName.tr); } else { $("#headwearName").val(name); $("#headwearArName").val(name); $("#headwearEnName").val(name); + $("#headwearTrName").val(name); } $("#price").val(json.price); diff --git a/src/views/infocard/InfocardManageView.vue b/src/views/infocard/InfocardManageView.vue index f654c5a..d9aae2d 100644 --- a/src/views/infocard/InfocardManageView.vue +++ b/src/views/infocard/InfocardManageView.vue @@ -1,631 +1,844 @@ \ No newline at end of file + width: 100% !important; +} + \ No newline at end of file diff --git a/src/views/medal/MedalInfo.vue b/src/views/medal/MedalInfo.vue index db2572c..ff4de70 100644 --- a/src/views/medal/MedalInfo.vue +++ b/src/views/medal/MedalInfo.vue @@ -48,6 +48,9 @@ + + +
+ +
+ 勋章名称-土耳其 + +
@@ -198,10 +214,7 @@ :before-upload="beforeAvatarUpload" :on-error="handleAvatarError" > - +
@@ -349,6 +362,7 @@ export default { nickZh: "", nickEn: "", nickAr: "", + nickTr: "", imageUrl1: "", value2: "", options2: [ @@ -419,6 +433,7 @@ export default { this.controlsObj.nickZh = ""; this.controlsObj.nickEn = ""; this.controlsObj.nickAr = ""; + this.controlsObj.nickTr = ""; this.controlsObj.imageUrl1 = ""; this.controlsObj.value2 = ""; this.controlsDialog = true; @@ -431,6 +446,7 @@ export default { this.controlsObj.nickZh = JSON.parse(val.name).zh; this.controlsObj.nickEn = JSON.parse(val.name).en; this.controlsObj.nickAr = JSON.parse(val.name).ar; + this.controlsObj.nickTr = JSON.parse(val.name).tr; this.controlsObj.imageUrl1 = val.picUrl; this.controlsObj.value2 = val.enable; this.controlsObj.id = val.id; @@ -452,6 +468,7 @@ export default { zh: this.controlsObj.nickZh, en: this.controlsObj.nickEn, ar: this.controlsObj.nickAr, + tr: this.controlsObj.nickTr, }); obj.picUrl = this.controlsObj.imageUrl1; obj.enable = this.controlsObj.value2; @@ -480,6 +497,7 @@ export default { zh: this.controlsObj.nickZh, en: this.controlsObj.nickEn, ar: this.controlsObj.nickAr, + tr: this.controlsObj.nickTr, }); obj1.picUrl = this.controlsObj.imageUrl1; obj1.enable = this.controlsObj.value2; @@ -535,32 +553,51 @@ export default { //1 2 4 var val = 0; if (type == 2) { - if (num == 0 || num == 7) { - val = [4, 1, 2]; + if (num == 0 || num == 15) { + val = [1, 2, 4, 8]; + } + if (num == 0 || num == 15) { + val = [1, 2, 4, 8]; } else if (num == 1) { val = [1]; } else if (num == 3) { val = [1, 2]; + } else if (num == 7) { + val = [1, 2, 4]; } else if (num == 2) { val = [2]; } else if (num == 6) { val = [2, 4]; + } else if (num == 14) { + val = [2, 4, 8]; } else if (num == 4) { val = [4]; + } else if (num == 12) { + val = [4, 8]; + } else if (num == 8) { + val = [8]; } } else { - if (num == 0 || num == 7) { - val = "华语区、英语区、阿语区"; + if (num == 0 || num == 15) { + val = "英语区、阿语区、华语区、土耳其区"; } else if (num == 1) { val = "英语区"; } else if (num == 3) { val = "英语区、阿语区"; + } else if (num == 7) { + val = "英语区、阿语区、华语区"; } else if (num == 2) { val = "阿语区"; } else if (num == 6) { val = "阿语区、华语区"; + } else if (num == 14) { + val = "阿语区、华语区、土耳其区"; } else if (num == 4) { val = "华语区"; + } else if (num == 12) { + val = "华语区、土耳其区"; + } else if (num == 8) { + val = "土耳其区"; } } return val; diff --git a/src/views/nameplate/NameplateInfoView.vue b/src/views/nameplate/NameplateInfoView.vue index 291b579..9202f29 100644 --- a/src/views/nameplate/NameplateInfoView.vue +++ b/src/views/nameplate/NameplateInfoView.vue @@ -74,6 +74,7 @@ 英语区
阿拉伯语区
华语区
+ 土耳其区
@@ -103,6 +104,12 @@
+
+ +
+ +
+
@@ -129,6 +136,12 @@
+
+ +
+ +
+
@@ -247,6 +260,7 @@ export default { {field: 'name.zh', title: '铭牌名称', align: 'middle', width: '5%'}, {field: 'name.ar', title: '阿语铭牌名称', align: 'middle', width: '5%'}, {field: 'name.en', title: '英语铭牌名称', align: 'middle', width: '5%'}, + {field: 'name.tr', title: '土耳其名称', align: 'middle', width: '5%'}, { field: 'partitionFlag', title: '地区', @@ -263,6 +277,9 @@ export default { if ((val & 4) != 0) { value += '华语区
'; } + if ((val & 8) != 0) { + value += '土耳其区
'; + } return value; } }, @@ -320,6 +337,19 @@ export default { } } }, + { + field: 'fixedWord.tr', + title: '土耳其固定文案', + align: 'middle', + width: '5%', + formatter: function (val, row, index) { + if (isEmpty(val)) { + return '/'; + } else { + return val; + } + } + }, { field: 'days', title: '有效期(天)', align: 'middle', width: '5%' }, { field: 'statusStr', title: '状态', align: 'middle', width: '5%' }, { field: 'typeStr', title: '铭牌款式', align: 'middle', width: '5%' }, @@ -454,10 +484,12 @@ export default { $("#name1").val(jsonName.zh); $("#ar_name1").val(jsonName.ar); $("#en_name1").val(jsonName.en); + $("#tr_name1").val(jsonName.tr); } else { $("#name1").val(name); $("#ar_name1").val(name); $("#en_name1").val(name); + $("#tr_name1").val(name); } let fixedWord = json.fixedWord; if (fixedWord && fixedWord.startsWith('{') && fixedWord.endsWith('}')) { @@ -465,10 +497,12 @@ export default { $('#zhFixedWord').val(jsonValue.zh); $('#arFixedWord').val(jsonValue.ar); $('#enFixedWord').val(jsonValue.en); + $('#trFixedWord').val(jsonValue.tr); } else { $('#zhFixedWord').val(fixedWord); $('#arFixedWord').val(fixedWord); $('#enFixedWord').val(fixedWord); + $('#trFixedWord').val(fixedWord); } $('#nameplateType1').attr("disabled", "true"); if (!json.isCustomWord) { @@ -477,6 +511,7 @@ export default { $('#zhFixedWord').val(''); $('#arFixedWord').val(''); $('#enFixedWord').val(''); + $('#trFixedWord').val(''); } else { $('input[name="isCustomWord"]').get(1).checked = true; $('#fixedWord-div').removeClass("hidden"); @@ -553,17 +588,19 @@ export default { var zhFixedWord = $('#zhFixedWord').val(); var arFixedWord = $('#arFixedWord').val(); var enFixedWord = $('#enFixedWord').val(); + var trFixedWord = $('#trFixedWord').val(); let fixedWordValue = ''; - if (!(zhFixedWord == '' && arFixedWord == '' && enFixedWord == '')) { - let jsonFixedWord = {'zh': zhFixedWord, 'ar': arFixedWord, 'en': enFixedWord}; + if (!(zhFixedWord == '' && arFixedWord == '' && enFixedWord == '' && trFixedWord=="")) { + let jsonFixedWord = {'zh': zhFixedWord, 'ar': arFixedWord, 'en': enFixedWord,'tr':trFixedWord}; fixedWordValue = JSON.stringify(jsonFixedWord); } var isCustomWord = $('input[name="isCustomWord"]:checked').val(); var name = $('#name1').val(); var ar_name = $('#ar_name1').val(); var en_name = $('#en_name1').val(); + var tr_name = $('#tr_name1').val(); - var jsonName = {"zh":name,"ar":ar_name,"en":en_name} + var jsonName = {"zh":name,"ar":ar_name,"en":en_name,"tr":tr_name} const nameValue = JSON.stringify(jsonName); var nameplateType = $('#nameplateType1').val(); var id = $('#id').val(); @@ -771,12 +808,14 @@ function cleanNamePlateModal() { $('#zhFixedWord').val(''); $('#arFixedWord').val(''); $('#enFixedWord').val(''); + $('#trFixedWord').val(''); $('input[name="isCustomWord"]').each(function () { $(this).removeAttr("checked"); }); $('#name1').val(''); $('#ar_name1').val(''); $('#en_name1').val(''); + $('#tr_name1').val(''); $('#nameplateType1').val(''); $('#name1').removeAttr("readonly"); $('#nameplateType1').removeAttr("disabled"); diff --git a/src/views/room/RoomtagAdminView.vue b/src/views/room/RoomtagAdminView.vue index 8ab2a54..c61bff4 100644 --- a/src/views/room/RoomtagAdminView.vue +++ b/src/views/room/RoomtagAdminView.vue @@ -103,6 +103,12 @@
+
+ +
+ +
+
@@ -214,6 +220,7 @@ export default { {field: 'name.zh', title: '名称', align: 'center', width: '10%'}, {field: 'name.ar', title: '阿语名称', align: 'center', width: '10%'}, {field: 'name.en', title: '英语名称', align: 'center', width: '10%'}, + {field: 'name.tr', title: '土耳其名称', align: 'center', width: '10%'}, {field: 'pict', title: '图片', align:'center', width: '10%',valign:'center', formatter: function (val,row,index) { if(null == val || val == '') { @@ -390,6 +397,7 @@ export default { $("#modal_name").val(""); $("#ar_modal_name").val(""); $("#en_modal_name").val(""); + $("#tr_modal_name").val(""); $("#modal_seq").val(""); $("#modal_status").val(""); $("#modal_type").val(""); @@ -409,8 +417,10 @@ export default { var ar_name = $("#ar_modal_name").val(); // 英语名称 var en_name = $("#en_modal_name").val(); + // 土耳其名称 + var tr_name = $("#tr_modal_name").val(); // 国际化字段 - var jsonName = {"zh":name,"ar":ar_name,"en":en_name} + var jsonName = {"zh":name,"ar":ar_name,"en":en_name,"tr":tr_name} const nameValue = JSON.stringify(jsonName); var seq = $("#modal_seq").val(); var status = $("#modal_status").val(); @@ -483,12 +493,16 @@ export default { $("#ar_modal_name").val(jsonName.ar); // 英语名称 $("#en_modal_name").val(jsonName.en); + // 土耳其名称 + $("#tr_modal_name").val(jsonName.tr); } else { $("#modal_name").val(name); // 阿语名称 $("#ar_modal_name").val(name); // 英语名称 $("#en_modal_name").val(name); + // 土耳其名称 + $("#tr_modal_name").val(name); } $("#modal_seq").val(json.seq); diff --git a/src/views/system/I18nMessageAdminView.vue b/src/views/system/I18nMessageAdminView.vue index e1d57b3..104c537 100644 --- a/src/views/system/I18nMessageAdminView.vue +++ b/src/views/system/I18nMessageAdminView.vue @@ -60,6 +60,13 @@ v-model="i18nMessage.ar" />
+
+ +
+ +
+
@@ -84,6 +91,7 @@ export default { { field: 'zh', title: '华语', align: 'center', width: '15%' }, { field: 'en', title: '英语', align: 'center', width: '15%' }, { field: 'ar', title: '阿语', align: 'center', width: '15%' }, + { field: 'tr', title: '土耳其', align: 'center', width: '15%' }, { field: 'key', title: '操作', @@ -151,6 +159,7 @@ export default { this.i18nMessage.zh = ''; this.i18nMessage.en = ''; this.i18nMessage.ar = ''; + this.i18nMessage.tr = ''; $('#editModal').modal('show'); }, edit(obj) { @@ -160,6 +169,7 @@ export default { this.i18nMessage.zh = record.zh; this.i18nMessage.en = record.en; this.i18nMessage.ar = record.ar; + this.i18nMessage.tr = record.tr; $('#editModal').modal('show'); }, save() { diff --git a/src/views/users/ChargeRecordTrPartitionStatisticsView.vue b/src/views/users/ChargeRecordTrPartitionStatisticsView.vue new file mode 100644 index 0000000..62fcf2e --- /dev/null +++ b/src/views/users/ChargeRecordTrPartitionStatisticsView.vue @@ -0,0 +1,161 @@ + + + + + \ No newline at end of file diff --git a/src/views/users/GiftManageView.vue b/src/views/users/GiftManageView.vue index 86a25f7..51edbd6 100644 --- a/src/views/users/GiftManageView.vue +++ b/src/views/users/GiftManageView.vue @@ -156,6 +156,7 @@ 英语区
阿拉伯语区
华语区
+ 土耳其区
@@ -654,6 +655,7 @@ export default { {field: 'giftName.zh', title: '礼物名称', align: 'center', width: '15%'}, {field: 'giftName.ar', title: '阿语礼物名称', align: 'center', width: '10%'}, {field: 'giftName.en', title: '英语礼物名称', align: 'center', width: '10%'}, + {field: 'giftName.tr', title: '土耳其礼物名称', align: 'center', width: '10%'}, { field: 'partitionFlag', title: '地区', @@ -670,6 +672,9 @@ export default { if ((val & 4) != 0) { value += '华语区
'; } + if ((val & 8) != 0) { + value += '土耳其
'; + } return value; } },