From b7e8dc58a1f543e1433d2a546f1c63f68ede4eba Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Fri, 26 Jan 2024 16:29:11 +0800
Subject: [PATCH] 1

---
 src/views/examine/exhibit.vue   |  2 +-
 src/views/examine/jfproduct.vue | 13 +++++++------
 src/views/examine/order.vue     |  8 ++++----
 src/views/examine/product.vue   | 15 ++++++++-------
 src/views/examine/works.vue     | 15 ++++++++-------
 vue.config.js                   |  4 ++--
 6 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/views/examine/exhibit.vue b/src/views/examine/exhibit.vue
index 4e229ef..7aea5ce 100644
--- a/src/views/examine/exhibit.vue
+++ b/src/views/examine/exhibit.vue
@@ -24,7 +24,7 @@
 				@selection-change="handleSelectionChange">
 				<el-table-column type="selection" width="55"></el-table-column>
 				<el-table-column type="index" label="序号" width="80"> </el-table-column>
-				<el-table-column prop="name" label="标题"> </el-table-column>
+				<el-table-column prop="name" label="标题" show-overflow-tooltip> </el-table-column>
 				<el-table-column prop="cover" label="封面图片" width="280">
 					<template #default="scope">
 						<el-image :src="scope.row.cover"></el-image>
diff --git a/src/views/examine/jfproduct.vue b/src/views/examine/jfproduct.vue
index aae32a6..819c160 100644
--- a/src/views/examine/jfproduct.vue
+++ b/src/views/examine/jfproduct.vue
@@ -51,9 +51,9 @@
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="80">
         </el-table-column>
-        <el-table-column prop="goodsName" label="商品"> </el-table-column>
-        <el-table-column prop="introduce" label="简介"> </el-table-column>
-        <el-table-column prop="shopInfo.userName" label="作者">
+        <el-table-column prop="goodsName" label="商品" show-overflow-tooltip> </el-table-column>
+        <!-- <el-table-column prop="introduce" label="简介"> </el-table-column> -->
+        <el-table-column prop="shopInfo.userName" label="发布者">
         </el-table-column>
         <!-- <el-table-column prop="workTag" label="标签"> </el-table-column> -->
         <el-table-column prop="typeName" label="类型">
@@ -179,12 +179,12 @@
       <el-form-item label="商品名称">
         <el-input v-model="detailForm.goodsName"></el-input>
       </el-form-item>
-      <el-form-item label="作者">
+      <el-form-item label="发布者">
         <el-input v-model="detailForm.userName"></el-input>
       </el-form-item>
-      <!-- <el-form-item label="简介">
+      <el-form-item label="简介">
 				<el-input type="textarea" v-model="detailForm.introduce"></el-input>
-			</el-form-item> -->
+			</el-form-item>
       <el-form-item label="网盘地址">
         <el-input v-model="detailForm.wpPath"></el-input>
       </el-form-item>
@@ -367,6 +367,7 @@ export default {
       this.detailForm.userName = value.shopInfo.userName;
       this.detailForm.wpPath = value.domainInfo.wpPath;
       this.detailForm.code = value.domainInfo.code;
+      this.detailForm.introduce = value.domainInfo.introduce;
       let img1 = null;
       if (value.domainInfo.file) {
         img1 = value.domainInfo.file.split(",");
diff --git a/src/views/examine/order.vue b/src/views/examine/order.vue
index 334427f..4e2f236 100644
--- a/src/views/examine/order.vue
+++ b/src/views/examine/order.vue
@@ -24,13 +24,13 @@
 				@selection-change="handleSelectionChange">
 				<el-table-column type="selection" width="55"></el-table-column>
 				<el-table-column type="index" label="序号" width="80"> </el-table-column>
-				<el-table-column prop="title" label="标题"> </el-table-column>
-				<el-table-column prop="content" label="简介"> </el-table-column>
-				<el-table-column prop="cover" label="封面图片" width="280">
+				<el-table-column prop="title" label="标题" show-overflow-tooltip> </el-table-column>
+				<!-- <el-table-column prop="content" label="简介"> </el-table-column> -->
+				<!-- <el-table-column prop="cover" label="封面图片" width="280">
 					<template #default="scope">
 						<el-image :src="scope.row.cover"></el-image>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 				<el-table-column prop="examineState" label="审核状态">
 					<template #default="scope">
 						<span v-if="scope.row.examineState == '0'" style="color:#409EFF;">未审核</span>
diff --git a/src/views/examine/product.vue b/src/views/examine/product.vue
index 8eda9e9..2ec3453 100644
--- a/src/views/examine/product.vue
+++ b/src/views/examine/product.vue
@@ -51,10 +51,10 @@
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="80">
         </el-table-column>
-        <el-table-column prop="goodsName" label="商品"> </el-table-column>
-        <el-table-column prop="domainInfo.introduce" label="简介">
-        </el-table-column>
-        <el-table-column prop="shopInfo.userName" label="作者">
+        <el-table-column prop="goodsName" label="商品" show-overflow-tooltip> </el-table-column>
+        <!-- <el-table-column prop="domainInfo.introduce" label="简介">
+        </el-table-column> -->
+        <el-table-column prop="shopInfo.userName" label="发布者">
         </el-table-column>
         <!-- <el-table-column prop="workTag" label="标签"> </el-table-column> -->
         <el-table-column prop="typeName" label="类型">
@@ -180,12 +180,12 @@
       <el-form-item label="商品名称">
         <el-input v-model="detailForm.name"></el-input>
       </el-form-item>
-      <el-form-item label="作者">
+      <el-form-item label="发布者">
         <el-input v-model="detailForm.userName"></el-input>
       </el-form-item>
-      <!-- <el-form-item label="简介">
+      <el-form-item label="简介">
 				<el-input type="textarea" v-model="detailForm.introduce"></el-input>
-			</el-form-item> -->
+			</el-form-item>
       <el-form-item label="网盘地址">
         <el-input v-model="detailForm.wpPath"></el-input>
       </el-form-item>
@@ -365,6 +365,7 @@ export default {
       this.detailForm.wpPath = value.domainInfo.wpPath;
       this.detailForm.code = value.domainInfo.code;
       this.detailForm.userName = value.shopInfo.userName;
+      this.detailForm.introduce = value.domainInfo.introduce;
       let img1 = null;
       if (value.domainInfo.file) {
         img1 = value.domainInfo.file.split(",");
diff --git a/src/views/examine/works.vue b/src/views/examine/works.vue
index 7683f5f..93cfba8 100644
--- a/src/views/examine/works.vue
+++ b/src/views/examine/works.vue
@@ -24,10 +24,10 @@
 				@selection-change="handleSelectionChange">
 				<el-table-column type="selection" width="55"></el-table-column>
 				<el-table-column type="index" label="序号" width="80"> </el-table-column>
-				<el-table-column prop="name" label="标题"> </el-table-column>
-				<el-table-column prop="introduce" label="简介"> </el-table-column>
-				<el-table-column prop="userName" label="作者"> </el-table-column>
-				<el-table-column prop="workTag" label="标签"> </el-table-column>
+				<el-table-column prop="name" label="标题" show-overflow-tooltip> </el-table-column>
+				<!-- <el-table-column prop="introduce" label="简介"> </el-table-column> -->
+				<el-table-column prop="user.userName" label="发布者"> </el-table-column>
+				<!-- <el-table-column prop="workTag" label="标签"> </el-table-column> -->
 				<el-table-column prop="typeName" label="类型">
 					<template #default="scope">
 						<span>{{ scope.row.typeName }} - {{ scope.row.typesName }}</span>
@@ -99,12 +99,12 @@
 			<el-form-item label="作品名称">
 				<el-input v-model="detailForm.name"></el-input>
 			</el-form-item>
-			<el-form-item label="作者">
+			<el-form-item label="发布者">
 				<el-input v-model="detailForm.userName"></el-input>
 			</el-form-item>
-			<!-- <el-form-item label="简介">
+			<el-form-item label="简介">
 				<el-input type="textarea" v-model="detailForm.introduce"></el-input>
-			</el-form-item> -->
+			</el-form-item>
 			<el-form-item label="网盘地址">
 				<el-input v-model="detailForm.wpPath"></el-input>
 			</el-form-item>
@@ -266,6 +266,7 @@ export default {
 			this.title = title
 			this.opens = true
 			this.detailForm = value
+			this.detailForm.userName = value.user.userName
 			let img1 = value.file.split(',')
 			if (img1.length > 0) {
 				img1.forEach(ele => {
diff --git a/vue.config.js b/vue.config.js
index b9ae201..ad7504d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,8 +13,8 @@ module.exports = {
         port: 2800, //挂载端口
         proxy: {
             '/api': {
-                target: 'https://yxx.ydool.net',
-                // target: 'http://192.168.2.48:8080',
+                // target: 'https://yxx.ydool.net',
+                target: 'http://192.168.2.48:8080',
                 //target: 'http://192.168.0.230:8090',
                 //target: 'http://192.168.0.57:8090',
                 //target: 'http://127.0.0.1:8090',