From afdb0520db528bebdf43303648fe3546c6428e22 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Fri, 15 Sep 2023 16:43:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/book/bookchapter.vue        |  8 ++--
 .../shop/shopproduct-add-or-update.vue        | 45 ++++++++++---------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/book/bookchapter.vue b/src/views/modules/book/bookchapter.vue
index 16c19d4..93ebd8c 100644
--- a/src/views/modules/book/bookchapter.vue
+++ b/src/views/modules/book/bookchapter.vue
@@ -25,10 +25,12 @@
         align="center"
         width="50">
       </el-table-column>
-      <el-table-column label="序号" width="70" align="center">
+      <!-- <el-table-column label="序号" width="70" align="center">
         <template slot-scope="scope">
-          {{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
+          {{ (pageIndex - 1) * pageSize + scope.$index + 1 }}         
         </template>
+      </el-table-column> -->
+      <el-table-column label="章节号" prop="number" width="70" align="center">       
       </el-table-column>
       <!-- <el-table-column
         prop="id"
@@ -46,7 +48,7 @@
         prop="chapter"
         header-align="center"
         align="center"
-        label="章节">
+        label="章节名">
       </el-table-column>
       <el-table-column
         prop="content"
diff --git a/src/views/modules/shop/shopproduct-add-or-update.vue b/src/views/modules/shop/shopproduct-add-or-update.vue
index 56dfb03..21e82b6 100644
--- a/src/views/modules/shop/shopproduct-add-or-update.vue
+++ b/src/views/modules/shop/shopproduct-add-or-update.vue
@@ -11,6 +11,9 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="商品名称" prop="productName">
+        <el-input v-model="dataForm.productName" placeholder="商品名称"></el-input>
+      </el-form-item>
       <!-- 关联的图书ids -->     
       <el-form-item label="关联图书" prop="Books">        
         <el-table
@@ -42,11 +45,7 @@
         <div style="text-align: center;">
           <el-button type="primary" size="mini" plain @click="showChooseBook">添加</el-button>
         </div>
-      </el-form-item>     
-      <el-form-item label="商品名称" prop="productName">
-        <el-input v-model="dataForm.productName" placeholder="商品名称"></el-input>
-      </el-form-item>
-
+      </el-form-item> 
       <el-form-item label="商品图" prop="productImages">
         <el-upload :limit="dataForm.limitCountImg" class="el-uploadfeng "
           :class="{ uoloadSty: dataForm.showBtnDealImg, disUoloadSty: dataForm.noneBtnImg }"
@@ -72,11 +71,12 @@
         <span>图片尺寸：600*600px，支持图片类型：.jpeg,.jpg,.gif,.png， 最多上传5张图片</span>
       </el-form-item>
       <div>
-        <el-form-item label="活动价" prop="price" style="width: 50%; float: left;">
+        <el-form-item label="商品价格" prop="price" style="width: 50%; float: left;">
           <el-input v-model="dataForm.price" placeholder="活动价"></el-input>
         </el-form-item>
-        <el-form-item label="商品价格" prop="hDprice" style="width: 50%; float: left;">
+        <el-form-item label="活动价" prop="hDprice" style="width: 50%; float: left;">
           <el-input v-model="dataForm.hDprice" placeholder="商品价格"></el-input>
+          <span style="color: #999;">值为0或者不填，则没有活动价格</span>
         </el-form-item>
         <el-form-item label="商品重量" prop="weight" style="width: 50%; float: right;">
           <el-input style="width: 80%;" v-model="dataForm.weight" placeholder="商品重量"></el-input><span
@@ -89,7 +89,7 @@
       <!-- <el-form-item label="上架状态" prop="publishStatus">
           <el-input v-model="dataForm.publishStatus" placeholder="上架状态"></el-input>
         </el-form-item> -->
-      <div>
+      <!-- <div>
         <el-form-item label="出版社" prop="publisher" style="width: 50%; float: left;">
           <el-input placeholder="出版社" v-model="dataForm.publisher"></el-input>
         </el-form-item>
@@ -102,7 +102,7 @@
           <el-date-picker @change="changeTime" format="yyyy 年 MM 月 dd 日" v-model="dataForm.pubDate" type="date"
             placeholder="选择日期时间">
           </el-date-picker>
-          <!-- <el-input placeholder="出版时间" v-model=""></el-input> -->
+         
         </el-form-item>
         <el-form-item label="页数" prop="pageNum" style="width: 50%; float: right;">
           <el-input placeholder="页数" v-model="dataForm.pageNum"></el-input>
@@ -115,7 +115,7 @@
         <el-form-item label="开本" prop="format" style="width: 50%; float: right;">
           <el-input v-model="dataForm.format" placeholder="16开或其他规格"></el-input>
         </el-form-item>
-      </div>
+      </div> -->
       <!-- 关联的图书ids -->
       <!-- <div style="clear: both;">
         <el-form-item label="关联图书" prop="Books">
@@ -175,7 +175,7 @@
           checkStrictly: true
         },
         dataForm: {
-          hDprice: null, // 活动价
+          hDprice: 0, // 活动价
           productId: 0,
           limitCountImg: 1, // 图片数量
           productImageList: '', // 轮播图
@@ -188,10 +188,10 @@
           publisher: '',
           weight: '',
           pubDate: '',
-          format: '', // 开本
+          // format: '', // 开本
           isFreeMail: '', // 是否包邮
-          pageNum: '',
-          quality: '', // 内文用纸
+          // pageNum: '',
+          // quality: '', // 内文用纸
           sumSales: null, // 总销量
           publishStatus: '',
           productPid: '',
@@ -348,9 +348,9 @@
                 this.dataForm.publisher = data.shopProduct.publisher
                 this.dataForm.author = data.shopProduct.author
                 this.dataForm.pubDate = data.shopProduct.pubDate
-                this.dataForm.pageNum = data.shopProduct.pageNum
-                this.dataForm.quality = data.shopProduct.quality
-                this.dataForm.format = data.shopProduct.format
+                // this.dataForm.pageNum = data.shopProduct.pageNum
+                // this.dataForm.quality = data.shopProduct.quality
+                // this.dataForm.format = data.shopProduct.format
                 this.dataForm.isFreeMail = data.shopProduct.isFreeMail
                 this.dataForm.productDetails = data.shopProduct.productDetails
                 this.dataForm.poids = data.shopProduct.poids
@@ -429,6 +429,11 @@
           var bookIDS = this.getBookIds()
           //  console.log(this.dataForm.productImageList)
           if (valid) {
+            if (!this.dataForm.hDprice || this.dataForm.hDprice == 0) {
+              console.log('没有值')
+              this.dataForm.hDprice = 0
+             }
+           
             this.$http({
               url: this.$http.adornUrl(`/book/shopproduct/${!this.dataForm.productId ? 'save' : 'update'}`),
               method: 'post',
@@ -450,10 +455,10 @@
                 'author': this.dataForm.author,
                 'publisher': this.dataForm.publisher,
                 'pubDate': this.dataForm.pubDate,
-                'format': this.dataForm.format, // 开本
+                // 'format': this.dataForm.format, // 开本
                 'isFreeMail': this.dataForm.isFreeMail,
-                'pageNum': this.dataForm.pageNum,
-                'quality': this.dataForm.quality, // 内文用纸
+                // 'pageNum': this.dataForm.pageNum,
+                // 'quality': this.dataForm.quality, // 内文用纸
                 'productStock': this.dataForm.productStock, // 库存
                 'activityPrice': this.dataForm.hDprice,
                 'bookids': this.bookidsd,     // 关联的图书