diff --git a/.gitignore b/.gitignore index bf8177b..27bc36e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules/ unpackage/ .DS_Store +.idea/ diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json deleted file mode 100644 index 1e1eb6a..0000000 --- a/.hbuilderx/launch.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ - // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 - "version" : "0.0", - "configurations" : [ - { - "app-plus" : { - "launchtype" : "remote" - }, - "default" : { - "launchtype" : "remote" - }, - "h5" : { - "launchtype" : "remote" - }, - "mp-weixin" : { - "launchtype" : "remote" - }, - "type" : "uniCloud" - }, - { - "playground" : "standard", - "type" : "uni-app:app-android" - } - ] -} diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 0d22b58..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - // 使用 IntelliSense 了解相关属性。 - // 悬停以查看现有属性的描述。 - // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "pwa-chrome", - "request": "launch", - "name": "Launch Chrome against localhost", - "url": "http://localhost:8080", - "webRoot": "${workspaceFolder}" - } - ] -} \ No newline at end of file diff --git a/App.vue b/App.vue index c7659f8..4b6d532 100644 --- a/App.vue +++ b/App.vue @@ -203,4 +203,126 @@ body { .flex1 { flex: 1; //必须父级设置flex } + +.light-color { + color: $light-color; +} +.main-color { + color: $main-color !important; +} +.bg-light-color { + background-color: $light-color !important; +} +.bg-main-color { + background-color: $main-color !important; +} + +// 渐变主题颜色 +.bg-linear-gradient { + background-image: linear-gradient(25deg, var(--theme-primary, #fa123b), var(--theme-light, #ff6b35), var(--theme-aider, #ff9f28), #ffcc03); +} +.uni-tabbar .uni-tabbar__icon { + width: 20px; + height: 18px; +} + +.flex { + display: flex; +} + +.btn { + background-color: $light-color; + color: #ffffff; + border-width: 0px; + border: none; + border-radius: 44px; + height: 44px; + box-shadow: none; + font-weight: 400; + font-style: normal; + line-height: 44px; + text-align: center; + &::after { + border: none; + } +} +.button-hover { + opacity: 0.7; +} + +.margin { + margin: 10px; +} + +.tag { + background-color: rgba(242, 242, 242, 1); + color: #333333; + height: 28px; + border-radius: 28px; + box-shadow: none; + font-family: "PingFangSC-Regular", "PingFang SC", sans-serif; + font-weight: 400; + font-style: normal; + line-height: 28px; + text-align: center; + width: 90px; +} + +.c-content { + background-color: #ffffff; + // margin-top: 30rpx; + border-top: 1px solid $border-color-light; + border-bottom: 1px solid $border-color-light; +} +.mt-30 { + margin-top: 30rpx; +} +.border-top { + border-top: 1px solid $border-color-light; +} +.describe { + color: $font-color-light; + font-size: $font-sm; + padding: 30rpx; +} +.flex-center { + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; +} + +.flex-a-c{ + align-items: center; +} +.flex-j-sb{ + justify-content: space-between; +} +.relative { + position: relative; +} + +.wes { + /* 多出部分用省略号表示 , 用于一行 */ + overflow: hidden; + word-wrap: normal; + white-space: nowrap; + text-overflow: ellipsis; +} + +.wes-2 { + /* 适用于webkit内核和移动端 */ + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; +} + +.wes-3 { + /* 适用于webkit内核和移动端 */ + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; + overflow: hidden; +} diff --git a/LICENSE b/LICENSE index 80a61fa..9dfcd43 100644 --- a/LICENSE +++ b/LICENSE @@ -1,661 +1,21 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - 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 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. - - - Copyright (C) - - 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 . - -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 -. +MIT License + +Copyright (c) 2020-2026 Beijing Hongye Huicheng Technology Co., Ltd. (北京宏业汇成科技有限公司) + +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. diff --git a/README.en.md b/README.en.md index 3cbec73..5f46b16 100644 --- a/README.en.md +++ b/README.en.md @@ -1,180 +1,140 @@ -# Lilishop(Pickmall) - Java Open Source Mall System +
+ Lilishop Logo +

Lilishop(PickMall) - Mobile Client (uni-app)

-[![GitHub Stars](https://img.shields.io/github/stars/hongyehuicheng/lilishop.svg?style=social&logo=github)](https://github.com/hongyehuicheng/lilishop) -[![Gitee Stars](https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark)](https://gitee.com/beijing_hongye_huicheng/lilishop) +

+ GitHub Stars + Gitee Stars + License + Vue 3 + uni-app +

-

- 简体中文 | English -

+

+ 🏠 Official Website · + 📖 Product Documentation · + 📱 Online Demo · + 💻 GitHub +

-LiliShop is a Java open source ecommerce system built with Spring Boot, Spring Cloud, Vue, and Uniapp. +

+ 简体中文 | English +

+
-It supports: +> ⭐ **If you like this project, please click `Star` in the top-right corner to support us! Your Star is our greatest motivation for continuous open-source iteration!** -- B2B2C multi-vendor marketplace -- Microservice architecture -- WeChat mini program -- Vue ecommerce frontend -- Uniapp mobile app -- Live streaming ecommerce -- Distribution & affiliate system -- Flash sale / coupon / promotion -- Docker deployment -- Private deployment -- Multi-language ecommerce platform +**LILISHOP** is an open-source e-commerce system built with Spring Boot, Vue 3, and uni-app. It supports B2B2C multi-vendor marketplaces, WeChat Mini Programs, H5, Android/iOS Apps, live-streaming e-commerce, affiliate distribution, and flash sales. + +### ✨ Why Choose Lilishop +- 🟢 **True MIT License**: Free for commercial use and private secondary development without licensing concerns. +- 🚀 **Modern Vue 3 Stack**: Built on `uni-app + Vue 3 + uview-plus 3.x`, leaving legacy Vue 2 templates behind. +- 🧩 **Production-Ready Completeness**: Not a static UI template—fully integrated with B2B2C multi-vendor workflows, visual storefront decoration, IM customer service, flash sales, group buying, affiliate distribution, and live streaming. --- -## Keywords +## 1. Overview -Java Mall System -Open Source Ecommerce Platform -Spring Boot Mall System -Spring Cloud Ecommerce -B2B2C Marketplace -Multi Vendor Ecommerce Platform -Vue Ecommerce System -Uniapp Mall System -Microservice Mall System -Wechat Mini Program Mall -Docker Ecommerce Deployment +This repository (`lilishop-uniapp`) is the **Mobile Buyer Client** of Lilishop, supporting **H5, WeChat Mini Program, Android, and iOS Apps** from a single codebase powered by **Vue 3** and **uni-app**. + +- **Official Website**: +- **Documentation**: [Product Documentation](https://bdwx2tfwwt.feishu.cn/wiki/space/7675179368632617952?ccm_open_type=lark_wiki_spaceLink&open_tab_from=wiki_home) +- **Gitee Repository**: +- **GitHub Main Repository**: --- -## Official Website +## 2. Online Demo -- Website: https://pickmall.cn -- Documentation: https://docs.pickmall.cn -- GitHub: https://github.com/lilishop/lilishop -- Gitee: https://gitee.com/beijing_hongye_huicheng/lilishop +> **Note**: The verification code for the demo environment is `111111`. + +| WeChat Mini Program | Mobile H5 ([Visit Directly](https://m-b2b2c.pickmall.cn)) | +| :---: | :---: | +| WeChat Mini Program QR Code | Mobile H5 QR Code | +| Scan with WeChat | Scan or visit | + +- **PC Mall**: +- **Admin Panel**: (`admin` / `123456`) +- **Store Panel**: (`13011111111` / `111111`) + +### Mobile UI Preview + +| Home | Product List | Product Detail | Checkout | User Center | +| :---: | :---: | :---: | :---: | :---: | +| Home | Product List | Product Detail | Checkout | User Center | --- -## Core Features +## 3. Core Features & Tech Stack -### Full Platform Support +### Core Features +- **Cross-Platform**: One codebase runs on H5, WeChat Mini Program, Android, and iOS. +- **Multi-Vendor B2B2C**: Supports merchant onboarding and store-level operations. +- **Visual Storefront Decoration**: Dynamic home page & floor layouts (`pages/floor`) and customizable theme colors. +- **Live Streaming & IM**: Integrated with Tencent Cloud IM / MQTT and HLS video streaming. +- **Full E-Commerce Workflow**: Product browsing, cart, promotions (flash sale, group buy, coupons, points, bargain, affiliate), order fulfillment, after-sales, and member center. -One codebase supports: - -- PC -- H5 -- WeChat Mini Program -- Android APP -- iOS APP - -### Microservice Architecture - -Built with: - -- Spring Boot -- Spring Cloud -- Redis -- RocketMQ -- Elasticsearch -- Docker -- ShardingSphere - -Supports distributed deployment and high concurrency ecommerce scenarios. - -### Ecommerce Features - -- Multi merchant marketplace -- Product management -- Order management -- Promotion system -- Coupon system -- Affiliate distribution -- Live streaming ecommerce -- Member system -- Points system -- Visual decoration -- Multi-language support +### Mobile Tech Stack +| Category | Technology | Description | +| :--- | :--- | :--- | +| Core Framework | `uni-app` + `Vue 3` | Cross-platform framework with Vue 3 support | +| State Management | `Vuex 4` | Global auth, cart, and user state management | +| UI Library | `uview-plus 3.x` | Vue 3 compatible uni-app multi-platform UI library | +| Messaging & IM | `mqtt 5.x` / `@tencentcloud/chat` | Real-time customer service and notification push | +| Video Streaming | `hls.js` | Live streaming playback support | +| CSS Preprocessor | `Sass (SCSS)` | Global theme variables (`uni.scss`) and styling | --- -## Tech Stack +## 4. Directory Structure -### Backend - -- Java -- Spring Boot -- Spring Cloud -- MyBatis Plus -- MySQL -- Redis -- RocketMQ -- Elasticsearch -- JWT -- Docker - -### Frontend - -- Vue.js -- Uniapp -- Vuex -- Axios -- iView -- uViewUI +```text +lilishop-uniapp +├── api/ # API module definitions (member, goods, order, promotion, IM, etc.) +├── components/ # Shared business and base components +├── config/ # Global configuration +│ ├── api.js # API base URLs (buyer / im / mqtt) +│ └── config.js # Mall name, Mini Program AppID, AMap Key, theme colors, etc. +├── hybrid/ # Local HTML assets for App WebView +├── js_sdk/ # Third-party and uni-app SDKs +├── lib/ # Base utility libraries +├── pages/ # Pages and sub-packages +│ ├── tabbar/ # Main tabbar pages (Home, Category, Cart, Mine) +│ ├── passport/ # Auth sub-package (Login, Register, Reset Password) +│ ├── product/ # Product detail, list, reviews, store homepage +│ ├── cart/ # Shopping cart and checkout +│ ├── order/ # Order list, detail, after-sales, logistics, invoice +│ ├── promotion/ # Flash sale, group buy, bargain, points mall, distribution, live +│ ├── mine/ # User center, wallet, points, favorites, addresses +│ ├── floor/ # Visual decoration floor components and topic pages +│ └── navigation/ # Navigation and search pages +├── patches/ # patch-package patches for dependencies +├── scripts/ # Build and postinstall runtime patch scripts +├── static/ # Static images and fonts +├── store/ # Vuex store modules +├── styles/ # Global stylesheets +├── uni_modules/ # uni_modules plugins (including uview-plus) +├── utils/ # Request interceptors, encryption, validators, storage helpers +├── App.vue # Root application component +├── main.js # Application entry point +├── manifest.json # uni-app multi-platform configuration +├── pages.json # Page routes, sub-packages, and navigation bar settings +└── uni.scss # Global SCSS variables and theme color definitions +``` --- -## Online Demo +## 5. Related Repositories -### Admin Panel - -https://admin-b2b2c.pickmall.cn - -Account: admin -Password: 123456 - -### Store Panel - -https://store-b2b2c.pickmall.cn - -Account: 13011111111 -Password: 111111 - -### PC Mall - -https://pc-b2b2c.pickmall.cn +| Repository | Description | Links | +| :--- | :--- | :--- | +| **`lilishop`** | Backend Services (Spring Boot 4 / Java 21) | [Gitee](https://gitee.com/beijing_hongye_huicheng/lilishop) · [GitHub](https://github.com/lilishop/lilishop) | +| **`lilishop-ui`** | PC Mall / Seller / Admin / IM Web Frontend | [Gitee](https://gitee.com/beijing_hongye_huicheng/lilishop-ui) | +| **`lilishop-uniapp`** | Mobile Buyer Client (H5 / Mini Program / App) | [Gitee](https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp) | +| **`docker`** | Docker Compose, Images & SQL Init Scripts | [Gitee](https://gitee.com/beijing_hongye_huicheng/docker) · [MySQL Scripts](https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql) | --- -## Quick Start +## 6. License -Please read the deployment documentation: - -https://docs.pickmall.cn - -Supports: - -- Docker deployment -- Linux deployment -- Kubernetes deployment -- Microservice deployment - ---- - -## FAQ - -### Is PickMall open source? - -Yes. PickMall is an open source Java ecommerce system. - -### Does PickMall support microservices? - -Yes. PickMall is built on Spring Cloud microservice architecture. - -### Does PickMall support Docker? - -Yes. Docker deployment is supported. - -### Does PickMall support WeChat Mini Program? - -Yes. It supports WeChat Mini Program and Uniapp. - ---- - -## License - -PickMall is licensed under AGPL-3.0. \ No newline at end of file +Lilishop is licensed under the [MIT](./LICENSE) License. Copyright © 2020-2026 **Beijing Hongye Huicheng Technology Co., Ltd.** diff --git a/README.md b/README.md index bbd1779..95292b1 100644 --- a/README.md +++ b/README.md @@ -1,159 +1,179 @@ -# Lilishop(PickMall) 开源商城系统 +
+ Lilishop Logo +

Lilishop(PickMall) 开源商城系统 - 移动端 (uni-app)

-[![GitHub Stars](https://img.shields.io/github/stars/lilishop/lilishop.svg?style=social&logo=github)](https://github.com/lilishop/lilishop) -[![Gitee Stars](https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark)](https://gitee.com/beijing_hongye_huicheng/lilishop) -[![License](https://img.shields.io/badge/license-AGPL--3.0-blue.svg)](./LICENSE) -[![Vue](https://img.shields.io/badge/Vue-3-brightgreen.svg)](https://vuejs.org/) -[![uni-app](https://img.shields.io/badge/uni--app-Vue3-blue.svg)](https://uniapp.dcloud.net.cn/) +

+ GitHub Stars + Gitee Stars + License + Vue 3 + uni-app +

-

- 简体中文 | English -

+

+ 🏠 官方网站 · + 📖 产品文档 · + 📱 在线演示 · + 💬 微信交流群 +

+

+ 简体中文 | English +

+
-LILISHOP 是基于 Spring Boot / Spring Cloud / Vue / Uniapp 开发的 Java 开源商城系统，支持 B2B2C 多商户商城、小程序商城、微服务商城、直播电商、分销返佣、秒杀活动、Docker 私有化部署。 +> ⭐ **如果觉得项目不错，请点击右上角 `Star` 收藏支持！您的 Star 是我们持续开源迭代的最大动力！** -## 核心特性 +**LILISHOP** 是基于 Spring Boot / Vue 3 / uni-app 开发的开源商城系统，支持 B2B2C 多商户商城、微信小程序商城、H5 商城、APP 商城、直播电商、分销返佣、秒杀活动。 -- Java商城系统 -- 开源商城系统 -- Spring Boot 4商城系统 -- SpringCloud微服务商城 -- B2B2C商城源码 -- 多商户商城系统 -- 小程序商城源码 -- Uniapp商城系统 -- Vue商城系统 -- Docker商城部署 -- 多语言商城 - -适用于： - -- 企业级商城系统 -- 私有化商城部署 -- Java商城系统二次开发 -- 开源商城源码学习 -- 多商户电商平台 ---- - -### 1. 项目简介 - -**Lilishop** 是一款功能完善的B2B2C多商户商城系统，采用前后端分离架构，全端代码开源。 -后端基于 **Spring Boot 4**（Java 21）构建，具备高内聚、低耦合的特性，支持分布式部署。 -前端覆盖PC、H5、小程序和APP，基于 **Vue** 和 **uni-app** 开发。 - -- **官方网站**: -- **官方文档**: -- **Gitee 仓库**: -- **GitHub 仓库**: - -本仓库为买家端 **H5 / 小程序 / APP** 源码（`lilishop-uniapp`）。 +### ✨ 为什么选择 Lilishop +- 🟢 **真 MIT 协议**：支持免费商用与私有化闭源二开，无版权后顾之忧。 +- 🚀 **Vue 3 全新栈**：基于 `uni-app + Vue 3 + uview-plus 3.x`，告别老旧 Vue 2 模板。 +- 🧩 **生产级完整度**：非静态切图模板，完整覆盖 B2B2C 多商户、可视化装修、IM 客服、秒杀拼团、分销直播全闭环。 --- -### 2. 核心特性 +## 1. 项目简介 -- **全端覆盖**: 一套代码库支持PC、H5、小程序、APP，降低开发和维护成本。 -- **商家入驻**: 支持多商家入驻，构建平台化电商生态。 -- **分布式架构**: 后端API服务化，支持独立部署和弹性伸缩。 -- **前后端分离**: 清晰的职责划分，便于团队协作和独立开发。 -- **容器化支持**: 提供Docker镜像和docker-compose配置，实现一键部署。 -- **功能完善**: 涵盖客户、订单、商品、促销、店铺、运营、统计等完整电商业务模块。 +**Lilishop** 是一款功能完善的 B2B2C 多商户商城系统，采用前后端分离架构，全端代码开源。 +后端基于 **Spring Boot 4**（Java 21）构建，具备高内聚、低耦合的特性，支持分布式部署；前端覆盖 PC、H5、小程序和 APP，基于 **Vue 3** 和 **uni-app** 开发。 + +本仓库（`lilishop-uniapp`）为 **买家端移动端源码**，一套代码同时支持 **H5、微信小程序、Android / iOS APP**。 + +- **官方网站**: +- **官方文档**: [产品文档](https://bdwx2tfwwt.feishu.cn/wiki/space/7675179368632617952?ccm_open_type=lark_wiki_spaceLink&open_tab_from=wiki_home) +- **Gitee 仓库**: +- **GitHub 主仓库**: --- -### 3. 在线演示 +## 2. 在线演示 -**注意**: 演示站手机验证码统一为 `111111`。演示环境部署于 `master` 分支。 +> **注意**: 演示站手机验证码统一为 `111111`。演示环境部署于 `master` 分支。 -- **平台管理端**: - - 账号: `admin` - - 密码: `123456` -- **店铺管理端**: - - 账号: `13011111111` - - 密码: `111111` -- **商城PC端**: -- **微信小程序**: - ![移动端体验二维码](https://static.pickmall.cn/images/h5-qrcode.png) +| 微信小程序 | 移动端 H5（[点击直接访问](https://m-b2b2c.pickmall.cn)） | +| :---: | :---: | +| 微信小程序体验码 | 移动端 H5 体验二维码 | +| 微信扫码体验小程序 | 手机扫码或访问 | + +- **商城 PC 端**: +- **平台管理端**: + - 账号: `admin` / 密码: `123456` +- **店铺管理端**: + - 账号: `13011111111` / 密码: `111111` + +### 移动端界面预览 + +| 商城首页 | 商品列表 | 商品详情 | 填写订单 | 个人中心 | +| :---: | :---: | :---: | :---: | :---: | +| 商城首页 | 商品列表 | 商品详情 | 填写订单 | 个人中心 | --- -### 4. 快速开始 +## 3. 核心特性与技术栈 -#### 环境准备与部署 -详细的本地部署指南，请参考官方文档： -[**部署文档 -> 环境准备**](https://docs.pickmall.cn/deply/deply.html) +### 核心特性 +- **全端覆盖**: 一套 `uni-app` 代码库支持 H5、微信小程序、Android / iOS APP，大幅降低多端开发与维护成本。 +- **商家入驻**: 支持多商家入驻，构建平台化 B2B2C 电商生态。 +- **可视化装修**: 支持首页及专题楼层（`pages/floor`）动态可视化配置与主题色切换。 +- **即时通讯与直播**: 集成腾讯云 IM / MQTT 消息推送及 HLS 视频流，支持在线客服与直播带货。 +- **完整电商闭环**: 涵盖商品浏览、购物车、多种促销（秒杀/拼团/优惠券/积分/砍价/分销）、订单履约、售后维权、会员中心等全流程。 -#### 数据库初始化 -- **推荐方式**: 使用项目提供的 `docker-compose` 配置，可自动完成数据库（MySQL、Redis 等）的部署与初始化。 -- **手动方式**: 如果您选择手动部署，SQL脚本位于以下地址。请确保获取与您代码版本一致的SQL文件。 - [**数据库脚本 (Gitee)**](https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql) +### 移动端技术栈 +| 类别 | 技术选型 | 说明 | +| :--- | :--- | :--- | +| 核心框架 | `uni-app` + `Vue 3` | 跨端开发框架（支持 Vue 3 语法与渲染） | +| 状态管理 | `Vuex 4` | 全局登录态、购物车与用户状态管理 | +| UI 组件库 | `uview-plus 3.x` | 适配 Vue 3 的 uni-app 多端 UI 组件库 | +| 即时通讯 | `mqtt 5.x` / `@tencentcloud/chat` | 客服消息与实时通知推送 | +| 音视频流 | `hls.js` | 直播流播放支持 | +| 样式预处理 | `Sass (SCSS)` | 全局主题变量（`uni.scss`）与组件样式定制 | --- -### 5. 架构文档边界 +## 4. 目录结构 -本仓库首页不再维护不完整的系统架构图和技术栈表，避免与实际源码、部署形态和分支差异产生偏差。当前仓库主要说明买家端 H5 / 小程序 / APP 源码定位、在线演示和部署入口。 - -完整架构请以官方文档及四个源码仓库为准： - -- 后端源码：`lilishop` -- PC / 商家端 / 运营端 / IM Web：`lilishop-ui` -- H5 / 小程序 / APP：`lilishop-uniapp` -- 部署、SQL、镜像与启动脚本：`docker` +```text +lilishop-uniapp +├── api/ # 各业务模块接口定义（会员、商品、订单、促销、IM 等） +├── components/ # 公共业务与基础组件 +├── config/ # 全局配置目录 +│ ├── api.js # 接口域名配置（buyer / im / mqtt） +│ └── config.js # 商城名称、小程序 AppID、高德 Key、主题色等全局参数 +├── hybrid/ # App 端本地 HTML 资源（如异常页、WebView 辅助页） +├── js_sdk/ # 第三方及 uni-app 插件 SDK +├── lib/ # 基础工具库封装 +├── pages/ # 页面与分包目录 +│ ├── tabbar/ # 底部导航主包页面（首页、分类、购物车、我的等） +│ ├── passport/ # 登录、注册、找回密码分包 +│ ├── product/ # 商品详情、列表、评价、店铺主页分包 +│ ├── cart/ # 购物车与结算页分包 +│ ├── order/ # 订单列表、详情、售后、物流、发票分包 +│ ├── promotion/ # 秒杀、拼团、砍价、积分商城、分销、直播等营销分包 +│ ├── mine/ # 个人中心、钱包、积分、收藏、地址管理分包 +│ ├── floor/ # 可视化装修楼层组件与专题页 +│ └── navigation/ # 导航与搜索相关页面 +├── patches/ # patch-package 第三方依赖补丁 +├── scripts/ # 构建与依赖修补脚本（如 postinstall 补丁） +├── static/ # 静态图片与字体资源 +├── store/ # Vuex 状态管理 +├── styles/ # 公共样式文件 +├── uni_modules/ # uni_modules 模块（含 uview-plus 等） +├── utils/ # 请求拦截器、加密、校验、存储等工具函数 +├── App.vue # 应用入口组件 +├── main.js # 应用初始化入口 +├── manifest.json # uni-app 多端应用配置（AppID、权限、SDK 配置等） +├── pages.json # 页面路由、分包加载与导航栏配置 +└── uni.scss # 全局 SCSS 变量与主题色定义 +``` --- -### 6. 功能列表 +## 5. 配套源码仓库 -[功能清单](https://bdwx2tfwwt.feishu.cn/sheets/FFQKscQKDhUx60to1k9cbMngnYb?from=from_copylink) +本仓库专注于买家端 **H5 / 小程序 / APP**（`lilishop-uniapp`）。完整系统由以下四个核心仓库组成： + +| 仓库名称 | 职责说明 | 仓库地址 | +| :--- | :--- | :--- | +| **`lilishop`** | 后端服务源码（Spring Boot 4 / Java 21） | [Gitee](https://gitee.com/beijing_hongye_huicheng/lilishop) · [GitHub](https://github.com/lilishop/lilishop) | +| **`lilishop-ui`** | PC 商城 / 商家端 / 运营管理端 / IM Web 前端 | [Gitee](https://gitee.com/beijing_hongye_huicheng/lilishop-ui) | +| **`lilishop-uniapp`** | 买家端 H5 / 微信小程序 / Android & iOS APP | [Gitee](https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp) | +| **`docker`** | 容器化部署编排、镜像与数据库脚本 | [Gitee](https://gitee.com/beijing_hongye_huicheng/docker) · [MySQL 脚本](https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql) | --- -### 7. 开源与授权 +## 6. 开源与授权 -1. **开源协议**: 本项目遵循 `AGPL-3.0` 开源协议。 -2. **使用范围**: 仅允许用于个人学习、研究和非商业用途。 -3. **禁止行为**: 禁止将本项目的代码和资源用于任何形式的商业销售。 -4. **商业授权**: 如需商业使用，必须获得官方授权。授权为一次性永久授权，并提供持续的版本升级服务。详情请联系官网客服。 -5. **软件著作权**: 本软件受国家计算机软件著作权保护（登记号：2021SR0805085）。 +本项目遵循 [MIT](./LICENSE) 开源协议，版权归 **北京宏业汇成科技有限公司** 所有。允许个人及企业免费用于学习、研究、修改和商业用途（需保留原始版权和许可声明）。 --- -### 8. 社区与支持 +## 7. 社区与支持 -我们欢迎任何形式的交流与贡献。在提问前，请先查阅 [官方文档](https://docs.pickmall.cn/) ，并参考 [《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md) 以便高效沟通。 +我们欢迎任何形式的交流与贡献。在提问前，请先查阅 [产品文档](https://bdwx2tfwwt.feishu.cn/wiki/space/7675179368632617952?ccm_open_type=lark_wiki_spaceLink&open_tab_from=wiki_home)，并参考 [《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md) 以便高效沟通。 -- **[在线客服](https://work.weixin.qq.com/kfid/kfc4d8dc24a73c15f44)** -- **微信交流群**: - ![微信群](https://lilishop-wechat.oss-cn-beijing.aliyuncs.com/wechat.jpg) +- **[在线客服](https://work.weixin.qq.com/kfid/kfc4d8dc24a73c15f44)** +- **微信交流群**: + 微信群 --- -### 9. 升级计划 +## 8. 升级计划 -以下功能将陆续在后续版本中发布：✅ 已完成 · 🔜 规划中 +### ✅ 已完成特性 +| 功能模块 | 功能模块 | +| :--- | :--- | +| ✅ 商品定时上下架 | ✅ 商品分组 / 会员分组 | +| ✅ 商品虚拟销量 | ✅ 专用发票（发票上传） | +| ✅ 置顶评论 | ✅ 客户等级体系 | +| ✅ 购物卡 | ✅ 腾讯云-云直播 | +| ✅ 卡密商品 | ✅ 二级分销 | +| ✅ 定时任务管理 | ✅ 预约服务商品 | +| ✅ 主题色管理 | ✅ 商家发货改造（整单/拆单/无需配送） | +| ✅ 多维统计（营业/商品/会员/积分/储值/营销/分销） | ✅ 经营报表（店铺业绩/商品同比环比/订单明细/销售汇总） | -- ✅ 商品定时上下架 -- ✅ 商品分组 -- ✅ 会员分组 -- ✅ 商品虚拟销量 -- ✅ 专用发票（发票上传） -- ✅ 置顶评论 -- ✅ 客户等级 -- ✅ 购物卡 -- ✅ 腾讯云-云直播 -- ✅ 统计：营业概况、商品概况、会员概况、积分分析、储值分析、营销概况、分销统计 -- ✅ 经营报表（店铺业绩报表、商品同比环比报表、销售订单明细报表、商品销售汇总报表） -- ✅ 卡密商品 -- ✅ 二级分销 -- ✅ 定时任务管理 -- ✅ 服务商品 -- ✅ 主题色管理 -- 🔜 店铺结算汇总 -- 🔜 支付方式汇总 -- 🔜 结算台账 -- 🔜 钱包流水 -- 🔜 财务汇总 +### 🔜 近期规划中 +- 🔜 店铺结算汇总 & 结算台账 +- 🔜 支付方式汇总 & 钱包流水 & 财务汇总 - 🔜 微信小店对接 - 🔜 抖店对接 diff --git a/VUE3_MIGRATION.md b/VUE3_MIGRATION.md deleted file mode 100644 index 1d8ad48..0000000 --- a/VUE3_MIGRATION.md +++ /dev/null @@ -1,73 +0,0 @@ -# Vue 3 升级说明 - -本项目已从 Vue 2 + uView 1.6 升级到 **Vue 3 + uView Plus**。 - -## 环境要求 - -- HBuilderX 3.8+ -- Node.js 16+（用于安装 `uview-plus`、`vuex@4`、`sass`） - -## 安装依赖 - -```bash -npm install -``` - -## 主要变更 - -| 项 | 变更 | -|---|---| -| `manifest.json` | 增加 `"vueVersion": "3"` | -| `main.js` | 使用 `createSSRApp` + `export function createApp()` | -| UI 库 | `uview-ui` → `uview-plus`（npm 依赖） | -| 状态管理 | Vuex 4 `createStore` | -| 全局 filter | 改为 `main.js` 全局 mixin methods | -| 小程序分享 | `utils/mpShare.js` | -| u-cell-item | 改为 `u-cell` | -| u-verification-code | 改为 `u-code` | -| u-swipe-action | 内层增加 `u-swipe-action-item` | -| u-upload | 关闭 `auto-upload`，使用 `@afterRead` + `utils/uploadHelper.js` | -| u-parse | `:html` 改为 `:content`，移除 `show-with-animation` / `use-cache` | - -## 编译 - -请使用 HBuilderX 分别运行到 **H5**、**微信小程序**、**App** 进行验证。 - -## 回归测试清单 - -### 核心交易链路（H5 / 小程序） - -- [ ] 首页装修模块加载（轮播、商品、优惠券等） -- [ ] 分类 / 搜索 / 商品详情 -- [ ] 加购 / 购物车 / 填写订单 -- [ ] 支付（H5 微信支付、小程序支付） -- [ ] 订单列表 / 订单详情 / 物流 -- [ ] 售后申请 / 退款 / 评价 -- [ ] 个人中心 / 地址 / 优惠券 / 积分 - -### 微商城专项（H5） - -- [ ] 微信公众号内 JSSDK 分享 -- [ ] 网页授权登录（`wechatH5Login`） -- [ ] `js_sdk/lili-pay/wx-pay.js` 微信支付 -- [ ] 粘贴板分享链接跳转（`h5-copy`） -- [ ] H5 唤起 App 浮窗（`m-airbtn`） - -### 微信小程序专项 - -- [ ] 分包加载正常 -- [ ] `onShareAppMessage` 分享 -- [ ] 定位 / 相册权限 -- [ ] 海报 / 二维码（u-draw-poster、Sansnn-uQRCode） - -### App 端（后续阶段） - -- [ ] 5+ 原生模块：支付 / 分享 / OAuth / 定位 / 地图 / 指纹 -- [ ] 头像裁剪（`okingtz-cropper`） -- [ ] 启动参数 / 唤起逻辑（`App.vue` `checkArguments`） - -## 第三方插件 - -- `Sansnn-uQRCode`：声明支持 Vue3 -- `u-draw-poster`：声明支持 Vue2/3 -- `okingtz-cropper`：需在 App 端实测头像裁剪 diff --git a/VUE3_MIGRATION_PLAN.md b/VUE3_MIGRATION_PLAN.md deleted file mode 100644 index 1a7113c..0000000 --- a/VUE3_MIGRATION_PLAN.md +++ /dev/null @@ -1,638 +0,0 @@ -# Vue 3 语法改造计划 - -> 本文档用于按文件夹逐步改造业务代码。框架层（Vue 3 运行时、uView Plus、Vuex 4）已就绪，目标是让各模块语法与 Vue 3 完全兼容，并可选升级为 Composition API。 - -## 改造目标 - -| 层级 | 说明 | 是否必须 | -| --- | --- | --- | -| L1 兼容性修复 | 模板语法、uView Plus 组件、生命周期等 Vue 3 不兼容写法 | 必须 | -| L2 代码现代化 | Options API → ` - - diff --git a/components/m-placard/index.vue b/components/m-placard/index.vue deleted file mode 100644 index 96bf3e5..0000000 --- a/components/m-placard/index.vue +++ /dev/null @@ -1,199 +0,0 @@ - - - - diff --git a/components/popups/popups.vue b/components/popups/popups.vue deleted file mode 100644 index ddadcd5..0000000 --- a/components/popups/popups.vue +++ /dev/null @@ -1,331 +0,0 @@ - - - - - diff --git a/components/verification/verification.vue b/components/verification/verification.vue index f8de759..ba2afa0 100644 --- a/components/verification/verification.vue +++ b/components/verification/verification.vue @@ -4,12 +4,9 @@ v-if="!state.hid" class="flex-row-center" :style="{ top: state.scHight }" - style="width: 750rpx; position: fixed; z-index: 100; left: 0" + style="width: 750rpx; position: fixed; z-index: 100; left: 0; background-color: #ffffff; padding: 40rpx 0" > - + - + + + {{ + state.hasImg + }} - + - - {{ - state.hasImg - }} - - - 刷新拼图 - Lili-FRAMEWORK + + + + + + + + + + + Lili-FRAMEWORK 安全验证 @@ -133,6 +114,13 @@ const phone = uni.getSystemInfoSync() const l = phone.screenWidth / 750 const mainColor = computed(() => store.getters.mainColor) +const fillWidth = computed(() => `${state.moveX + 42 * l}px`) +const handleStyle = computed(() => { + const glow = /^#[0-9a-fA-F]{6}$/.test(mainColor.value) + ? mainColor.value + '59' + : 'rgba(0, 0, 0, 0.18)' + return { background: mainColor.value, boxShadow: `0 6rpx 20rpx ${glow}` } +}) const state = reactive({ flage: false, key: '', // key @@ -284,6 +272,79 @@ defineExpose({ @import "./animation.css"; @import "./icon.css"; // @import './main.css'; + +.v-track { + position: relative; + width: 100%; + height: 84rpx; + margin-top: 36rpx; + background-color: #f7f7f8; + border-radius: 42rpx; +} + +.v-fill { + position: absolute; + left: 0; + top: 0; + bottom: 0; + background-color: #ffe9e5; + border-radius: 42rpx; +} + +.v-track-text { + position: absolute; + left: 0; + right: 0; + top: 0; + line-height: 84rpx; + text-align: center; + font-size: 26rpx; + letter-spacing: 2rpx; +} + +.v-handle { + width: 84rpx; + height: 84rpx; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; +} + +.v-foot { + display: flex; + flex-direction: row; + justify-content: flex-end; + width: 100%; + margin-top: 28rpx; +} + +.v-icon-btn { + width: 68rpx; + height: 68rpx; + border-radius: 50%; + background-color: #f4f4f5; + display: flex; + align-items: center; + justify-content: center; + margin-left: 24rpx; +} + +.v-mark { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + margin-top: 32rpx; + font-size: 22rpx; + color: #d2d2d2; +} + +.v-mark-icon { + margin-right: 8rpx; + font-size: 22rpx; + color: #d9d9d9; +} .dh-wt { animation: at 1.1s ease; animation-iteration-count: infinite; diff --git a/main.js b/main.js index a53dfd8..4ad85b4 100644 --- a/main.js +++ b/main.js @@ -1,84 +1,86 @@ -import { createSSRApp, computed } from 'vue' -import App from './App' -import uviewPlus, { setConfig } from 'uview-plus' -import store from './store' -import config from '@/config/config' -import airBtn from '@/components/m-airbtn/index.vue' -import mpShare from '@/utils/mpShare.js' -import * as filterUtils from './utils/filters.js' -import { getThemeStyle } from '@/utils/theme' - -export function createApp() { - const app = createSSRApp(App) - - // uview-plus 内部会触发 Vue3 开发态告警（枚举组件实例 keys），不影响运行 - app.config.warnHandler = (msg, _instance, trace) => { - if ( - typeof msg === 'string' && - msg.includes('enumerating keys on a component instance') - ) { - return - } - try { - console.warn(`[Vue warn]: ${msg}${trace || ''}`) - } catch (e) { - // #ifdef MP-WEIXIN - // 微信开发者工具部分版本在输出 Vue warn 时会触发 - // TypeError: Cannot read property '__global' of null - // #endif - } - } - - app.use(store) - app.use(uviewPlus) - - // uview-plus 的图标字体默认每个 u-icon 实例都会触发 uni.loadFontFace， - // 导致进入页面时同一字体被反复请求。开启 loadFontOnce 后全局只加载一次。 - setConfig({ - config: { - loadFontOnce: true, - }, - props: { - form: { - labelWidth: '180rpx', - labelPosition: 'left', - }, - }, - }) - - app.config.globalProperties.$store = store - app.config.globalProperties.$mainColor = computed(() => store.getters.mainColor) - app.config.globalProperties.$lightColor = computed(() => store.getters.lightColor) - app.config.globalProperties.$aiderLightColor = computed( - () => store.getters.aiderLightColor - ) - - const filterMethods = {} - Object.keys(filterUtils).forEach((key) => { - if (typeof filterUtils[key] === 'function') { - filterMethods[key] = filterUtils[key] - } - }) - - app.mixin({ - methods: filterMethods, - computed: { - themeStyle() { - return getThemeStyle(this.$store.state.theme) - }, - }, - }) - app.mixin(mpShare) - - // #ifdef H5 - if (config.enableMiniBarStartUpApp) { - const mountPoint = document.createElement('div') - document.body.appendChild(mountPoint) - createSSRApp(airBtn).mount(mountPoint) - } - // #endif - - return { - app - } -} +import { createSSRApp, computed } from 'vue' +import App from './App' +import uviewPlus, { setConfig } from 'uview-plus' +import store from './store' +import config from '@/config/config' +// #ifdef H5 +import airBtn from '@/components/m-airbtn/index.vue' +// #endif +import mpShare from '@/utils/mpShare.js' +import * as filterUtils from './utils/filters.js' +import { getThemeStyle } from '@/utils/theme' + +export function createApp() { + const app = createSSRApp(App) + + // uview-plus 内部会触发 Vue3 开发态告警（枚举组件实例 keys），不影响运行 + app.config.warnHandler = (msg, _instance, trace) => { + if ( + typeof msg === 'string' && + msg.includes('enumerating keys on a component instance') + ) { + return + } + try { + console.warn(`[Vue warn]: ${msg}${trace || ''}`) + } catch (e) { + // #ifdef MP-WEIXIN + // 微信开发者工具部分版本在输出 Vue warn 时会触发 + // TypeError: Cannot read property '__global' of null + // #endif + } + } + + app.use(store) + app.use(uviewPlus) + + // uview-plus 的图标字体默认每个 u-icon 实例都会触发 uni.loadFontFace， + // 导致进入页面时同一字体被反复请求。开启 loadFontOnce 后全局只加载一次。 + setConfig({ + config: { + loadFontOnce: true, + }, + props: { + form: { + labelWidth: '180rpx', + labelPosition: 'left', + }, + }, + }) + + app.config.globalProperties.$store = store + app.config.globalProperties.$mainColor = computed(() => store.getters.mainColor) + app.config.globalProperties.$lightColor = computed(() => store.getters.lightColor) + app.config.globalProperties.$aiderLightColor = computed( + () => store.getters.aiderLightColor + ) + + const filterMethods = {} + Object.keys(filterUtils).forEach((key) => { + if (typeof filterUtils[key] === 'function') { + filterMethods[key] = filterUtils[key] + } + }) + + app.mixin({ + methods: filterMethods, + computed: { + themeStyle() { + return getThemeStyle(this.$store.state.theme) + }, + }, + }) + app.mixin(mpShare) + + // #ifdef H5 + if (config.enableMiniBarStartUpApp) { + const mountPoint = document.createElement('div') + document.body.appendChild(mountPoint) + createSSRApp(airBtn).mount(mountPoint) + } + // #endif + + return { + app + } +} diff --git a/manifest.json b/manifest.json index c5c635b..3c85fbc 100644 --- a/manifest.json +++ b/manifest.json @@ -192,6 +192,7 @@ "mp-weixin" : { /* 小程序特有相关 */ "usingComponents" : true, + "lazyCodeLoading" : "requiredComponents", "appid" : "wx6f10f29075dc1b0b", "optimization" : { "subPackages" : true diff --git a/package.json b/package.json index afdae68..6226aee 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "description": "Lilishop uni-app mobile client (Vue 3)", "main": "main.js", "scripts": { - "migrate:vue3": "node scripts/migrate-vue3.js && node scripts/migrate-filters-usage.js", "postinstall": "patch-package && node scripts/patch-mqtt-abort.js", "test:mqtt-app-runtime": "node scripts/test-mqtt-app-runtime.js" }, @@ -12,7 +11,7 @@ "type": "git", "url": "https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp" }, - "license": "ISC", + "license": "MIT", "dependencies": { "@tencentcloud/chat": "^3.5.5", "hls.js": "^1.6.16", diff --git a/pages/mine/point/myPoint.vue b/pages/mine/point/myPoint.vue index fd9c28a..a52c1fe 100644 --- a/pages/mine/point/myPoint.vue +++ b/pages/mine/point/myPoint.vue @@ -1,8 +1,8 @@ diff --git a/static/appleidButton@2x.png b/pages/passport/static/appleidButton@2x.png similarity index 100% rename from static/appleidButton@2x.png rename to pages/passport/static/appleidButton@2x.png diff --git a/pages/passport/static/logo-title.png b/pages/passport/static/logo-title.png deleted file mode 100644 index dd6f716..0000000 Binary files a/pages/passport/static/logo-title.png and /dev/null differ diff --git a/pages/product/comment.vue b/pages/product/comment.vue index 32cb6c4..a15b008 100644 --- a/pages/product/comment.vue +++ b/pages/product/comment.vue @@ -303,7 +303,7 @@ page { .star-item { width: 28rpx; height: 28rpx; - background: url("/static/star.png"); + background: url("/pages/product/static/star.png"); background-size: 100%; opacity: 0.25; diff --git a/pages/product/product/promotion/group.scss b/pages/product/product/promotion/group.scss index 11a4614..a668fc1 100644 --- a/pages/product/product/promotion/group.scss +++ b/pages/product/product/promotion/group.scss @@ -1,5 +1,5 @@ .group-wrapper { - background: url("/static/exchange.png"); + background: url("/pages/product/static/exchange.png"); background-size: cover; } .u-group-row { diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue index 6399ecb..abf53ed 100644 --- a/pages/product/shopPage.vue +++ b/pages/product/shopPage.vue @@ -1,927 +1,943 @@ - - - - - +const themeStyle = computed(() => getThemeStyle(store.state.theme)) +const mainColor = computed(() => store.getters.mainColor) + +const pageData = ref<{ list: any[] }>({ list: [] }) +const enablePageData = ref(false) +const basePageData = ref(false) +const scrollTop = ref(0) +const current = ref(0) +const tabs = [ + { name: '全部商品' }, + { name: '分类查看' }, +] +const storeId = ref('') +const keyword = ref('') +const storeInfo = ref({}) +const isCollection = ref(false) +const goodsList = ref([]) +const couponList = ref([]) +const categoryList = ref([]) +const couponParams = reactive({ + pageNumber: 1, + pageSize: 50, + storeId: '', +}) +const goodsParams = reactive({ + pageNumber: 1, + pageSize: 10, + storeId: '', +}) + +const floorHasTopSearch = computed(() => { + const list = pageData.value && pageData.value.list + if (!list || !list.length) return false + return list.some((item, index) => item.type === 'search' && index !== 1) +}) + +watch(current, (val) => { + if (val == 0) { + goodsList.value = [] + getGoodsData() + } else { + getCategoryData() + } +}) + +function talk() { + talkIm(storeInfo.value.storeId) +} + +function back() { + const pages = getCurrentPages() + if (pages.length > 1) { + uni.navigateBack({ delta: 1 }) + } else { + uni.switchTab({ url: '/pages/tabbar/home/index' }) + } +} + +function isPageDataSuccess(payload: any) { + return payload?.success === true || payload?.code === 200 +} + +function shouldUseFloorPage(pageShow: unknown) { + return pageShow === '1' || pageShow === 1 || pageShow === true +} + +function initPageData() { + getFloorStoreData({ + pageType: 'STORE', + num: storeId.value, + }) + .then((res) => { + const payload = res?.data != null ? res.data : res + const result = payload?.result + const pageDataStr = result?.pageData + if (!isPageDataSuccess(payload) || !pageDataStr) { + fallbackToBasePage() + return + } + try { + const parsed = JSON.parse(pageDataStr) + if (parsed && Array.isArray(parsed.list)) { + parsed.list = parsed.list.filter((i: any) => !i?.hidden) + } + pageData.value = + parsed && Array.isArray(parsed.list) ? parsed : { list: [] } + enablePageData.value = pageData.value.list.length > 0 + if (!enablePageData.value) { + fallbackToBasePage() + } + } catch (e) { + fallbackToBasePage() + } + }) + .catch(() => { + fallbackToBasePage() + }) +} + +function fallbackToBasePage() { + enablePageData.value = false + basePageData.value = true + pageData.value = { list: [] } + getGoodsData() + getCategoryData() +} + +function applyStoreId(id) { + storeId.value = id || '' + goodsParams.storeId = storeId.value + couponParams.storeId = storeId.value +} + +function parseStoreIdFromParams(params) { + const text = String(params || '').trim() + if (!text) return '' + if (text.indexOf('id=') === 0) return text.slice(3) + const match = /(?:^|&)id=([^&]+)/.exec(text) + return match ? decodeURIComponent(match[1]) : '' +} + +async function resolveStoreIdFromScene(scene) { + const raw = decodeURIComponent(String(scene || '')).trim() + if (!raw) return '' + const direct = parseStoreIdFromParams(raw) + if (direct) return direct + try { + const res = await getMpScene(raw) + return parseStoreIdFromParams(res?.data?.result) + } catch { + return '' + } +} + +function getStoreLicencePhoto() { + uni.navigateTo({ + url: `/pages/product/licencePhoto?id=${storeId.value}`, + }) +} + +function init() { + goodsList.value = [] + categoryList.value = [] + couponList.value = [] + goodsParams.pageNumber = 1 + if (isLogin('auth')) { + enableGoodsIsCollect() + } + getStoreData() +} + +function linkKefuDetail() { + // 客服 + // #ifdef MP-WEIXIN + + const params = { + // originalPrice: goodsDetail.original || goodsDetail.price, + uuid: storage.getUuid(), + token: storage.getAccessToken(), + sign: storeInfo.value.yzfSign, + mpSign: storeInfo.value.yzfMpSign, + } + uni.navigateTo({ + url: '/pages/mine/im/index', + }) + // uni.navigateTo({ + // url: + // "/pages/product/customerservice/index?params=" + + // encodeURIComponent(JSON.stringify(params)), + // }); + // // #endif + // // #ifndef MP-WEIXIN + // const sign = storeInfo.yzfSign; + // uni.navigateTo({ + // url: + // "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" + + // sign, + // }); + // #endif +} + +async function getCategoryData() { + const res = await getStoreCategory(storeId.value) + if (res.data.success) { + categoryList.value = res.data.result + } +} + +async function enableGoodsIsCollect() { + const res = await getStoreIsCollect('STORE', storeId.value) + if (res.data.success) { + isCollection.value = res.data.result + } +} + +function getCategoryGoodsList(val: any) { + uni.navigateTo({ + url: `/pages/product/shopPageGoods?title=${val.labelName}&id=${val.id}&storeId=${storeId.value}`, + }) +} + +function goToSearch() { + uni.navigateTo({ + url: `/pages/navigation/search/searchPage?storeId=${storeId.value}&keyword=${keyword.value}`, + }) +} + +async function getStoreData() { + const res = await getStoreBaseInfo(storeId.value) + if (res.data.success) { + storeInfo.value = res.data.result + getCouponsData() + if (shouldUseFloorPage(res.data.result.pageShow)) { + initPageData() + } else { + getGoodsData() + getCategoryData() + basePageData.value = true + } + } else { + uni.reLaunch({ + url: '/', + }) + } +} + +async function getGoodsData() { + const res = await getGoodsList(goodsParams) + if (res.data.success) { + goodsList.value.push(...res.data.result.records) + } +} + +async function getCouponsData() { + couponParams.storeId = storeId.value + const res = await getAllCoupons(couponParams) + if (res.data.success) { + couponList.value.push(...res.data.result.records) + } +} + +function whetherCollection() { + if (isCollection.value) { + deleteStoreCollection(storeId.value).then((res) => { + if (res.data.success) { + isCollection.value = false + uni.showToast({ + icon: 'none', + duration: 3000, + title: '取消关注成功！', + }) + } + }) + } else { + collectionStore(storeId.value).then((res) => { + if (res.data.success) { + isCollection.value = true + uni.showToast({ + icon: 'none', + duration: 3000, + title: '关注成功！', + }) + } + }) + } +} + +function getCoupon(item: any) { + if (!isLogin('auth')) { + uni.showToast({ + icon: 'none', + duration: 3000, + title: '请先登录！', + }) + + navigateToLogin('redirectTo') + return false + } + receiveCoupons(item.id).then((res) => { + if (res.data.success) { + uni.showToast({ + icon: 'none', + duration: 3000, + title: '领取成功！', + }) + } + }) +} + +onLoad((options: any) => { + applyStoreId(options?.id) + if (!storeId.value && options?.scene) { + resolveStoreIdFromScene(options.scene).then((id) => { + if (!storeId.value && id) { + applyStoreId(id) + init() + } + }) + } +}) + +onPageScroll((e) => { + scrollTop.value = e.scrollTop +}) + +onPullDownRefresh(() => { + init() +}) + +onReachBottom(() => { + goodsParams.pageNumber++ + getGoodsData() +}) + +onMounted(() => { + // #ifdef MP-WEIXIN + uni.showShareMenu({ + withShareTicket: true, + }) + // #endif + if (storeId.value) init() +}) + + + diff --git a/static/exchange.png b/pages/product/static/exchange.png similarity index 100% rename from static/exchange.png rename to pages/product/static/exchange.png diff --git a/static/star.png b/pages/product/static/star.png similarity index 100% rename from static/star.png rename to pages/product/static/star.png diff --git a/pages/promotion/joinGroup.vue b/pages/promotion/joinGroup.vue index 8859e03..f33e6b4 100644 --- a/pages/promotion/joinGroup.vue +++ b/pages/promotion/joinGroup.vue @@ -27,7 +27,7 @@ - +
@@ -156,7 +156,7 @@ function GET_AssembleGoods() { } .header-wraper { - background: url('/static/bg.png') no-repeat center center; + background: url('/pages/promotion/static/bg.png') no-repeat center center; background-size: cover; height: 200rpx; display: flex; diff --git a/pages/promotion/point/user.vue b/pages/promotion/point/user.vue index fc3278e..424548c 100644 --- a/pages/promotion/point/user.vue +++ b/pages/promotion/point/user.vue @@ -32,7 +32,7 @@ async function init() { padding: 0 20rpx; height: 300rpx; flex-shrink: 0; - background: url("/static/point-bg.png") no-repeat; + background: url("/pages/promotion/static/point-bg.png") no-repeat; background-size: 100%; display: flex; align-items: center; diff --git a/pages/promotion/seckill.vue b/pages/promotion/seckill.vue index 6f5b62d..b78cc1a 100644 --- a/pages/promotion/seckill.vue +++ b/pages/promotion/seckill.vue @@ -9,7 +9,7 @@ @left-click="back" > - + @@ -176,7 +176,7 @@ function clickNavigateTime(type: number) { } .header-wraper { - background: url('/static/bg.png') no-repeat center center; + background: url('/pages/promotion/static/bg.png') no-repeat center center; background-size: cover; height: 200rpx; display: flex; diff --git a/static/bg.png b/pages/promotion/static/bg.png similarity index 100% rename from static/bg.png rename to pages/promotion/static/bg.png diff --git a/pages/promotion/static/head-sample.png b/pages/promotion/static/head-sample.png deleted file mode 100644 index 7b097a9..0000000 Binary files a/pages/promotion/static/head-sample.png and /dev/null differ diff --git a/static/join-buy.png b/pages/promotion/static/join-buy.png similarity index 100% rename from static/join-buy.png rename to pages/promotion/static/join-buy.png diff --git a/pages/promotion/static/live.png b/pages/promotion/static/live.png deleted file mode 100644 index d07cdae..0000000 Binary files a/pages/promotion/static/live.png and /dev/null differ diff --git a/static/point-bg.png b/pages/promotion/static/point-bg.png similarity index 100% rename from static/point-bg.png rename to pages/promotion/static/point-bg.png diff --git a/static/seckill.png b/pages/promotion/static/seckill.png similarity index 100% rename from static/seckill.png rename to pages/promotion/static/seckill.png diff --git a/pages/promotion/static/zan.gif b/pages/promotion/static/zan.gif deleted file mode 100644 index 043c721..0000000 Binary files a/pages/promotion/static/zan.gif and /dev/null differ diff --git a/pages/tabbar/home/index.vue b/pages/tabbar/home/index.vue index f65cc75..01621d3 100644 --- a/pages/tabbar/home/index.vue +++ b/pages/tabbar/home/index.vue @@ -1,208 +1,262 @@ - - - - - + + + + + diff --git a/pages/tabbar/home/template/fetch_coupon.vue b/pages/tabbar/home/template/fetch_coupon.vue index 2bcc0f6..85315ad 100644 --- a/pages/tabbar/home/template/fetch_coupon.vue +++ b/pages/tabbar/home/template/fetch_coupon.vue @@ -18,7 +18,7 @@ diff --git a/pages/tabbar/home/template/tpl.js b/pages/tabbar/home/template/tpl.js index 190f9e1..40b7e50 100644 --- a/pages/tabbar/home/template/tpl.js +++ b/pages/tabbar/home/template/tpl.js @@ -243,3 +243,35 @@ function seacnCode() { }, }); } + +/** 广告魔方各布局共用的样式字段（装修面板配置；老数据无字段时返回空对象，保持原样） */ +export function cubeWrapperStyle(res) { + if (!res || res.paddingTop === undefined) return {}; + const r = (v) => `${Number(v) || 0}rpx`; + const bg = + !res.bgColor2 || res.bgColor1 === res.bgColor2 + ? res.bgColor1 + : `linear-gradient(180deg, ${res.bgColor1}, ${res.bgColor2})`; + return { + padding: `${r(res.paddingTop)} ${r(res.paddingX)} ${r(res.paddingBottom)}`, + background: bg, + borderRadius: r(res.borderRadius), + marginBottom: r(res.pageGap), + overflow: Number(res.borderRadius) > 0 ? "hidden" : "visible", + }; +} + +/** 内容圆角（作用于单张图片容器） */ +export function cubeImgStyle(res) { + if (!res || res.imgRadius === undefined) return {}; + return { + borderRadius: `${Number(res.imgRadius) || 0}rpx`, + overflow: "hidden", + }; +} + +/** 内容间距（作用于图片布局容器，flex gap） */ +export function cubeGapStyle(res) { + if (!res || res.contentGap === undefined) return {}; + return { gap: `${Number(res.contentGap) || 0}rpx` }; +} diff --git a/pages/tabbar/home/template/tpl_article.vue b/pages/tabbar/home/template/tpl_article.vue new file mode 100644 index 0000000..97a2178 --- /dev/null +++ b/pages/tabbar/home/template/tpl_article.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/pages/tabbar/home/template/tpl_banner.vue b/pages/tabbar/home/template/tpl_banner.vue index 93b3f51..3b4a700 100644 --- a/pages/tabbar/home/template/tpl_banner.vue +++ b/pages/tabbar/home/template/tpl_banner.vue @@ -1,55 +1,190 @@ - - - - + + + + diff --git a/pages/tabbar/home/template/tpl_blank.vue b/pages/tabbar/home/template/tpl_blank.vue new file mode 100644 index 0000000..cd3984b --- /dev/null +++ b/pages/tabbar/home/template/tpl_blank.vue @@ -0,0 +1,24 @@ + + + diff --git a/pages/tabbar/home/template/tpl_coupon.vue b/pages/tabbar/home/template/tpl_coupon.vue new file mode 100644 index 0000000..32688a5 --- /dev/null +++ b/pages/tabbar/home/template/tpl_coupon.vue @@ -0,0 +1,511 @@ + + + + + diff --git a/pages/tabbar/home/template/tpl_flex_five.vue b/pages/tabbar/home/template/tpl_flex_five.vue index fb0db24..afd8214 100644 --- a/pages/tabbar/home/template/tpl_flex_five.vue +++ b/pages/tabbar/home/template/tpl_flex_five.vue @@ -1,16 +1,21 @@ \ No newline at end of file +.flex-img { + flex: 1; + min-width: 0; +} + diff --git a/pages/tabbar/home/template/tpl_flex_four.vue b/pages/tabbar/home/template/tpl_flex_four.vue index b166f78..791f571 100644 --- a/pages/tabbar/home/template/tpl_flex_four.vue +++ b/pages/tabbar/home/template/tpl_flex_four.vue @@ -1,24 +1,33 @@ \ No newline at end of file +.flex-img { + flex: 1; + min-width: 0; +} + diff --git a/pages/tabbar/home/template/tpl_flex_one.vue b/pages/tabbar/home/template/tpl_flex_one.vue index 992371e..d48c180 100644 --- a/pages/tabbar/home/template/tpl_flex_one.vue +++ b/pages/tabbar/home/template/tpl_flex_one.vue @@ -1,6 +1,6 @@