Browse Source

Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_back into dev-meta

sunkean 3 years ago
parent
commit
0789047517
56 changed files with 83 additions and 180 deletions
  1. 3 0
      src/main/java/com/izouma/nineth/web/AirDropController.java
  2. 10 5
      src/main/java/com/izouma/nineth/web/AssetController.java
  3. 0 1
      src/main/resources/static/js/jquery.min.js
  4. 0 4
      src/main/vue/src/views/MetaAccessoriesEdit.vue
  5. 0 4
      src/main/vue/src/views/MetaAdvertRecordEdit.vue
  6. 1 1
      src/main/vue/src/views/MetaAdvertRecordList.vue
  7. 0 6
      src/main/vue/src/views/MetaAtomTaskEdit.vue
  8. 2 2
      src/main/vue/src/views/MetaAtomTaskList.vue
  9. 0 6
      src/main/vue/src/views/MetaBagAssetEffectConfigEdit.vue
  10. 0 4
      src/main/vue/src/views/MetaBoatPositionEdit.vue
  11. 0 6
      src/main/vue/src/views/MetaChannelEdit.vue
  12. 1 1
      src/main/vue/src/views/MetaChannelList.vue
  13. 0 4
      src/main/vue/src/views/MetaCommonSwitchEdit.vue
  14. 0 4
      src/main/vue/src/views/MetaDestroyActivityEdit.vue
  15. 7 7
      src/main/vue/src/views/MetaDestroyActivityList.vue
  16. 1 1
      src/main/vue/src/views/MetaEmailList.vue
  17. 3 3
      src/main/vue/src/views/MetaFeedBackList.vue
  18. 0 4
      src/main/vue/src/views/MetaGameCopyEdit.vue
  19. 1 1
      src/main/vue/src/views/MetaGameCopyList.vue
  20. 0 4
      src/main/vue/src/views/MetaGameStageAwardEdit.vue
  21. 4 4
      src/main/vue/src/views/MetaGameStageAwardList.vue
  22. 0 4
      src/main/vue/src/views/MetaItemEdit.vue
  23. 1 1
      src/main/vue/src/views/MetaLuckyDrawAwardReceiveRecordList.vue
  24. 0 4
      src/main/vue/src/views/MetaLuckyDrawEdit.vue
  25. 2 2
      src/main/vue/src/views/MetaLuckyDrawList.vue
  26. 0 4
      src/main/vue/src/views/MetaPlayerRoleClassifyEdit.vue
  27. 3 3
      src/main/vue/src/views/MetaPlayerRoleClassifyList.vue
  28. 9 9
      src/main/vue/src/views/MetaProblemEdit.vue
  29. 4 4
      src/main/vue/src/views/MetaProblemList.vue
  30. 0 4
      src/main/vue/src/views/MetaPropEdit.vue
  31. 0 4
      src/main/vue/src/views/MetaQuestionEdit.vue
  32. 1 1
      src/main/vue/src/views/MetaQuestionList.vue
  33. 0 4
      src/main/vue/src/views/MetaResourceVersionEdit.vue
  34. 4 4
      src/main/vue/src/views/MetaResourceVersionList.vue
  35. 0 6
      src/main/vue/src/views/MetaResourcesEdit.vue
  36. 1 1
      src/main/vue/src/views/MetaSignAwardDrawRecordList.vue
  37. 0 4
      src/main/vue/src/views/MetaSignAwardEdit.vue
  38. 0 4
      src/main/vue/src/views/MetaSignEdit.vue
  39. 1 1
      src/main/vue/src/views/MetaSignList.vue
  40. 0 4
      src/main/vue/src/views/MetaSpatialInfoEdit.vue
  41. 1 1
      src/main/vue/src/views/MetaStoreList.vue
  42. 0 4
      src/main/vue/src/views/MetaTaskActivityEdit.vue
  43. 0 4
      src/main/vue/src/views/MetaTaskEdit.vue
  44. 1 1
      src/main/vue/src/views/MetaTaskList.vue
  45. 0 6
      src/main/vue/src/views/MetaTaskNewEdit.vue
  46. 2 2
      src/main/vue/src/views/MetaTaskNewList.vue
  47. 1 1
      src/main/vue/src/views/MetaTaskToUserList.vue
  48. 1 1
      src/main/vue/src/views/MetaTaskToUserNewList.vue
  49. 11 1
      src/main/vue/src/views/MetaTopDetailList.vue
  50. 4 4
      src/main/vue/src/views/MetaTopList.vue
  51. 1 1
      src/main/vue/src/views/MetaUserTaskAwardReceivedRecordNewList.vue
  52. 1 1
      src/main/vue/src/views/MetaUserTaskProgressNewList.vue
  53. 0 4
      src/main/vue/src/views/MetaWebsocketSwitchEdit.vue
  54. 0 4
      src/main/vue/src/views/MetaZombieEdit.vue
  55. 0 4
      src/main/vue/src/views/MetaZouMaLightEdit.vue
  56. 1 1
      src/main/vue/src/views/MetaZouMaLightList.vue

+ 3 - 0
src/main/java/com/izouma/nineth/web/AirDropController.java

@@ -32,11 +32,13 @@ public class AirDropController extends BaseController {
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
+    @PreAuthorize("hasAnyRole('ADMIN', 'SAAS')")
     public Page<AirDrop> all(@RequestBody PageQuery pageQuery) {
         return airDropService.all(pageQuery);
     }
 
     @GetMapping("/get/{id}")
+    @PreAuthorize("hasAnyRole('ADMIN', 'SAAS')")
     public AirDrop get(@PathVariable Long id) {
         return airDropRepo.findById(id).orElseThrow(new BusinessException("无记录"));
     }
@@ -47,6 +49,7 @@ public class AirDropController extends BaseController {
     }
 
     @GetMapping("/excel")
+    @PreAuthorize("hasAnyRole('ADMIN', 'SAAS')")
     @ResponseBody
     public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
         List<AirDrop> data = all(pageQuery).getContent();

+ 10 - 5
src/main/java/com/izouma/nineth/web/AssetController.java

@@ -104,6 +104,10 @@ public class AssetController extends BaseController {
     @JsonView(Asset.View.Basic.class)
     public Asset get(@PathVariable Long id) {
         Asset asset = assetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        if (!asset.isPublicShow() && (SecurityUtils.getAuthenticatedUser() == null
+                || !asset.getUserId().equals(SecurityUtils.getAuthenticatedUser().getId()))) {
+            throw new BusinessException("无记录");
+        }
         if (asset.getType().equals(CollectionType.DOMAIN)) {
             String domainName = asset.getName().substring(9);
             DomainOrder domainOrder = domainOrderRepo
@@ -168,7 +172,7 @@ public class AssetController extends BaseController {
     @ApiOperation("转赠(无gas费)")
     public GiftOrder giftWithoutGasFee(@RequestParam Long assetId, @RequestParam Long toUserId, @RequestParam String tradeCode) {
         return giftOrderService.giftWithoutGasFee(SecurityUtils.getAuthenticatedUser()
-                .getId(), assetId, toUserId, tradeCode);
+                                                               .getId(), assetId, toUserId, tradeCode);
     }
 
     @GetMapping("/tokenHistory")
@@ -233,7 +237,7 @@ public class AssetController extends BaseController {
     @PostMapping("/metaDestroy")
     public void metaDestroy(@RequestBody MetaDestroyParam metaDestroyParam) {
         assetService.metaDestroyWithoutTradeCode(metaDestroyParam, SecurityUtils.getAuthenticatedUser()
-                .getId(), OperationSource.META);
+                                                                                .getId(), OperationSource.META);
     }
 
     @ApiOperation("开盲盒")
@@ -259,7 +263,7 @@ public class AssetController extends BaseController {
             return 0;
         }
         return assetService.getRoyalties(asset.getMinterId(), asset.getRoyalties(), SecurityUtils.getAuthenticatedUser()
-                .getId());
+                                                                                                 .getId());
     }
 
     @PostMapping("/getServicecharge")
@@ -269,7 +273,7 @@ public class AssetController extends BaseController {
             return assetService.getDomainServiceCharge(SecurityUtils.getAuthenticatedUser().getId());
         }
         return assetService.getServicecharge(asset.getServiceCharge(), SecurityUtils.getAuthenticatedUser()
-                .getId());
+                                                                                    .getId());
     }
 
     @GetMapping("/hcChain")
@@ -314,7 +318,8 @@ public class AssetController extends BaseController {
 
     @GetMapping("/getId/{name}")
     public MetaRestResult<Long> getId(@PathVariable String name) {
-        Asset asset = assetRepo.findByNameAndStatusAndCategoryAndDel("RID元宇宙域名 ".concat(name).concat(".nft"), AssetStatus.NORMAL,"元域名",false);
+        Asset asset = assetRepo.findByNameAndStatusAndCategoryAndDel("RID元宇宙域名 ".concat(name)
+                                                                                     .concat(".nft"), AssetStatus.NORMAL, "元域名", false);
         if (Objects.isNull(asset)) {
             return MetaRestResult.returnError("该域名不存在");
         }

File diff suppressed because it is too large
+ 0 - 1
src/main/resources/static/js/jquery.min.js


+ 0 - 4
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>

+ 0 - 4
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>

+ 1 - 1
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>

+ 0 - 6
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>

+ 2 - 2
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);

+ 0 - 6
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>

+ 0 - 4
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>

+ 0 - 6
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>

+ 1 - 1
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}">

+ 0 - 4
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>

+ 0 - 4
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>

+ 7 - 7
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>

+ 1 - 1
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>

+ 3 - 3
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 }">

+ 0 - 4
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>

+ 1 - 1
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>

+ 0 - 4
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>

+ 4 - 4
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"

+ 0 - 4
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>

+ 1 - 1
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);

+ 0 - 4
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>

+ 2 - 2
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);

+ 0 - 4
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>

+ 3 - 3
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">

+ 9 - 9
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>

+ 4 - 4
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>

+ 0 - 4
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>

+ 0 - 4
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>

+ 1 - 1
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>

+ 0 - 4
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>

+ 4 - 4
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>

+ 0 - 6
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>

+ 1 - 1
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);

+ 0 - 4
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>

+ 0 - 4
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>

+ 1 - 1
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>

+ 0 - 4
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>

+ 1 - 1
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>

+ 0 - 4
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>

+ 0 - 4
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>

+ 1 - 1
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">

+ 0 - 6
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>

+ 2 - 2
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);

+ 1 - 1
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="奖励图片">

+ 1 - 1
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);

+ 11 - 1
src/main/vue/src/views/MetaTopDetailList.vue

@@ -35,7 +35,17 @@
         >
             <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="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="num" label="金币数量"> </el-table-column>
         </el-table>

+ 4 - 4
src/main/vue/src/views/MetaTopList.vue

@@ -34,10 +34,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="name" label="排行榜名称"> </el-table-column>
-            <el-table-column prop="rule" label="排行榜用途"> </el-table-column>
-            <el-table-column prop="pic" label="配置图片">
+            <el-table-column prop="id" label="ID" width="100" align="center"> </el-table-column>
+            <el-table-column prop="name" label="排行榜名称" align="center"> </el-table-column>
+            <el-table-column prop="rule" label="排行榜用途" align="center"> </el-table-column>
+            <el-table-column prop="pic" label="配置图片" align="center">
                 <template slot-scope="{ row }">
                     <el-image
                         style="width: 30px; height: 30px"

+ 1 - 1
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);

+ 1 - 1
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);

+ 0 - 4
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>

+ 0 - 4
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>

+ 0 - 4
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>

+ 1 - 1
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>

Some files were not shown because too many files changed in this diff