From 0609bb74727db6d274566d4b1127b2ce278004a3 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Mon, 6 Jun 2022 16:08:22 +0800
Subject: [PATCH] swagger

---
 src/views/tool/swagger/index.vue       |   2 +-
 src/views/wjnft/collection/index.vue   | 103 +---------------------
 src/views/wjnft/mycollection/index.vue | 114 ++-----------------------
 3 files changed, 8 insertions(+), 211 deletions(-)

diff --git a/src/views/tool/swagger/index.vue b/src/views/tool/swagger/index.vue
index b8becc6..517493b 100644
--- a/src/views/tool/swagger/index.vue
+++ b/src/views/tool/swagger/index.vue
@@ -8,7 +8,7 @@ export default {
   components: { iFrame },
   data() {
     return {
-      url: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html"
+      url: "http://localhost:8080" + "/swagger-ui/index.html"
     };
   },
 };
diff --git a/src/views/wjnft/collection/index.vue b/src/views/wjnft/collection/index.vue
index 911973b..8f371ff 100644
--- a/src/views/wjnft/collection/index.vue
+++ b/src/views/wjnft/collection/index.vue
@@ -37,15 +37,6 @@
             onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
         />
       </el-form-item>
-      <!--      <el-form-item label="作品故事图片" prop="storyPicture">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.storyPicture"-->
-      <!--          placeholder="请输入作品故事图片"-->
-      <!--          clearable-->
-      <!--          size="small"-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
       <el-form-item label="总数量" prop="issueNumber">
         <el-input
             v-model="queryParams.issueNumber"
@@ -83,15 +74,6 @@
             v-hasRole="['admin','tester']"
         />
       </el-form-item>
-      <!--      <el-form-item label="特殊作品" prop="special">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.special"-->
-      <!--          placeholder="请选择是否为"-->
-      <!--          clearable-->
-      <!--          size="small"-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
       <el-form-item label="特殊作品" prop="special">
         <el-select v-model="queryParams.special" clearable placeholder="请选择是否为特殊作品"
                    size="small"
@@ -101,15 +83,6 @@
           <el-option label="是" value=true></el-option>
         </el-select>
       </el-form-item>
-      <!--      <el-form-item label="作品状态 " prop="state">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.state"-->
-      <!--          placeholder="请输入作品状态 "-->
-      <!--          clearable-->
-      <!--          size="small"-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
       <el-form-item label="作品状态" prop="state">
         <el-select v-model="queryParams.state" clearable placeholder="请选择作品状态"
                    size="small"
@@ -164,17 +137,7 @@
             v-hasRole="['admin','tester']"
         >修改</el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--            type="danger"-->
-<!--            plain-->
-<!--            icon="el-icon-delete"-->
-<!--            size="mini"-->
-<!--            :disabled="multiple"-->
-<!--            @click="handleDelete"-->
-<!--            v-hasRole="['admin','tester']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
+
       <el-col :span="1.5">
         <el-button
             type="warning"
@@ -189,36 +152,9 @@
 
     <el-table v-loading="loading" :data="collectionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!--      <el-table-column label="id" align="center" prop="id" />-->
       <el-table-column label="序号" type="index" width="50"> </el-table-column>
-      <!--      <el-table -column label="作品系列表ID" align="center" prop="seriesId" />-->
       <el-table-column label="作品名称" align="center" prop="collectionName" />
       <el-table-column label="作品系列" align="center" prop="seriesName" />
-
-<!--      <el-table-column label="作品故事" align="center" prop="storyText" />-->
-<!--      <el-table-column label="作品故事图片" align="center" prop="storyPicture" />-->
-<!--      <el-table-column label="作品故事图片" align="center" prop="storyPicture" >-->
-<!--        <template slot-scope="scope">-->
-<!--          <div class="demo-image">-->
-<!--            <div class="block">-->
-<!--              <el-image-->
-<!--                  style="-->
-<!--            width: 50px;-->
-<!--            height: 51px;-->
-<!--            border-radius: 6px;-->
-<!--            z-index: 2;-->
-<!--          "-->
-<!--                  :src="scope.row.storyPicture"-->
-<!--                  :preview-src-list="srcList"-->
-<!--              >-->
-<!--              </el-image>-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </template>-->
-
-<!--      </el-table-column>-->
-
-<!--      <el-table-column label="艺术家手机" align="center" prop="artistId" />-->
       <el-table-column label="作者名称" align="center" prop="artistName" />
       <el-table-column label="作家头像" align="center" prop="writerAvatar" >
         <template slot-scope="scope">
@@ -241,9 +177,6 @@
 
       </el-table-column>
       <el-table-column label="所属创作者" align="center" prop="issueName" />
-<!--      <el-table-column label="特殊作品标识 " align="center" prop="special" />-->
-<!--      <el-table-column label="作品状态 " align="center" prop="state" />-->
-<!--      <el-table-column label="作品可见状态 " align="center" prop="visibleState" />-->
       <el-table-column
           prop="visibleState"
           align="center"
@@ -267,20 +200,6 @@
           {{ scope.row.state === 7 ?  '已关闭(下架）': '' }}
         </template>
       </el-table-column>
-<!--      <el-table-column-->
-<!--        prop="visibleState"-->
-<!--        align="center"-->
-<!--        label="标识">-->
-<!--      <template scope="scope">-->
-<!--        {{ scope.row.visibleState == true ?  '可见': '' }}-->
-<!--        {{ scope.row.visibleState == false ?  '不可见': '' }}-->
-<!--      </template>-->
-<!--    </el-table-column>-->
-      <!--      <el-table-column label="删除时间 逻辑删除" align="center" prop="deletedTime" width="180">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <span>{{ parseTime(scope.row.deletedTime, '{y}-{m}-{d}') }}</span>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
       <el-table-column label="价格(单位:元)" align="center" prop="price" />
       <el-table-column label="发售总数量" align="center" prop="issueNumber" />
       <el-table-column label="发售剩余数量" align="center" prop="numberRemaining" />
@@ -291,9 +210,7 @@
           <span>{{ parseTime(scope.row.timeSale, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="作品图片路径" align="center" prop="imagePath" />-->
       <el-table-column label="作品权重 " align="center" prop="weight" v-if = "testColumn"/>
-<!--      <el-table-column label="图片" align="center" prop="thumbnail" />-->
       <el-table-column label="作品图片" align="center" prop="thumbnail" >
         <template slot-scope="scope">
           <div class="demo-image">
@@ -314,22 +231,7 @@
         </template>
 
       </el-table-column>
-<!--      <el-table-column label="创建人" align="center" prop="createdBy" />-->
-<!--      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="更新人" align="center" prop="updatedBy" />-->
-<!--      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <!--      <el-table-column label="预留" align="center" prop="reservedA" />-->
             <el-table-column label="热力值" align="center" prop="heatValue" />
-      <!--      <el-table-column label="预留" align="center" prop="reservedC" />-->
-      <!--      <el-table-column label="预留" align="center" prop="reservedD" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -362,9 +264,6 @@
     <!-- 添加或修改作品 对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :destroy-on-close="true" @close='handleCancle' >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <!--         <el-form-item label="作品系列表ID" prop="seriesId">-->
-        <!--          <el-input v-model="form.seriesId" placeholder="请输入作品系列表ID" />-->
-        <!--        </el-form-item>-->
         <el-form-item label="作品系列" prop="seriesId" v-if="YC3">
           <el-select v-model="form.seriesId" clearable placeholder="请选择系列"
                      size="small"
diff --git a/src/views/wjnft/mycollection/index.vue b/src/views/wjnft/mycollection/index.vue
index 8fd3dc1..45a8228 100644
--- a/src/views/wjnft/mycollection/index.vue
+++ b/src/views/wjnft/mycollection/index.vue
@@ -80,54 +80,9 @@
       </el-form-item>
     </el-form>
 
-<!--    <el-row :gutter="10" class="mb8">-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['wjnft:mycollection:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['wjnft:mycollection:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['wjnft:mycollection:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['wjnft:mycollection:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
-<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
-<!--    </el-row>-->
+
 
     <el-table v-loading="loading" :data="mycollectionList" @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55" align="center" />-->
       <el-table-column label="序号" type="index" width="50"></el-table-column>
       <el-table-column label="用户姓名" align="center" prop="userName" />
       <el-table-column label="用户电话" align="center" prop="phone" />
@@ -158,18 +113,6 @@
           <span v-if="scope.row.onChainStatus === 2">链上已确认</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="删除时间" align="center" prop="deletedTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.deletedTime, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="创建人" align="center" prop="createdBy" />-->
-<!--      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="更新人" align="center" prop="updatedBy" />-->
       <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
@@ -183,13 +126,6 @@
             icon="el-icon-edit"
             @click="collectionChanges(scope.row)"
           >作品更改</el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['wjnft:mycollection:remove']"-->
-<!--          >删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -202,10 +138,9 @@
       @pagination="getList"
     />
     <!-- 添加或修改我的作品 对话框 -->
-    <el-dialog :title="title" :visible.sync="collChanges" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="collChanges" width="500px" append-to-body  @close='handleCancle'>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
                 <el-form-item label="作品图片" prop="onChainStatus">
-<!--                  <el-input v-model="form.onChainStatus" placeholder="请选择作品状态" />-->
                   <div>
                     <el-upload
                         ref="upload"
@@ -268,15 +203,6 @@
     <!-- 添加或修改我的作品 对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-<!--        <el-form-item label="用户ID" prop="userId">-->
-<!--          <el-input v-model="form.userId" placeholder="请输入用户ID" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="作品信息ID" prop="informationTableId">-->
-<!--          <el-input v-model="form.informationTableId" placeholder="请输入作品信息ID" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="作品状态" prop="onChainStatus">-->
-<!--          <el-input v-model="form.onChainStatus" placeholder="请选择作品状态" />-->
-<!--        </el-form-item>-->
         <el-form-item label="作品状态" prop="onChainStatus" >
           <el-select v-model="form.onChainStatus" clearable placeholder="请选择作品状态"
                      size="small"
@@ -290,36 +216,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-<!--        <el-form-item label="删除时间" prop="deletedTime">-->
-<!--          <el-date-picker clearable size="small"-->
-<!--            v-model="form.deletedTime"-->
-<!--            type="date"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            placeholder="选择删除时间">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="创建人" prop="createdBy">-->
-<!--          <el-input v-model="form.createdBy" placeholder="请输入创建人" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="创建时间" prop="createdTime">-->
-<!--          <el-date-picker clearable size="small"-->
-<!--            v-model="form.createdTime"-->
-<!--            type="date"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            placeholder="选择创建时间">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="更新人" prop="updatedBy">-->
-<!--          <el-input v-model="form.updatedBy" placeholder="请输入更新人" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="更新时间" prop="updatedTime">-->
-<!--          <el-date-picker clearable size="small"-->
-<!--            v-model="form.updatedTime"-->
-<!--            type="date"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            placeholder="选择更新时间">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -427,6 +323,7 @@ export default {
         Authorization: "Bearer " + getToken()
       }
     },
+
     // 是否显示提示
     showTip() {
       return this.isShowTip && (this.fileType || this.fileSize);
@@ -439,6 +336,9 @@ export default {
     this.getList();
   },
   methods: {
+    handleCancle () {
+      this.imgList=[];
+    },
     /** 查询我的作品 列表 */
     getList() {
       this.loading = true;
@@ -544,8 +444,6 @@ export default {
     },
     /** 提交藏品修改按钮 */
     submitCollForm() {
-      //console.log(this.imgList);
-     // console.log(this.pictureUrl);
       let path = null;
       if(this.imgList.length > 0){
        path = this.imgList[0].url;