新增土耳其相关
This commit is contained in:
@@ -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();
|
||||
},
|
||||
|
@@ -63,6 +63,7 @@
|
||||
<input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
|
||||
<input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
|
||||
<input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
|
||||
<input type="checkbox" name="partitionFlag" value="8"/>土耳其区<br>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
@@ -93,6 +94,12 @@
|
||||
<input type="text" class="form-control validate[required]" name="name" id="en_modal_name" placeholder="请输入气泡名称">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="tr_modal_name" class="col-sm-4 control-label">土耳其装扮名称:</label>
|
||||
<div class="col-sm-6">
|
||||
<input type="text" class="form-control validate[required]" name="name" id="tr_modal_name" placeholder="请输入气泡名称">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">安卓图片:</label>
|
||||
<div class="col-sm-6">
|
||||
@@ -216,12 +223,16 @@ export default {
|
||||
if ((val & 4) != 0) {
|
||||
value += '华语区<br>';
|
||||
}
|
||||
if ((val & 8) != 0) {
|
||||
value += '土耳其区<br>';
|
||||
}
|
||||
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;
|
||||
});
|
||||
|
@@ -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) {
|
||||
|
@@ -73,6 +73,7 @@
|
||||
<input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
|
||||
<input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
|
||||
<input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
|
||||
<input type="checkbox" name="partitionFlag" value="8"/>土耳其区<br>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
@@ -93,6 +94,12 @@
|
||||
<input type="text" class="form-control" name="headwearName" id="headwearEnName">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="headwearTrName" class="col-sm-3 control-label">土耳其头饰名称:</label>
|
||||
<div class="col-sm-9">
|
||||
<input type="text" class="form-control" name="headwearName" id="headwearTrName">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">使用萝卜购买</label>
|
||||
<div class="col-sm-9">
|
||||
@@ -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 += '华语区<br>';
|
||||
}
|
||||
if ((val & 8) != 0) {
|
||||
value += '土耳其<br>';
|
||||
}
|
||||
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);
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -48,6 +48,9 @@
|
||||
<el-table-column prop="name" align="center" label="勋章名称-阿语区">
|
||||
<template v-slot="scope">{{ JSON.parse(scope.row.name).ar }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="name" align="center" label="勋章名称-土耳其区">
|
||||
<template v-slot="scope">{{ JSON.parse(scope.row.name).tr }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="picUrl"
|
||||
@@ -182,6 +185,19 @@
|
||||
class="input"
|
||||
></el-input>
|
||||
</div>
|
||||
<!-- 勋章名称-土耳其 -->
|
||||
<div style="margin-bottom: 25px; margin-top: 10px; display: flex">
|
||||
<span
|
||||
style="display: inline-block; margin-right: 20px"
|
||||
class="col-sm-2 control-label"
|
||||
>勋章名称-土耳其</span
|
||||
>
|
||||
<el-input
|
||||
v-model="controlsObj.nickTr"
|
||||
placeholder=""
|
||||
class="input"
|
||||
></el-input>
|
||||
</div>
|
||||
|
||||
<!-- 勋章图片 -->
|
||||
<div style="margin-bottom: 25px; margin-top: 10px; display: flex">
|
||||
@@ -198,10 +214,7 @@
|
||||
:before-upload="beforeAvatarUpload"
|
||||
:on-error="handleAvatarError"
|
||||
>
|
||||
<img
|
||||
:src="controlsObj.imageUrl1"
|
||||
class="avatar"
|
||||
/>
|
||||
<img :src="controlsObj.imageUrl1" class="avatar" />
|
||||
</el-upload>
|
||||
</div>
|
||||
|
||||
@@ -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;
|
||||
|
@@ -74,6 +74,7 @@
|
||||
<input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
|
||||
<input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
|
||||
<input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
|
||||
<input type="checkbox" name="partitionFlag" value="8"/>土耳其区<br>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
@@ -103,6 +104,12 @@
|
||||
<input type="text" class="form-control validate[required]" name="name1" id="en_name1" placeholder="请输入,5个字符内">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="tr_name1" class="col-sm-4 control-label">土耳其铭牌名称:</label>
|
||||
<div class="col-sm-6">
|
||||
<input type="text" class="form-control validate[required]" name="name1" id="tr_name1" placeholder="请输入,5个字符内">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">用户自定义文案:</label>
|
||||
<div class="col-sm-6">
|
||||
@@ -129,6 +136,12 @@
|
||||
<input type="text" class="form-control" name="enFixedWord" id="enFixedWord">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="trFixedWord" class="col-sm-4 control-label">土耳其固定文案:</label>
|
||||
<div class="col-sm-6">
|
||||
<input type="text" class="form-control" name="trFixedWord" id="trFixedWord">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="days" class="col-sm-4 control-label">有效期(天):</label>
|
||||
@@ -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 += '华语区<br>';
|
||||
}
|
||||
if ((val & 8) != 0) {
|
||||
value += '土耳其区<br>';
|
||||
}
|
||||
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");
|
||||
|
@@ -103,6 +103,12 @@
|
||||
<input type="text" class="form-control validate[required]" name="name" id="en_modal_name">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="tr_modal_name" class="col-sm-3 control-label">土耳其名称<font color="red">*</font>:</label>
|
||||
<div class="col-sm-9">
|
||||
<input type="text" class="form-control validate[required]" name="name" id="tr_modal_name">
|
||||
</div>
|
||||
</div>
|
||||
<!-- 上传act图片 -->
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">图片:</label>
|
||||
@@ -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);
|
||||
|
@@ -60,6 +60,13 @@
|
||||
v-model="i18nMessage.ar" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="ar" class="col-sm-3 control-label">土耳其:</label>
|
||||
<div class="col-sm-8">
|
||||
<input type="text" class="form-control validate[required]" name="tr" id="tr"
|
||||
v-model="i18nMessage.tr" />
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
@@ -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() {
|
||||
|
161
src/views/users/ChargeRecordTrPartitionStatisticsView.vue
Normal file
161
src/views/users/ChargeRecordTrPartitionStatisticsView.vue
Normal file
@@ -0,0 +1,161 @@
|
||||
<template>
|
||||
<section class="content">
|
||||
<div class="box box-primary">
|
||||
<div class="box-body">
|
||||
<section class="content-header">
|
||||
<h1 id="itemTitle"></h1>
|
||||
</section>
|
||||
<section class="content-body">
|
||||
<div id="toolbar">
|
||||
<div class="col-sm-12">
|
||||
<div class="pull-left">
|
||||
<form id="searchForm"
|
||||
class="col-sm-pull-12"
|
||||
action="/admin/chargeRecord/exportPartitionDetail"
|
||||
method="get"
|
||||
target="_blank">
|
||||
<div class="col-sm-11">
|
||||
<input type="number"
|
||||
name="partitionId"
|
||||
value="8"
|
||||
hidden />
|
||||
<label for="beginDate"
|
||||
class="col-sm-2 control-label">开始日期:</label>
|
||||
<div class="col-sm-4"><input type="text"
|
||||
class="form-control"
|
||||
name="beginDate"
|
||||
id="beginDate"
|
||||
placeholder="必填"></div>
|
||||
<label for="endDate"
|
||||
class="col-sm-2 control-label">结束日期:</label>
|
||||
<div class="col-sm-4"><input type="text"
|
||||
class="form-control"
|
||||
name="endDate"
|
||||
id="endDate"
|
||||
placeholder="必填"></div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
<button id="btnSearch"
|
||||
class="btn btn-default">
|
||||
<i class="glyphicon glyphicon-search"></i>查询
|
||||
</button>
|
||||
<button id="btnExport"
|
||||
class="btn btn-default">
|
||||
<i class="glyphicon glyphicon-export"></i>导出
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- .content -->
|
||||
<div id="table"></div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import TableHelper from '@/utils/bootstrap-table-helper';
|
||||
|
||||
export default {
|
||||
name: "ChargeRecordTrPartitionStatisticsView",
|
||||
setup () {
|
||||
return {};
|
||||
},
|
||||
created () {
|
||||
this.$nextTick(function () {
|
||||
this.initData();
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
initData () {
|
||||
|
||||
$(function () {
|
||||
var chargeStart = $('#beginDate').datepicker({
|
||||
format: 'yyyy-mm-dd',
|
||||
autoclose: true
|
||||
});
|
||||
chargeStart.datepicker("setDate", new Date(new Date() - 7 * 24 * 60 * 60 * 1000))
|
||||
|
||||
var chargeEnd = $('#endDate').datepicker({
|
||||
format: 'yyyy-mm-dd',
|
||||
autoclose: true
|
||||
});
|
||||
chargeEnd.datepicker("setDate", new Date())
|
||||
|
||||
chargeStart.on('changeDate', function () {
|
||||
var date = $('#beginDate').datepicker('getDate');
|
||||
chargeEnd.datepicker('setStartDate', date);
|
||||
});
|
||||
chargeEnd.on('changeDate', function () {
|
||||
var date = $('#endDate').datepicker('getDate');
|
||||
chargeStart.datepicker('setEndDate', date);
|
||||
});
|
||||
|
||||
$('#table').bootstrapTable('destroy');
|
||||
$('#table').bootstrapTable({
|
||||
columns: [
|
||||
{ field: 'date', title: '日期', align: 'center', width: '14%' },
|
||||
{ field: 'googleUsd', title: 'google充值美元', align: 'center', width: '14%' },
|
||||
{ field: 'payermaxUsd', title: 'payermax充值美元', align: 'center', width: '14%' },
|
||||
{ field: 'myCardUsd', title: 'myCard充值美元', align: 'center', width: '14%' },
|
||||
{ field: 'startPayUsd', title: 'startPay充值美元', align: 'center', width: '14%' },
|
||||
{ field: 'iosUsd', title: 'ios充值美元', align: 'center', width: '14%' },
|
||||
{ field: 'companyUsd', title: '对公打款美元', align: 'center', width: '14%' },
|
||||
{ field: 'totalUsd', title: '总充值美元', align: 'center', width: '14%' },
|
||||
],
|
||||
cache: false,
|
||||
striped: true,
|
||||
showRefresh: false,
|
||||
pagination: false,
|
||||
search: false,
|
||||
queryParamsType: "undefined",
|
||||
queryParams: function queryParams (params) { //设置查询参数
|
||||
var param = {
|
||||
partitionId: 8,
|
||||
beginDate: $('#beginDate').val(),
|
||||
endDate: $('#endDate').val()
|
||||
};
|
||||
return param;
|
||||
},
|
||||
toolbar: '#toolbar',
|
||||
url: '/admin/chargeRecord/partitionDetail',
|
||||
onLoadSuccess: function () { //加载成功时执行
|
||||
console.log("load success");
|
||||
},
|
||||
onLoadError: function () { //加载失败时执行
|
||||
console.log("load fail");
|
||||
}
|
||||
});
|
||||
|
||||
// 导出EXCEL
|
||||
$('#btnExport').on('click', function () {
|
||||
if (!$('#beginDate').val() || !$('#endDate').val()) {
|
||||
$("#tipMsg").text("请输入必填的信息");
|
||||
$("#tipModal").modal('show');
|
||||
return;
|
||||
}
|
||||
$("#searchForm").submit();
|
||||
});
|
||||
|
||||
// 查询刷新
|
||||
$('#btnSearch').on('click', function () {
|
||||
if (!$('#beginDate').val() || !$('#endDate').val()) {
|
||||
$("#tipMsg").text("请输入必填的信息");
|
||||
$("#tipModal").modal('show');
|
||||
return;
|
||||
}
|
||||
TableHelper.doRefresh('#table');
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped></style>
|
@@ -156,6 +156,7 @@
|
||||
<input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
|
||||
<input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
|
||||
<input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
|
||||
<input type="checkbox" name="partitionFlag" value="8"/>土耳其区<br>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
@@ -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 += '华语区<br>';
|
||||
}
|
||||
if ((val & 8) != 0) {
|
||||
value += '土耳其<br>';
|
||||
}
|
||||
return value;
|
||||
}
|
||||
},
|
||||
|
Reference in New Issue
Block a user