Merge remote-tracking branch 'origin/dev' into dev

src/views/wjnft/artist/index.vue

@@ -416,10 +416,7 @@
                                 this.$message.error("请填写创作者介绍")
                                 return;
                             }
-                            if (this.form.proportion === "" || this.form.proportion === null || this.form.proportion === undefined) {
-                                this.$message.error("请填写比例")
-                                return;
-                            }
+
                             if (this.form.artistName === "" || this.form.artistName === null || this.form.artistName === undefined) {
                                 this.$message.error("请填写作为创作者的名称")
                                 return;
@@ -438,10 +435,7 @@
                                 this.$message.error("请填写创作者介绍")
                                 return;
                             }
-                            if (this.form.proportion === "" || this.form.proportion === null || this.form.proportion === undefined) {
-                                this.$message.error("请填写比例")
-                                return;
-                            }
+
                             if (this.form.artistName === "" || this.form.artistName === null || this.form.artistName === undefined) {
                                 this.$message.error("请填写作为创作者的名称")
                                 return;

src/views/wjnft/collection/index.vue

@@ -311,11 +311,11 @@
 
       </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="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">-->
@@ -323,7 +323,7 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
       <!--      <el-table-column label="预留" align="center" prop="reservedA" />-->
-      <!--      <el-table-column label="预留" align="center" prop="reservedB" />-->
+            <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">
@@ -813,7 +813,7 @@ export default {
         updatedBy: null,
         updatedTime: null,
         reservedA: null,
-        reservedB: null,
+        heatValue: null,
         reservedC: null,
         reservedD: null
       };

src/views/wjnft/feedback/index.vue

@@ -45,15 +45,15 @@
 <!--          placeholder="选择${comment}">-->
 <!--        </el-date-picker>-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="${comment}" prop="createdBy">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.createdBy"-->
-<!--          placeholder="请输入${comment}"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="反馈者" prop="createdBy">
+        <el-input
+          v-model="queryParams.createdBy"
+          placeholder="请输入反馈者名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--      <el-form-item label="${comment}" prop="updatedTime">-->
 <!--        <el-date-picker clearable size="small"-->
 <!--          v-model="queryParams.updatedTime"-->
@@ -85,16 +85,16 @@
       </el-form-item>
     </el-form>
 
-<!--    <el-row :gutter="10" class="mb8">-->
+    <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:feedback:add']"-->
-<!--        >新增</el-button>-->
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['wjnft:feedback:add']"
+        >新增</el-button>
 <!--      </el-col>-->
 <!--      <el-col :span="1.5">-->
 <!--        <el-button-->
@@ -129,23 +129,44 @@
 <!--        >导出</el-button>-->
 <!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
-<!--    </el-row>-->
+    </el-row>
 
     <el-table v-loading="loading" :data="feedbackList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="${comment}" align="center" prop="id" />-->
       <el-table-column label="序号" type="index" width="50"></el-table-column>
-      <el-table-column label="手机" align="center" prop="phone" />
-      <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="内容" align="center" prop="content" />
+<!--      <el-table-column label="手机" align="center" prop="phone" width="150"/>-->
+      <el-table-column label="标题" align="center" prop="title" width="200"/>
+      <el-table-column label="内容" align="center" prop="content" width="400"/>
+      <el-table-column label="回复内容" align="center" prop="admContent" width="400"/>
 <!--      <el-table-column label="用户ID" align="center" prop="userId" />-->
-      <el-table-column label="附件图片" align="center" prop="picture" />
-      <el-table-column label="反馈时间" align="center" prop="createdTime" width="180">
+<!--      <el-table-column label="附件图片" align="center" prop="picture" />-->
+      <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="srcLists"
+              >
+              </el-image>
+            </div>
+          </div>
+        </template>
+
+      </el-table-column>
+      <el-table-column label="反馈时间" align="center" prop="createdTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="反馈人" align="center" prop="createdBy" />
+      <el-table-column label="反馈者" align="center" prop="createdBy" width="100"/>
 <!--      <el-table-column label="${comment}" align="center" prop="updatedTime" width="180">-->
 <!--        <template slot-scope="scope">-->
 <!--          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
@@ -164,7 +185,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['wjnft:feedback:edit']"
+            v-if="scope.row.admContent==null"
           >回复</el-button>
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -188,8 +209,21 @@
     <!-- 添加或修改意见反馈对话框 -->
     <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="内容">
-          <editor v-model="form.content" :min-height="192"/>
+        <el-form-item label="反馈内容" >
+          <el-input
+              type="textarea"
+              :rows="10"
+              :disabled="true"
+              v-model="form.content">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="回复" >
+          <el-input
+              type="textarea"
+              :rows="8"
+              v-model="form.admContent">
+          </el-input>
         </el-form-item>
 <!--        <el-form-item label="手机" prop="phone">-->
 <!--          <el-input v-model="form.phone" placeholder="请输入手机" />-->
@@ -235,7 +269,7 @@
 <!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">回复</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -249,6 +283,8 @@ export default {
   name: "Feedback",
   data() {
     return {
+      //文本框
+      textarea: '',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -261,6 +297,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      srcLists: [],
       // 意见反馈表格数据
       feedbackList: [],
       // 弹出层标题
@@ -298,6 +335,9 @@ export default {
       this.loading = true;
       listFeedback(this.queryParams).then(response => {
         this.feedbackList = response.rows;
+        response.rows.forEach(item =>{
+          this.srcLists.push(item.picture);
+        });
         this.total = response.total;
         this.loading = false;
       });
@@ -346,14 +386,14 @@ export default {
       this.open = true;
       this.title = "添加意见反馈";
     },
-    /** 修改按钮操作 */
+    /** 回复按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
       getFeedback(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改意见反馈";
+        this.title = "回复意见反馈";
       });
     },
     /** 提交按钮 */
@@ -362,13 +402,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateFeedback(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("回复成功");
               this.open = false;
               this.getList();
             });
           } else {
             addFeedback(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess("回复失败");
               this.open = false;
               this.getList();
             });