diff --git a/src/api/wjnft/brand.js b/src/api/wjnft/brand.js
new file mode 100644
index 0000000..47a350a
--- /dev/null
+++ b/src/api/wjnft/brand.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询入驻品牌列表
+export function listBrand(query) {
+  return request({
+    url: '/wjnft/brand/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询入驻品牌详细
+export function getBrand(id) {
+  return request({
+    url: '/wjnft/brand/' + id,
+    method: 'get'
+  })
+}
+
+// 新增入驻品牌
+export function addBrand(data) {
+  return request({
+    url: '/wjnft/brand',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改入驻品牌
+export function updateBrand(data) {
+  return request({
+    url: '/wjnft/brand',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除入驻品牌
+export function delBrand(id) {
+  return request({
+    url: '/wjnft/brand/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index cf97c39..b0ee40b 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="component-upload-image">
     <el-upload
-      :action="uploadImgUrl"
+      :action="action"
       list-type="picture-card"
       :on-success="handleUploadSuccess"
       :before-upload="handleBeforeUpload"
@@ -18,7 +18,7 @@
     >
       <i class="el-icon-plus"></i>
     </el-upload>
-    
+
     <!-- 上传提示 -->
     <div class="el-upload__tip" slot="tip" v-if="showTip">
       请上传
@@ -43,19 +43,19 @@
 
 <script>
 import { getToken } from "@/utils/auth";
-
+const client = 1;
 export default {
   props: {
     value: [String, Object, Array],
     // 图片数量限制
     limit: {
       type: Number,
-      default: 5,
+      default: 3,
     },
     // 大小限制(MB)
     fileSize: {
        type: Number,
-      default: 5,
+      default: 3,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
@@ -74,7 +74,7 @@ export default {
       dialogVisible: false,
       hideUpload: false,
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/wjnft/oss/upload/" + client, // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },
@@ -112,6 +112,9 @@ export default {
     showTip() {
       return this.isShowTip && (this.fileType || this.fileSize);
     },
+    action() {
+      return process.env.VUE_APP_BASE_API + "/wjnft/oss/upload/" + client
+    }
   },
   methods: {
     // 删除图片
@@ -154,7 +157,7 @@ export default {
       if (this.fileSize) {
         const isLt = file.size / 1024 / 1024 < this.fileSize;
         if (!isLt) {
-          this.$message.error(`上传头像图片大小不能超过 ${this.fileSize} MB!`);
+          this.$message.error(`上传图片大小不能超过 ${this.fileSize} MB!`);
           return false;
         }
       }
@@ -183,6 +186,7 @@ export default {
     },
     // 对象转成指定字符串分隔
     listToString(list, separator) {
+      console.log(list,separator);
       let strs = "";
       separator = separator || ",";
       for (let i in list) {
diff --git a/src/views/wjnft/artapplication/index.vue b/src/views/wjnft/artapplication/index.vue
index f3e5617..0b7f151 100644
--- a/src/views/wjnft/artapplication/index.vue
+++ b/src/views/wjnft/artapplication/index.vue
@@ -112,12 +112,12 @@
 <!--      <el-table-column label="申请用户id" align="center" prop="userId" />-->
 <!--      <el-table-column label="申请状态 " align="center" prop="state" />-->
 
-      <el-table-column label="创作者昵称" align="center" prop="nickname" />
-      <el-table-column label="用户昵称" align="center" prop="name" />
+      <el-table-column label="申请人昵称" align="center" prop="nickname" />
+      <el-table-column label="申请人姓名" align="center" prop="name" />
       <el-table-column label="手机号" align="center" prop="phone" />
 <!--      <el-table-column label="微信号" align="center" prop="wechatId" />-->
-<!--      <el-table-column label="邮箱" align="center" prop="email" />-->
-      <el-table-column label="申请原因" align="center" prop="applyReason" />
+      <el-table-column label="邮箱" align="center" prop="email" />
+<!--      <el-table-column label="申请原因" align="center" prop="applyReason" />-->
       <el-table-column label="申请日期" align="center" prop="applicationDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applicationDate, '{y}-{m}-{d}') }}</span>
@@ -128,7 +128,7 @@
           prop="state"
           align="center"
           label="申请状态">
-        <template scope="scope">
+        <template slot-scope="scope">
           {{ scope.row.state === 1 ?  '已通过': '' }}
           {{ scope.row.state === 2 ?  '已拒绝': '' }}
           {{ scope.row.state === 3 ?  '未审核': '' }}
@@ -177,9 +177,9 @@
     <!-- 添加或修改创作者申请对话框 -->
     <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" disabled/>
-        </el-form-item>
+<!--        <el-form-item label="申请用户" prop="userId">-->
+<!--          <el-input v-model="form.userId" placeholder="请输入申请用户id" disabled/>-->
+<!--        </el-form-item>-->
         <el-form-item label="审核状态" prop="state">
 <!--         <el-input v-model="form.state" placeholder="请输入申请状态 " />-->
           <el-select v-model="form.state" clearable placeholder="请选择审核是否通过"
@@ -200,15 +200,15 @@
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入手机号" disabled/>
         </el-form-item>
-        <el-form-item label="微信号" prop="wechatId">
-          <el-input v-model="form.wechatId" placeholder="请输入微信号" disabled/>
-        </el-form-item>
+<!--        <el-form-item label="微信号" prop="wechatId">-->
+<!--          <el-input v-model="form.wechatId" placeholder="请输入微信号" disabled/>-->
+<!--        </el-form-item>-->
         <el-form-item label="邮箱" prop="email">
           <el-input v-model="form.email" placeholder="请输入邮箱" disabled/>
         </el-form-item>
-        <el-form-item label="申请原因" prop="applyReason">
-          <el-input v-model="form.applyReason" type="textarea" placeholder="请输入内容" disabled/>
-        </el-form-item>
+<!--        <el-form-item label="申请原因" prop="applyReason">-->
+<!--          <el-input v-model="form.applyReason" type="textarea" placeholder="请输入内容" disabled/>-->
+<!--        </el-form-item>-->
 
 <!--        <el-form-item label="附件" prop="attachment">-->
 <!--          <el-input v-model="form.attachment" placeholder="请输入附件" disabled/>-->
@@ -362,7 +362,7 @@ export default {
           this.form.state = "待审核"
         }
 
-        this.title = "修改创作者申请";
+        this.title = "审核创作者申请";
       });
     },
     restore(state){
diff --git a/src/views/wjnft/brand/index.vue b/src/views/wjnft/brand/index.vue
new file mode 100644
index 0000000..b9d1f08
--- /dev/null
+++ b/src/views/wjnft/brand/index.vue
@@ -0,0 +1,554 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="创建时间" prop="createdTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--          v-model="queryParams.createdTime"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="选择创建时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="更新时间" prop="updatedTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--          v-model="queryParams.updatedTime"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="选择更新时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="删除时间" prop="deletedTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--          v-model="queryParams.deletedTime"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="选择删除时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </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:brand: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:brand: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:brand: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:brand:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="brandList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号"  type="index" width="50"/>
+      <el-table-column label="标题" align="center" prop="name" />
+
+      <el-table-column label="介绍" align="center" prop="content" >
+        <template slot-scope="scope">
+          <div class="ql-container ql-snow">
+            <div class="ql-editor" v-html="scope.row.content" style="height:100px;width:100%;overflow:auto" />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="图片路径" align="center" prop="picture" >
+        <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.picture"
+                  :preview-src-list="srcList"
+              >
+              </el-image>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+
+      <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="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="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" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['wjnft:brand:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['wjnft:brand:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改入驻品牌对话框 -->
+    <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="标题" prop="name">
+          <el-input v-model="form.name" placeholder="请输入公司名称" />
+        </el-form-item>
+        <el-form-item label="介绍">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="图片路径">
+<!--          <imageUpload v-model="form.picture"/>-->
+          <div>
+            <el-upload
+                ref="upload"
+                :action="action"
+                :headers="headers"
+                :limit="3"
+                :on-exceed="handleExceed"
+                list-type="picture-card"
+                :on-success="handleSuccess"
+                :auto-upload="true"
+                :before-upload="beforeUpload"
+                :file-list="imgList"
+            >
+
+              <i slot="default" class="el-icon-plus"></i>
+              <div slot="file" slot-scope="{file}">
+                <img
+                    class="el-upload-list__item-thumbnail"
+                    :src="file.url" alt=""
+                >
+                <span class="el-upload-list__item-actions">
+                  <span
+                      class="el-upload-list__item-preview"
+                      @click="handlePictureCardPreview(file)"
+                  >
+                    <i class="el-icon-zoom-in"></i>
+                  </span>
+                  <span
+                      v-if="!disabled"
+                      class="el-upload-list__item-delete"
+                      @click="handleDownload(file)"
+                  >
+                    <i class="el-icon-download"></i>
+                  </span>
+                  <span
+                      v-if="!disabled"
+                      class="el-upload-list__item-delete"
+                      @click="handleRemove(file)"
+                  >
+                    <i class="el-icon-delete"></i>
+                  </span>
+              </span>
+              </div>
+            </el-upload>
+
+          </div>
+          <span> 上传文件只能是<b style="color: #C03639">png，jpeg，jpg</b >格式,大小不能超过<b style="color: #C03639">3M</b> </span>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
+          </el-dialog>
+
+        </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="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-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>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listBrand, getBrand, delBrand, addBrand, updateBrand } from "@/api/wjnft/brand";
+import {getToken} from "@/utils/auth";
+
+
+const client = 1;
+export default {
+  name: "Brand",
+  props:{
+    // 大小限制(MB)
+    fileSize: {
+      type: Number,
+      default: 3,
+    },
+    // 文件类型, 例如['png', 'jpg', 'jpeg']
+    fileType: {
+      type: Array,
+      default: () => ["png", "jpg", "jpeg"],
+    },
+    // 是否显示提示
+    isShowTip: {
+      type: Boolean,
+      default: true
+    },
+
+
+  },
+  data() {
+    return {
+      pictures:[],
+      //文件上传
+      srcList: [],
+      pictureUrl:[],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      //
+      disabled: false,
+      imgList:[],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 入驻品牌表格数据
+      brandList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        content: null,
+        picture: null,
+        createdTime: null,
+        updatedTime: null,
+        deletedTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  computed: {
+    headers() {
+      return {
+        Authorization: "Bearer " + getToken()
+      }
+    },
+    // 是否显示提示
+    showTip() {
+      return this.isShowTip && (this.fileType || this.fileSize);
+    },
+    action() {
+      return process.env.VUE_APP_BASE_API + "/wjnft/oss/upload/" + client
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询入驻品牌列表 */
+    getList() {
+      this.loading = true;
+      listBrand(this.queryParams).then(response => {
+        //
+        response.rows.forEach(item =>{
+         let picture = item.picture;
+          if(picture.search(",") != -1){
+             let  e = picture.split(",");
+               e.forEach( items => {
+                 item.picture = items;
+                 this.srcList.push(items);
+               })
+          }else{
+            item.pictur = picture;
+            this.srcList.push(picture);
+          }
+
+        });
+
+        this.brandList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.imgList = [];
+      this.form = {
+        id: null,
+        name: null,
+        content: null,
+        picture: null,
+        createdTime: null,
+        updatedTime: null,
+        deletedTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加入驻品牌";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.imgList = [];
+      this.reset();
+      const id = row.id || this.ids
+      getBrand(id).then(response => {
+        this.form = response.data;
+        let picture = this.form.picture;
+        if(picture.search(",") != -1){
+          let  e = picture.split(",");
+          e.forEach( items => {
+            let obj = {}
+            obj.url = items
+            this.imgList.push(obj)
+          })
+        }else{
+          let t = this.form.picture
+          let obj = {}
+          obj.url = t
+          this.imgList.push(obj)
+        }
+        this.open = true;
+        this.title = "修改入驻品牌";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            console.log(this.pictureUrl);
+            let url = "";
+            if(this.pictureUrl.length > 0){
+              this.imgList.forEach(item =>{
+                if(url === ""){
+                  url = item.url+',';
+                }else{
+                  url = url + item.url+',';
+                }
+
+              })
+              if(this.pictureUrl.length > 1 ){
+                url = url + this.pictureUrl.join(",")
+              }
+              url = url + this.pictureUrl[0];
+              this.form.picture = url;
+            }
+            console.log(this.imgList);
+            console.log(this.form)
+            updateBrand(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            if(this.pictureUrl.length > 1){
+              this.form.picture = this.pictureUrl.join(",");
+            }else{
+              this.form.picture = this.pictureUrl[0];
+            }
+            console.log(this.form);
+            addBrand(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除入驻品牌编号为"' + ids + '"的数据项？').then(function() {
+        return delBrand(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wjnft/brand/export', {
+        ...this.queryParams
+      }, `brand_${new Date().getTime()}.xlsx`)
+    },
+    //  上传文件时触发
+    beforeUpload(file) {
+      //console.log(file)
+      let testmsg = file.name.substring(file.name.lastIndexOf(".") + 1);
+      const extension = testmsg === "png";
+      const extension1 = testmsg === "jpg";
+      const extension2 = testmsg === "jpeg";
+      const isLt32M = file.size / 1024 / 1024 < 3;
+      if (!extension && !extension2 && !extension1) {
+        this.$message.warning('上传文件只能是png,jpeg,jpg格式！');
+      }
+      if (!isLt32M) {
+        this.$message.warning('上传文件大小不能超过3MB！');
+      }
+      return (extension || extension2 || extension1) && isLt32M;
+
+    },
+    // 上传的提示
+    handleExceed(files, fileList) {
+      this.$message.warning('当前只允许上传三个文件');
+    },
+    //上传成功
+    handleSuccess(res, file) {
+      this.imagesUrl = res.data;
+      //图片路径返回给父组件
+      console.log(res);
+      this.pictureUrl.push( res.url);
+      return this.imgList;
+    },
+    handleRemove(file) {
+      console.log(file);
+      //this.$refs.upload.clearFiles()
+      const findex = this.imgList.map(f => f.url).indexOf(file.url);
+      if(findex > -1) {
+        this.imgList.splice(findex, 1);
+      }
+
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    handleDownload(file) {
+      console.log(file);
+    },
+
+
+  }
+};
+</script>
diff --git a/src/views/wjnft/collection/index.vue b/src/views/wjnft/collection/index.vue
index b1146c2..b405ccd 100644
--- a/src/views/wjnft/collection/index.vue
+++ b/src/views/wjnft/collection/index.vue
@@ -544,13 +544,14 @@
           </el-dialog>
         </el-form-item>
         <el-form-item label="作品权重 " prop="weight"  v-hasRole="['admin','tester']" >
-          <el-input v-model="weight" placeholder="请输入作品权重(1-10000) "
-                    onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
-                    onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+          <el-input v-model=" weight " placeholder="请输入作品权重(1-10000) "
+                    onkeyup="value=value.replace(/[^\d]/g,' ')"
                     maxLength = '5'
                     v-hasRole="['admin','tester']"
           />
-
+          <!--                    onkeyup="if(this.value.length === 1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+                                  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>
       <div slot="footer" class="dialog-footer">
@@ -942,6 +943,8 @@ export default {
               this.$message.error("请上传作品图片")
               return ;
             }
+            this.form.weight = this.weight;
+            //console.log(this.form);
             updateCollection(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
diff --git a/src/views/wjnft/uploading/upload.vue b/src/views/wjnft/uploading/upload.vue
index 743ef54..9a24b3d 100644
--- a/src/views/wjnft/uploading/upload.vue
+++ b/src/views/wjnft/uploading/upload.vue
@@ -57,7 +57,7 @@ name: "upload",
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5,
+      default: 3,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {