Merge branch 'master' of https://git.ichaoj.com/MorningWhale/ams-backend

front/admin-front/src/assets/autoplay/arrow_left_alt.svg

@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.5">
+<mask id="mask0_1149_1056" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="24">
+<rect width="24" height="24" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_1149_1056)">
+<path d="M10 18L4 12L10 6L11.4 7.45L7.85 11H20V13H7.85L11.4 16.55L10 18Z" fill="#222222"/>
+</g>
+</g>
+</svg>

front/admin-front/src/views/autoplay/index.vue

@@ -261,6 +261,10 @@
       <div class="drawerRecord-container" v-if="drawerRecordStatus === 1">
         <div class="drawerAddress-container-head">
           <div class="drawerAddress-container-head-left">
+            <div class="back" style="cursor: pointer;" @click="drawerRecordStatus = 0">
+              <img src="../../assets/autoplay/arrow_left_alt.svg" alt="arrow_left_alt">
+              返回
+            </div>
             <div class="missionName">
               <div class="id">
                 {{ currentTaskInfo.amsTaskId }}
@@ -312,6 +316,14 @@
                 {{ currentRecordData.maxGas }}
               </div>
             </div>
+            <div class="item" v-for="item in currentRecordData.airdropParams">
+              <div class="title">
+                {{item.note}}
+              </div>
+              <div class="info">
+                {{ item.value }}
+              </div>
+            </div>
           </div>
           <div class="recordTitle">
             <div class="left">
@@ -319,7 +331,7 @@
                 正在进行中
               </div>
               <div class="number">
-                总计交互地址: 3/100
+                总计交互地址: {{ongoingDataTotal}}
               </div>
             </div>
             <div class="right" style="cursor: pointer" @click="refresh">
@@ -332,18 +344,23 @@
               style="width: 100%">
               <el-table-column
                 prop="address"
+                label="地址"
                 width="150">
               </el-table-column>
               <el-table-column
+                label="金额"
                 prop="amount">
               </el-table-column>
               <el-table-column
+                label="Gas"
                 prop="gas">
               </el-table-column>
               <el-table-column
+                label="TX ID"
                 prop="txId">
               </el-table-column>
               <el-table-column
+                label="状态"
                 prop="status">
                 <template v-slot="scope">
                   <div class="status" style="cursor: auto">
@@ -386,6 +403,10 @@
       <div class="drawerRecord-container" v-if="drawerRecordStatus === 2">
         <div class="drawerAddress-container-head">
           <div class="drawerAddress-container-head-left">
+            <div class="back" style="cursor: pointer;" @click="drawerRecordStatus = 0">
+              <img src="../../assets/autoplay/arrow_left_alt.svg" alt="arrow_left_alt">
+              返回
+            </div>
             <div class="missionName">
               <div class="id">
                 {{ currentTaskInfo.amsTaskId }}
@@ -428,13 +449,12 @@
                 {{ currentRecordData.intervalMax }}/分
               </div>
             </div>
-            <div class="item">
+            <div class="item" v-for="item in currentRecordData.airdropParams">
               <div class="title">
-                <img src="../../assets/autoplay/gas_meter.svg" alt="gas_meter">
-                最大 Gas fee
+                {{item.note}}
               </div>
               <div class="info">
-                {{ currentRecordData.maxGas }}
+                {{ item.value }}
               </div>
             </div>
           </div>
@@ -444,7 +464,7 @@
                 已完成
               </div>
               <div class="number">
-                总计交互地址: 3/100
+                总计交互地址: {{ongoingDataTotal}}
               </div>
             </div>
           </div>
@@ -454,18 +474,23 @@
               style="width: 100%">
               <el-table-column
                 prop="address"
+                label="地址"
                 width="150">
               </el-table-column>
               <el-table-column
+                label="金额"
                 prop="amount">
               </el-table-column>
               <el-table-column
+                label="Gas"
                 prop="gas">
               </el-table-column>
               <el-table-column
+                label="TX ID"
                 prop="txId">
               </el-table-column>
               <el-table-column
+                label="状态"
                 prop="status">
                 <template v-slot="scope">
                   <div class="status" style="cursor: auto">
@@ -726,6 +751,7 @@ export default {
       value1: '',
       recordData: [],
       ongoingData: [],//下一层
+      ongoingDataTotal:0,
       drawerStrategy: false,
       accountPassword: false,
       batchExecutionParams: {
@@ -782,6 +808,7 @@ export default {
       }
       getInteractionRecord(params).then(res => {
         this.ongoingData = res.records
+        this.ongoingDataTotal = res.total
       })
     },
     getTaskList() {
@@ -878,6 +905,7 @@ export default {
     viewRecordDetails(item, page) {
       this.drawerRecordStatus = page
       this.currentRecordData = item
+      console.log(item);
       let params = {
         page: 1,
         pageSize: 10,
@@ -885,6 +913,7 @@ export default {
       }
       getInteractionRecord(params).then(res => {
         this.ongoingData = res.records
+        this.ongoingDataTotal = res.total
       })
     },
     refresh() {
@@ -1301,7 +1330,12 @@ export default {
         display: flex;
         flex-direction: column;
         gap: 8px;
-
+        .back{
+          cursor: pointer;
+          display: flex;
+          align-items: center;
+          gap:4px;
+        }
         .missionName {
           display: flex;
           gap: 8px;
@@ -1394,14 +1428,14 @@ export default {
 
       .interactionStrategy {
         width: 100%;
-        height: 108px;
         background: #FFFFFF;
         border: 1px solid #F5F5F5;
         border-radius: 4px;
         padding: 28px;
         display: flex;
         justify-content: space-between;
-
+        flex-wrap: wrap;
+        gap:20px;
         .item {
           display: flex;
           flex-direction: column;
@@ -1509,7 +1543,7 @@ export default {
 
       .progressBar {
         position: absolute;
-        top: 138px;
+        top: 168px;
         width: 90%;
         height: 50px;
         background: #2980FF;