Merge branch 'master_cart' into dev

src/main/java/com/izouma/nineth/config/MetaConstants.java

@@ -21,4 +21,6 @@ public interface MetaConstants {
     String BLANK = " ";
 
     String REDIS_STOCK_PREFIX = "stock:";
+
+    Long META_GOLD_RECEIVED_RANK_ID = 1L;
 }

src/main/java/com/izouma/nineth/domain/MetaTop.java → src/main/java/com/izouma/nineth/domain/MetaRank.java

@@ -14,13 +14,13 @@ import javax.persistence.Entity;
 @NoArgsConstructor
 @Entity
 @ApiModel("元宇宙排行榜管理")
-public class MetaTop extends BaseEntity{
+public class MetaRank extends BaseEntity {
 
-    @ApiModelProperty("排行榜名称")
+    @ApiModelProperty("名称")
     private String name;
 
-    @ApiModelProperty("排行榜用途")
-    private String rule;
+    @ApiModelProperty("详情")
+    private String detail;
 
     @ApiModelProperty("配置图片")
     private String pic;

src/main/java/com/izouma/nineth/dto/MetaGoldTopDTO.java → src/main/java/com/izouma/nineth/dto/MetaRankDTO.java

@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
-public class MetaGoldTopDTO {
+public class MetaRankDTO {
 
     @ApiModelProperty("用户Id")
     @ExcelProperty("用户ID")
@@ -23,7 +23,7 @@ public class MetaGoldTopDTO {
     @ExcelProperty("昵称")
     private String nickName;
 
-    @ApiModelProperty("用户金币数量")
-    @ExcelProperty("金币数量")
-    private Long num;
+    @ApiModelProperty("备注")
+    @ExcelProperty("备注")
+    private String remark;
 }

src/main/java/com/izouma/nineth/dto/nftdomain/DomainOrderDTO.java

@@ -0,0 +1,25 @@
+package com.izouma.nineth.dto.nftdomain;
+
+import com.izouma.nineth.converter.FileObjectListConverter;
+import com.izouma.nineth.domain.FileObject;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Convert;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DomainOrderDTO {
+    private String           name;
+    private String           owner;
+    private String           ownerAvatar;
+    private BigDecimal       price;
+    @Convert(converter = FileObjectListConverter.class)
+    private List<FileObject> pic;
+    private LocalDate        payTime;
+}

src/main/java/com/izouma/nineth/enums/MetaResourcesType.java

@@ -3,6 +3,7 @@ package com.izouma.nineth.enums;
 public enum MetaResourcesType {
     PARTY_ONE("党建一楼"),
     PARTY_TWO("党建二楼"),
+    METAVERSE("元宇宙"),
     PARTY_THREE("党建三楼");
 
     private final String description;

src/main/java/com/izouma/nineth/repo/AssetRepo.java

@@ -1,11 +1,13 @@
 package com.izouma.nineth.repo;
 
+import com.izouma.nineth.aspect.AssetSaveAspect;
 import com.izouma.nineth.domain.Asset;
 import com.izouma.nineth.dto.FuAssetDTO;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.enums.AssetSource;
 import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.enums.CollectionType;
+import org.jboss.marshalling.util.IdentityIntMap;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -37,9 +39,9 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
 
     List<Asset> findByCreatedAtBefore(LocalDateTime localDateTime);
 
-    Optional<Asset> findByCollectionIdAndStatus(Long collectionId,AssetStatus statuses );
+    Optional<Asset> findByCollectionIdAndStatus(Long collectionId, AssetStatus statuses);
 
-    Optional<Asset> findByIdAndStatus(Long collectionId,AssetStatus statuses );
+    Optional<Asset> findByIdAndStatus(Long collectionId, AssetStatus statuses);
 
     List<Asset> findByConsignmentTrue();
 
@@ -187,5 +189,11 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
 
     Asset findFirstByNameAndStatus(String name, AssetStatus status);
 
-    Asset findByNameAndStatusAndCategoryAndDel(String name, AssetStatus status, String categroy,boolean del);
+    Asset findByNameAndStatusAndCategoryAndDel(String name, AssetStatus status, String categroy, boolean del);
+
+    int countAllByPrefixNameAndStatusAndDel(String prefixName, AssetStatus assetStatus, boolean del);
+
+    int countAllByPrefixNameAndStatusAndConsignmentAndDel(String prefixName, AssetStatus assetStatus, boolean consignment, boolean del);
+
+    int countAllByPrefixNameAndStatusAndConsignmentAndPublicShowAndDel(String prefixName, AssetStatus assetStatus, boolean consignment, boolean publicShow, boolean del);
 }

src/main/java/com/izouma/nineth/repo/MetaTopRepo.java → src/main/java/com/izouma/nineth/repo/MetaRankRepo.java

@@ -1,6 +1,6 @@
 package com.izouma.nineth.repo;
 
-import com.izouma.nineth.domain.MetaTop;
+import com.izouma.nineth.domain.MetaRank;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -8,8 +8,8 @@ import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
 
-public interface MetaTopRepo extends JpaRepository<MetaTop, Long>, JpaSpecificationExecutor<MetaTop> {
-    @Query("update MetaTop t set t.del = true where t.id = ?1")
+public interface MetaRankRepo extends JpaRepository<MetaRank, Long>, JpaSpecificationExecutor<MetaRank> {
+    @Query("update MetaRank t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);

src/main/java/com/izouma/nineth/repo/MetaUserGoldRecordRepo.java

@@ -1,8 +1,6 @@
 package com.izouma.nineth.repo;
 
 import com.izouma.nineth.domain.MetaUserGoldRecord;
-import com.izouma.nineth.dto.MetaGoldTopDTO;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -18,6 +16,6 @@ public interface MetaUserGoldRecordRepo extends JpaRepository<MetaUserGoldRecord
     @Transactional
     void softDelete(Long id);
 
-    @Query(value = "select user_id userId,sum(operation_num) num,nickname nickName,avatar head from meta_user_gold_record inner join user u on meta_user_gold_record.user_id = u.id where meta_user_gold_record.created_at between ?1 and ?2 and operation_num > 0 group by user_id  order by sum(operation_num) desc",nativeQuery = true)
-    List<Map<String,String>> top(String beginTime, String endTime);
+    @Query(value = "select user_id userId, sum(operation_num) remark, nickname nickName, avatar head from meta_user_gold_record inner join user u on meta_user_gold_record.user_id = u.id where meta_user_gold_record.created_at between ?1 and ?2 and operation_num > 0 group by user_id  order by sum(operation_num) desc", nativeQuery = true)
+    List<Map<String, String>> rank(String beginTime, String endTime);
 }

src/main/java/com/izouma/nineth/repo/OrderRepo.java

@@ -128,4 +128,7 @@ public interface OrderRepo extends JpaRepository<Order, Long>, JpaSpecificationE
     List<Map<String, Object>> newestDomainOrder();
 
     List<Order> findAllByParentOrderId(Long id);
+
+    @Query("select o from Order o join Asset a on o.id = a.id where o.status = 'FINISH' and a.prefixName = ?1 order by o.payTime desc ")
+    Page<Order> queryDomainOrder(String prefixName, Pageable pageable);
 }

src/main/java/com/izouma/nineth/service/MetaRankService.java

@@ -0,0 +1,73 @@
+package com.izouma.nineth.service;
+
+import cn.hutool.core.convert.Convert;
+import com.alibaba.fastjson.JSONArray;
+import com.izouma.nineth.config.MetaConstants;
+import com.izouma.nineth.domain.MetaRank;
+import com.izouma.nineth.dto.MetaRankDTO;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.dto.PageWrapper;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaRankRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class MetaRankService {
+
+    private MetaRankRepo metaRankRepo;
+
+    private MetaUserGoldRecordService metaUserGoldRecordService;
+
+    public Page<MetaRank> all(PageQuery pageQuery) {
+        return metaRankRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaRank.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public Page<MetaRankDTO> rank(PageQuery pageQuery) {
+        Map<String, Object> query = pageQuery.getQuery();
+        if (!query.containsKey("id")) {
+            throw new BusinessException("排行榜id不存在！");
+        }
+        Long id = Convert.toLong(query.get("id"));
+        if (id.equals(MetaConstants.META_GOLD_RECEIVED_RANK_ID)) {
+            return buildPage(pageQuery, metaUserGoldRecordService.rank());
+        }
+        // ...
+        throw new BusinessException("非法排行榜id");
+    }
+
+    private Page<MetaRankDTO> buildPage(PageQuery pageQuery, List<Map<String, String>> rank) {
+        if (CollectionUtils.isEmpty(rank)) {
+            return null;
+        }
+        JSONArray jsonArray = new JSONArray();
+        jsonArray.addAll(rank);
+        List<MetaRankDTO> metaRankDTOS = jsonArray.toJavaList(MetaRankDTO.class);
+        int page = pageQuery.getPage();
+        int size = pageQuery.getSize();
+        int start = page * size;
+        int totalElements = 0;
+        if (CollectionUtils.isEmpty(metaRankDTOS)) {
+            return new PageWrapper<>(new ArrayList<MetaRankDTO>(), page,
+                    size, totalElements).toPage();
+        }
+        totalElements = metaRankDTOS.size();
+        List<MetaRankDTO> newMetaRankDTOS;
+        if (metaRankDTOS.size() < start + size) {
+            newMetaRankDTOS = metaRankDTOS.subList(start, metaRankDTOS.size());
+            return new PageWrapper<>(newMetaRankDTOS, page,
+                    size, totalElements).toPage();
+        }
+        newMetaRankDTOS = metaRankDTOS.subList(start, start + size);
+        return new PageWrapper<>(newMetaRankDTOS, page,
+                size, totalElements).toPage();
+    }
+}

src/main/java/com/izouma/nineth/service/MetaStoreService.java

@@ -153,7 +153,7 @@ public class MetaStoreService {
     }
 
     /**
-     * 更新 Redis 中的库存信息，异步更新数据库中的库存
+     * 更新 Redis 中的库存信息，同时更新数据库中的库存
      *
      * @param metaStoreId 商品id
      * @param stockNum    库存数量

src/main/java/com/izouma/nineth/service/MetaTopService.java

@@ -1,20 +0,0 @@
-package com.izouma.nineth.service;
-
-import com.izouma.nineth.domain.MetaTop;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.repo.MetaTopRepo;
-import com.izouma.nineth.utils.JpaUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-@Service
-@AllArgsConstructor
-public class MetaTopService {
-
-    private MetaTopRepo metaTopRepo;
-
-    public Page<MetaTop> all(PageQuery pageQuery) {
-        return metaTopRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaTop.class), JpaUtils.toPageRequest(pageQuery));
-    }
-}

src/main/java/com/izouma/nineth/service/MetaUserGoldRecordService.java

@@ -1,22 +1,32 @@
 package com.izouma.nineth.service;
 
+import com.izouma.nineth.config.MetaConstants;
 import com.izouma.nineth.domain.MetaUserGoldRecord;
 import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.dto.PageWrapper;
-import com.izouma.nineth.dto.UserHoldDTO;
 import com.izouma.nineth.repo.MetaUserGoldRecordRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 @Service
 @AllArgsConstructor
 public class MetaUserGoldRecordService {
 
     private MetaUserGoldRecordRepo metaUserGoldRecordRepo;
 
+    private MetaParamsConfigService metaParamsConfigService;
+
     public Page<MetaUserGoldRecord> all(PageQuery pageQuery) {
         return metaUserGoldRecordRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaUserGoldRecord.class), JpaUtils.toPageRequest(pageQuery));
     }
+
+    public List<Map<String, String>> rank() {
+        String beginTime = metaParamsConfigService.getString(MetaConstants.META_GOLD_TOP_BEGIN_TIME);
+        String endTime = metaParamsConfigService.getString(MetaConstants.META_GOLD_TOP_END_TIME);
+        return metaUserGoldRecordRepo.rank(beginTime, endTime);
+    }
 }

src/main/java/com/izouma/nineth/service/OrderService.java

@@ -24,6 +24,7 @@ import com.izouma.nineth.domain.nftdomain.Cart;
 import com.izouma.nineth.dto.MarketSettlement;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.dto.UserBankCard;
+import com.izouma.nineth.dto.nftdomain.DomainOrderDTO;
 import com.izouma.nineth.enums.*;
 import com.izouma.nineth.event.*;
 import com.izouma.nineth.exception.BusinessException;
@@ -33,6 +34,7 @@ import com.izouma.nineth.security.Authority;
 import com.izouma.nineth.service.netease.NeteaseMessageService;
 import com.izouma.nineth.service.sms.SmsService;
 import com.izouma.nineth.utils.*;
+import com.sun.xml.bind.v2.runtime.NameBuilder;
 import io.github.bucket4j.Bandwidth;
 import io.github.bucket4j.Bucket;
 import io.github.bucket4j.BucketConfiguration;
@@ -52,6 +54,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.env.Environment;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.BoundValueOperations;
@@ -60,6 +63,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import javax.crypto.interfaces.PBEKey;
 import javax.persistence.criteria.Join;
 import javax.transaction.Transactional;
 import java.io.OutputStream;
@@ -1258,4 +1262,40 @@ public class OrderService {
             });
         }).get();
     }
+
+    public Map<String, Object> domainTransferInfo(String prefixName) {
+        //流通量
+        int transferringCount = assetRepo.countAllByPrefixNameAndStatusAndDel(prefixName, AssetStatus.NORMAL, false);
+        //寄售中
+        int consignment = assetRepo
+                .countAllByPrefixNameAndStatusAndConsignmentAndDel(prefixName, AssetStatus.NORMAL, true, false);
+        //仅展示
+        int publicShow = assetRepo
+                .countAllByPrefixNameAndStatusAndConsignmentAndPublicShowAndDel(prefixName, AssetStatus.NORMAL, false, true, false);
+        Map<String, Object> result = new HashMap<>();
+        result.put("transferringCount", transferringCount);
+        result.put("consignment", consignment);
+        result.put("publicShow", publicShow);
+        return result;
+    }
+
+    public Page<DomainOrderDTO> newestDomainTransfer(String prefix, Pageable pageable) {
+        Page<Order> orders = orderRepo.queryDomainOrder(prefix, pageable);
+        List<Order> orderContent = orders.getContent();
+        List<DomainOrderDTO> domainOrderDTOS = new ArrayList<>();
+        orderContent.forEach(order -> {
+            Asset asset = assetRepo.findById(order.getAssetId()).orElse(null);
+            if (asset != null) {
+                DomainOrderDTO domainOrderDTO = new DomainOrderDTO();
+                domainOrderDTO.setName(order.getName());
+                domainOrderDTO.setOwner(asset.getOwner());
+                domainOrderDTO.setOwnerAvatar(asset.getOwnerAvatar());
+                domainOrderDTO.setPrice(order.getPrice());
+                domainOrderDTO.setPayTime(order.getPayTime().toLocalDate());
+                domainOrderDTO.setPic(order.getPic());
+                domainOrderDTOS.add(domainOrderDTO);
+            }
+        });
+        return new PageImpl<>(domainOrderDTOS, orders.getPageable(), orders.getTotalElements());
+    }
 }

src/main/java/com/izouma/nineth/web/MetaRankController.java

@@ -0,0 +1,53 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.MetaRank;
+import com.izouma.nineth.dto.MetaRankDTO;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaRankRepo;
+import com.izouma.nineth.service.MetaRankService;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/metaRank")
+@AllArgsConstructor
+public class MetaRankController extends BaseController {
+    private MetaRankService metaRankService;
+    private MetaRankRepo    metaRankRepo;
+
+    @PostMapping("/all")
+    public Page<MetaRank> all(@RequestBody PageQuery pageQuery) {
+        return metaRankService.all(pageQuery);
+    }
+
+    @PostMapping("/save")
+    public MetaRank save(@RequestBody MetaRank record) {
+        if (record.getId() != null) {
+            MetaRank orig = metaRankRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return metaRankRepo.save(orig);
+        }
+        return metaRankRepo.save(record);
+    }
+
+    @PostMapping("/rank")
+    public Page<MetaRankDTO> rank(@RequestBody PageQuery pageQuery) {
+        return metaRankService.rank(pageQuery);
+    }
+
+    @GetMapping("/excel/rank")
+    @ResponseBody
+    public void excelTop(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MetaRankDTO> data = rank(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/nineth/web/MetaTopController.java

@@ -1,60 +0,0 @@
-package com.izouma.nineth.web;
-import com.izouma.nineth.domain.MetaTop;
-import com.izouma.nineth.service.MetaTopService;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.MetaTopRepo;
-import com.izouma.nineth.utils.ObjUtils;
-import com.izouma.nineth.utils.excel.ExcelUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-@RestController
-@RequestMapping("/metaTop")
-@AllArgsConstructor
-public class MetaTopController extends BaseController {
-    private MetaTopService metaTopService;
-    private MetaTopRepo metaTopRepo;
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/save")
-    public MetaTop save(@RequestBody MetaTop record) {
-        if (record.getId() != null) {
-            MetaTop orig = metaTopRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, record);
-            return metaTopRepo.save(orig);
-        }
-        return metaTopRepo.save(record);
-    }
-
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/all")
-    public Page<MetaTop> all(@RequestBody PageQuery pageQuery) {
-        return metaTopService.all(pageQuery);
-    }
-
-    @GetMapping("/get/{id}")
-    public MetaTop get(@PathVariable Long id) {
-        return metaTopRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-    }
-
-    @PostMapping("/del/{id}")
-    public void del(@PathVariable Long id) {
-        metaTopRepo.softDelete(id);
-    }
-
-    @GetMapping("/excel")
-    @ResponseBody
-    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<MetaTop> data = all(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
-}
-

src/main/java/com/izouma/nineth/web/MetaUserGoldRecordController.java

@@ -1,37 +1,26 @@
 package com.izouma.nineth.web;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.izouma.nineth.config.MetaConstants;
-import com.izouma.nineth.domain.MetaGameBoxPoints;
-import com.izouma.nineth.domain.MetaParamsConfig;
 import com.izouma.nineth.domain.MetaUserGoldRecord;
-import com.izouma.nineth.dto.*;
+import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.MetaParamsConfigRepo;
 import com.izouma.nineth.repo.MetaUserGoldRecordRepo;
-import com.izouma.nineth.service.MetaParamsConfigService;
 import com.izouma.nineth.service.MetaUserGoldRecordService;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/metaUserGoldRecord")
 @AllArgsConstructor
 public class MetaUserGoldRecordController extends BaseController {
     private MetaUserGoldRecordService metaUserGoldRecordService;
-    private MetaUserGoldRecordRepo metaUserGoldRecordRepo;
-    private MetaParamsConfigService metaParamsConfigService;
+    private MetaUserGoldRecordRepo    metaUserGoldRecordRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -67,45 +56,5 @@ public class MetaUserGoldRecordController extends BaseController {
         List<MetaUserGoldRecord> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
-
-    @GetMapping("/excel/top")
-    @ResponseBody
-    public void excelTop(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<MetaGoldTopDTO> data = top(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
-
-    @PostMapping("/goldTop")
-    public Page<MetaGoldTopDTO> top(@RequestBody PageQuery pageQuery) {
-        String beginTime = metaParamsConfigService.getString(MetaConstants.META_GOLD_TOP_BEGIN_TIME);
-        String endTime = metaParamsConfigService.getString(MetaConstants.META_GOLD_TOP_END_TIME);
-        List<Map<String, String>> map = metaUserGoldRecordRepo.top(beginTime, endTime);
-        JSONArray jsonArray = new JSONArray();
-        jsonArray.addAll(map);
-        List<MetaGoldTopDTO> metaGoldTopDTOS = jsonArray.toJavaList(MetaGoldTopDTO.class);
-        // 当前页
-        int page = pageQuery.getPage();
-        // pageSize 每页查询多少条数据
-        int size = pageQuery.getSize();
-        // limit 开始偏移量
-        int start = page * size;
-        int totalElements = 0;
-        if (CollectionUtils.isEmpty(metaGoldTopDTOS)) {
-            totalElements = 0;
-            return new PageWrapper<>(new ArrayList<MetaGoldTopDTO>(), page,
-                    size, totalElements).toPage();
-        }
-        totalElements = metaGoldTopDTOS.size();
-        List<MetaGoldTopDTO> newMetaGoldTopDTOS;
-        if (metaGoldTopDTOS.size() < start + size) {
-            newMetaGoldTopDTOS = metaGoldTopDTOS.subList(start, metaGoldTopDTOS.size());
-            return new PageWrapper<>(newMetaGoldTopDTOS, page,
-                    size, totalElements).toPage();
-        }
-        newMetaGoldTopDTOS = metaGoldTopDTOS.subList(start, start + size);
-        return new PageWrapper<>(newMetaGoldTopDTOS, page,
-                size, totalElements).toPage();
-
-    }
 }
 

src/main/java/com/izouma/nineth/web/OrderController.java

@@ -5,6 +5,7 @@ import com.izouma.nineth.domain.Order;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.OrderDTO;
 import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.dto.nftdomain.DomainOrderDTO;
 import com.izouma.nineth.enums.*;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.AssetRepo;
@@ -78,8 +79,8 @@ public class OrderController extends BaseController {
         Page<Order> all = orderService.all(pageQuery);
         List<Long> userIds = all.getContent().stream().map(Order::getUserId).distinct().collect(Collectors.toList());
         Map<Long, String> userMap = userRepo.findAllById(userIds)
-                .stream()
-                .collect(Collectors.toMap(User::getId, User::getNickname));
+                                            .stream()
+                                            .collect(Collectors.toMap(User::getId, User::getNickname));
         return all.map(order -> {
             order.setNickname(userMap.get(order.getUserId()));
             return order;
@@ -247,5 +248,15 @@ public class OrderController extends BaseController {
     public void refundGas() throws ExecutionException, InterruptedException {
         orderService.refundGas();
     }
+
+    @PostMapping("/domainOrderStatistic")
+    public Map<String, Object> domainOrderStatistic(String prefixName) {
+        return orderService.domainTransferInfo(prefixName);
+    }
+
+    @PostMapping("/newestOrder")
+    public Page<DomainOrderDTO> domainOrderStatistic(String prefixName, Pageable pageable) {
+        return orderService.newestDomainTransfer(prefixName, pageable);
+    }
 }
 

src/main/vue/src/router.js

@@ -1959,37 +1959,109 @@ const router = new Router({
                     },
                },
                 {
-                    path: '/hyperlinkEdit',
-                    name: 'HyperlinkEdit',
-                    component: () => import(/* webpackChunkName: "hyperlinkEdit" */ '@/views/HyperlinkEdit.vue'),
+                    path: '/metaAtomTaskEdit',
+                    name: 'MetaAtomTaskEdit',
+                    component: () => import(/* webpackChunkName: "metaAtomTaskEdit" */ '@/views/MetaAtomTaskEdit.vue'),
                     meta: {
-                       title: '超链编辑',
+                        title: '基础任务编辑',
                     },
                 },
                 {
-                    path: '/hyperlinkList',
-                    name: 'HyperlinkList',
-                    component: () => import(/* webpackChunkName: "hyperlinkList" */ '@/views/HyperlinkList.vue'),
+                    path: '/metaAtomTaskList',
+                    name: 'MetaAtomTaskList',
+                    component: () => import(/* webpackChunkName: "metaAtomTaskList" */ '@/views/MetaAtomTaskList.vue'),
                     meta: {
-                       title: '超链',
+                        title: '基础任务',
                     },
-               },
+                },
+                {
+                    path: '/metaTaskNewEdit',
+                    name: 'MetaTaskNewEdit',
+                    component: () => import(/* webpackChunkName: "metaTaskNewEdit" */ '@/views/MetaTaskNewEdit.vue'),
+                    meta: {
+                        title: '新任务管理编辑',
+                    },
+                },
+                {
+                    path: '/metaTaskNewList',
+                    name: 'MetaTaskNewList',
+                    component: () => import(/* webpackChunkName: "metaTaskNewList" */ '@/views/MetaTaskNewList.vue'),
+                    meta: {
+                        title: '新任务管理',
+                    },
+                },
                 {
-                    path: '/domainAskEdit',
-                    name: 'DomainAskEdit',
-                    component: () => import(/* webpackChunkName: "domainAskEdit" */ '@/views/DomainAskEdit.vue'),
+                    path: '/metaStoreEdit',
+                    name: 'MetaStoreEdit',
+                    component: () => import(/* webpackChunkName: "metaStoreEdit" */ '@/views/MetaStoreEdit.vue'),
                     meta: {
-                       title: '元域名叫价编辑',
+                        title: '商店编辑',
                     },
                 },
                 {
-                    path: '/domainAskList',
-                    name: 'DomainAskList',
-                    component: () => import(/* webpackChunkName: "domainAskList" */ '@/views/DomainAskList.vue'),
+                    path: '/metaStoreList',
+                    name: 'MetaStoreList',
+                    component: () => import(/* webpackChunkName: "metaStoreList" */ '@/views/MetaStoreList.vue'),
                     meta: {
-                       title: '元域名叫价',
+                        title: '商店',
                     },
-               }
+                },
+                {
+                    path: '/metaStorePurchaseRecordList',
+                    name: 'MetaStorePurchaseRecordList',
+                    component: () => import(/* webpackChunkName: "metaStorePurchaseRecordList" */ '@/views/MetaStorePurchaseRecordList.vue'),
+                    meta: {
+                        title: '商店购买记录',
+                    },
+                },
+                {
+                    path: '/metaRankEdit',
+                    name: 'MetaRankEdit',
+                    component: () => import(/* webpackChunkName: "metaRankEdit" */ '@/views/MetaRankEdit.vue'),
+                    meta: {
+                       title: '元宇宙排行榜管理新增',
+                    },
+                },
+                {
+                    path: '/metaRankList',
+                    name: 'MetaRankList',
+                    component: () => import(/* webpackChunkName: "metaRankList" */ '@/views/MetaRankList.vue'),
+                    meta: {
+                       title: '元宇宙排行榜管理',
+                    },
+                },
+                {
+                    path: '/MetaRankDetailList',
+                    name: 'MetaRankDetailList',
+                    component: () => import(/* webpackChunkName: "metaRankList" */ '@/views/MetaRankDetailList.vue'),
+                    meta: {
+                       title: '元宇宙排行榜',
+                    },
+                },
+                {
+                    path: '/metaUserTaskAwardReceivedRecordNewList',
+                    name: 'MetaUserTaskAwardReceivedRecordNewList',
+                    component: () => import(/* webpackChunkName: "metaUserTaskAwardReceivedRecordNewList" */ '@/views/MetaUserTaskAwardReceivedRecordNewList.vue'),
+                    meta: {
+                        title: '任务奖励奖励记录',
+                    },
+                },
+                {
+                    path: '/metaUserTaskProgressNewList',
+                    name: 'MetaUserTaskProgressNewList',
+                    component: () => import(/* webpackChunkName: "metaUserTaskProgressNewList" */ '@/views/MetaUserTaskProgressNewList.vue'),
+                    meta: {
+                        title: '任务进度',
+                    },
+                },
+                {
+                    path: '/metaTaskToUserNewList',
+                    name: 'MetaTaskToUserNewList',
+                    component: () => import(/* webpackChunkName: "metaTaskToUserNewList" */ '@/views/MetaTaskToUserNewList.vue'),
+                    meta: {
+                        title: '任务领取记录',
+                    },
+                }
                 /**INSERT_LOCATION**/
             ]
         },

src/main/vue/src/views/MetaAccessoriesEdit.vue

@@ -2,7 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
             <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -53,9 +52,6 @@
                     </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaAdvertRecordEdit.vue

@@ -2,7 +2,6 @@
 	<div class="edit-view">
 		<page-title>
 			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
 			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
 		</page-title>
 		<div class="edit-view__content-wrapper">
@@ -37,9 +36,6 @@
 					</el-form-item>
 					<el-form-item class="form-submit">
 						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
 						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
 					</el-form-item>
 				</el-form>

src/main/vue/src/views/MetaAdvertRecordList.vue

@@ -36,7 +36,7 @@
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <el-table-column prop="createdAt" align="center" label="时间"> </el-table-column>
             <el-table-column prop="name" align="center" label="名称"> </el-table-column>
-            <el-table-column prop="detail" align="center" label="详情"> </el-table-column>
+            <el-table-column prop="detail" align="center" label="详情" show-overflow-tooltip> </el-table-column>
             <el-table-column prop="price" align="center" label="价格"> </el-table-column>
             <el-table-column prop="region" align="center" label="区域"> </el-table-column>
             <el-table-column prop="number" align="center" label="编号"> </el-table-column>

src/main/vue/src/views/MetaAtomTaskEdit.vue

@@ -2,9 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                删除
-            </el-button>
             <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -68,9 +65,6 @@
                         <el-button @click="onSave" :loading="saving" type="primary">
                             保存
                         </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaAtomTaskList.vue

@@ -25,7 +25,7 @@
             </el-table-column>
             <el-table-column prop="name" align="center" label="任务名称">
             </el-table-column>
-            <el-table-column prop="detail" align="center" label="任务详情">
+            <el-table-column prop="detail" align="center" label="任务详情" show-overflow-tooltip>
             </el-table-column>
             <el-table-column prop="targetType" align="center" label="任务目标" :formatter="targetTypeFormatter">
             </el-table-column>
@@ -141,7 +141,7 @@ export default {
 			this.$axios
 				.get('/metaAtomTask/excel', {
 					responseType: 'blob',
-					params: { size: 10000 }
+					params: { size: 10000, query: { del : false } }
 				})
 				.then(res => {
 					console.log(res);

src/main/vue/src/views/MetaBagAssetEffectConfigEdit.vue

@@ -2,9 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                删除
-            </el-button>
             <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -23,9 +20,6 @@
                         <el-button @click="onSave" :loading="saving" type="primary">
                             保存
                         </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaBoatPositionEdit.vue

@@ -2,7 +2,6 @@
 	<div class="edit-view">
 		<page-title>
 			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
 			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
 		</page-title>
 		<div class="edit-view__content-wrapper">
@@ -52,9 +51,6 @@
 					</el-form-item>
 					<el-form-item class="form-submit">
 						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
 						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
 					</el-form-item>
 				</el-form>

src/main/vue/src/views/MetaChannelEdit.vue

@@ -2,9 +2,6 @@
 	<div class="edit-view">
 		<page-title>
 			<el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-				删除
-			</el-button>
 			<el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
 		</page-title>
 		<div class="edit-view__content-wrapper">
@@ -23,9 +20,6 @@
 						<el-button @click="onSave" :loading="saving" type="primary">
 							保存
 						</el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
 						<el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
 					</el-form-item>
 				</el-form>

src/main/vue/src/views/MetaChannelList.vue

@@ -25,7 +25,7 @@
             </el-table-column>
             <el-table-column prop="name" align="center" label="名称">
             </el-table-column>
-            <el-table-column prop="intro" align="center" label="介绍">
+            <el-table-column prop="intro" align="center" label="介绍" show-overflow-tooltip>
             </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="150">
                 <template slot-scope="{row}">

src/main/vue/src/views/MetaCommonSwitchEdit.vue

@@ -2,7 +2,6 @@
 	<div class="edit-view">
 		<page-title>
 			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
 			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
 		</page-title>
 		<div class="edit-view__content-wrapper">
@@ -24,9 +23,6 @@
 					</el-form-item>
 					<el-form-item class="form-submit">
 						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
 						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
 					</el-form-item>
 				</el-form>

src/main/vue/src/views/MetaDestroyActivityEdit.vue

@@ -2,7 +2,6 @@
 	<div class="edit-view">
 		<page-title>
 			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
 			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
 		</page-title>
 		<div class="edit-view__content-wrapper">
@@ -70,9 +69,6 @@
 					</el-form-item>
 					<el-form-item class="form-submit">
 						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
 						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
 					</el-form-item>
 				</el-form>

src/main/vue/src/views/MetaDestroyActivityList.vue

@@ -43,9 +43,9 @@
             v-loading="fetchingData"
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-            <el-table-column prop="detail" label="详情"> </el-table-column>
-            <el-table-column prop="awardPic" label="奖励图片">
+            <el-table-column prop="id" label="ID" align="center" width="100"> </el-table-column>
+            <el-table-column prop="detail" label="详情" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="awardPic" align="center" label="奖励图片">
                 <template slot-scope="{ row }">
                     <el-image
                         style="width: 30px; height: 30px"
@@ -62,8 +62,8 @@
                     <el-tag type="success" v-else> 自动 </el-tag>
                 </template>
             </el-table-column>
-            <el-table-column prop="collectionName" label="藏品名称"> </el-table-column>
-            <el-table-column prop="rule" label="藏品规则">
+            <el-table-column prop="collectionName" label="藏品名称" align="center"> </el-table-column>
+            <el-table-column prop="rule" label="藏品规则" align="center">
                 <template v-slot="{ row }">
                     <template v-if="row.rule">
                         <div v-for="item in row.rule.tags" :key="item.id">
@@ -73,8 +73,8 @@
                 </template>
             </el-table-column>
             <el-table-column prop="num" label="藏品数量" width="80" align="center"> </el-table-column>
-            <el-table-column prop="application" label="用途"> </el-table-column>
-            <el-table-column prop="publish" label="是否发布">
+            <el-table-column prop="application" label="用途" align="center"> </el-table-column>
+            <el-table-column prop="publish" label="是否发布" align="center">
                 <template slot-scope="{ row }">
                     <el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>
                 </template>

src/main/vue/src/views/MetaEmailList.vue

@@ -46,7 +46,7 @@
 			<el-table-column prop="id" align="center" label="ID" width="100"> </el-table-column>
 			<el-table-column prop="title" align="center" label="邮件标题" width="200"> </el-table-column>
 			<el-table-column prop="author" align="center" label="邮件作者" width="100"> </el-table-column>
-			<el-table-column prop="description" align="center" label="邮件内容"> </el-table-column>
+			<el-table-column prop="description" align="center" label="邮件内容" show-overflow-tooltip> </el-table-column>
 			<el-table-column prop="publish" align="center" label="是否发布" width="80">
 				<template slot-scope="{ row }">
 					<el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>

src/main/vue/src/views/MetaFeedBackList.vue

@@ -24,9 +24,9 @@
 			v-loading="fetchingData"
 		>
 			<el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-			<el-table-column prop="id" label="ID" width="100"> </el-table-column>
-			<el-table-column prop="userId" label="用户ID"> </el-table-column>
-			<el-table-column prop="detail" label="反馈详情"> </el-table-column>
+			<el-table-column prop="id" label="ID" width="200" align="center"> </el-table-column>
+			<el-table-column prop="userId" label="用户ID" align="center"> </el-table-column>
+			<el-table-column prop="detail" label="反馈详情" align="center" show-overflow-tooltip> </el-table-column>
 			<!-- <el-table-column prop="pic" label="图片"> </el-table-column> -->
 			<el-table-column label="操作" align="center" fixed="right" width="150">
 				<template slot-scope="{ row }">

src/main/vue/src/views/MetaGameCopyEdit.vue

@@ -2,7 +2,6 @@
 	<div class="edit-view">
 		<page-title>
 			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
 			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
 		</page-title>
 		<div class="edit-view__content-wrapper">
@@ -180,9 +179,6 @@
 					</el-form-item>
 					<el-form-item class="form-submit">
 						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
 						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
 					</el-form-item>
 				</el-form>

src/main/vue/src/views/MetaGameCopyList.vue

@@ -70,7 +70,7 @@
             </el-table-column>
             <el-table-column prop="collectionName" align="center" label="藏品名称"> </el-table-column>
             <el-table-column prop="num" align="center" label="所需nft数量"> </el-table-column>
-            <el-table-column prop="detail" align="center" label="规则详情"> </el-table-column>
+            <el-table-column prop="detail" align="center" label="规则详情" show-overflow-tooltip> </el-table-column>
             <el-table-column prop="publish" align="center" label="是否发布">
                 <template slot-scope="{ row }">
                     <el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>

src/main/vue/src/views/MetaGameStageAwardEdit.vue

@@ -2,7 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
             <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -36,9 +35,6 @@
                     </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaGameStageAwardList.vue

@@ -43,10 +43,10 @@
             v-loading="fetchingData"
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-            <el-table-column prop="gameName" label="游戏" :formatter="gameNameFormatter"> </el-table-column>
-            <el-table-column prop="point" label="积分"> </el-table-column>
-            <el-table-column prop="awardPic" label="奖励图片">
+            <el-table-column prop="id" label="ID" width="100" align="center"> </el-table-column>
+            <el-table-column prop="gameName" align="center" label="游戏" :formatter="gameNameFormatter"> </el-table-column>
+            <el-table-column prop="point" label="积分" align="center"> </el-table-column>
+            <el-table-column prop="awardPic" label="奖励图片" align="center">
                 <template slot-scope="{ row }">
                     <el-image
                         style="width: 30px; height: 30px"

src/main/vue/src/views/MetaItemEdit.vue

@@ -2,7 +2,6 @@
 	<div class="edit-view">
 		<page-title>
 			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
 			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
 		</page-title>
 		<div class="edit-view__content-wrapper">
@@ -32,9 +31,6 @@
 					</el-form-item>
 					<el-form-item class="form-submit">
 						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
 						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
 					</el-form-item>
 				</el-form>

src/main/vue/src/views/MetaLuckyDrawAwardReceiveRecordList.vue

@@ -90,7 +90,7 @@ export default {
 			this.$axios
 				.get('/metaLuckyDrawAwardReceiveRecord/excel', {
 					responseType: 'blob',
-					params: { size: 10000 }
+					params: { size: 10000, query: { del : false } }
 				})
 				.then(res => {
 					console.log(res);

src/main/vue/src/views/MetaLuckyDrawEdit.vue

@@ -2,7 +2,6 @@
 	<div class="edit-view">
 		<page-title>
 			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
 			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
 		</page-title>
 		<div class="edit-view__content-wrapper">
@@ -246,9 +245,6 @@
 					</el-form-item>
 					<el-form-item class="form-submit">
 						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
 						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
 					</el-form-item>
 				</el-form>

src/main/vue/src/views/MetaLuckyDrawList.vue

@@ -76,7 +76,7 @@
             <el-table-column prop="num" align="center" label="所需nft数量"> </el-table-column>
             <el-table-column prop="metaPropId" align="center" label="道具"> </el-table-column>
             <el-table-column prop="metaPropNum" align="center" label="道具数量"> </el-table-column>
-            <el-table-column prop="detail" align="center" label="规则详情"> </el-table-column>
+            <el-table-column prop="detail" align="center" label="规则详情" show-overflow-tooltip> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="350">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain> 编辑 </el-button>
@@ -166,7 +166,7 @@ export default {
             this.$axios
                 .get('/metaLuckyDraw/excel', {
                     responseType: 'blob',
-                    params: { size: 10000 }
+                    params: { size: 10000, query: { del : false }}
                 })
                 .then(res => {
                     console.log(res);

src/main/vue/src/views/MetaPlayerRoleClassifyEdit.vue

@@ -2,7 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
             <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -53,9 +52,6 @@
                     </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaPlayerRoleClassifyList.vue

@@ -43,9 +43,9 @@
             v-loading="fetchingData"
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-            <el-table-column prop="classify" label="角色分类"> </el-table-column>
-            <el-table-column prop="metaPlayerRoleList" label="角色列表">
+            <el-table-column prop="id" label="ID" width="100" align="center"> </el-table-column>
+            <el-table-column prop="classify" label="角色分类" align="center"> </el-table-column>
+            <el-table-column prop="metaPlayerRoleList" label="角色列表" align="center">
                 <template v-slot="{ row }">
                     <template v-if="row.metaPlayerRoleList">
                         <div v-for="item in row.metaPlayerRoleList" :key="item.id">

src/main/vue/src/views/MetaProblemEdit.vue

@@ -2,9 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                删除
-            </el-button>
             <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -15,9 +12,15 @@
                         <el-form-item prop="title" label="标题">
                                     <el-input v-model="formData.title"></el-input>
                         </el-form-item>
-                        <el-form-item prop="answer" label="答案">
-                                    <el-input v-model="formData.answer"></el-input>
-                        </el-form-item>
+                        <el-form-item prop="answer" label="答案" style="width: calc(100vw - 450px)">
+						<el-input
+							v-model="formData.answer"
+							type="textarea"
+							:autosize="{ minRows: 3, maxRows: 20 }"
+							placeholder="请输入答案"
+						>
+						</el-input>
+					</el-form-item>
                         <el-form-item prop="value" label="文件">
                         <file-upload v-model="formData.value" :limit="1"></file-upload>
                     </el-form-item>
@@ -25,9 +28,6 @@
                         <el-button @click="onSave" :loading="saving" type="primary">
                             保存
                         </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaProblemList.vue

@@ -43,10 +43,10 @@
             v-loading="fetchingData"
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-            <el-table-column prop="title" label="标题"> </el-table-column>
-            <el-table-column prop="answer" label="答案"> </el-table-column>
-            <el-table-column prop="value" label="文件"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100" align="center"> </el-table-column>
+            <el-table-column prop="title" label="标题" align="center"> </el-table-column>
+            <el-table-column prop="answer" label="答案" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="value" label="文件" align="center"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="150">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>

src/main/vue/src/views/MetaPropEdit.vue

@@ -2,7 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
             <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -74,9 +73,6 @@
 					</el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaQuestionEdit.vue

@@ -2,7 +2,6 @@
 	<div class="edit-view">
 		<page-title>
 			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
 			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
 		</page-title>
 		<div class="edit-view__content-wrapper">
@@ -62,9 +61,6 @@
                     </el-form-item>
 					<el-form-item class="form-submit">
 						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
 						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
 					</el-form-item>
 				</el-form>

src/main/vue/src/views/MetaQuestionList.vue

@@ -45,7 +45,7 @@
 			<el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
 			<el-table-column prop="id" label="ID" width="100"> </el-table-column>
 			<el-table-column prop="title" label="题目标签"> </el-table-column>
-			<el-table-column prop="description" label="题目描述"> </el-table-column>
+			<el-table-column prop="description" label="题目描述" show-overflow-tooltip> </el-table-column>
 			<el-table-column prop="optionA" label="选项A"> </el-table-column>
 			<el-table-column prop="optionB" label="选项B"> </el-table-column>
 			<el-table-column prop="optionC" label="选项C"> </el-table-column>

src/main/vue/src/views/MetaRankDetailList.vue

@@ -0,0 +1,87 @@
+<template>
+    <div class="list-view">
+        <page-title>
+            <el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData"
+                class="filter-item">
+                导出
+            </el-button>
+        </page-title>
+        <el-table :data="tableData" row-key="id" ref="table" header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell" row-class-name="table-row" cell-class-name="table-cell"
+            :height="tableHeight" v-loading="fetchingData">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="userId" label="用户Id" width="100"> </el-table-column>
+            <el-table-column prop="head" align="center" label="图片">
+                <template slot-scope="{ row }">
+                    <el-image style="width: 30px; height: 30px" :src="row.head" fit="cover" :preview-src-list="[row.head]">
+                    </el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="nickName" label="用户昵称"> </el-table-column>
+            <el-table-column prop="remark" label="金币数量" v-if ="this.$route.query.id == 1"> </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <el-pagination background @size-change="onSizeChange" @current-change="onCurrentChange" :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements">
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+	name: 'MetaRankDetailList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			url: '/metaRank/rank',
+			downloading: false
+		};
+	},
+	computed: {
+		selection() {
+			return this.$refs.table.selection.map(i => i.id);
+		}
+	},
+	methods: {
+		beforeGetData() {
+			return { query: { id: this.$route.query.id } };
+		},
+		toggleMultipleMode(multipleMode) {
+			this.multipleMode = multipleMode;
+			if (!multipleMode) {
+				this.$refs.table.clearSelection();
+			}
+		},
+		download() {
+			this.downloading = true;
+			this.$axios
+				.get('/metaRank/excel/rank', {
+					responseType: 'blob',
+					params: { size: 10000, query: { id: this.$route.query.id } }
+				})
+				.then(res => {
+					console.log(res);
+					this.downloading = false;
+					const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+					const link = document.createElement('a');
+					link.href = downloadUrl;
+					link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+					document.body.appendChild(link);
+					link.click();
+					link.remove();
+				})
+				.catch(e => {
+					console.log(e);
+					this.downloading = false;
+					this.$message.error(e.error);
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/MetaRankEdit.vue

@@ -0,0 +1,86 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form :model="formData" :rules="rules" ref="form" label-width="94px" label-position="right" size="small"
+                    style="max-width: 500px;">
+                    <el-form-item prop="name" label="名称">
+                        <el-input v-model="formData.name" placeholder="请输入排行榜名称"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="detail" label="详情">
+                        <el-input v-model="formData.detail" type="textarea" placeholder="请输入排行榜详情"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pic" label="图片">
+                        <single-upload v-model="formData.pic"></single-upload>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary">
+                            保存
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+	name: 'MetaRankEdit',
+	data() {
+		return {
+			saving: false,
+			formData: {},
+			rules: {
+				name: [
+					{
+						required: true,
+						message: '请输入排行榜名称',
+						trigger: 'blur'
+					}
+				],
+				detail: [
+					{
+						required: true,
+						message: '请输入排行榜详情',
+						trigger: 'blur'
+					}
+				]
+			}
+		};
+	},
+	methods: {
+		onSave() {
+			this.$refs.form.validate(valid => {
+				if (valid) {
+					this.submit();
+				} else {
+					return false;
+				}
+			});
+		},
+		submit() {
+			let data = { ...this.formData };
+
+			this.saving = true;
+			this.$http
+				.post('/metaRank/save', data, { body: 'json' })
+				.then(res => {
+					this.saving = false;
+					this.$message.success('成功');
+					this.$router.go(-1);
+				})
+				.catch(e => {
+					console.log(e);
+					this.saving = false;
+					this.$message.error(e.error);
+				});
+		}
+	}
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/MetaRankList.vue

@@ -0,0 +1,86 @@
+<template>
+    <div class="list-view">
+        <page-title>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading"
+                class="filter-item"
+                v-if="$store.state.userInfo && ($store.state.userInfo.id === '7179223' || $store.state.userInfo.id === '8240118' || $store.state.userInfo.id === '7963942' || $store.state.userInfo.id === '7960391')">
+                新增
+            </el-button>
+        </page-title>
+        <el-table :data="tableData" row-key="id" ref="table" header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell" row-class-name="table-row" cell-class-name="table-cell"
+            :height="tableHeight" v-loading="fetchingData">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100" align="center"> </el-table-column>
+            <el-table-column prop="name" label="名称" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="detail" label="详情" align="center" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="pic" label="图片" align="center">
+                <template slot-scope="{ row }">
+                    <el-image style="width: 30px; height: 30px" :src="row.pic" fit="cover"
+                        :preview-src-list="[row.pic]"></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="rankDetail(row.id)" type="primary" size="mini" plain>查看排行榜</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <el-pagination background @size-change="onSizeChange" @current-change="onCurrentChange" :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements">
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+	name: 'MetaRankList',
+	mixins: [pageableTable],
+	data() {
+		return {
+			multipleMode: false,
+			search: '',
+			url: '/metaRank/all',
+			downloading: false
+		};
+	},
+	computed: {
+		selection() {
+			return this.$refs.table.selection.map(i => i.id);
+		}
+	},
+	methods: {
+		beforeGetData() {
+			return { search: this.search, query: { del: false } };
+		},
+		toggleMultipleMode(multipleMode) {
+			this.multipleMode = multipleMode;
+			if (!multipleMode) {
+				this.$refs.table.clearSelection();
+			}
+		},
+		addRow() {
+			this.$router.push({
+				path: '/metaRankEdit',
+				query: {
+					...this.$route.query
+				}
+			});
+		},
+		rankDetail(id) {
+			this.$router.push({
+				path: '/MetaRankDetailList',
+				query: {
+					id: id
+				}
+			});
+		}
+	}
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/MetaResourceVersionEdit.vue

@@ -2,7 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
             <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -24,9 +23,6 @@
                     </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaResourceVersionList.vue

@@ -43,10 +43,10 @@
             v-loading="fetchingData"
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-            <el-table-column prop="createdAt" label="创建时间"> </el-table-column>
-            <el-table-column prop="downloadUrl" label="资源下载链接"> </el-table-column>
-            <el-table-column prop="version" label="资源版本"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100" align="center"> </el-table-column>
+            <el-table-column prop="createdAt" label="创建时间" align="center"> </el-table-column>
+            <el-table-column prop="downloadUrl" label="资源下载链接" align="center"> </el-table-column>
+            <el-table-column prop="version" label="资源版本" align="center"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="150">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain> 编辑 </el-button>

src/main/vue/src/views/MetaResourcesEdit.vue

@@ -2,9 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                删除
-            </el-button>
             <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -28,9 +25,6 @@
                         <el-button @click="onSave" :loading="saving" type="primary">
                             保存
                         </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
                     </el-form-item>
                 </el-form>
@@ -60,7 +54,8 @@ export default {
             type: '',
 			typeOptions: [{ label: '党建一楼', value: 'PARTY_ONE' },
 			{ label: '党建二楼', value: 'PARTY_TWO' },
-			{ label: '党建三楼', value: 'PARTY_THREE' }
+			{ label: '党建三楼', value: 'PARTY_THREE' },
+            { label: '元宇宙', value: 'METAVERSE' }
 		],
 			formData: {},
 			rules: {

src/main/vue/src/views/MetaResourcesList.vue

@@ -62,7 +62,8 @@ export default {
 			typeOptions: [
 				{ label: '党建一楼', value: 'PARTY_ONE' },
 				{ label: '党建二楼', value: 'PARTY_TWO' },
-				{ label: '党建三楼', value: 'PARTY_THREE' }
+				{ label: '党建三楼', value: 'PARTY_THREE' },
+                { label: '元宇宙', value: 'METAVERSE' }
 			],
 			url: '/metaResources/all',
 			downloading: false

src/main/vue/src/views/MetaSignAwardDrawRecordList.vue

@@ -88,7 +88,7 @@ export default {
 			this.$axios
 				.get('/metaSignAwardDrawRecord/excel', {
 					responseType: 'blob',
-					params: { size: 10000 }
+					params: { size: 10000 , query: { del : false }} 
 				})
 				.then(res => {
 					console.log(res);

src/main/vue/src/views/MetaSignAwardEdit.vue

@@ -2,7 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
             <el-button @click="onSave" :loading="saving" type="primary" v-if="!formData.id"> 保存 </el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -86,9 +85,6 @@
                     </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary" v-if="!formData.id"> 保存 </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaSignEdit.vue

@@ -2,7 +2,6 @@
 	<div class="edit-view">
 		<page-title>
 			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
 			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
 		</page-title>
 		<div class="edit-view__content-wrapper">
@@ -91,9 +90,6 @@
                     </el-form-item>
 					<el-form-item class="form-submit">
 						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
 						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
 					</el-form-item>
 				</el-form>

src/main/vue/src/views/MetaSignList.vue

@@ -45,7 +45,7 @@
 			<el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
 			<el-table-column prop="id" align="center" label="ID" width="100"> </el-table-column>
 			<el-table-column prop="date" align="center" label="日期"> </el-table-column>
-            <el-table-column prop="signRule" align="center" label="规则详情"> </el-table-column>
+            <el-table-column prop="signRule" align="center" label="规则详情" show-overflow-tooltip> </el-table-column>
 			<el-table-column prop="awardType" align="center" label="每日签到奖励类型" :formatter="awardTypeFormatter">
 			</el-table-column>
 			<el-table-column prop="metaPropId" align="center" label="道具"> </el-table-column>

src/main/vue/src/views/MetaSpatialInfoEdit.vue

@@ -2,7 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
             <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -57,9 +56,6 @@
                     </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaStoreList.vue

@@ -32,7 +32,7 @@
                     </el-image>
                 </template>
             </el-table-column>
-            <el-table-column prop="introduction" align="center" label="商品介绍">
+            <el-table-column prop="introduction" align="center" label="商品介绍" show-overflow-tooltip>
             </el-table-column>
             <el-table-column prop="price" align="center" label="金币价格">
             </el-table-column>

src/main/vue/src/views/MetaTaskActivityEdit.vue

@@ -2,7 +2,6 @@
 	<div class="edit-view">
 		<page-title>
 			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
 			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
 		</page-title>
 		<div class="edit-view__content-wrapper">
@@ -33,9 +32,6 @@
 					</el-form-item>
 					<el-form-item class="form-submit">
 						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
 						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
 					</el-form-item>
 				</el-form>

src/main/vue/src/views/MetaTaskEdit.vue

@@ -2,7 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
             <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -76,9 +75,6 @@
                     </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaTaskList.vue

@@ -48,7 +48,7 @@
             <el-table-column prop="name" align="center" label="任务名称" width="200"> </el-table-column>
             <el-table-column prop="type" align="center" label="任务类型" :formatter="typeFormatter" width="100"> </el-table-column>
             <el-table-column prop="value" align="center" label="配置值" width="80"> </el-table-column>
-            <el-table-column prop="detail" align="center" label="详情"> </el-table-column>
+            <el-table-column prop="detail" align="center" label="详情" show-overflow-tooltip> </el-table-column>
             <el-table-column prop="awardType" align="center" label="奖励类型" :formatter="awardTypeFormatter" width="100"> </el-table-column>
             <el-table-column prop="goldNum" align="center" label="奖励金币数量" width="100"> </el-table-column>
             <el-table-column prop="awardPic" align="center" label="奖励图片" width="100">

src/main/vue/src/views/MetaTaskNewEdit.vue

@@ -2,9 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                删除
-            </el-button>
             <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -171,9 +168,6 @@
                         <el-button @click="onSave" :loading="saving" type="primary">
                             保存
                         </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaTaskNewList.vue

@@ -25,7 +25,7 @@
 			</el-table-column>
 			<el-table-column prop="name" align="center" label="任务名称" width="300">
 			</el-table-column>
-			<el-table-column prop="detail" align="center" label="任务详情">
+			<el-table-column prop="detail" align="center" label="任务详情" show-overflow-tooltip>
 			</el-table-column>
 			<el-table-column prop="type" align="center" label="任务分类" :formatter="typeFormatter" width="100">
 			</el-table-column>
@@ -119,7 +119,7 @@ export default {
             this.$axios
                 .get('/metaTaskNew/excel', {
                     responseType: 'blob',
-                    params: { size: 10000 }
+                    params: { size: 10000, query: { del : false } }
                 })
                 .then(res => {
                     console.log(res);

src/main/vue/src/views/MetaTaskToUserList.vue

@@ -41,7 +41,7 @@
             <el-table-column prop="taskId" align="center" label="任务id"> </el-table-column>
             <el-table-column prop="taskName" align="center" label="任务名称"> </el-table-column>
             <el-table-column prop="channelId" align="center" label="所属频道"> </el-table-column>
-            <el-table-column prop="detail" align="center" label="详情"> </el-table-column>
+            <el-table-column prop="detail" align="center" label="详情" show-overflow-tooltip > </el-table-column>
             <el-table-column prop="taskType" align="center" label="任务类型" :formatter="taskTypeFormatter"> </el-table-column>
             <el-table-column prop="status" align="center" label="当前状态" :formatter="taskStatusFormatter"> </el-table-column>
             <el-table-column prop="awardPic" align="center" label="奖励图片">

src/main/vue/src/views/MetaTaskToUserNewList.vue

@@ -72,7 +72,7 @@ export default {
 			this.$axios
 				.get('/metaTaskToUserNew/excel', {
 					responseType: 'blob',
-					params: { size: 10000 }
+					params: { size: 10000 , query: { del : false }}
 				})
 				.then(res => {
 					console.log(res);

src/main/vue/src/views/MetaTopDetailList.vue

@@ -1,132 +0,0 @@
-<template>
-    <div class="list-view">
-        <page-title>
-            <el-button
-                @click="download"
-                icon="el-icon-upload2"
-                :loading="downloading"
-                :disabled="fetchingData"
-                class="filter-item"
-            >
-                导出
-            </el-button>
-        </page-title>
-        <div class="filters-container">
-            <el-input
-                placeholder="搜索..."
-                v-model="search"
-                clearable
-                class="filter-item search"
-                @keyup.enter.native="getData"
-            >
-                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
-            </el-input>
-        </div>
-        <el-table
-            :data="tableData"
-            row-key="id"
-            ref="table"
-            header-row-class-name="table-header-row"
-            header-cell-class-name="table-header-cell"
-            row-class-name="table-row"
-            cell-class-name="table-cell"
-            :height="tableHeight"
-            v-loading="fetchingData"
-        >
-            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="userId" label="用户Id" width="100"> </el-table-column>
-            <el-table-column prop="head" label="用户头像"> </el-table-column>
-            <el-table-column prop="nickName" label="用户昵称"> </el-table-column>
-            <el-table-column prop="num" label="金币数量"> </el-table-column>
-        </el-table>
-        <div class="pagination-wrapper">
-            <!-- <div class="multiple-mode-wrapper">
-                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
-                <el-button-group v-else>
-                    <el-button @click="operation1">批量操作1</el-button>
-                    <el-button @click="operation2">批量操作2</el-button>
-                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
-                </el-button-group>
-            </div> -->
-            <el-pagination
-                background
-                @size-change="onSizeChange"
-                @current-change="onCurrentChange"
-                :current-page="page"
-                :page-sizes="[10, 20, 30, 40, 50]"
-                :page-size="pageSize"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="totalElements"
-            >
-            </el-pagination>
-        </div>
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex';
-import pageableTable from '@/mixins/pageableTable';
-
-export default {
-    name: 'MetaTopDetailList',
-    mixins: [pageableTable],
-    data() {
-        return {
-            multipleMode: false,
-            search: '',
-            url: '/metaUserGoldRecord/goldTop',
-            downloading: false
-        };
-    },
-    computed: {
-        selection() {
-            return this.$refs.table.selection.map(i => i.id);
-        }
-    },
-    methods: {
-        beforeGetData() {
-            return { search: this.search, query: { del: false } };
-        },
-        toggleMultipleMode(multipleMode) {
-            this.multipleMode = multipleMode;
-            if (!multipleMode) {
-                this.$refs.table.clearSelection();
-            }
-        },
-        download() {
-            this.downloading = true;
-            this.$axios
-                .get('/metaUserGoldRecord/excel/top', {
-                    responseType: 'blob',
-                    params: { size: 10000 }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.downloading = false;
-                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
-                    const link = document.createElement('a');
-                    link.href = downloadUrl;
-                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
-                    document.body.appendChild(link);
-                    link.click();
-                    link.remove();
-                })
-                .catch(e => {
-                    console.log(e);
-                    this.downloading = false;
-                    this.$message.error(e.error);
-                });
-        },
-        operation1() {
-            this.$notify({
-                title: '提示',
-                message: this.selection
-            });
-        },
-        operation2() {
-            this.$message('操作2');
-        }
-    }
-};
-</script>
-<style lang="less" scoped>
-</style>

src/main/vue/src/views/MetaTopEdit.vue

@@ -1,106 +0,0 @@
-<template>
-    <div class="edit-view">
-        <page-title>
-            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                删除
-            </el-button>
-            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
-        </page-title>
-        <div class="edit-view__content-wrapper">
-            <div class="edit-view__content-section">
-                <el-form :model="formData" :rules="rules" ref="form" label-width="94px" label-position="right"
-                         size="small"
-                         style="max-width: 500px;">
-                        <el-form-item prop="name" label="排行榜名称">
-                                    <el-input v-model="formData.name"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="rule" label="排行榜用途">
-                                    <el-input v-model="formData.rule"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="pic" label="配置图片">
-                                    <single-upload v-model="formData.pic"></single-upload>
-                        </el-form-item>
-                    <el-form-item class="form-submit">
-                        <el-button @click="onSave" :loading="saving" type="primary">
-                            保存
-                        </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
-                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-                    </el-form-item>
-                </el-form>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    export default {
-        name: 'MetaTopEdit',
-        created() {
-            if (this.$route.query.id) {
-                this.$http
-                    .get('metaTop/get/' + this.$route.query.id)
-                    .then(res => {
-                        this.formData = res;
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.$message.error(e.error);
-                    });
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {
-                },
-                rules: {
-                },
-            }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                let data = {...this.formData};
-
-                this.saving = true;
-                this.$http
-                    .post('/metaTop/save', data, {body: 'json'})
-                    .then(res => {
-                        this.saving = false;
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.saving = false;
-                        this.$message.error(e.error);
-                    });
-            },
-            onDelete() {
-                this.$confirm('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/metaTop/del/${this.formData.id}`)
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(e => {
-                    if (e !== 'cancel') {
-                        console.log(e);
-                        this.$message.error((e || {}).error || '删除失败');
-                    }
-                })
-            },
-        }
-    }
-</script>
-<style lang="less" scoped></style>

src/main/vue/src/views/MetaTopList.vue

@@ -1,185 +0,0 @@
-<template>
-    <div class="list-view">
-        <page-title>
-            <el-button
-                @click="addRow"
-                type="primary"
-                icon="el-icon-plus"
-                :disabled="fetchingData || downloading"
-                class="filter-item"
-            >
-                新增
-            </el-button>
-        </page-title>
-        <div class="filters-container">
-            <el-input
-                placeholder="搜索..."
-                v-model="search"
-                clearable
-                class="filter-item search"
-                @keyup.enter.native="getData"
-            >
-                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
-            </el-input>
-        </div>
-        <el-table
-            :data="tableData"
-            row-key="id"
-            ref="table"
-            header-row-class-name="table-header-row"
-            header-cell-class-name="table-header-cell"
-            row-class-name="table-row"
-            cell-class-name="table-cell"
-            :height="tableHeight"
-            v-loading="fetchingData"
-        >
-            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-            <el-table-column prop="name" label="排行榜名称"> </el-table-column>
-            <el-table-column prop="rule" label="排行榜用途"> </el-table-column>
-            <el-table-column prop="pic" label="配置图片">
-                <template slot-scope="{ row }">
-                    <el-image
-                        style="width: 30px; height: 30px"
-                        :src="row.pic"
-                        fit="cover"
-                        :preview-src-list="[row.pic]"
-                    ></el-image>
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="150">
-                <template slot-scope="{ row }">
-                    <el-button @click="MetaTopDetailList(row)" type="primary" size="mini" plain>查看</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination-wrapper">
-            <!-- <div class="multiple-mode-wrapper">
-                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
-                <el-button-group v-else>
-                    <el-button @click="operation1">批量操作1</el-button>
-                    <el-button @click="operation2">批量操作2</el-button>
-                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
-                </el-button-group>
-            </div> -->
-            <el-pagination
-                background
-                @size-change="onSizeChange"
-                @current-change="onCurrentChange"
-                :current-page="page"
-                :page-sizes="[10, 20, 30, 40, 50]"
-                :page-size="pageSize"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="totalElements"
-            >
-            </el-pagination>
-        </div>
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex';
-import pageableTable from '@/mixins/pageableTable';
-
-export default {
-    name: 'MetaTopList',
-    mixins: [pageableTable],
-    data() {
-        return {
-            multipleMode: false,
-            search: '',
-            url: '/metaTop/all',
-            downloading: false
-        };
-    },
-    computed: {
-        selection() {
-            return this.$refs.table.selection.map(i => i.id);
-        }
-    },
-    methods: {
-        beforeGetData() {
-            return { search: this.search, query: { del: false } };
-        },
-        toggleMultipleMode(multipleMode) {
-            this.multipleMode = multipleMode;
-            if (!multipleMode) {
-                this.$refs.table.clearSelection();
-            }
-        },
-        addRow() {
-            this.$router.push({
-                path: '/metaTopEdit',
-                query: {
-                    ...this.$route.query
-                }
-            });
-        },
-        MetaTopDetailList() {
-            this.$router.push({
-                path: '/MetaTopDetailList',
-                query: {
-                    
-                }
-            });
-        },
-        editRow(row) {
-            this.$router.push({
-                path: '/metaTopEdit',
-                query: {
-                    id: row.id
-                }
-            });
-        },
-        download() {
-            this.downloading = true;
-            this.$axios
-                .get('/metaTop/excel', {
-                    responseType: 'blob',
-                    params: { size: 10000 }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.downloading = false;
-                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
-                    const link = document.createElement('a');
-                    link.href = downloadUrl;
-                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
-                    document.body.appendChild(link);
-                    link.click();
-                    link.remove();
-                })
-                .catch(e => {
-                    console.log(e);
-                    this.downloading = false;
-                    this.$message.error(e.error);
-                });
-        },
-        operation1() {
-            this.$notify({
-                title: '提示',
-                message: this.selection
-            });
-        },
-        operation2() {
-            this.$message('操作2');
-        },
-        deleteRow(row) {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
-                .then(() => {
-                    return this.$http.post(`/metaTop/del/${row.id}`);
-                })
-                .then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                })
-                .catch(e => {
-                    if (e !== 'cancel') {
-                        this.$message.error(e.error);
-                    }
-                });
-        }
-    }
-};
-</script>
-<style lang="less" scoped>
-</style>

src/main/vue/src/views/MetaUserTaskAwardReceivedRecordNewList.vue

@@ -61,7 +61,7 @@ export default {
 			this.$axios
 				.get('/metaUserTaskAwardReceivedRecordNew/excel', {
 					responseType: 'blob',
-					params: { size: 10000 }
+					params: { size: 10000, query: { del : false } }
 				})
 				.then(res => {
 					console.log(res);

src/main/vue/src/views/MetaUserTaskProgressNewList.vue

@@ -62,7 +62,7 @@ export default {
 			this.$axios
 				.get('/metaUserTaskProgressNew/excel', {
 					responseType: 'blob',
-					params: { size: 10000 }
+					params: { size: 10000 , query: { del : false } }
 				})
 				.then(res => {
 					console.log(res);

src/main/vue/src/views/MetaWebsocketSwitchEdit.vue

@@ -2,7 +2,6 @@
 	<div class="edit-view">
 		<page-title>
 			<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-			<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
 			<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
 		</page-title>
 		<div class="edit-view__content-wrapper">
@@ -24,9 +23,6 @@
 					</el-form-item>
 					<el-form-item class="form-submit">
 						<el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-						<el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-							删除
-						</el-button>
 						<el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
 					</el-form-item>
 				</el-form>

src/main/vue/src/views/MetaZombieEdit.vue

@@ -2,7 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
             <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -42,9 +41,6 @@
                     </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaZouMaLightEdit.vue

@@ -2,7 +2,6 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
             <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
         </page-title>
         <div class="edit-view__content-wrapper">
@@ -27,9 +26,6 @@
                     </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
                         <el-button @click="$router.go(-1)" :disabled="saving"> 取消 </el-button>
                     </el-form-item>
                 </el-form>

src/main/vue/src/views/MetaZouMaLightList.vue

@@ -44,7 +44,7 @@
 		>
 			<el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
 			<el-table-column prop="id" align="center" label="ID" width="100"> </el-table-column>
-			<el-table-column prop="description" align="center" label="走马灯详情"> </el-table-column>
+			<el-table-column prop="description" align="center" label="走马灯详情" show-overflow-tooltip> </el-table-column>
 			<el-table-column prop="publish" align="center" label="是否发布" width="100">
 				<template slot-scope="{ row }">
 					<el-tag :type="row.publish ? '' : 'info'"> {{ row.publish }} </el-tag>