From 35a4592a7496a60467d60886d9f589ded41e649f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com>
Date: Fri, 6 Dec 2024 17:20:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../book/bookchaptercontent-add-or-update.vue      | 14 +++++++-------
 src/views/modules/order/buyorder.vue               | 13 +++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/book/bookchaptercontent-add-or-update.vue b/src/views/modules/book/bookchaptercontent-add-or-update.vue
index 052e6cf..93b66fd 100644
--- a/src/views/modules/book/bookchaptercontent-add-or-update.vue
+++ b/src/views/modules/book/bookchaptercontent-add-or-update.vue
@@ -44,15 +44,15 @@
           </component>
 
           <!-- 获取内容 -->
-          <p>
+          <!-- <p>
             <el-button @click="getContent()">获得内容</el-button>
-          </p>
-          <el-dialog title="内容" :visible.sync="dialogVisible" :append-to-body="true">
+          </p> -->
+          <!-- <el-dialog title="内容" :visible.sync="dialogVisible" :append-to-body="true">
             {{ dataForm.otherContent }}
             <span slot="footer" class="dialog-footer">
               <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
             </span>
-          </el-dialog>
+          </el-dialog> -->
         </div>
       </el-form-item>
       <el-form-item label="排序" prop="sort">
@@ -173,9 +173,9 @@ export default {
       })
     },
     // 表单提交
-    dataFormSubmit() {
-      this.$refs['dataForm'].validate((valid) => {
-        this.getContent()
+ async   dataFormSubmit() {
+      this.$refs['dataForm'].validate(async(valid) => {
+      await  this.getContent()
         if (valid) {
           this.$http({
             url: this.$http.adornUrl(`/book/bookchaptercontent/${!this.dataForm.id ? 'save' : 'update'}`),
diff --git a/src/views/modules/order/buyorder.vue b/src/views/modules/order/buyorder.vue
index 7169a90..f18a370 100644
--- a/src/views/modules/order/buyorder.vue
+++ b/src/views/modules/order/buyorder.vue
@@ -69,6 +69,14 @@
           </el-date-picker>
         </div>
       </el-form-item>
+      <el-form-item>
+        <div class="block">
+          <el-checkbox size="mini"
+           
+            align="right"  v-model="dataForm.filterPresale"> 过滤预售书
+          </el-checkBox>
+        </div>
+      </el-form-item>
 
       <el-form-item>
         <el-button @click="pageIndex = 1;getDataList()">查询</el-button>
@@ -704,6 +712,10 @@
       }
     },
     methods: {
+      changeFilterPresale(){
+this.pageIndex = 1
+        this.getDataList()
+      },
       seeBooks(arr) {
         this.currBookLIst = arr
         this.booksShow = true
@@ -954,6 +966,7 @@
             "orderStatus": this.tabChange.tabActiveName,
             "pageIndex": this.pageIndex,
             "pageSize": this.pageSize,
+            "filterPresale": this.dataForm.filterPresale?1:0,
           })
         }).then(({
           data