From 86aac60c449dbae75442b3a73d65ad0fe48073f8 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 28 Mar 2023 11:05:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                   |  4 ++--
 src/components/XyTinymce/index.vue |  5 +++--
 src/views/order/orderList.vue      | 36 ++++++++++++++++++++++--------
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/.env.development b/.env.development
index ae62b32..82421b8 100644
--- a/.env.development
+++ b/.env.development
@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = https://yybtest.ali251.langye.net/
-#VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
+#VUE_APP_BASE_API = https://yybtest.ali251.langye.net/
+VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
diff --git a/src/components/XyTinymce/index.vue b/src/components/XyTinymce/index.vue
index 63f8c5f..627b47f 100644
--- a/src/components/XyTinymce/index.vue
+++ b/src/components/XyTinymce/index.vue
@@ -31,6 +31,7 @@ import "tinymce/plugins/wordcount";
 import "tinymce/plugins/colorpicker";
 import "tinymce/plugins/textcolor";
 import "tinymce/icons/default"
+import 'tinymce/plugins/code'
 export default {
   components: {
     Editor,
@@ -52,11 +53,11 @@ export default {
     plugins: {
       type: [String, Array],
       default:
-        "paste preview searchreplace autolink directionality visualblocks visualchars fullscreen image   template  codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave ",
+        "code paste preview searchreplace autolink directionality visualblocks visualchars fullscreen image   template  codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave ",
     },
     toolbar: {
       type: [String, Array],
-      default: ` undo redo restoredraft | assignment | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough  anchor | alignleft aligncenter alignright alignjustify outdent indent |
+      default: ` undo redo restoredraft | code | assignment | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough  anchor | alignleft aligncenter alignright alignjustify outdent indent |
                 styleselect formatselect fontselect fontsizeselect | table image  charmap emoticons hr pagebreak |bullist numlist | blockquote subscript superscript removeformat |
                  insertdatetime print preview | fullscreen | bdmap indent2em lineheight formatpainter axupimgs`,
     },
diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue
index feeaa67..e77cd90 100644
--- a/src/views/order/orderList.vue
+++ b/src/views/order/orderList.vue
@@ -456,17 +456,35 @@
             this.select.order_item_id=""
             this.getOrders();
           },
-          changeUpdateDate(e) {
-            this.select.start_updated = e[0];
-            this.select.end_updated = e[1];
+          changeUpdateDate(e) {
+            if(e){
+              this.select.start_updated = e[0]+' 00:00:00';
+              this.select.end_updated = e[1]+' 23:59:59';
+            }else{
+              this.select.start_updated = ""
+              this.select.start_updated = ""
+            }
           },
-          changePayDate(e) {
-            this.select.start_paid = e[0];
-            this.select.end_paid = e[1];
+          changePayDate(e) {
+            if(e){
+              this.select.start_paid = e[0]+' 00:00:00';
+              this.select.end_paid = e[1]+' 23:59:59';
+            }else{
+              this.select.start_paid = "";
+              this.select.end_paid = "";
+            }
+
           },
-          changeCreatedDate(e) {
-            this.select.start_created = e[0];
-            this.select.end_created = e[1];
+          changeCreatedDate(e) {
+            console.log("date",e)
+            if(e){
+              this.select.start_created = e[0]+' 00:00:00';
+              this.select.end_created = e[1]+' 23:59:59';
+            }else{
+              this.select.start_created = '';
+              this.select.end_created = '';
+            }
+
           },
           productTypeChange(e) {
             this.select.productType = this.$refs['cascader'].getCheckedNodes()[0].data.id;