aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

布局修改 部分bug修复

Browse Source
This commit is contained in:
X1627315083
2025-08-22 10:27:48 +08:00
parent 141821a843
commit 594bf5ce0a
275 changed files with 5675 additions and 13049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/component/Administrator/SE/allUser/addAllUser.vue
View File

@@ -17,13 +17,12 @@
<div class="generalModel_btn">
<div class="generalModel_closeIcon" @click.stop="cancelDsign()">
<svg
width="46"
height="46"
width="100%" height="100%"
viewBox="0 0 46 46"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<circle cx="23" cy="23" r="23" fill="white" fill-opacity="0.3" />
<circle cx="23" cy="23" r="23" fill="black" fill-opacity="0.3" />
<rect
x="32.5063"
y="12"
@@ -157,7 +156,7 @@ export default defineComponent({
operationsData.accountId = data.id;
operationsData.userName = data.userName;
operationsData.userEmail = data.userEmail;
operationsData.password = data.userPassword;
operationsData.password = data.userPassword?data.userPassword:null;
operationsData.oldPassword = data.userPassword;
// operationsData.validStartTime='2024-08-05T00:00:06'
// operationsData.validEndTime='2024-08-05T00:00:06'

54
src/component/Administrator/SE/allUser/index.vue
View File

@@ -34,7 +34,7 @@
:options="allCountry"
></a-select>
</div> -->
<div class="admin_state_item">
<!-- <div class="admin_state_item">
<span>Email:</span>
<input
v-model="email"
@@ -43,13 +43,14 @@
type="text"
style="width: 230px"
/>
</div>
</div> -->
<div class="admin_state_item">
<span>User Name:</span>
<a-select
v-model:value="ids"
mode="multiple"
style="width: 230px"
:field-names="{ label: 'label', value: 'label' }"
:filter-option="filterOption"
placeholder="Select Item..."
max-tag-count="responsive"
@@ -165,6 +166,8 @@ import {
import { formatTime } from "@/tool/util";
import { useStore } from "vuex";
import { Https } from "@/tool/https";
import { Modal,message } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import allUserPoerationsVue from "./addAllUser.vue";
export default defineComponent({
components: {allUserPoerationsVue,},
@@ -281,6 +284,22 @@ export default defineComponent({
key: "credits",
width:100,
sorter: true,
},
{
title: "Credits Usage",
align: "center",
dataIndex: "creditsUsage",
key: "creditsUsage",
width:150,
sorter: true,
},
{
title: "Credits Usage Limit",
align: "center",
dataIndex: "creditsUsageLimit",
key: "creditsUsageLimit",
width:200,
sorter: true,
},
{
title: "Operations",
@@ -345,13 +364,15 @@ export default defineComponent({
page: filterData.currentPage,
systemUser: filterData.systemUser,
country: filterData.country,
email: filterData.email.trim(),
// email: filterData.email.trim(),
userType: filterData.userType,
ids: filterData.ids,
ids: [],
occupation: filterData.occupation,
order: filterData.order,
orderBy: filterData.orderBy,
userName: filterData.userName,
// userName: filterData.userName,
userName: filterData.ids,
};
return data;
};
@@ -435,7 +456,28 @@ export default defineComponent({
fileInput.click();
}
const deleteAagree = (event:any)=>{
const confirmDelete = ()=>{
return new Promise<void>((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]
}

15
src/component/Administrator/affiliate/affiliateAudit.vue
View File

@@ -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,

16
src/component/Administrator/affiliate/itemAffiliateDetail.vue
View File

@@ -13,7 +13,7 @@
>
<div class="generalModel_btn">
<div class="generalModel_closeIcon" @click.stop="cancelDsign()">
<svg width="46" height="46" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
<svg width="100%" height="100%" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="23" cy="23" r="23" fill="#000" fill-opacity="0.3"/>
<rect x="32.5063" y="12" width="3" height="29" rx="1.5" transform="rotate(45 32.5063 12)" fill="white"/>
<rect x="34.6274" y="32.5059" width="3" height="29" rx="1.5" transform="rotate(135 34.6274 32.5059)" fill="white"/>
@@ -70,6 +70,7 @@
import { defineComponent, ref, createVNode, computed, reactive, toRefs, nextTick } from "vue";
import { Https } from "@/tool/https";
import { Modal, message } from "ant-design-vue";
import { orderBy } from "element-plus/es/components/table/src/util.mjs";
export default defineComponent({
components: {
},
@@ -87,6 +88,7 @@ export default defineComponent({
currentPage: 1,
pageSize: 10,
order:'',
orderBy:'',
total: 0,
historyTableHeight:0,
columns:computed(() => {
@@ -98,6 +100,7 @@ export default defineComponent({
dataIndex: "accountId",
key: "accountId",
fixed: "left",
sorter: true,
},{
title: 'User Name',
key: "username",
@@ -118,6 +121,7 @@ export default defineComponent({
width: 200,
dataIndex: "firstSubscriptionPaymentAmount",
key: "firstSubscriptionPaymentAmount",
sorter: true,
},{
title: 'Commission',
align: "center",
@@ -177,6 +181,15 @@ export default defineComponent({
const changePage = (e: any, filters:any, sorter:any)=>{
itemAffiliateDetail.currentPage = e.current;
itemAffiliateDetail.pageSize = e.pageSize;
if(sorter.order){
if(sorter.columnKey == 'accountId'){
itemAffiliateDetail.orderBy = 'id'
}else if(sorter.columnKey == "time"){
itemAffiliateDetail.orderBy = 'createTime'
}else if(sorter.columnKey == "firstSubscriptionPaymentAmount"){
itemAffiliateDetail.orderBy = 'totalIncome'
}
}
itemAffiliateDetail.order = sorter.order == "descend" ? "DESC" : "ASC";
getDetailList();
}
@@ -193,6 +206,7 @@ export default defineComponent({
endTime:endDate,
startTime:startDate,
order:itemAffiliateDetail.order,
orderBy:itemAffiliateDetail.orderBy,
page: itemAffiliateDetail.currentPage,
size: itemAffiliateDetail.pageSize,
}

2
src/component/Administrator/allUserPoerations.vue
View File

@@ -15,7 +15,7 @@
>
<div class="generalModel_btn">
<div class="generalModel_closeIcon" @click.stop="cancelDsign()">
<svg width="46" height="46" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
<svg width="100%" height="100%" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="23" cy="23" r="23" fill="#000" fill-opacity="0.3"/>
<rect x="32.5063" y="12" width="3" height="29" rx="1.5" transform="rotate(45 32.5063 12)" fill="white"/>
<rect x="34.6274" y="32.5059" width="3" height="29" rx="1.5" transform="rotate(135 34.6274 32.5059)" fill="white"/>

5
src/component/Administrator/coupons/addAllUser.vue
View File

@@ -17,13 +17,12 @@
<div class="generalModel_btn">
<div class="generalModel_closeIcon" @click.stop="cancelDsign()">
<svg
width="46"
height="46"
width="100%" height="100%"
viewBox="0 0 46 46"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<circle cx="23" cy="23" r="23" fill="white" fill-opacity="0.3" />
<circle cx="23" cy="23" r="23" fill="black" fill-opacity="0.3" />
<rect
x="32.5063"
y="12"

2
src/component/Administrator/organization/add.vue
View File

@@ -16,7 +16,7 @@
>
<div class="generalModel_btn">
<div class="generalModel_closeIcon" @click.stop="cancelDsign()">
<svg width="46" height="46" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
<svg width="100%" height="100%" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="23" cy="23" r="23" fill="#000" fill-opacity="0.3"/>
<rect x="32.5063" y="12" width="3" height="29" rx="1.5" transform="rotate(45 32.5063 12)" fill="white"/>
<rect x="34.6274" y="32.5059" width="3" height="29" rx="1.5" transform="rotate(135 34.6274 32.5059)" fill="white"/>

2
src/component/Administrator/questionnaire.vue
View File

@@ -47,7 +47,7 @@
>
<div class="generalModel_btn">
<div class="generalModel_closeIcon" @click.stop="closeModal()">
<svg width="46" height="46" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
<svg width="100%" height="100%" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="23" cy="23" r="23" fill="white" fill-opacity="0.3"/>
<rect x="32.5063" y="12" width="3" height="29" rx="1.5" transform="rotate(45 32.5063 12)" fill="white"/>
<rect x="34.6274" y="32.5059" width="3" height="29" rx="1.5" transform="rotate(135 34.6274 32.5059)" fill="white"/>