新增：联系博主页面顶部返回按钮；

修复：修复 默认封面图、默认图片、默认头像在使用随机api时候无法显示的BUG;
修复：后台管理新增文章发布失败BUG;
删除：去除联系博主页面中的 联系博主 按钮；
优化：对友链页面进行重写；
优化：对部分页面和功能进行优化。

.hbuilderx/launch.json

@@ -10,6 +10,10 @@
      	{
      		"launchtype" : "local"
      	},
+     	"h5" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"mp-weixin" : 
      	{
      		"launchtype" : "local"

LICENSE

@@ -1,20 +1,661 @@
-The MIT License (MIT)
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Copyright (c) 2018 RuoYi
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-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:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server 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.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.

README.md

@@ -98,8 +98,8 @@
  
  
 ## 🔍 许可证
-<a href="https://gitee.com/ialley-workshop-open/uni-halo/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
-uni-halo 使用 MIT 协议开源，请遵守开源协议。
+
+uni-halo 使用 AGPL-3.0 协议开源，请遵守开源协议。
 
 ## 🏭 贡献
 

api/admin/posts.js

@@ -24,6 +24,7 @@ const createOrEditModel = {
 		"value": "string"
 	}],
 	"originalContent": "string",
+	"formatContent": "",
 	"password": "string",
 	"slug": "string",
 	"status": "DRAFT",

components/cache-image/cache-image.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="">
+	<view class="cache-image">
 		<view v-if="loadStatus == 'loading'" class="img-loading" :style="[imgStyle, loadStyle]">
 			<!-- <text class="img-load-icon iconfont icon-loading"></text>
 			<text class="img-load-text">{{ loadText }}</text> -->
@@ -108,6 +108,7 @@ export default {
 		}
 	},
 	created() {
+		console.log('cache-image', this.url);
 		this.imgStyle = {
 			width: this.width,
 			height: this.height,
@@ -144,6 +145,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.cache-image {
+	width: 100%;
+	height: 100%;
+}
 .img-loading,
 .img-error {
 	display: flex;

config/halo.config.template.js

@@ -18,9 +18,17 @@ export default {
 	apiAuthorization: '', // Halo中-系统-博客设置-切换到高级选项-API设置-Access key 
 
 	title: '', // 博客标题
-	indexImageUrl: '', // 开屏首页图片	
 	miniCodeImageUrl: '', // 小程序码地址
 
+	start: { // 首次启动页配置
+		title: 'uni-halo', // 标题
+		bg: '', // 留空则使用默认 开屏首页背景，可以是颜色值或者图片图片地址
+		logo: 'https://b.925i.cn/uni_halo/uni_halo_logo.png', // logo
+		desc1: '全新UI，准备出发', // 描述信息1
+		desc2: '新触动 新感受 新体验', // 描述信息2
+		btnText: '全新触发' // 按钮文字
+	},
+
 	author: {
 		name: '', // 昵称
 		avatar: '', // 头像地址

manifest.json

@@ -1,159 +1,157 @@
 {
-	"name": "uni-halo",
-	"appid": "__UNI__5748B6E",
-	"description": "uni-halo博客：基于halo开源博客系统API开发的多端博客。",
-	"versionName": "1.0.0",
-	"versionCode": 100,
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {
-			"OAuth": {},
-			"Share": {}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CAPTURE_VIDEO_OUTPUT\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {
-				"dSYMs": false,
-				"capabilities": {
-					"entitlements": {
-						"com.apple.developer.associated-domains": [
-							"applinks:static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com"
-						]
-					}
-				}
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"ad": {
-					"gdt": {},
-					"csj": {},
-					"360": {},
-					"ks": {},
-					"sigmob": {},
-					"hw": {},
-					"bd": {}
-				},
-				"oauth": {
-					"weixin": {
-						"appid": "wxd971954762ec4744",
-						"UniversalLinks": "https://static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com/uni-universallinks/__UNI__5748B6E/"
-					}
-				},
-				"share": {
-					"weixin": {
-						"appid": "wxd971954762ec4744",
-						"UniversalLinks": "https://static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com/uni-universallinks/__UNI__5748B6E/"
-					}
-				}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wx1bb161867082c72f",
-		"setting": {
-			"urlCheck": false,
-			"minified": true
-		},
-		"usingComponents": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2",
-	"h5": {
-		"title": "uni-halo",
-		"devServer": {
-			"https": false,
-			"disableHostCheck": true,
-			"proxy": {
-				"/api": {
-					"target": "https://b.925i.cn",
-					"changeOrigin": true,
-					"secure": false,
-					"pathRewrite": {
-						"^/api": ""
-					}
-				}
-			}
-		}
-	},
-	"_spaceID": "699a26a5-a6cd-4b54-b603-5155b312a5f5"
+    "name" : "uni-halo",
+    "appid" : "__UNI__5748B6E",
+    "description" : "uni-halo博客：基于halo开源博客系统API开发的多端博客。",
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "OAuth" : {},
+            "Share" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CAPTURE_VIDEO_OUTPUT\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false,
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com" ]
+                    }
+                }
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {
+                    "gdt" : {},
+                    "csj" : {},
+                    "360" : {},
+                    "ks" : {},
+                    "sigmob" : {},
+                    "hw" : {},
+                    "bd" : {}
+                },
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wxd971954762ec4744",
+                        "UniversalLinks" : "https://static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com/uni-universallinks/__UNI__5748B6E/"
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wxd971954762ec4744",
+                        "UniversalLinks" : "https://static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com/uni-universallinks/__UNI__5748B6E/"
+                    }
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx1bb161867082c72f",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "title" : "uni-halo",
+        "devServer" : {
+            "https" : false,
+            "disableHostCheck" : true,
+            "proxy" : {
+                "/api" : {
+                    "target" : "https://b.925i.cn",
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "pathRewrite" : {
+                        "^/api" : ""
+                    }
+                }
+            }
+        }
+    },
+    "_spaceID" : "699a26a5-a6cd-4b54-b603-5155b312a5f5"
 }

pages.json

@@ -201,8 +201,7 @@
 				"path": "contact/contact",
 				"style": {
 					"navigationBarTitleText": "联系博主",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
+					"enablePullDownRefresh": false
 				}
 			}, {
 				"path": "about/about",
@@ -216,7 +215,6 @@
 					"navigationBarTitleText": "设置",
 					"enablePullDownRefresh": false
 				}
-
 			}]
 		},
 		{

pages/tabbar/about/about.vue

@@ -5,7 +5,7 @@
 			<image class="avatar" :src="$utils.checkAvatarUrl(bloggerInfo.avatar)" mode="aspectFill" @click="miniProfileCard.show = true"></image>
 			<view class="profile">
 				<view class="author mt-24 text-size-g text-weight-b">{{ bloggerInfo.nickname }}</view>
-				<view class="desc mt-24 text-size-m">{{ bloggerInfo.description || '一个爱凑热闹的、喜欢捣鼓前端的博主。' }}</view>
+				<view class="desc mt-24 text-size-m">{{ bloggerInfo.description || '这个博主很懒，竟然没写介绍~' }}</view>
 			</view>
 			<image v-if="calcWaveUrl" :src="calcWaveUrl" mode="scaleToFill" class="gif-wave"></image>
 		</view>

pages/tabbar/category/category.vue

@@ -23,6 +23,10 @@
 					@refresherrefresh="fnGetData(true)"
 					@scrolltolower="fnGetData(false)"
 					@scroll="fnOnScroll"
+					@touchmove.stop
+					@touchstart="fnOnTouchStart"
+					@touchend="fnOnTouchEnd"
+					@touchcancel="fnOnTouchEnd"
 				>
 					<view v-if="dataList.length == 0" class="article-empty flex flex-center">
 						<tm-empty icon="icon-shiliangzhinengduixiang-" label="该分类下暂无文章~"></tm-empty>
@@ -78,6 +82,8 @@ export default {
 			isLoadMore: false,
 			loadMoreText: '',
 			scrollTop: 0,
+			tempScrollTop: 0,
+			scrollTimeout: null,
 			triggered: false
 		};
 	},
@@ -181,9 +187,7 @@ export default {
 			});
 		},
 		fnOnScroll(e) {
-			throttle(() => {
-				this.scrollTop = e.detail.scrollTop;
-			}, 1000);
+			this.tempScrollTop = e.detail.scrollTop;
 		},
 		fnToTopScroll() {
 			uni.pageScrollTo({
@@ -191,6 +195,15 @@ export default {
 				duration: 500
 			});
 			this.scrollTop = 0;
+			this.tempScrollTop = 0;
+		},
+		fnOnTouchStart() {
+			clearTimeout(this.scrollTimeout);
+		},
+		fnOnTouchEnd() {
+			this.scrollTimeout = setTimeout(() => {
+				this.scrollTop = this.tempScrollTop;
+			}, 500);
 		}
 	}
 };

pages/tabbar/gallery/gallery.vue

@@ -16,10 +16,10 @@
 			<tm-skeleton model="listAvatr"></tm-skeleton>
 		</view>
 		<!-- 内容区域 -->
-		<view class="content" v-else>
+		<view class="content" v-else :class="{ 'bg-white': dataList.length !== 0 }">
 			<view v-if="dataList.length == 0" class="content-empty">
 				<!-- 空布局 -->
-				<tm-empty icon="icon-shiliangzhinengduixiang-" label="该分类下暂无数据"></tm-empty>
+				<tm-empty icon="icon-shiliangzhinengduixiang-" label="博主还没有分享图片~"></tm-empty>
 			</view>
 			<block v-else>
 				<tm-flowLayout v-if="globalAppSettings.gallery.useWaterfull" @click="fnOnClick" ref="wafll">
@@ -227,26 +227,32 @@ export default {
 			this.$httpApi
 				.getPhotoListByPage(this.queryParams)
 				.then(res => {
-					this.loading = 'success';
-					this.result = res.data;
-					if (res.data.content.length != 0) {
-						const _list = res.data.content.map((item, index) => {
-							item['image'] = this.$utils.checkImageUrl(item.thumbnail);
-							item['model'] = 'text';
-							item['takeTime'] = this.$tm.dayjs(item['takeTime']).format('DD/MM/YYYY');
-							return item;
-						});
-						this.fnCacheDataList(_list);
-						if (this.globalAppSettings.gallery.useWaterfull) {
-							this.dataList = _list;
-							this.$nextTick(() => {
-								this.$refs.wafll.pushData(_list);
+					if (res.status == 200) {
+						this.loading = 'success';
+						this.result = res.data;
+						if (res.data.content.length != 0) {
+							const _list = res.data.content.map((item, index) => {
+								item['image'] = this.$utils.checkImageUrl(item.thumbnail);
+								item['model'] = 'text';
+								item['takeTime'] = this.$tm.dayjs(item['takeTime']).format('DD/MM/YYYY');
+								return item;
 							});
-						} else {
-							this.dataList = this.dataList.concat(_list);
+							this.fnCacheDataList(_list);
+							if (this.globalAppSettings.gallery.useWaterfull) {
+								this.dataList = _list;
+								this.$nextTick(() => {
+									this.$refs.wafll.pushData(_list);
+								});
+							} else {
+								this.dataList = this.dataList.concat(_list);
+							}
 						}
+						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
+					} else {
+						this.loading = 'error';
+						this.waterfall.loading = 'finish';
+						this.loadMoreText = '';
 					}
-					this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
 				})
 				.catch(err => {
 					console.error(err);
@@ -301,6 +307,7 @@ export default {
 	}
 }
 .content {
+	box-sizing: border-box;
 	padding: 0 24rpx;
 	padding-top: 24rpx;
 
@@ -312,6 +319,7 @@ export default {
 	}
 }
 .loading-wrap {
+	box-sizing: border-box;
 	padding: 24rpx;
 }
 </style>

pages/tabbar/home/home.vue

@@ -196,7 +196,10 @@ export default {
 			this.$httpApi
 				.getCategoryList({ more: true })
 				.then(res => {
-					this.categoryList = res.data;
+					this.categoryList = res.data.sort((a, b) => {
+						return b.postCount - a.postCount;
+					});
+
 					setTimeout(() => {
 						this.loading = 'success';
 					}, 500);
@@ -216,12 +219,16 @@ export default {
 		fnGetBanner() {
 			const _this = this;
 			const _format = function(list, type) {
-				return list.map(item => {
+				return list.map((item, index) => {
 					switch (type) {
 						case 'list':
 							return {
-								id: '',
-								src: item
+								id: index,
+								nickname: _this.bloggerInfo.nickname,
+								avatar: _this.bloggerInfo.avatar,
+								address: item.href || '',
+								title: item.title,
+								image: _this.$utils.checkImageUrl(item.thumbnail)
 							};
 						case 'article':
 							return {

pages/tabbar/links/links.vue

@@ -7,9 +7,9 @@
 			<tm-skeleton model="listAvatr"></tm-skeleton>
 			<tm-skeleton model="listAvatr"></tm-skeleton>
 		</view>
-		<block v-else>
+		<view v-else class="content">
 			<!-- 空数据 -->
-			<view v-if="result.length == 0" class="empty flex flex-center"><tm-empty icon="icon-shiliangzhinengduixiang-" label="啊偶,博主还没有朋友呢~"></tm-empty></view>
+			<view v-if="result.length == 0" class="content-empty flex flex-center"><tm-empty icon="icon-shiliangzhinengduixiang-" label="啊偶,博主还没有朋友呢~"></tm-empty></view>
 
 			<!-- 如果只有一个分组：使用列表的形式 result.length == 1 -->
 			<view v-else-if="result.length == 1" class="flex flex-col pb-24">
@@ -28,44 +28,49 @@
 						</view>
 					</tm-translate>
 				</block>
-				<!-- 返回顶部 -->
-				<tm-flotbutton @click="fnToTopPage" size="m" icon="icon-angle-up"></tm-flotbutton>
 			</view>
 
 			<!-- 如果大于一个分组：使用联系人的索引形式 result.length > 1 -->
-			<block v-else-if="result.length > 1">
-				<tm-quickIndex :list="result">
-					<template #cell="{ data }">
+			<block v-else>
+				<block v-for="(team, index) in result" :key="index">
+					<view class="grey-lighten-4 text  text-size-s text-weight-b px-32 py-12">{{ team.title }}</view>
+					<block v-for="(link, linkIndex) in team.children" :key="link.id">
 						<!-- 艳丽版本 -->
-						<view v-if="!globalAppSettings.links.useSimple" class="info flex pa-36  border-b-1" @click="fnOnLinkEvent(data.item)">
-							<view class="link-logo">
-								<cache-image class="link-logo_img" radius="12rpx" :url="data.item.logo" :fileMd5="data.item.logo" mode="aspectFill"></cache-image>
-							</view>
+						<view
+							v-if="!globalAppSettings.links.useSimple"
+							class="info flex pa-36"
+							:class="{ 'border-b-1': linkIndex != team.children.length - 1 }"
+							@click="fnOnLinkEvent(link)"
+						>
+							<view class="link-logo"><cache-image class="link-logo_img" radius="12rpx" :url="link.logo" :fileMd5="link.logo" mode="aspectFill"></cache-image></view>
 							<view class="flex flex-col pl-30 info-detail">
-								<view class="link-card_name text-size-l text-weight-b text-red">{{ data.item.name }}</view>
+								<view class="link-card_name text-size-l text-weight-b text-red">{{ link.name }}</view>
 								<view class="poup-tag ml--10 mt-6">
-									<tm-tags color="bg-gradient-amber-accent" :shadow="0" size="s" model="fill">ID：{{ data.item.id }}</tm-tags>
-									<tm-tags color=" bg-gradient-light-blue-lighten" :shadow="0" size="s" model="fill">{{ data.item.team }}</tm-tags>
+									<tm-tags color="bg-gradient-amber-accent" :shadow="0" size="s" model="fill">ID：{{ link.id }}</tm-tags>
+									<tm-tags color=" bg-gradient-light-blue-lighten" :shadow="0" size="s" model="fill">{{ link.team }}</tm-tags>
 								</view>
-								<view class="link-card_desc text-overflow text-size-s mt-4">博客简介：{{ data.item.description || '这个博主很懒，没写简介~' }}</view>
+								<view class="link-card_desc text-overflow text-size-s mt-4">博客简介：{{ link.description || '这个博主很懒，没写简介~' }}</view>
 							</view>
 						</view>
 						<!-- 简洁版本 -->
-						<view v-else class="link-card flex ml-24 mr-24 pt-24 pb-24" @click="fnOnLinkEvent(data.item)">
-							<image class="logo shadow-6" :src="data.item.logo" mode="aspectFill"></image>
+						<view v-else class="link-card flex ml-24 mr-24 pt-24 pb-24" @click="fnOnLinkEvent(link)">
+							<image class="logo shadow-6" :src="link.logo" mode="aspectFill"></image>
 							<view class="info pl-24">
-								<view class="name text-size-g">{{ data.item.name }}</view>
-								<view class="desc mt-12 text-size-s text-grey-darken-1">{{ data.item.description }}</view>
+								<view class="name text-size-g">{{ link.name }}</view>
+								<view class="desc mt-12 text-size-s text-grey-darken-1">{{ link.description }}</view>
 								<view v-if="false" class="link mt-12 text-size-m text-grey-darken-1">
 									<text class="iconfont icon-link mr-6 text-size-s"></text>
-									{{ data.item.url }}
+									{{ link.url }}
 								</view>
 							</view>
 						</view>
-					</template>
-				</tm-quickIndex>
+					</block>
+				</block>
 			</block>
 
+			<!-- 返回顶部 -->
+			<tm-flotbutton v-if="linkTotal > 10" color="light-blue" @click="fnToTopPage" size="m" icon="icon-angle-up"></tm-flotbutton>
+
 			<!-- 详情弹窗 -->
 			<tm-poup v-model="detail.show" :width="640" height="auto" position="center" :round="6">
 				<view class="poup pa-36">
@@ -90,7 +95,7 @@
 					<view class="mt-24"><tm-images :width="568" :round="2" :src="caclSiteThumbnail(detail.data.url)" mode="aspectFill"></tm-images></view>
 				</view>
 			</tm-poup>
-		</block>
+		</view>
 	</view>
 </template>
 
@@ -101,7 +106,6 @@ import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vu
 import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
 import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
 import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
-import tmQuickIndex from '@/tm-vuetify/components/tm-quickIndex/tm-quickIndex.vue';
 import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
 
 import { GetRandomNumberByRange } from '@/utils/random.js';
@@ -114,7 +118,6 @@ export default {
 		tmTags,
 		tmEmpty,
 		tmImages,
-		tmQuickIndex,
 		tmPoup
 	},
 	data() {
@@ -129,7 +132,8 @@ export default {
 			detail: {
 				show: false,
 				data: {}
-			}
+			},
+			linkTotal: 0
 		};
 	},
 	computed: {
@@ -158,6 +162,7 @@ export default {
 			return this.$haloConfig.colors[_r];
 		},
 		fnGetData() {
+			this.linkTotal = 0;
 			this.loading = 'loading';
 			uni.showLoading({
 				mask: true,
@@ -169,12 +174,12 @@ export default {
 					if (res.status == 200) {
 						console.log('请求结果：');
 						console.log(res);
-						let resData = res.data;
 						// 处理数据
-						const _result = resData.map(item => {
+						const _result = res.data.map(item => {
 							const _team = item.team || '未分组';
 							const _firstChart = _team ? _team.substring(0, 1) : '';
 							const _links = item.links.map(link => {
+								this.linkTotal += 1;
 								link.logo = this.$utils.checkAvatarUrl(link.logo);
 								return link;
 							});
@@ -185,7 +190,7 @@ export default {
 							};
 						});
 
-						this.result = _result.reverse();
+						// this.result = _result.reverse();
 						setTimeout(() => {
 							this.loading = 'success';
 						}, 500);
@@ -240,17 +245,24 @@ export default {
 	min-height: 100vh;
 	display: flex;
 	flex-direction: column;
+	background-color: #fafafd;
 }
 .loading-wrap {
 	padding: 24rpx;
 	min-height: 100vh;
 }
 
-.empty {
-	width: 100vw;
-	height: 60vh;
-}
+.content {
+	padding: 0 24rpx;
+	padding-top: 24rpx;
 
+	.content-empty {
+		height: 60vh;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+}
 .link-card {
 	border-bottom: 2rpx solid #f5f5f5;
 	background-color: #ffffff;
@@ -266,7 +278,7 @@ export default {
 		// height: 126rpx;
 		width: 80rpx;
 		height: 80rpx;
-		border-radius: 50%;
+		border-radius: 12rpx;
 		border: 6rpx solid #ffffff;
 		box-shadow: none;
 	}

pagesA/about/about.vue

@@ -26,7 +26,7 @@
 			</tm-grouplist>
 		</view>
 		<view class="copyright bg-white text-size-xs text-align-center text-grey-darken-1 pa-36">
-			<view class="">根据 MIT 许可证发布</view>
+			<view class="">根据 AGPL-3.0 协议开源</view>
 			<view class="mt-8">「 2022 uni-halo 丨 开源项目丨巷子工坊@小莫唐尼 」</view>
 		</view>
 	</view>

pagesA/category-detail/category-detail.vue

@@ -16,7 +16,7 @@
 				<view class="load-text">{{ loadMoreText }}</view>
 			</block>
 
-			<tm-flotbutton @click="fnToTopPage" size="m" icon="icon-angle-up"></tm-flotbutton>
+			<tm-flotbutton @click="fnToTopPage" color="light-blue" size="m" icon="icon-angle-up"></tm-flotbutton>
 		</block>
 	</view>
 </template>

pagesA/contact/contact.vue

@@ -2,12 +2,9 @@
 	<view class="app-page flex flex-col felx-center bg-white">
 		<!-- 信息 -->
 		<view class="profile flex flex-col flex-center pa-36">
-			<view class="avatar">
-				<text v-if="false" class="icon flex flex-center"><text class="iconfont icon-check text-size-s"></text></text>
-				<image class="avatar-img" :src="bloggerInfo.avatar" mode="aspectFill"></image>
-			</view>
+			<view class="avatar"><image class="avatar-img" :src="bloggerInfo.avatar" mode="aspectFill"></image></view>
 			<view class="nickname mt-24 text-weight-b text-size-g">{{ bloggerInfo.nickname }}</view>
-			<view class="desc mt-24 text-size-m text-grey-darken-3">{{ bloggerInfo.description }}</view>
+			<view class="desc mt-24 text-size-m text-grey-darken-3">{{ bloggerInfo.description || '这个博主很懒，竟然没写介绍~' }}</view>
 			<!-- 联系图标 -->
 			<view class="mt-24 contact-icons">
 				<!-- 放全部：似乎显得有点拥挤 -->
@@ -19,7 +16,7 @@
 				<text class="ml-12 halocoloricon halocoloricon-gitee"></text>
 				<text class="ml-12 halocoloricon halocoloricon-ic_email_round"></text>
 			</view>
-			<view class="mt-24 ">
+			<view v-if="false" class="mt-24 ">
 				<tm-button theme="bg-gradient-light-blue-accent" size="m" openType="contact">在线客服联系</tm-button>
 				<tm-button theme="bg-gradient-orange-accent" size="m" @click="fnOnToWeb">访问PC端博客</tm-button>
 			</view>
@@ -129,7 +126,7 @@ export default {
 		}
 	},
 	onLoad() {
-		this.fnSetPageTitle('❤');
+		this.fnSetPageTitle('联系博主');
 	},
 	created() {
 		this.fnGetData();
@@ -185,19 +182,6 @@ export default {
 		border: 6rpx solid #fff;
 		box-shadow: 0rpx 2rpx 24rpx rgba(0, 0, 0, 0.07);
 		overflow: hidden;
-		.icon {
-			width: 42rpx;
-			height: 42rpx;
-			position: absolute;
-			right: 6rpx;
-			bottom: 0rpx;
-			border-radius: 50%;
-			color: #fff;
-			box-sizing: border-box;
-			background-color: #03b0fd;
-			border: 4rpx solid #fff;
-			z-index: 2;
-		}
 		&-img {
 			width: 100%;
 			height: 100%;

pagesA/leaving/leaving.vue

@@ -6,10 +6,10 @@
 			<tm-skeleton model="listAvatr"></tm-skeleton>
 		</view>
 		<!-- 内容区域 -->
-		<view v-else class="app-page-content bg-white pa-24">
+		<view v-else class="app-page-content pa-24" :class="{ 'bg-white': dataList.length !== 0 }">
 			<view v-if="dataList.length == 0" class="content-empty flex flex-center">
 				<!-- 空布局 -->
-				<tm-empty icon="icon-shiliangzhinengduixiang-" label="该分类下暂无数据"></tm-empty>
+				<tm-empty icon="icon-shiliangzhinengduixiang-" label="啊偶,博主还没有留言~"></tm-empty>
 			</view>
 			<block v-else>
 				<block v-for="(item, index) in dataList" :key="index">
@@ -28,9 +28,9 @@
 					</tm-translate>
 				</block>
 				<tm-flotbutton :offset="[16, 80]" @click="fnToTopPage" size="m" color="light-blue" icon="icon-angle-up"></tm-flotbutton>
-				<tm-flotbutton actions-pos="left" :show-text="true" color="bg-gradient-orange-accent" @click="fnToComment(null)"></tm-flotbutton>
 				<view class="load-text">{{ loadMoreText }}</view>
 			</block>
+			<tm-flotbutton actions-pos="left" :show-text="true" color="bg-gradient-orange-accent" @click="fnToComment(null)"></tm-flotbutton>
 		</view>
 
 		<!-- 评论详情 -->
@@ -164,6 +164,7 @@ export default {
 				.then(res => {
 					if (res.status == 200) {
 						this.loading = 'success';
+						// return;
 						this.loadMoreText = res.data.hasNext ? '上拉加载更多' : '呜呜，没有更多数据啦~';
 						// 处理数据
 						this.result = res.data;
@@ -252,12 +253,18 @@ export default {
 	width: 100vw;
 	display: flex;
 	flex-direction: column;
+	background-color: #fafafd;
 }
 .app-page-content {
 	box-sizing: border-box;
-	box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
+	// box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.05);
+}
+.content-empty {
+	width: 100%;
+	height: 60vh;
 }
 .loading-wrap {
+	box-sizing: border-box;
 	padding: 24rpx;
 }
 </style>

pagesA/setting/setting.vue

@@ -148,6 +148,8 @@ export default {
 			isBlackTheme: false,
 			loading: true,
 			appSettings: {},
+			isSaved: true,
+			firstLoad: true,
 			homeLayout: {
 				list: [{ name: '一行一列', value: 'h_row_col1' }, { name: '一行两列', value: 'h_row_col2' }],
 				selectDefault: ['一行一列'],
@@ -169,15 +171,17 @@ export default {
 			dotPositionList: [{ name: '右边', value: 'right', checked: true }, { name: '下边', value: 'bottom', checked: false }]
 		};
 	},
-	computed: {
-		// 获取设置
-		_appSettings() {
-			return uni.$tm.vx.getters().setting.getSettings;
-		}
-	},
+
 	watch: {
-		_appSettings(val) {
-			this.appSettings = val;
+		appSettings: {
+			deep: true,
+			handler() {
+				if (this.firstLoad) {
+					this.firstLoad = false;
+				} else {
+					this.isSaved = false;
+				}
+			}
 		}
 	},
 
@@ -185,7 +189,7 @@ export default {
 		this.fnSetPageTitle('应用设置');
 	},
 	created() {
-		this.appSettings = this._appSettings;
+		this.appSettings = uni.$tm.vx.getters().setting.getSettings;
 		this.fnHandleFormatSelect();
 		uni.showLoading({
 			title: '加载中...',
@@ -242,6 +246,7 @@ export default {
 		},
 		// 保存
 		fnOnSave() {
+			this.isSaved = true;
 			this.$tm.vx.commit('setting/setSettings', this.appSettings);
 			uni.$tm.toast('保存成功，部分设置在重启后生效！');
 		},
@@ -257,12 +262,16 @@ export default {
 				confirmColor: '#03a9f4'
 			})
 				.then(res => {
+					this.isSaved = true;
 					uni.$tm.vx.actions('setting/updateDefaultAppSettings');
 					uni.$tm.toast('系统设置已恢复为默认配置，部分设置在重启后生效！');
 				})
 				.catch(err => {});
 		},
 		fnOnBack() {
+			if (this.isSaved) {
+				uni.navigateBack();
+			}
 			uni.$eShowModal({
 				title: '提示',
 				content: '您当前可能有未保存的数据，确定返回吗？',
@@ -274,6 +283,7 @@ export default {
 			})
 				.then(res => {
 					uni.navigateBack();
+					this.isSaved = true;
 				})
 				.catch(err => {});
 		}

pagesA/start/start.vue

@@ -1,6 +1,5 @@
 <template>
-	<view class="app-page bg-gradient-blue-lighten-b">
-		<!-- 流星-->
+	<view class="app-page bg-gradient-blue-lighten-b" :style="pageStyle">
 		<view class="tn-satr">
 			<view class="sky"></view>
 			<view class="stars">
@@ -41,18 +40,19 @@
 			</view>
 		</view>
 
-		<!-- 头像用户信息 -->
 		<view class="user-info__container flex flex-col flex-center">
-			<image class="user-info__avatar" src="https://blog-oss.925i.cn/blog-files/d500acd35e8b6d24bbfa2dabd2a605e6.png" mode="aspectFill"></image>
-			<view class="user-info__nick-name">「 uni-halo 」</view>
+			<image class="user-info__avatar" :src="startInfo.logo" mode="aspectFill"></image>
+			<view class="user-info__nick-name">「 {{ startInfo.title }} 」</view>
 		</view>
 
 		<view class="text-align-center text-white" style="padding: 60vh 0 0 0;">
-			<view class="" style="font-size: 44rpx;">全新UI，准备出发</view>
-			<view class="mt-30 text-size-m">新触动 新感受 新体验</view>
+			<view class="" style="font-size: 44rpx;" v-if="startInfo.desc1">{{ startInfo.desc1 }}</view>
+			<view class="mt-30 text-size-m" v-if="startInfo.desc2">{{ startInfo.desc2 }}</view>
 		</view>
 
-		<view class="" style="padding: 120rpx 200rpx;z-index: 999;position: relative;"><view class="start-btn" @click="fnStart()">全新出发</view></view>
+		<view class="" style="padding: 120rpx 200rpx;z-index: 999;position: relative;">
+			<view class="start-btn" @click="fnStart()">{{ startInfo.btnText || '开始体验' }}</view>
+		</view>
 
 		<!-- 波浪效果 -->
 		<wave></wave>
@@ -63,6 +63,20 @@
 import wave from '@/components/wave/wave.vue';
 export default {
 	components: { wave },
+	computed: {
+		startInfo() {
+			return getApp().globalData.start;
+		},
+		pageStyle() {
+			if (this.startInfo.bg) {
+				const _bg = this.$utils.checkIsUrl(this.startInfo.bg) ? `url(${this.startInfo.bg})` : this.startInfo.bg;
+				return {
+					background: _bg + '!important'
+				};
+			}
+			return {};
+		}
+	},
 	methods: {
 		fnStart() {
 			uni.switchTab({

pagesB/articles/article-edit.vue

@@ -151,7 +151,8 @@ export default {
 			form: {
 				content: '',
 				keepRaw: true,
-				sourceContent: '',
+				originalContent: '',
+				formatContent: '',
 				type: 'PUBLIC'
 			},
 			modal: null,
@@ -532,9 +533,10 @@ export default {
 				return uni.$tm.toast('请输入内容!');
 			}
 			this.form.content = _content;
-			this.form.sourceContent = this.$refs.markdown.getText();
+			this.form.formatContent = _content;
+			this.form.originalContent = this.$refs.markdown.getText();
 			uni.setStorageSync('posts-content', _content);
-			uni.setStorageSync('posts-content-source', this.form.sourceContent);
+			uni.setStorageSync('posts-content-source', this.form.originalContent);
 			if (this.form.id) {
 				this.$Router.push({
 					path: '/pagesB/articles/article-setting',

pagesB/articles/article-setting.vue

@@ -151,7 +151,7 @@
 			<!-- 操作区域 -->
 			<view class="btn-bar flex flex-center bg-white">
 				<tm-button theme="blue" :shadow="0" block :height="70" @click="fnOnSave(false, false)">立即保存</tm-button>
-				<tm-button theme="light-blue" :shadow="0" block :height="70" @click="fnOnSave(false, true)">保存并返回</tm-button>
+				<tm-button v-if="isEdit" theme="light-blue" :shadow="0" block :height="70" @click="fnOnSave(false, true)">保存并返回</tm-button>
 				<!-- 	<block v-if="from == 'edit' && isEdit">
 					<tm-button
 						v-if="article.status == 'DRAFT' || article.status == 'INTIMATE' || article.status == 'RECYCLE'"
@@ -357,10 +357,21 @@ export default {
 				list: ['常规', '高级', 'SEO']
 			},
 			article: {
+				title: '',
+				slug: '',
+				status: '',
 				content: '',
 				keepRaw: true,
-				sourceContent: '',
-				type: 'PUBLIC'
+				topPriority: 0,
+				summary: '',
+				password: '',
+				originalContent: '',
+				metaDescription: '',
+				formatContent: '',
+				editorType: 'MARKDOWN',
+				createTime: '',
+				categoryIds: [],
+				tagIds: []
 			},
 			articleStatus: {
 				list: [{ name: '发布', value: 'PUBLISHED' }, { name: '私有', value: 'INTIMATE' }, { name: '草稿', value: 'DRAFT' }, { name: '回收站', value: 'RECYCLE' }],
@@ -397,6 +408,9 @@ export default {
 		this.from = from;
 		this.createTime = uni.$tm.dayjs(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss');
 		this.fnGetSettings();
+
+		console.log(uni.getStorageSync('posts-content'));
+		console.log(uni.getStorageSync('posts-content-source'));
 	},
 	onPullDownRefresh() {
 		if (this.isEdit == false) {
@@ -533,7 +547,7 @@ export default {
 						}
 						this.createTime = uni.$tm.dayjs(new Date(this.article.createTime).getTime()).format('YYYY-MM-DD HH:mm:ss');
 						if (this.postTitle) {
-							this.article.title = this.postTitle;
+							this.$set(this.article, 'title', this.postTitle);
 						}
 					}
 					const _cateRes = res[1];
@@ -577,6 +591,7 @@ export default {
 				})
 				.catch(err => {
 					this.$tm.toast('数据加载失败，请重试！');
+					console.log(err);
 					this.loading = 'error';
 				})
 				.finally(() => {
@@ -626,7 +641,8 @@ export default {
 			// 设置文章内容
 			if (this.from == 'edit') {
 				this.article.content = uni.getStorageSync('posts-content');
-				this.article.sourceContent = uni.getStorageSync('posts-content-source');
+				this.article.formatContent = uni.getStorageSync('posts-content');
+				this.article.originalContent = uni.getStorageSync('posts-content-source');
 			}
 			if (this.articleStatus.selectValue != 'INTIMATE') {
 				this.article.password = '';
@@ -651,8 +667,7 @@ export default {
 										delta: 1
 									});
 								}
-
-								uni.$emit('refresh-article-list');
+								// uni.$emit('refresh-article-list');
 							}, 1000);
 						} else {
 							uni.$tm.toast('保存失败，请重试!');
@@ -662,13 +677,12 @@ export default {
 						}
 					})
 					.catch(err => {
-						uni.$tm.toast('保存失败，请重试!');
+						uni.$tm.toast(`保存失败，${err.message}!`);
 						if (isChangeStatus) {
 							this.article.status = this.article.status == 'DRAFT' ? 'PUBLISHED' : 'DRAFT';
 						}
 					});
 			} else {
-				this.article.content = this.article.sourceContent = uni.getStorageInfoSync();
 				this.$httpApi.admin
 					.createPosts(this.article)
 					.then(res => {
@@ -678,12 +692,9 @@ export default {
 							uni.setStorageSync('posts-content', '');
 							uni.setStorageSync('posts-content-source', '');
 							setTimeout(() => {
-								if (isBack) {
-									uni.navigateBack({
-										delta: 1
-									});
-								}
-
+								uni.navigateBack({
+									delta: 2
+								});
 								uni.$emit('refresh-article-list');
 							}, 1000);
 						} else {
@@ -691,7 +702,7 @@ export default {
 						}
 					})
 					.catch(err => {
-						uni.$tm.toast('发布失败，请重试!');
+						uni.$tm.toast(`发布失败：${err.message}`);
 					});
 			}
 		},

utils/app.js

@@ -36,7 +36,7 @@ export const _DefaultAppSettings = {
 	},
 	gallery: {
 		// 是否使用瀑布流
-		useWaterfull: false
+		useWaterfull: true
 	},
 	links: {
 		// 是否使用简约模式

utils/halo.logs.js

@@ -0,0 +1,51 @@
+/**
+ * 日志工具
+ */
+const LOG_NAME = 'APP_CONFIG_LOG'
+
+export const logTypes = {
+	config: 'BASE_CONFIG'
+}
+export const logTypesMap = {
+	BASE_CONFIG: '基础配置'
+}
+export const logUtils = {
+
+	/**
+	 * @param {Object} type 日志类型
+	 * @param {Object} msg 日志信息
+	 */
+	saveLog(type, data) {
+		const {
+			msg,
+			page,
+			path
+		} = data;
+		let _logs = this.getLogs()
+		const logMsgObj = {
+			time: new Date().getTime(),
+			type: type,
+			typeText: logTypesMap[type],
+			page: page || '',
+			path: path || '',
+			msg: msg
+		}
+		_logs.push(logMsgObj)
+		uni.setStorageSync(LOG_NAME, JSON.stringify(_logs))
+	},
+
+	/**
+	 * 获取所有的日志
+	 */
+	getLogs() {
+		let _logs = uni.getStorageSync(LOG_NAME)
+		return _logs ? JSON.parse(_logs) : [];
+	},
+
+	/**
+	 * 删除所有日志
+	 */
+	removeLogs() {
+		uni.removeStorageSync(LOG_NAME)
+	},
+}

utils/index.js

@@ -11,7 +11,10 @@
  */
 
 import HaloConfig from '@/config/halo.config.js';
-
+import {
+	logTypes,
+	logUtils
+} from '@/utils/halo.logs.js'
 const utils = {
 	/**
 	 * 检查是否为http/https链接
@@ -30,14 +33,29 @@ const utils = {
 
 	// 检查封面图
 	checkThumbnailUrl: function(thumbnail) {
-		if (!thumbnail) return HaloConfig.defaultThumbnailUrl + `&r=${new Date().getTime()}`;
+		if (!HaloConfig.defaultThumbnailUrl) {
+			// logUtils.saveLog(logTypes.config, {
+			// 	path: 'checkThumbnailUrl',
+			// 	page: 'checkThumbnailUrl',
+			// 	msg: '未配置默认的封面图，配置参数【HaloConfig.defaultThumbnailUrl】'
+			// })
+		}
+		let _url = HaloConfig.defaultThumbnailUrl
+		if (_url) {
+			_url = _url.indexOf('?') !== -1 ? _url : _url + `&r=${new Date().getTime()}`
+		}
+		if (!thumbnail) return _url;
 		if (!this.checkIsUrl(thumbnail)) return HaloConfig.apiUrl + thumbnail;
 		return thumbnail
 	},
 
 	// 检查图片
 	checkImageUrl: function(image) {
-		if (!image) return HaloConfig.defaultImageUrl + `&r=${new Date().getTime()}`;
+		let _url = HaloConfig.defaultImageUrl
+		if (_url) {
+			_url = _url.indexOf('?') !== -1 ? _url : _url + `&r=${new Date().getTime()}`
+		}
+		if (!image) return _url;
 		if (!this.checkIsUrl(image)) return HaloConfig.apiUrl + image;
 		return image
 	},
@@ -46,7 +64,11 @@ const utils = {
 	checkAvatarUrl: function(avatar, isAdmin = false) {
 		if (isAdmin) return HaloConfig.author.avatar;
 		if (!avatar) {
-			return HaloConfig.defaultAvatarUrl + `&r=${new Date().getTime()}`;
+			let _url = HaloConfig.defaultAvatarUrl
+			if (_url) {
+				_url = _url.indexOf('?') !== -1 ? _url : _url + `&r=${new Date().getTime()}`
+			}
+			return _url;
 		}
 		if (!this.checkIsUrl(avatar)) return HaloConfig.apiUrl + avatar;
 		return avatar