优化

src/views/modules/activity/add.vue

@@ -87,7 +87,9 @@
                         <div class="upload_tip">尺寸：702*440px,最多上传6张,图片格式：jpg、png、jpeg</div>
                     </el-form-item>
                     <el-form-item label="活动详情" prop="activityDetails" class="redLabel">
+                      <template v-if="basicForm&&basicForm.activityDetails">
                         <editor-vue style="margin-top: -30px;" :content="basicForm.activityDetails"  @EditorChange="getEditor" ref="infoIntroduceRef"></editor-vue>
+                      </template>
                     </el-form-item>
                 </el-form>
                 <div class="btns adfac">

src/views/modules/activity/list.vue

@@ -68,7 +68,7 @@
                       <el-button link type="text" @click="handleReviewCode(scope.row)" v-if="scope.row.signCode&&$hasPermission('core:activity:code')">查看签到码</el-button>
                       <el-button link type="text" @click="handleUpDown(scope.row,0)" v-if="scope.row.state==1&&(scope.row.activeState==0||scope.row.activeState==3)&&$hasPermission('core:activity:updown')">下架</el-button>
                       <el-button link type="text" @click="handleUpDown(scope.row,1)" v-if="scope.row.state==0&&scope.row.activeState==0&&$hasPermission('core:activity:updown')">上架</el-button>
-                      <el-button link type="text" @click="handleDelete(scope.row)" v-if="$hasPermission('core:activity:delete')&&scope.row.activeState==0">删除</el-button>
+                      <el-button link type="text" @click="handleDelete(scope.row)" v-if="$hasPermission('core:activity:delete')&&(scope.row.state==0||scope.row.activeState==0||scope.row.activeState==3)">删除</el-button>
                   </template>
               </el-table-column>
             </el-table>