update

public/lib/tinymce/langs/README.md

@@ -1,3 +0,0 @@
-This is where language files should be placed.
-
-Please DO NOT translate these directly use this service: https://www.transifex.com/projects/p/tinymce/

public/lib/tinymce/license.txt

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Ephox Corporation DBA Tiny Technologies, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

public/lib/tinymce/plugins/code/plugin.min.js

@@ -1,4 +0,0 @@
-/**
- * TinyMCE version 6.0.3 (2022-05-25)
- */
-!function(){"use strict";tinymce.util.Tools.resolve("tinymce.PluginManager").add("code",(e=>((e=>{e.addCommand("mceCodeEditor",(()=>{(e=>{const o=(e=>e.getContent({source_view:!0}))(e);e.windowManager.open({title:"Source Code",size:"large",body:{type:"panel",items:[{type:"textarea",name:"code"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:{code:o},onSubmit:o=>{((e,o)=>{e.focus(),e.undoManager.transact((()=>{e.setContent(o)})),e.selection.setCursorLocation(),e.nodeChanged()})(e,o.getData().code),o.close()}})})(e)}))})(e),(e=>{const o=()=>e.execCommand("mceCodeEditor");e.ui.registry.addButton("code",{icon:"sourcecode",tooltip:"Source code",onAction:o}),e.ui.registry.addMenuItem("code",{icon:"sourcecode",text:"Source code",onAction:o})})(e),{})))}();

public/lib/tinymce/plugins/nonbreaking/plugin.min.js

@@ -1,4 +0,0 @@
-/**
- * TinyMCE version 6.0.3 (2022-05-25)
- */
-!function(){"use strict";var n=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=n=>e=>typeof e===n,a=e("boolean"),o=e("number"),t=n=>e=>e.options.get(n),i=t("nonbreaking_force_tab"),r=t("nonbreaking_wrap"),s=(n,e)=>{let a="";for(let o=0;o<e;o++)a+=n;return a},c=(n,e)=>{const a=r(n)||n.plugins.visualchars?`<span class="${(n=>!!n.plugins.visualchars&&n.plugins.visualchars.isEnabled())(n)?"mce-nbsp-wrap mce-nbsp":"mce-nbsp-wrap"}" contenteditable="false">${s("&nbsp;",e)}</span>`:s("&nbsp;",e);n.undoManager.transact((()=>n.insertContent(a)))};var l=tinymce.util.Tools.resolve("tinymce.util.VK");n.add("nonbreaking",(n=>{(n=>{const e=n.options.register;e("nonbreaking_force_tab",{processor:n=>a(n)?{value:n?3:0,valid:!0}:o(n)?{value:n,valid:!0}:{valid:!1,message:"Must be a boolean or number."},default:!1}),e("nonbreaking_wrap",{processor:"boolean",default:!0})})(n),(n=>{n.addCommand("mceNonBreaking",(()=>{c(n,1)}))})(n),(n=>{const e=()=>n.execCommand("mceNonBreaking");n.ui.registry.addButton("nonbreaking",{icon:"non-breaking",tooltip:"Nonbreaking space",onAction:e}),n.ui.registry.addMenuItem("nonbreaking",{icon:"non-breaking",text:"Nonbreaking space",onAction:e})})(n),(n=>{const e=i(n);e>0&&n.on("keydown",(a=>{if(a.keyCode===l.TAB&&!a.isDefaultPrevented()){if(a.shiftKey)return;a.preventDefault(),a.stopImmediatePropagation(),c(n,e)}}))})(n)}))}();

public/lib/tinymce/plugins/pagebreak/plugin.min.js

@@ -1,4 +0,0 @@
-/**
- * TinyMCE version 6.0.3 (2022-05-25)
- */
-!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),a=tinymce.util.Tools.resolve("tinymce.Env");const t=e=>a=>a.options.get(e),r=t("pagebreak_separator"),n=t("pagebreak_split_block"),o="mce-pagebreak",s=e=>{const t=`<img src="${a.transparentSrc}" class="mce-pagebreak" data-mce-resize="false" data-mce-placeholder />`;return e?`<p>${t}</p>`:t};e.add("pagebreak",(e=>{(e=>{const a=e.options.register;a("pagebreak_separator",{processor:"string",default:"\x3c!-- pagebreak --\x3e"}),a("pagebreak_split_block",{processor:"boolean",default:!1})})(e),(e=>{e.addCommand("mcePageBreak",(()=>{e.insertContent(s(n(e)))}))})(e),(e=>{const a=()=>e.execCommand("mcePageBreak");e.ui.registry.addButton("pagebreak",{icon:"page-break",tooltip:"Page break",onAction:a}),e.ui.registry.addMenuItem("pagebreak",{text:"Page break",icon:"page-break",onAction:a})})(e),(e=>{const a=r(e),t=()=>n(e),c=new RegExp(a.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,(e=>"\\"+e)),"gi");e.on("BeforeSetContent",(e=>{e.content=e.content.replace(c,s(t()))})),e.on("PreInit",(()=>{e.serializer.addNodeFilter("img",(r=>{let n,s,c=r.length;for(;c--;)if(n=r[c],s=n.attr("class"),s&&-1!==s.indexOf(o)){const r=n.parent;if(e.schema.getBlockElements()[r.name]&&t()){r.type=3,r.value=a,r.raw=!0,n.remove();continue}n.type=3,n.value=a,n.raw=!0}}))}))})(e),(e=>{e.on("ResolveName",(a=>{"IMG"===a.target.nodeName&&e.dom.hasClass(a.target,o)&&(a.name="pagebreak")}))})(e)}))}();

public/lib/tinymce/plugins/preview/plugin.min.js

@@ -1,4 +0,0 @@
-/**
- * TinyMCE version 6.0.3 (2022-05-25)
- */
-!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),t=tinymce.util.Tools.resolve("tinymce.Env"),o=tinymce.util.Tools.resolve("tinymce.util.Tools");const n=e=>t=>t.options.get(e),i=n("content_style"),s=n("content_css_cors"),c=n("body_class"),r=n("body_id");e.add("preview",(e=>{(e=>{e.addCommand("mcePreview",(()=>{(e=>{const n=(e=>{var n;let l="";const a=e.dom.encode,d=null!==(n=i(e))&&void 0!==n?n:"";l+='<base href="'+a(e.documentBaseURI.getURI())+'">';const m=s(e)?' crossorigin="anonymous"':"";o.each(e.contentCSS,(t=>{l+='<link type="text/css" rel="stylesheet" href="'+a(e.documentBaseURI.toAbsolute(t))+'"'+m+">"})),d&&(l+='<style type="text/css">'+d+"</style>");const y=r(e),u=c(e),v='<script>document.addEventListener && document.addEventListener("click", function(e) {for (var elm = e.target; elm; elm = elm.parentNode) {if (elm.nodeName === "A" && !('+(t.os.isMacOS()||t.os.isiOS()?"e.metaKey":"e.ctrlKey && !e.altKey")+")) {e.preventDefault();}}}, false);<\/script> ",p=e.getBody().dir,w=p?' dir="'+a(p)+'"':"";return"<!DOCTYPE html><html><head>"+l+'</head><body id="'+a(y)+'" class="mce-content-body '+a(u)+'"'+w+">"+e.getContent()+v+"</body></html>"})(e);e.windowManager.open({title:"Preview",size:"large",body:{type:"panel",items:[{name:"preview",type:"iframe",sandboxed:!0}]},buttons:[{type:"cancel",name:"close",text:"Close",primary:!0}],initialData:{preview:n}}).focus("close")})(e)}))})(e),(e=>{const t=()=>e.execCommand("mcePreview");e.ui.registry.addButton("preview",{icon:"preview",tooltip:"Preview",onAction:t}),e.ui.registry.addMenuItem("preview",{icon:"preview",text:"Preview",onAction:t})})(e)}))}();

public/lib/tinymce/plugins/save/plugin.min.js

@@ -1,4 +0,0 @@
-/**
- * TinyMCE version 6.0.3 (2022-05-25)
- */
-!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const n=("function",e=>"function"==typeof e);var o=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),t=tinymce.util.Tools.resolve("tinymce.util.Tools");const a=e=>n=>n.options.get(e),c=a("save_enablewhendirty"),i=a("save_onsavecallback"),s=a("save_oncancelcallback"),r=(e,n)=>{e.notificationManager.open({text:n,type:"error"})},l=e=>n=>{const o=()=>{n.setEnabled(!c(e)||e.isDirty())};return o(),e.on("NodeChange dirty",o),()=>e.off("NodeChange dirty",o)};e.add("save",(e=>{(e=>{const n=e.options.register;n("save_enablewhendirty",{processor:"boolean",default:!0}),n("save_onsavecallback",{processor:"function"}),n("save_oncancelcallback",{processor:"function"})})(e),(e=>{e.ui.registry.addButton("save",{icon:"save",tooltip:"Save",enabled:!1,onAction:()=>e.execCommand("mceSave"),onSetup:l(e)}),e.ui.registry.addButton("cancel",{icon:"cancel",tooltip:"Cancel",enabled:!1,onAction:()=>e.execCommand("mceCancel"),onSetup:l(e)}),e.addShortcut("Meta+S","","mceSave")})(e),(e=>{e.addCommand("mceSave",(()=>{(e=>{const t=o.DOM.getParent(e.id,"form");if(c(e)&&!e.isDirty())return;e.save();const a=i(e);if(n(a))return a.call(e,e),void e.nodeChanged();t?(e.setDirty(!1),t.onsubmit&&!t.onsubmit()||("function"==typeof t.submit?t.submit():r(e,"Error: Form submit field collision.")),e.nodeChanged()):r(e,"Error: No form element found.")})(e)})),e.addCommand("mceCancel",(()=>{(e=>{const o=t.trim(e.startContent),a=s(e);n(a)?a.call(e,e):e.resetContent(o)})(e)}))})(e)}))}();

public/lib/tinymce/plugins/visualblocks/plugin.min.js

@@ -1,4 +0,0 @@
-/**
- * TinyMCE version 6.0.3 (2022-05-25)
- */
-!function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const s=(t,s,o)=>{t.dom.toggleClass(t.getBody(),"mce-visualblocks"),o.set(!o.get()),((t,s)=>{t.dispatch("VisualBlocks",{state:s})})(t,o.get())},o=("visualblocks_default_state",t=>t.options.get("visualblocks_default_state"));const e=(t,s)=>o=>{o.setActive(s.get());const e=t=>o.setActive(t.state);return t.on("VisualBlocks",e),()=>t.off("VisualBlocks",e)};t.add("visualblocks",((t,l)=>{(t=>{(0,t.options.register)("visualblocks_default_state",{processor:"boolean",default:!1})})(t);const a=(t=>{let s=!1;return{get:()=>s,set:t=>{s=t}}})();((t,o,e)=>{t.addCommand("mceVisualBlocks",(()=>{s(t,0,e)}))})(t,0,a),((t,s)=>{const o=()=>t.execCommand("mceVisualBlocks");t.ui.registry.addToggleButton("visualblocks",{icon:"visualblocks",tooltip:"Show blocks",onAction:o,onSetup:e(t,s)}),t.ui.registry.addToggleMenuItem("visualblocks",{text:"Show blocks",icon:"visualblocks",onAction:o,onSetup:e(t,s)})})(t,a),((t,e,l)=>{t.on("PreviewFormats AfterPreviewFormats",(s=>{l.get()&&t.dom.toggleClass(t.getBody(),"mce-visualblocks","afterpreviewformats"===s.type)})),t.on("init",(()=>{o(t)&&s(t,0,l)}))})(t,0,a)}))}();

public/lib/tinymce/skins/content/dark/content.min.css

@@ -1 +0,0 @@
-body{background-color:#222f3e;color:#fff;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem}a{color:#4099ff}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border="0"]):not([style*=border-width]) td,table[border]:not([border="0"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border="0"]):not([style*=border-style]) td,table[border]:not([border="0"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border="0"]):not([style*=border-color]) td,table[border]:not([border="0"]):not([style*=border-color]) th{border-color:#6d737b}figure{display:table;margin:1rem auto}figure figcaption{color:#8a8f97;display:block;margin-top:.25rem;text-align:center}hr{border-color:#6d737b;border-style:solid;border-width:1px 0 0 0}code{background-color:#6d737b;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #6d737b;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #6d737b;margin-right:1.5rem;padding-right:1rem}

public/lib/tinymce/skins/content/default/content.min.css

@@ -1 +0,0 @@
-body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border="0"]):not([style*=border-width]) td,table[border]:not([border="0"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border="0"]):not([style*=border-style]) td,table[border]:not([border="0"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border="0"]):not([style*=border-color]) td,table[border]:not([border="0"]):not([style*=border-color]) th{border-color:#ccc}figure{display:table;margin:1rem auto}figure figcaption{color:#999;display:block;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}code{background-color:#e8e8e8;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}

public/lib/tinymce/skins/content/document/content.min.css

@@ -1 +0,0 @@
-@media screen{html{background:#f4f4f4;min-height:100%}}body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif}@media screen{body{background-color:#fff;box-shadow:0 0 4px rgba(0,0,0,.15);box-sizing:border-box;margin:1rem auto 0;max-width:820px;min-height:calc(100vh - 1rem);padding:4rem 6rem 6rem 6rem}}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border="0"]):not([style*=border-width]) td,table[border]:not([border="0"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border="0"]):not([style*=border-style]) td,table[border]:not([border="0"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border="0"]):not([style*=border-color]) td,table[border]:not([border="0"]):not([style*=border-color]) th{border-color:#ccc}figure figcaption{color:#999;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}

public/lib/tinymce/skins/content/tinymce-5-dark/content.min.css

@@ -1 +0,0 @@
-body{background-color:#2f3742;color:#dfe0e4;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem}a{color:#4099ff}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border="0"]):not([style*=border-width]) td,table[border]:not([border="0"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border="0"]):not([style*=border-style]) td,table[border]:not([border="0"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border="0"]):not([style*=border-color]) td,table[border]:not([border="0"]):not([style*=border-color]) th{border-color:#6d737b}figure{display:table;margin:1rem auto}figure figcaption{color:#8a8f97;display:block;margin-top:.25rem;text-align:center}hr{border-color:#6d737b;border-style:solid;border-width:1px 0 0 0}code{background-color:#6d737b;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #6d737b;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #6d737b;margin-right:1.5rem;padding-right:1rem}

public/lib/tinymce/skins/content/tinymce-5/content.min.css

@@ -1 +0,0 @@
-body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border="0"]):not([style*=border-width]) td,table[border]:not([border="0"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border="0"]):not([style*=border-style]) td,table[border]:not([border="0"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border="0"]):not([style*=border-color]) td,table[border]:not([border="0"]):not([style*=border-color]) th{border-color:#ccc}figure{display:table;margin:1rem auto}figure figcaption{color:#999;display:block;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}code{background-color:#e8e8e8;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}

public/lib/tinymce/skins/content/writer/content.min.css

@@ -1 +0,0 @@
-body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem auto;max-width:900px}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border="0"]):not([style*=border-width]) td,table[border]:not([border="0"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border="0"]):not([style*=border-style]) td,table[border]:not([border="0"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border="0"]):not([style*=border-color]) td,table[border]:not([border="0"]):not([style*=border-color]) th{border-color:#ccc}figure{display:table;margin:1rem auto}figure figcaption{color:#999;display:block;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}code{background-color:#e8e8e8;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}

public/lib/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css

@@ -1 +0,0 @@
-body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}

public/lib/tinymce/skins/ui/oxide/skin.shadowdom.min.css

@@ -1 +0,0 @@
-body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}

public/lib/tinymce/skins/ui/tinymce-5-dark/skin.shadowdom.min.css

@@ -1 +0,0 @@
-body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}

public/lib/tinymce/skins/ui/tinymce-5/skin.shadowdom.min.css

@@ -1 +0,0 @@
-body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}

src/packages/pc/components/modules/quote/forex/index.vue

@@ -1,30 +1,30 @@
 <template>
     <div class="app-quote-forex">
         <ul>
-            <li @click="onSellClick(1)">
-                <span>卖一</span>
-                <span :class="quote?.askColor">{{ handleNumberValue(quote?.ask) }}</span>
-                <span>{{ handleNumberValue(quote?.askvolume) }}</span>
+            <li @click="onSellClick(5)">
+                <span>卖五</span>
+                <span :class="quote?.ask5Color">{{ handleNumberValue(quote?.ask5) }}</span>
+                <span>{{ handleNumberValue(quote?.askvolume5) }}</span>
             </li>
-            <li @click="onSellClick(2)">
-                <span>卖二</span>
-                <span :class="quote?.ask2Color">{{ handleNumberValue(quote?.ask2) }}</span>
-                <span>{{ handleNumberValue(quote?.askvolume2) }}</span>
+            <li @click="onSellClick(4)">
+                <span>卖四</span>
+                <span :class="quote?.ask4Color">{{ handleNumberValue(quote?.ask4) }}</span>
+                <span>{{ handleNumberValue(quote?.askvolume4) }}</span>
             </li>
             <li @click="onSellClick(3)">
                 <span>卖三</span>
                 <span :class="quote?.ask3Color">{{ handleNumberValue(quote?.ask3) }}</span>
                 <span>{{ handleNumberValue(quote?.askvolume3) }}</span>
             </li>
-            <li @click="onSellClick(4)">
-                <span>卖四</span>
-                <span :class="quote?.ask4Color">{{ handleNumberValue(quote?.ask4) }}</span>
-                <span>{{ handleNumberValue(quote?.askvolume4) }}</span>
+            <li @click="onSellClick(2)">
+                <span>卖二</span>
+                <span :class="quote?.ask2Color">{{ handleNumberValue(quote?.ask2) }}</span>
+                <span>{{ handleNumberValue(quote?.askvolume2) }}</span>
             </li>
-            <li @click="onSellClick(5)">
-                <span>卖五</span>
-                <span :class="quote?.ask5Color">{{ handleNumberValue(quote?.ask5) }}</span>
-                <span>{{ handleNumberValue(quote?.askvolume5) }}</span>
+            <li @click="onSellClick(1)">
+                <span>卖一</span>
+                <span :class="quote?.askColor">{{ handleNumberValue(quote?.ask) }}</span>
+                <span>{{ handleNumberValue(quote?.askvolume) }}</span>
             </li>
         </ul>
         <ul>

src/packages/pc/views/market/trade/spot/order/delisting/index.vue

@@ -29,7 +29,7 @@
         </el-form>
         <template #footer>
             <el-button type="primary" @click="onSubmit">提交</el-button>
-            <el-button @click="onCancel(false)" plain>取消</el-button>
+            <el-button type="info" @click="onCancel(false)">取消</el-button>
         </template>
     </app-drawer>
 </template>

src/packages/sbyj/assets/themes/default/default.less

@@ -8,7 +8,7 @@
 
     /* 颜色规范 */
     --color-default: #384048;
-    --color-primary: #409EFF;
+    --color-primary: #243862;
     --color-secondary: #04c786;
     --color-info: #999;
     --color-border: #eee;
@@ -18,20 +18,20 @@
     /* 导航栏 */
     --navbar-height: .88rem;
     --navbar-color: #fff;
-    --navbar-background: #C30D23;
+    --navbar-background: var(--color-primary);
     --navbar-backbutton-color: #fff;
 
     /* 标签栏 */
-    --tabbar-background: #fff;
-    --tabbar-icon: #999;
-    --tabbar-icon-active: #c30d23;
+    --tabbar-background: #243862;
+    --tabbar-icon: #fff;
+    --tabbar-icon-active: #f7dc51;
 
     /* 内容边距 */
     --content-inset: .24rem;
 
     /* Vant-Button */
     --van-button-border-width: 0;
-    --van-button-primary-background: #1e78b9;
+    --van-button-primary-background: var(--color-primary);
     --van-button-danger-background: #d82d42;
 
     /* Vant-Checkbox */

src/packages/sbyj/components/base/list/index.less

@@ -57,6 +57,7 @@
         display: flex;
         flex-direction: column;
         justify-content: center;
+        gap: .04rem;
         min-height: .72rem;
 
         .text-small {

src/packages/sbyj/views/home/index.vue

@@ -34,34 +34,37 @@ const tabList: Tabbar[] = [
   {
     name: 'home-index',
     label: '首页',
-    icon: 'icon-a-zu826',
-    activeIcon: 'icon-a-zu753',
+    icon: 'icon-a-zu830',
+    activeIcon: 'icon-a-zu829',
   },
   {
     name: 'home-market',
     label: '行情',
-    icon: 'icon-a-zu8201',
-    activeIcon: 'icon-a-zu824',
+    icon: 'icon-a-zu832',
+    activeIcon: 'icon-a-zu831',
   },
   {
     name: 'home-news',
     label: '资讯',
-    icon: 'icon-a-zu821',
-    activeIcon: 'icon-a-zu818',
+    icon: 'icon-a-zu835',
+    activeIcon: 'icon-a-zu834',
   },
   {
     name: 'home-mine',
     label: '我的',
-    icon: 'icon-a-zu823',
-    activeIcon: 'icon-a-zu819',
+    icon: 'icon-a-zu836',
+    activeIcon: 'icon-a-zu833',
   }
 ]
 
 const onTabClick = (index: number) => {
   const { name } = tabList[index]
   cssTransition.value = false
-  
-  if (name === 'home-mine') {
+
+  if (name !== 'home-mine' || loginStore.token) {
+    currentTab.value = index
+    routerTo(name, true)
+  } else {
     fullloading((hideLoading) => {
       userLogin(true).then(() => {
         currentTab.value = index
@@ -72,9 +75,6 @@ const onTabClick = (index: number) => {
         hideLoading()
       })
     }, '加载中...')
-  } else {
-    currentTab.value = index
-    routerTo(name, true)
   }
 }
 

src/packages/sbyj/views/home/main/index.less

@@ -1,9 +1,27 @@
 @import '@/packages/sbyj/assets/themes/base/mixin.less';
 
 .home-main {
-    &__header {
-        background: linear-gradient(var(--navbar-background), var(--navbar-background) 60%, transparent 60%);
-        padding: .2rem;
+    &__banner {
+        padding: .4rem;
+        padding-bottom: 0;
+
+        &::before {
+            content: '';
+            width: 140%;
+            height: 3.6rem;
+            position: absolute;
+            left: -20%;
+            top: 0;
+            border-radius: 0 0 50% 50%;
+            background-color: var(--color-primary);
+        }
+
+        .app-banner {
+            position: relative;
+            z-index: 1;
+            border-radius: .2rem;
+            overflow: hidden;
+        }
     }
 
     &__iconbar {
@@ -67,26 +85,6 @@
         }
     }
 
-    &__market {
-        .scrollbar {
-            width: 100%;
-            padding: .2rem;
-        }
-
-        .van-swipe {
-            height: 32px;
-            background-color: #f6f6f6;
-
-            ul {
-                display: flex;
-                justify-content: space-around;
-                align-items: center;
-                height: inherit;
-                font-size: .26rem;
-            }
-        }
-    }
-
     &__news {
         .article {
             &-item {

src/packages/sbyj/views/home/main/index.vue

@@ -3,7 +3,9 @@
     <template #header>
       <app-navbar title="水贝亿爵" :show-back-button="false" />
     </template>
-    <Banner :data-list="topBanners" />
+    <div class="home-main__banner">
+      <Banner :data-list="topBanners" />
+    </div>
     <PullRefresh class="home-main__container" v-model="refreshing" @refresh="onRefresh">
       <app-block>
         <Cell title="通知公告" value="更多" :to="{ name: 'notice-list' }" icon="volume" is-link />
@@ -11,19 +13,19 @@
       <app-block class="home-main__iconbar bg">
         <ul>
           <li @click="switchTab(1)">
-            <Iconfont label-direction="bottom" icon="icon-cankaohangqing">行情</Iconfont>
+            <Iconfont label-direction="bottom" icon="icon-a-zu745">行情</Iconfont>
           </li>
           <li @click="routerTo('order-list')">
-            <Iconfont label-direction="bottom" icon="icon-diaoqimaoyi">订单</Iconfont>
+            <Iconfont label-direction="bottom" icon="icon-a-zu838">订单</Iconfont>
           </li>
           <li @click="routerTo('delivery-list')">
-            <Iconfont label-direction="bottom" icon="icon-dingjinzhuanrang">交收</Iconfont>
+            <Iconfont label-direction="bottom" icon="icon-a-zu837">交收</Iconfont>
           </li>
         </ul>
       </app-block>
       <app-block class="home-main__news">
         <CellGroup class="article">
-          <Cell class="home-main__titlebar" value="更多" :to="{ name: 'news-list' }" is-link>
+          <Cell class="home-main__titlebar" value="更多" @click="switchTab(2)" is-link>
             <template #title>
               <img src="@/packages/sbyj/assets/icons/fire.png" />
               <span>市场资讯</span>
@@ -41,10 +43,8 @@
 <script lang="ts" setup>
 import { shallowRef } from "vue";
 import { Cell, CellGroup, PullRefresh } from "vant";
-import { formatDate } from "@/filters";
 import { useNavigation } from '@/packages/sbyj/router/navigation';
 import { queryImageConfigs, getJ10News } from "@/services/api/common";
-import { queryNewTitles } from "@/services/api/news";
 import { useLoginStore } from '@/stores'
 import Banner from '@/packages/sbyj/components/base/banner/index.vue'
 import Iconfont from '@/packages/sbyj/components/base/iconfont/index.vue'
@@ -63,6 +63,9 @@ const switchTab = (tabIndex: number) => {
       case 1:
         routerTo('home-market', true)
         break
+      case 2:
+        routerTo('home-news', true)
+        break
     }
   } else {
     routerTo('user-login')
@@ -71,15 +74,13 @@ const switchTab = (tabIndex: number) => {
 
 // 下拉刷新
 const onRefresh = () => {
-  if (!topBanners.value.length) {
-    queryImageConfigs({
-      data: {
-        imageType: 1,
-      }
-    }).then((res) => {
-      topBanners.value = res.data.map((e) => e.imagepath)
-    })
-  }
+  queryImageConfigs({
+    data: {
+      imageType: 1,
+    }
+  }).then((res) => {
+    topBanners.value = res.data.map((e) => e.imagepath)
+  })
   // 市场资讯
   getJ10News({
     data: {

src/packages/sbyj/views/market/list/index.less

@@ -0,0 +1,7 @@
+.market {
+    &-title {
+        color: #999;
+        font-size: .26rem;
+        padding: .24rem;
+    }
+}

src/packages/sbyj/views/market/list/index.vue

@@ -1,7 +1,7 @@
 <template>
-    <app-view>
+    <app-view class="market">
         <template #header>
-            <app-navbar title="行情" />
+            <app-navbar title="行情" :show-back-button="false" />
         </template>
         <app-list :columns="columns" :data-list="touristTradeGoodsList" @row-click="rowClick">
             <!-- 回购 -->
@@ -18,8 +18,8 @@
                 <span :class="row.lowestColor">{{ handleNumberValue(row.lowest) }}</span>
             </template>
         </app-list>
-        <div>参考行情</div>
-        <app-list :columns="columns" :data-list="touristRefGoodsList" @row-click="rowClick">
+        <div class="market-title" v-if="touristRefGoodsList.length">参考商品</div>
+        <app-list :show-header="false" :columns="columns" :data-list="touristRefGoodsList">
             <!-- 回购 -->
             <template #ask="{ row }">
                 <span :class="row.bidColor">{{ handleNumberValue(row.bid) }}</span>
@@ -38,7 +38,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onActivated, onDeactivated ,nextTick} from 'vue'
+import { computed, onActivated, onDeactivated, nextTick } from 'vue'
 import { handleNumberValue } from '@/filters'
 import { useNavigation } from '@/packages/sbyj/router/navigation'
 import { useFuturesStore, useLoginStore } from '@/stores'
@@ -58,7 +58,7 @@ const { dataList: touristGoodsList, run: getTouristGoods } = useRequest(queryTou
     manual: true,
     onSuccess: (res) => {
         const goodsCodes = res.data.map((item) => item.goodscode)
-        getTouristQuoteDay({goodsCodes: goodsCodes.join(',')})
+        getTouristQuoteDay({ goodsCodes: goodsCodes.join(',') })
     }
 })
 // 获取游客商品盘面
@@ -67,7 +67,7 @@ const { dataList: srcTouristQuoteDayList, run: getTouristQuoteDay } = useRequest
     onSuccess: () => {
         const goodsCodes = touristGoodsList.value.map((item) => item.goodscode)
         // 每2秒轮训一次游客商品盘面（递归调用）
-        timerTask.setTimeout(() => getTouristQuoteDay({goodsCodes: goodsCodes.join(',')}), 2000, 'queryTouristQuoteDayKey')
+        timerTask.setTimeout(() => getTouristQuoteDay({ goodsCodes: goodsCodes.join(',') }), 2000, 'queryTouristQuoteDayKey')
     }
 })
 
@@ -77,7 +77,7 @@ const touristQuoteDayList = computed(() => {
     touristGoodsList.value.forEach((item) => {
         const t = srcTouristQuoteDayList.value.find((r) => r.goodscode === item.goodscode)
         if (t) {
-            arr.push({ 
+            arr.push({
                 goodsid: item.goodsid,
                 goodscode: item.goodscode,
                 goodsname: item.goodsname,
@@ -114,7 +114,7 @@ const touristRefGoodsList = computed(() => {
 
 // *************** 已登录 ***************
 const dataList = computed(() => {
-    const list = futuresStore.quoteList.filter((e) => e.trademode === 52 || e.trademode === 99 )
+    const list = futuresStore.quoteList.filter((e) => e.trademode === 52 || e.trademode === 99)
     return list.map((e) => ({
         goodscode: e.goodscode,
         goodsname: e.goodsname,
@@ -132,14 +132,14 @@ const dataList = computed(() => {
 
 // 处理行情价格颜色
 const handleColor = (value: number, presettle: number) => {
-                if (value === 0 || value === presettle) {
-                    return ''
-                } else if (value > presettle) {
-                    return 'g-price-up'
-                } else {
-                    return 'g-price-down'
-                }
-            }
+    if (value === 0 || value === presettle) {
+        return ''
+    } else if (value > presettle) {
+        return 'g-price-up'
+    } else {
+        return 'g-price-down'
+    }
+}
 
 
 const subscribe = quoteSocket.createSubscribe()
@@ -174,4 +174,8 @@ onDeactivated(() => {
     subscribe.stop()
     timerTask.clearTimeout('queryTouristQuoteDayKey')
 })
-</script>
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>

src/packages/sbyj/views/mine/index.vue

@@ -19,13 +19,13 @@
                     </div>
                     <div class="profile-account">
                         <span>正常</span>
-                        <span>{{ accountInfo?.accountid ?? 0 }}</span>
+                        <span>{{ accountInfo.accountid ?? 0 }}</span>
                     </div>
                 </div>
                 <div class="bank">
                     <div class="bank-item">
                         <span>余额</span>
-                        <span>{{ accountInfo?.currentbalance.toFixed(2) ?? '0.00' }}</span>
+                        <span>{{ accountInfo.currentbalance?.toFixed(2) ?? '0.00' }}</span>
                     </div>
                     <div class="bank-item">
                         <span>冻结</span>
@@ -44,17 +44,17 @@
                 </div>
                 <div class="button">
                     <Button size="small" round @click="doInOutMoney('1')">提现</Button>
-                    <Button type="danger" size="small" round @click="doInOutMoney('0')">充值</Button>
+                    <Button type="primary" size="small" round @click="doInOutMoney('0')">充值</Button>
                 </div>
             </div>
         </div>
         <app-block class="mine-iconbar">
             <ul>
                 <li @click="routerTo('order-list')">
-                    <Iconfont label-direction="bottom" icon="icon-diaoqimaoyi">订单</Iconfont>
+                    <Iconfont label-direction="bottom" icon="icon-a-zu838">订单</Iconfont>
                 </li>
                 <li @click="routerTo('delivery-list')">
-                    <Iconfont label-direction="bottom" icon="icon-dingjinzhuanrang">交收</Iconfont>
+                    <Iconfont label-direction="bottom" icon="icon-a-zu837">交收</Iconfont>
                 </li>
             </ul>
         </app-block>
@@ -104,7 +104,7 @@
             </CellGroup>
         </app-block>
         <div class="mine-footer">
-            <Button class="button-logout" type="danger" size="small" round @click="userLogout">退出登录</Button>
+            <Button class="button-logout" type="primary" size="small" round @click="userLogout">退出登录</Button>
         </div>
     </app-view>
 </template>

src/packages/sbyj/views/news/list/index.less

@@ -1,20 +1,4 @@
-@import '@/packages/sbyj/assets/themes/base/mixin.less';
-
-.news-list {
-    &__container {
-        padding-top: .2rem;
-
-        .article-item {
-            &__title {
-                span {
-                    .mixin-text-overflow()
-                }
-            }
-
-            &__time {
-                flex: initial;
-                margin-left: .48rem;
-            }
-        }
-    }
+.news-iframe {
+    height: 100%;
+    border: 0;
 }

src/packages/sbyj/views/news/list/index.vue

@@ -1,10 +1,10 @@
 <template>
-  <app-view class="news-list" flex>
+  <app-view class="news" flex>
     <template #header>
-      <app-navbar title="市场资讯" />
+      <app-navbar title="市场资讯" :show-back-button="false" />
     </template>
-    <iframe src="https://www.jin10.com/example/jin10.com.html" style="height: 100%;" scrolling="auto"
-      security="restricted" sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts" />
+    <iframe class="news-iframe" src="https://www.jin10.com/example/jin10.com.html" security="restricted"
+      sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts" />
   </app-view>
 </template>