diff --git a/src/component/Account/followFans/follow.vue b/src/component/Account/followFans/follow.vue
index 3a77f3fe..d53357de 100644
--- a/src/component/Account/followFans/follow.vue
+++ b/src/component/Account/followFans/follow.vue
@@ -9,7 +9,7 @@
-->
- Search
+ {{ $t('account.search') }}
diff --git a/src/component/Account/frontPage/mylnformation.vue b/src/component/Account/frontPage/mylnformation.vue
index 4298f59c..e5df3e55 100644
--- a/src/component/Account/frontPage/mylnformation.vue
+++ b/src/component/Account/frontPage/mylnformation.vue
@@ -27,6 +27,7 @@
style="width: 100%;"
optionFilterProp="label"
:options="countryList"
+ :field-names="{ label: locale == 'CHINESE_SIMPLIFIED'?'labelCn':'label' }"
placeholder="Please select"
allowClear
show-search
@@ -62,7 +63,7 @@ export default defineComponent({
},
setup() {
const store = useStore();
- const {t} = useI18n();
+ const {t,locale} = useI18n();
let userDetail:any= computed(()=>{
return store.state.UserHabit.userDetail
})
@@ -143,6 +144,7 @@ export default defineComponent({
...toRefs(accountHomeData),
userDetail,
setSubmit,
+ locale,
}
},
data(){
diff --git a/src/component/Administrator/SE/allUser/addAllUser.vue b/src/component/Administrator/SE/allUser/addAllUser.vue
index 868481d2..d20eefb2 100644
--- a/src/component/Administrator/SE/allUser/addAllUser.vue
+++ b/src/component/Administrator/SE/allUser/addAllUser.vue
@@ -17,13 +17,12 @@
-->
-
+
User Name:
{
+ const confirmDelete = ()=>{
+ return new Promise((resolve, reject) => {
+ Modal.confirm({
+ title: 'Are you sure you want to delete this item?',
+ icon: createVNode(ExclamationCircleOutlined),
+ okText: 'Yes',
+ cancelText: 'No',
+ centered:true,
+ onOk() {
+ resolve(true)
+ },
+ onCancel(){
+ resolve(false)
+ }
+ });
+ })
+ }
+ const deleteAagree = async (event:any)=>{
+ let boolean:any = await confirmDelete()
+ if(!boolean){
+ return
+ }
const value = {
deleteIdList:[event.id]
}
diff --git a/src/component/Administrator/affiliate/affiliateAudit.vue b/src/component/Administrator/affiliate/affiliateAudit.vue
index 53efe406..7728c53e 100644
--- a/src/component/Administrator/affiliate/affiliateAudit.vue
+++ b/src/component/Administrator/affiliate/affiliateAudit.vue
@@ -95,6 +95,7 @@ export default defineComponent({
width: 50,
dataIndex: "id",
key: "id",
+ sorter: true,
fixed: "left",
},
{
@@ -127,6 +128,7 @@ export default defineComponent({
dataIndex: "totalEarnings",
key: "totalEarnings",
openType:'month',
+ sorter: true,
},{
title: 'Monthly income',
align: "center",
@@ -200,7 +202,6 @@ export default defineComponent({
let collectionList: any = ref([]);
let status: any = ref(0);
const openDetail = (value:any,openType:string)=>{
- console.log(value,openType);
let data = {
id:value.id,
type:openType
@@ -225,6 +226,7 @@ export default defineComponent({
pageSize: 10,
total: 0,
order:'',
+ orderBy:'',
affiliateId:'',
historyTableHeight: 0,
newCollectionName: "",
@@ -244,6 +246,16 @@ export default defineComponent({
this.currentPage = e.current;
this.pageSize = e.pageSize;
this.order = sorter.order == "descend" ? "DESC" : "ASC";
+ console.log(sorter.columnKey)
+ if(sorter.order){
+ if(sorter.columnKey == 'id'){
+ this.orderBy = 'id'
+ }else if(sorter.columnKey == "createTime"){
+ this.orderBy = 'createTime'
+ }else if(sorter.columnKey == "totalEarnings"){
+ this.orderBy = 'totalIncome'
+ }
+ }
this.gettrialList();
},
//查询列表
@@ -263,6 +275,7 @@ export default defineComponent({
page: this.currentPage,
size: this.pageSize,
order: this.order,
+ orderBy: this.orderBy,
status: this.currentState.value,
startTime:startDate,
endTime:endDate,
diff --git a/src/component/Administrator/affiliate/itemAffiliateDetail.vue b/src/component/Administrator/affiliate/itemAffiliateDetail.vue
index 3f916cb4..1f6ea3a5 100644
--- a/src/component/Administrator/affiliate/itemAffiliateDetail.vue
+++ b/src/component/Administrator/affiliate/itemAffiliateDetail.vue
@@ -13,7 +13,7 @@
>
-