Quellcode durchsuchen

feat: 特殊处理修复样式图标

zhangyuhan vor 6 Monaten
Ursprung
Commit
3b387e857f

+ 10 - 7
apps/bigmember_pc/src/views/datapack/model/home.js

@@ -103,11 +103,12 @@ async function chargeDetail(params = {}) {
     chargeList.value.isAdmin = res.isAdmin || false
     chargeList.value.list =
       (res.list || []).map((v) => {
-        return Object.assign({}, v,
-          {
-            time: v.createTime ? dayjs(v.createTime * 1000).format('YYYY-MM-DD HH:mm') : '-',
-            operator: v.operator || '-'
-          })
+        return Object.assign({}, v, {
+          time: v.createTime
+            ? dayjs(v.createTime * 1000).format('YYYY-MM-DD HH:mm')
+            : '-',
+          operator: v.operator || '-'
+        })
       }) || []
   } catch (error) {
     console.error(error)
@@ -138,12 +139,14 @@ async function exported(params = {}) {
         exportList.value.list = res.data.list.map((v) => ({
           id: v.id,
           data_from: v.data_from,
-          personal_name: v.personal_name || '-',
+          personal_name: (v.personal_name || '-').replace(/\s+/g, '<br>'),
           export_num: v.export_num,
           deduct_num: v.deduct_num,
           pay_way: v.pay_way,
           down_url: v.down_url,
-          export_timestamp: v.export_timestamp ? dayjs(v.export_timestamp * 1000).format('YYYY-MM-DD HH:mm') : '-',
+          export_timestamp: v.export_timestamp
+            ? dayjs(v.export_timestamp * 1000).format('YYYY-MM-DD HH:mm')
+            : '-',
           search: v.search
         }))
       }

+ 6 - 6
apps/bigmember_pc/src/views/datapack/pages/History.vue

@@ -30,8 +30,6 @@ onMounted(() => {
   resetFilters()
   onChangePageNum(1)
 })
-
-
 </script>
 
 <template>
@@ -56,7 +54,7 @@ onMounted(() => {
           >
             <!--  更多筛选  -->
             <search-schema-filter
-              :key='filtersKey'
+              :key="filtersKey"
               v-model="filters"
               :schema="filterSchema"
               :show-label="true"
@@ -93,9 +91,7 @@ onMounted(() => {
               width="138"
             >
               <template slot-scope="scope">
-                <span>{{
-                  scope.row.personal_name ? scope.row.personal_name : '--'
-                }}</span>
+                <span v-html="scope.row.personal_name"></span>
               </template>
             </el-table-column>
             <el-table-column
@@ -264,6 +260,10 @@ onMounted(() => {
       font-size: 14px;
       color: #686868;
 
+      .icon-xiala:before {
+        content: '\e6ad';
+      }
+
       &.hide-person {
         .search-schema-filter-item:first-child {
           display: none;

+ 14 - 5
apps/bigmember_pc/src/views/datapack/pages/Home.vue

@@ -35,7 +35,6 @@ onMounted(() => {
   resetFilters()
   onChangePageNum(1)
 })
-
 </script>
 
 <template>
@@ -130,7 +129,7 @@ onMounted(() => {
       ></power-person>
       <div class="up-line up-biao online-recharge">
         <div class="data-pack-search-filter-container">
-          <h3>账户余额明细</h3>
+          <h3 style="margin-bottom: 0">账户余额明细</h3>
           <div
             class="page-filter-container"
             :class="{
@@ -140,7 +139,7 @@ onMounted(() => {
           >
             <!--  更多筛选  -->
             <search-schema-filter
-              :key='filtersKey'
+              :key="filtersKey"
               v-model="filters"
               :schema="filterSchema"
               :show-label="true"
@@ -166,7 +165,11 @@ onMounted(() => {
               </div>
             </div>
 
-            <el-table-column prop="time" label="时间" align="left"></el-table-column>
+            <el-table-column
+              prop="time"
+              label="时间"
+              align="left"
+            ></el-table-column>
             <el-table-column
               v-if="chargeList.isAdmin"
               prop="operator"
@@ -238,7 +241,12 @@ onMounted(() => {
       display: flex;
       flex-direction: row;
       align-items: center;
+      margin-bottom: 24px;
       justify-content: space-between;
+
+      .icon-xiala:before {
+        content: '\e6ad';
+      }
     }
 
     .is-left.el-table__cell {
@@ -292,8 +300,9 @@ onMounted(() => {
     }
     .search-schema-filter-container.use-style-row .search-schema-filter-item {
       line-height: 28px;
-      margin-right: 24px;
+      margin-left: 24px;
       min-width: 150px;
+      margin-right: 0;
     }
 
     .type-tag-item {