From c3ad633a6610b513c45dc9791cce94b5a58afb0a Mon Sep 17 00:00:00 2001
From: Sakura9701 <328572838@qq.com>
Date: Thu, 13 Oct 2022 18:09:27 +0800
Subject: [PATCH] 1

---
 src/views/common/home.vue                     |  4 +-
 src/views/main-sidebar.vue                    |  4 +-
 .../modules/book/author-add-or-update.vue     | 12 ++---
 src/views/modules/book/book-add-or-update.vue | 47 +++++++++++++++++--
 src/views/modules/book/book.vue               |  2 +-
 .../book/bookchaptercontent-add-or-update.vue |  2 +-
 .../modules/book/publisher-add-or-update.vue  | 30 ++++++------
 .../shop/shopproduct-add-or-update.vue        |  2 +-
 src/views/modules/user/user-add-or-update.vue |  2 +-
 9 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/src/views/common/home.vue b/src/views/common/home.vue
index 05fcdfe..2e7b66b 100644
--- a/src/views/common/home.vue
+++ b/src/views/common/home.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mod-home">
-    <h3>项目介绍</h3>
+    <!-- <h3>项目介绍</h3>
     <ul>
       <li>renren-fast-vue基于vue、element-ui构建开发，实现<a href="https://gitee.com/renrenio/renren-fast" target="_blank">renren-fast</a>后台管理前端功能，提供一套更优的前端解决方案</li>
       <li>前后端分离，通过token进行数据交互，可独立部署</li>
@@ -22,7 +22,7 @@
     <ul>
       <li>高级群：324780204(大牛云集，跟大牛学习新技能)</li>
       <li>普通群：145799952(学习交流，互相解答各种疑问)</li>
-    </ul>
+    </ul> -->
   </div>
 </template>
 
diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue
index e3b18e8..23194f3 100644
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -10,7 +10,7 @@
           <icon-svg name="shouye" class="site-sidebar__menu-icon"></icon-svg>
           <span slot="title">首页</span>
         </el-menu-item>
-        <el-submenu index="demo">
+        <!-- <el-submenu index="demo">
           <template slot="title">
             <icon-svg name="shoucang" class="site-sidebar__menu-icon"></icon-svg>
             <span>demo</span>
@@ -23,7 +23,7 @@
             <icon-svg name="editor" class="site-sidebar__menu-icon"></icon-svg>
             <span slot="title">ueditor</span>
           </el-menu-item>
-        </el-submenu>
+        </el-submenu> -->
         <sub-menu
           v-for="menu in menuList"
           :key="menu.menuId"
diff --git a/src/views/modules/book/author-add-or-update.vue b/src/views/modules/book/author-add-or-update.vue
index 80d3ae4..5b29366 100644
--- a/src/views/modules/book/author-add-or-update.vue
+++ b/src/views/modules/book/author-add-or-update.vue
@@ -69,15 +69,15 @@
           sex: [
             { required: true, message: '性别不能为空', trigger: 'blur' }
           ],
-          age: [
-            { required: true, message: '年龄不能为空', trigger: 'blur' }
-          ],
+          // age: [
+          //   { required: true, message: '年龄不能为空', trigger: 'blur' }
+          // ],
           introduction: [
             { required: true, message: '简介不能为空', trigger: 'blur' }
           ],
-          tel: [
-            { required: true, message: '电话不能为空', trigger: 'blur' }
-          ],
+          // tel: [
+          //   { required: true, message: '电话不能为空', trigger: 'blur' }
+          // ],
           // address: [
           //   { required: true, message: '住址不能为空', trigger: 'blur' }
           // ],
diff --git a/src/views/modules/book/book-add-or-update.vue b/src/views/modules/book/book-add-or-update.vue
index a1bcb3b..3ddc004 100644
--- a/src/views/modules/book/book-add-or-update.vue
+++ b/src/views/modules/book/book-add-or-update.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible" @close="handlereset">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" 
       label-width="80px">
       <el-form-item label="书名" prop="name">
         <el-input v-model="dataForm.name" placeholder="书名"></el-input>
@@ -80,8 +80,27 @@
           <el-checkbox v-for="item in bookList" :key="item.dictType" :label="item.dictType" :value="item.dictType">{{item.dictValue}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
-      <el-form-item label="价格" prop="price">
-        <el-input v-model="dataForm.price" placeholder="价格"></el-input>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="原价" prop="price">
+            <el-input v-model="dataForm.price" placeholder="价格"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="优惠价格" prop="salePrice">
+            <el-input v-model="dataForm.salePrice" placeholder="优惠价格"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="付费类型" prop="isVip">
+        <el-radio-group v-model="dataForm.isVip">
+          <el-radio :label="2">付费</el-radio>
+          <el-radio :label="1">会免</el-radio>
+          <el-radio :label="0">免费</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="免费章节数" prop="freeChapterCount">
+        <el-input-number v-model="dataForm.freeChapterCount"  :min="0" :max="10" label="免费章节数"></el-input-number>
       </el-form-item>
       <el-form-item label="置顶" prop="istop">
         <el-radio-group v-model="dataForm.istop">
@@ -89,13 +108,19 @@
           <el-radio :label="0">否</el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="秒杀" prop="istop">
+        <el-radio-group v-model="dataForm.isSale">
+          <el-radio :label="1">是</el-radio>
+          <el-radio :label="0">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <!-- <el-form-item label="出版商名称" prop="publisherId">
         <el-input v-model="dataForm.publisherId" placeholder="出版商名称"></el-input>
       </el-form-item> -->
       <el-form-item label="文件上传" prop="novel">
         <el-upload
           class="upload-demo"
-          action="http://localhost:9100/pb/oss/fileoss"
+          action="http://59.110.212.44:9100/pb/oss/fileoss"
           :on-preview="handlePreview"
           :on-remove="handleRemoveNovel"
           :before-remove="beforeRemove"
@@ -109,7 +134,7 @@
       </el-form-item>
       <el-form-item label="插图" prop="images">
         <el-upload
-          action="http://localhost:9100/pb/oss/fileoss"
+          action="http://59.110.212.44:9100/pb/oss/fileoss"
           list-type="picture-card"
           :on-preview="handlePictureCardPreview"
           :file-list="fileList"
@@ -170,7 +195,11 @@ export default {
         content: '',
         type:[],
         price: '',
+        salePrice:'',
         istop: '',
+        isVip:'',
+        freeChapterCount:0,
+        isSale: '',
         publisherId: [],
         images: '',
         pid: '',
@@ -260,7 +289,11 @@ export default {
               this.dataForm.content = data.book.content
               // this.dataForm.type = data.book.type
               this.dataForm.price = data.book.price
+              this.dataForm.salePrice = data.book.salePrice
               this.dataForm.istop = data.book.istop
+              this.dataForm.isVip = data.book.isVip
+              this.dataForm.isSale = data.book.isSale
+              this.dataForm.freeChapterCount = data.book.freeChapterCount
               // this.dataForm.publisherId = data.book.publisherId
               this.dataForm.images = data.book.images
               this.dataForm.pid = data.book.pid
@@ -315,7 +348,11 @@ export default {
               'content': this.dataForm.content,
               'type': this.dataForm.type.join(','),
               'price': this.dataForm.price,
+              'salePrice': this.dataForm.salePrice,
               'istop': this.dataForm.istop,
+              'isVip': this.dataForm.isVip,
+              'isSale': this.dataForm.isSale,
+              'freeChapterCount': this.dataForm.freeChapterCount,
               'publisherId': this.dataForm.publisherId.join(','),
               'images': this.dataForm.images,
               'pid': this.dataForm.pid,
diff --git a/src/views/modules/book/book.vue b/src/views/modules/book/book.vue
index 9a8f2bf..5eba6f8 100644
--- a/src/views/modules/book/book.vue
+++ b/src/views/modules/book/book.vue
@@ -26,7 +26,7 @@
           {{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column prop="state" header-align="center" align="center" label="状态">
+      <el-table-column min-width="155px" prop="state" header-align="center" align="center" label="状态">
         <template slot-scope="scope">
           <el-switch :active-value=1 :inactive-value=0 style="display: block" v-model="scope.row.state"
             @change="SwitchChange(scope.row)" active-color="#13ce66" inactive-color="#ff4949" active-text="上架"
diff --git a/src/views/modules/book/bookchaptercontent-add-or-update.vue b/src/views/modules/book/bookchaptercontent-add-or-update.vue
index b077b40..dd91bf1 100644
--- a/src/views/modules/book/bookchaptercontent-add-or-update.vue
+++ b/src/views/modules/book/bookchaptercontent-add-or-update.vue
@@ -16,7 +16,7 @@
         <el-button style="margin-top: 10px;" @click="fontchange(dataForm.content)" type="primary">文字转语音</el-button>
       </el-form-item>
       <el-form-item label="音频文件上传" prop="voices">
-        <el-upload class="upload-demo" action="http://localhost:9100/pb/oss/fileoss" :on-preview="handlePreview"
+        <el-upload class="upload-demo" action="http://59.110.212.44:9100/pb/oss/fileoss" :on-preview="handlePreview"
           :on-remove="handleRemove" :on-success="handleVoicesSuccess" multiple :limit="3" :file-list="fileListVoices">
           <el-button size="small" type="primary">点击上传</el-button>
         </el-upload>
diff --git a/src/views/modules/book/publisher-add-or-update.vue b/src/views/modules/book/publisher-add-or-update.vue
index f8d6d02..bfc438a 100644
--- a/src/views/modules/book/publisher-add-or-update.vue
+++ b/src/views/modules/book/publisher-add-or-update.vue
@@ -48,21 +48,21 @@
           publisherName: [
             { required: true, message: '出版商名称不能为空', trigger: 'blur' }
           ],
-          introduction: [
-            { required: true, message: '出版商简介不能为空', trigger: 'blur' }
-          ],
-          tel: [
-            { required: true, message: '联系方式不能为空', trigger: 'blur' }
-          ],
-          createTime: [
-            { required: true, message: '创建时间不能为空', trigger: 'blur' }
-          ],
-          updateTime: [
-            { required: true, message: '更新时间不能为空', trigger: 'blur' }
-          ],
-          delFlag: [
-            { required: true, message: '删除标记不能为空', trigger: 'blur' }
-          ]
+          // introduction: [
+          //   { required: true, message: '出版商简介不能为空', trigger: 'blur' }
+          // ],
+          // tel: [
+          //   { required: true, message: '联系方式不能为空', trigger: 'blur' }
+          // ],
+          // createTime: [
+          //   { required: true, message: '创建时间不能为空', trigger: 'blur' }
+          // ],
+          // updateTime: [
+          //   { required: true, message: '更新时间不能为空', trigger: 'blur' }
+          // ],
+          // delFlag: [
+          //   { required: true, message: '删除标记不能为空', trigger: 'blur' }
+          // ]
         }
       }
     },
diff --git a/src/views/modules/shop/shopproduct-add-or-update.vue b/src/views/modules/shop/shopproduct-add-or-update.vue
index 6528718..f727125 100644
--- a/src/views/modules/shop/shopproduct-add-or-update.vue
+++ b/src/views/modules/shop/shopproduct-add-or-update.vue
@@ -22,7 +22,7 @@
     </el-form-item>
     <el-form-item label="商品图" prop="productImages">
         <el-upload
-          action="http://localhost:9100/pb/oss/fileoss"
+          action="http://59.110.212.44:9100/pb/oss/fileoss"
           list-type="picture-card"
           :on-preview="handlePictureCardPreview"
           :file-list="fileList"
diff --git a/src/views/modules/user/user-add-or-update.vue b/src/views/modules/user/user-add-or-update.vue
index 1adc0d4..84ad306 100644
--- a/src/views/modules/user/user-add-or-update.vue
+++ b/src/views/modules/user/user-add-or-update.vue
@@ -15,7 +15,7 @@
       </el-form-item>
       <el-form-item label="头像" prop="avatar">
         <!-- <el-input v-model="dataForm.avatar" placeholder="头像"></el-input> -->
-        <el-upload action="http://localhost:9100/pb/oss/fileoss" list-type="picture-card"
+        <el-upload action="http://59.110.212.44:9100/pb/oss/fileoss" list-type="picture-card"
           :on-preview="handlePictureCardPreview" :file-list="fileList" :on-success="handlePicSuccess"
           :on-remove="handleRemove">
           <i class="el-icon-plus"></i>