diff --git a/src/utils/partitionDesc.js b/src/utils/partitionDesc.js
index 9465b4e..234a8ad 100644
--- a/src/utils/partitionDesc.js
+++ b/src/utils/partitionDesc.js
@@ -4,6 +4,7 @@ const partitionInfoMap = {
4: '华语区',
8: '土耳其区',
16: '英语2区',
+ 32: '独联体',
}
export const partitionDesc = (val) => {
diff --git a/src/views/car/CarGoodsAdminView.vue b/src/views/car/CarGoodsAdminView.vue
index aa609db..4415de0 100644
--- a/src/views/car/CarGoodsAdminView.vue
+++ b/src/views/car/CarGoodsAdminView.vue
@@ -117,6 +117,9 @@
英语2区
+ 独联体
@@ -709,6 +712,9 @@ export default {
if ((val & 16) != 0) {
value += '英语2区
';
}
+ if ((val & 32) != 0) {
+ value += '独联体
';
+ }
return value;
}
},
@@ -1271,6 +1277,11 @@ export default {
} else {
$("input:checkbox[name='partitionFlag']")[4].checked = false;
}
+ if ((partitionFlag & 32) != 0) {
+ $("input:checkbox[name='partitionFlag']")[5].checked = true;
+ } else {
+ $("input:checkbox[name='partitionFlag']")[5].checked = false;
+ }
// 打开编辑弹窗
$("#cardGoodsModal").modal('show');
diff --git a/src/views/chatbubble/ChatbubbleManageView.vue b/src/views/chatbubble/ChatbubbleManageView.vue
index 4a66d0a..106cef9 100644
--- a/src/views/chatbubble/ChatbubbleManageView.vue
+++ b/src/views/chatbubble/ChatbubbleManageView.vue
@@ -111,6 +111,9 @@
英语2区
+ 独联体
@@ -370,6 +373,9 @@ export default {
if ((val & 16) != 0) {
value += '英语2区
';
}
+ if ((val & 32) != 0) {
+ value += '独联体
';
+ }
return value;
}
},
@@ -580,6 +586,11 @@ export default {
} else {
$("input:checkbox[name='partitionFlag']")[4].checked = false;
}
+ if ((partitionFlag & 32) != 0) {
+ $("input:checkbox[name='partitionFlag']")[5].checked = true;
+ } else {
+ $("input:checkbox[name='partitionFlag']")[5].checked = false;
+ }
$("#addModal").modal('show');
});
diff --git a/src/views/firstpage/RecommendResourceAdminView.vue b/src/views/firstpage/RecommendResourceAdminView.vue
index 70bfefc..db5657c 100644
--- a/src/views/firstpage/RecommendResourceAdminView.vue
+++ b/src/views/firstpage/RecommendResourceAdminView.vue
@@ -280,6 +280,9 @@ export default {
if ((val & 16) != 0) {
value += '英语2区
';
}
+ if ((val & 32) != 0) {
+ value += '独联体
';
+ }
return value;
}
},
diff --git a/src/views/headwear/HeadwearAdminView.vue b/src/views/headwear/HeadwearAdminView.vue
index 13356cf..6c49cf3 100644
--- a/src/views/headwear/HeadwearAdminView.vue
+++ b/src/views/headwear/HeadwearAdminView.vue
@@ -119,6 +119,9 @@
英语2区
+ 独联体
@@ -623,6 +626,9 @@ export default {
if ((val & 16) != 0) {
value += '英语2区
';
}
+ if ((val & 32) != 0) {
+ value += '独联体
';
+ }
return value;
}
},
@@ -1197,6 +1203,11 @@ export default {
} else {
$("input:checkbox[name='partitionFlag']")[4].checked = false;
}
+ if ((partitionFlag & 32) != 0) {
+ $("input:checkbox[name='partitionFlag']")[5].checked = true;
+ } else {
+ $("input:checkbox[name='partitionFlag']")[5].checked = false;
+ }
// 打开编辑弹窗
$("#headwearModal").modal('show');
diff --git a/src/views/infocard/InfocardManageView.vue b/src/views/infocard/InfocardManageView.vue
index 5bade12..a56ad02 100644
--- a/src/views/infocard/InfocardManageView.vue
+++ b/src/views/infocard/InfocardManageView.vue
@@ -116,6 +116,9 @@
英语2区
+ 独联体
@@ -402,6 +405,9 @@ export default {
if ((val & 16) != 0) {
value += "英语2区
";
}
+ if ((val & 32) != 0) {
+ value += "独联体
";
+ }
return value;
},
},
@@ -696,6 +702,11 @@ export default {
} else {
$("input:checkbox[name='partitionFlag']")[4].checked = false;
}
+ if ((partitionFlag & 32) != 0) {
+ $("input:checkbox[name='partitionFlag']")[5].checked = true;
+ } else {
+ $("input:checkbox[name='partitionFlag']")[5].checked = false;
+ }
$("#addModal").modal("show");
});
diff --git a/src/views/medal/MedalInfo.vue b/src/views/medal/MedalInfo.vue
index 77c966d..0cc2978 100644
--- a/src/views/medal/MedalInfo.vue
+++ b/src/views/medal/MedalInfo.vue
@@ -653,6 +653,9 @@ export default {
if ((num & 16) != 0) {
valArr.push(16);
}
+ if ((num & 32) != 0) {
+ valArr.push(32);
+ }
return valArr;
} else {
if ((num & 1) != 0) {
@@ -670,6 +673,9 @@ export default {
if ((num & 16) != 0) {
val += '英语2区 ';
}
+ if ((num & 32) != 0) {
+ val += '独联体 ';
+ }
return val;
}
diff --git a/src/views/medal/MedalLevelManagement.vue b/src/views/medal/MedalLevelManagement.vue
index 74ae580..7502b10 100644
--- a/src/views/medal/MedalLevelManagement.vue
+++ b/src/views/medal/MedalLevelManagement.vue
@@ -445,6 +445,9 @@ export default {
if ((num & 16) != 0) {
valArr.push(16);
}
+ if ((num & 32) != 0) {
+ valArr.push(32);
+ }
return valArr;
} else {
if ((num & 1) != 0) {
@@ -462,6 +465,9 @@ export default {
if ((num & 16) != 0) {
val += '英语2区 ';
}
+ if ((num & 32) != 0) {
+ val += '独联体 ';
+ }
return val;
}
diff --git a/src/views/nameplate/NameplateInfoView.vue b/src/views/nameplate/NameplateInfoView.vue
index 3727cad..22564d4 100644
--- a/src/views/nameplate/NameplateInfoView.vue
+++ b/src/views/nameplate/NameplateInfoView.vue
@@ -136,6 +136,9 @@
英语2区
+ 独联体
@@ -462,6 +465,9 @@ export default {
if ((val & 16) != 0) {
value += '英语2区
';
}
+ if ((val & 32) != 0) {
+ value += '独联体
';
+ }
return value;
}
},
@@ -755,6 +761,11 @@ export default {
} else {
$("input:checkbox[name='partitionFlag']")[4].checked = false;
}
+ if ((partitionFlag & 32) != 0) {
+ $("input:checkbox[name='partitionFlag']")[5].checked = true;
+ } else {
+ $("input:checkbox[name='partitionFlag']")[5].checked = false;
+ }
// 打开编辑弹窗
$("#addModal").modal('show');
$("#modalLabel").text("编辑铭牌");
diff --git a/src/views/room/GameAdmin.vue b/src/views/room/GameAdmin.vue
index d85637a..5a6547b 100644
--- a/src/views/room/GameAdmin.vue
+++ b/src/views/room/GameAdmin.vue
@@ -131,6 +131,7 @@
2
8
16
+ 32
@@ -231,6 +232,10 @@ export default {
partitionFlag: 16,
label: "英语2区",
},
+ {
+ partitionFlag: 32,
+ label: "独联体",
+ },
{
partitionFlag: "",
label: "全部",
@@ -389,7 +394,8 @@ export default {
英语区: 1,
阿拉伯语区: 2,
土耳其区: 8,
- 英语2区: 16
+ 英语2区: 16,
+ 独联体: 32,
};
this.ediObj.checkList.forEach((res, i) => {
num += district[res];
@@ -423,6 +429,9 @@ export default {
if ((val & 16) != 0) {
value += '英语2区 ';
}
+ if ((val & 32) != 0) {
+ value += '独联体 ';
+ }
return value;
},
// 编辑回显分区
@@ -443,6 +452,9 @@ export default {
if ((val & 16) != 0) {
arr.push('英语2区');
}
+ if ((val & 32) != 0) {
+ arr.push('独联体');
+ }
return arr;
},
// 分页导航
diff --git a/src/views/users/GiftManageView.vue b/src/views/users/GiftManageView.vue
index f276815..3672109 100644
--- a/src/views/users/GiftManageView.vue
+++ b/src/views/users/GiftManageView.vue
@@ -160,6 +160,7 @@
华语区
土耳其区
英语2区
+ 独联体
@@ -712,6 +713,9 @@ export default {
if ((val & 16) != 0) {
value += '英语2区
';
}
+ if ((val & 32) != 0) {
+ value += '独联体
';
+ }
return value;
}
},
@@ -1471,6 +1475,11 @@ export default {
} else {
$("input:checkbox[name='partitionFlag']")[4].checked = false;
}
+ if ((partitionFlag & 32) != 0) {
+ $("input:checkbox[name='partitionFlag']")[5].checked = true;
+ } else {
+ $("input:checkbox[name='partitionFlag']")[5].checked = false;
+ }
// 打开编辑弹窗
$("#giftModal").modal('show');
} else {
diff --git a/src/views/users/MessageAdminView.vue b/src/views/users/MessageAdminView.vue
index 3a6f5cd..11ec2ee 100644
--- a/src/views/users/MessageAdminView.vue
+++ b/src/views/users/MessageAdminView.vue
@@ -341,6 +341,9 @@ export default {
if ((val & 16) != 0) {
value += '英语2区
';
}
+ if ((val & 32) != 0) {
+ value += '独联体
';
+ }
return value;
},
},