From 06b494b43816e3aad59f4e42004c0eaea233888b Mon Sep 17 00:00:00 2001
From: yovinchen <gzh298255@gmail.com>
Date: Thu, 21 Mar 2024 10:29:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/ApifoxUploaderProjectSetting.xml        |  17 +
 .idea/compiler.xml                            |   4 +
 .idea/dataSources.xml                         |  84 +++-
 .idea/encodings.xml                           |   1 +
 .idea/misc.xml                                |  12 +-
 .idea/qaplug_profiles.xml                     | 465 ++++++++++++++++++
 .../ServiceAclApplication.xml                 |   3 +-
 .../ServiceActivityApplication.xml            |   3 +-
 .../ServiceGatewayApplication.xml             |   3 +-
 .../ServicePaymentApplication.xml             |   3 +-
 .../ServiceUserApplication.xml                |   3 +-
 .idea/uiDesigner.xml                          | 124 +++++
 xlcs-user/.hbuilderx/launch.json              |  23 +-
 xlcs-user/common/http.api.js                  |  21 +-
 xlcs-user/common/http.interceptor.js          |   2 +-
 xlcs-user/pages/cart/cart.vue                 |  74 +--
 xlcs-user/pages/login/login.vue               |   2 +
 xlcs-user/pages/loginh5/loginh5.vue           | 166 +++++++
 xlcs-user/pages/my/my.vue                     |  23 +-
 xlcs-user/pages/register/register.vue         | 151 ++++++
 .../pagesOrder/confirmOrder/confirmOrder.vue  |  45 +-
 .../pagesOrder/getOrderInfo/getOrderInfo.vue  |  69 ++-
 xlcs-user/pagesOrder/orderList/orderList.vue  |  27 +-
 23 files changed, 1200 insertions(+), 125 deletions(-)
 create mode 100644 .idea/ApifoxUploaderProjectSetting.xml
 create mode 100644 .idea/qaplug_profiles.xml
 create mode 100644 .idea/uiDesigner.xml
 create mode 100644 xlcs-user/pages/loginh5/loginh5.vue
 create mode 100644 xlcs-user/pages/register/register.vue

diff --git a/.idea/ApifoxUploaderProjectSetting.xml b/.idea/ApifoxUploaderProjectSetting.xml
new file mode 100644
index 0000000..868ecc4
--- /dev/null
+++ b/.idea/ApifoxUploaderProjectSetting.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ApifoxUploaderProjectSetting">
+    <option name="apifoxAccessToken" value="APS-y8NhuBd6z9h1ywfr4nlGAmv9UrquLNKs" />
+    <option name="apifoxApiOverwriteMode" value="覆盖所有字段" />
+    <option name="newApifoxProjectIds">
+      <array>
+        <option value="&lt;byte-array&gt;rO0ABXNyADZjb20uaXRhbmdjZW50LmlkZWEucGx1Z2luLmFwaS5hY2NvdW50LlByb2plY3RBbmRNb2R1bGUAAAAAAAAAAQIAFVoABmVuYWJsZUwACG1vZHVsZUlkdAASTGphdmEvbGFuZy9TdHJpbmc7TAAGb3RoZXIxcQB+AAFMAAdvdGhlcjEwcQB+AAFMAAdvdGhlcjExcQB+AAFMAAdvdGhlcjEycQB+AAFMAAZvdGhlcjJxAH4AAUwABm90aGVyM3EAfgABTAAGb3RoZXI0cQB+AAFMAAZvdGhlcjVxAH4AAUwABm90aGVyNnEAfgABTAAGb3RoZXI3cQB+AAFMAAZvdGhlcjhxAH4AAUwABm90aGVyOXEAfgABTAAKcGF0aEJlZm9yZXEAfgABTAANcHJvamVjdEZvbGRlcnEAfgABTAAPcHJvamVjdEZvbGRlcklkcQB+AAFMAAlwcm9qZWN0SWRxAH4AAUwAC3Byb2plY3ROYW1lcQB+AAFMAAxzY2hlbWFGb2xkZXJxAH4AAUwACHNjaGVtYUlkcQB+AAF4cAF0AAtzZXJ2aWNlLWFjbHBwcHBwcHBwcHBwcHQAAHQACeagueebruW9lXQAATB0AAc0MDU0MDU0dAAM5bCP6bm/6LaF5biCcQB+AAVxAH4ABg==&lt;/byte-array&gt;" />
+        <option value="&lt;byte-array&gt;rO0ABXNyADZjb20uaXRhbmdjZW50LmlkZWEucGx1Z2luLmFwaS5hY2NvdW50LlByb2plY3RBbmRNb2R1bGUAAAAAAAAAAQIAFVoABmVuYWJsZUwACG1vZHVsZUlkdAASTGphdmEvbGFuZy9TdHJpbmc7TAAGb3RoZXIxcQB+AAFMAAdvdGhlcjEwcQB+AAFMAAdvdGhlcjExcQB+AAFMAAdvdGhlcjEycQB+AAFMAAZvdGhlcjJxAH4AAUwABm90aGVyM3EAfgABTAAGb3RoZXI0cQB+AAFMAAZvdGhlcjVxAH4AAUwABm90aGVyNnEAfgABTAAGb3RoZXI3cQB+AAFMAAZvdGhlcjhxAH4AAUwABm90aGVyOXEAfgABTAAKcGF0aEJlZm9yZXEAfgABTAANcHJvamVjdEZvbGRlcnEAfgABTAAPcHJvamVjdEZvbGRlcklkcQB+AAFMAAlwcm9qZWN0SWRxAH4AAUwAC3Byb2plY3ROYW1lcQB+AAFMAAxzY2hlbWFGb2xkZXJxAH4AAUwACHNjaGVtYUlkcQB+AAF4cAF0AAxzZXJ2aWNlLXVzZXJwcHBwcHBwcHBwcHB0AAB0AAnmoLnnm67lvZV0AAEwdAAHNDA1NDA1NHQADOWwj+m5v+i2heW4gnEAfgAFcQB+AAY=&lt;/byte-array&gt;" />
+        <option value="&lt;byte-array&gt;rO0ABXNyADZjb20uaXRhbmdjZW50LmlkZWEucGx1Z2luLmFwaS5hY2NvdW50LlByb2plY3RBbmRNb2R1bGUAAAAAAAAAAQIAFVoABmVuYWJsZUwACG1vZHVsZUlkdAASTGphdmEvbGFuZy9TdHJpbmc7TAAGb3RoZXIxcQB+AAFMAAdvdGhlcjEwcQB+AAFMAAdvdGhlcjExcQB+AAFMAAdvdGhlcjEycQB+AAFMAAZvdGhlcjJxAH4AAUwABm90aGVyM3EAfgABTAAGb3RoZXI0cQB+AAFMAAZvdGhlcjVxAH4AAUwABm90aGVyNnEAfgABTAAGb3RoZXI3cQB+AAFMAAZvdGhlcjhxAH4AAUwABm90aGVyOXEAfgABTAAKcGF0aEJlZm9yZXEAfgABTAANcHJvamVjdEZvbGRlcnEAfgABTAAPcHJvamVjdEZvbGRlcklkcQB+AAFMAAlwcm9qZWN0SWRxAH4AAUwAC3Byb2plY3ROYW1lcQB+AAFMAAxzY2hlbWFGb2xkZXJxAH4AAUwACHNjaGVtYUlkcQB+AAF4cAF0AA9zZXJ2aWNlLXBheW1lbnRwcHBwcHBwcHBwcHB0AAB0AAdwYXltZW50dAAIMjk0MzYxNjh0AAc0MDU0MDU0dAAM5bCP6bm/6LaF5biCdAAJ5qC555uu5b2VdAABMA==&lt;/byte-array&gt;" />
+      </array>
+    </option>
+    <option name="treeNodes" value="&lt;byte-array&gt;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&lt;/byte-array&gt;" />
+    <option name="treeNodesJTree" value="&lt;byte-array&gt;rO0ABXNyACFqYXZheC5zd2luZy50cmVlLkRlZmF1bHRUcmVlTW9kZWynvpEmGsXl2QMAA1oAEmFza3NBbGxvd3NDaGlsZHJlbkwADGxpc3RlbmVyTGlzdHQAJUxqYXZheC9zd2luZy9ldmVudC9FdmVudExpc3RlbmVyTGlzdDtMAARyb290dAAbTGphdmF4L3N3aW5nL3RyZWUvVHJlZU5vZGU7eHAAc3IAI2phdmF4LnN3aW5nLmV2ZW50LkV2ZW50TGlzdGVuZXJMaXN0kUjMLXPfDt4DAAB4cHB4c3IAJ2phdmF4LnN3aW5nLnRyZWUuRGVmYXVsdE11dGFibGVUcmVlTm9kZcRYv/zyqHHgAwADWgAOYWxsb3dzQ2hpbGRyZW5MAAhjaGlsZHJlbnQAEkxqYXZhL3V0aWwvVmVjdG9yO0wABnBhcmVudHQAIkxqYXZheC9zd2luZy90cmVlL011dGFibGVUcmVlTm9kZTt4cAFzcgAQamF2YS51dGlsLlZlY3RvctmXfVuAO68BAwADSQARY2FwYWNpdHlJbmNyZW1lbnRJAAxlbGVtZW50Q291bnRbAAtlbGVtZW50RGF0YXQAE1tMamF2YS9sYW5nL09iamVjdDt4cAAAAAAAAAACdXIAE1tMamF2YS5sYW5nLk9iamVjdDuQzlifEHMpbAIAAHhwAAAACnNxAH4ABgFzcQB+AAoAAAAAAAAAB3VxAH4ADQAAAApzcQB+AAYBcHEAfgAPdXEAfgANAAAAAnQACnVzZXJPYmplY3RzcgAuY29tLml0YW5nY2VudC5pZGVhLnBsdWdpbi5hcGkuYWNjb3VudC5UcmVlTm9kZQAAAAAAAAABAgALTAAHYWxsUGF0aHQAEkxqYXZhL2xhbmcvU3RyaW5nO0wACGNoaWxkcmVudAAPTGphdmEvdXRpbC9NYXA7TAAIZnVsbFBhdGhxAH4AFkwAA2tleXEAfgAWTAAEbmFtZXEAfgAWTAAIcGFyZW50SWRxAH4AFkwACXByb2plY3RJZHEAfgAWTAALcHJvamVjdE5hbWVxAH4AFkwABnRlYW1JZHEAfgAWTAAIdGVhbU5hbWVxAH4AFkwABHR5cGV0ADBMY29tL2l0YW5nY2VudC9pZGVhL3BsdWdpbi9hcGkvYWNjb3VudC9Ob2RlVHlwZTt4cHQAF+ek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&lt;/byte-array&gt;" />
+    <option name="yapiTokens" value="" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index c06f7eb..0090167 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -30,6 +30,9 @@
         <module name="service-payment" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="service-doc" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
@@ -41,6 +44,7 @@
       <module name="service-activity-client" options="-parameters" />
       <module name="service-cart" options="-parameters" />
       <module name="service-cart-client" options="-parameters" />
+      <module name="service-doc" options="-parameters" />
       <module name="service-gateway" options="-parameters" />
       <module name="service-home" options="-parameters" />
       <module name="service-order" options="-parameters" />
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index fbd6cdb..76205e9 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -15,5 +15,87 @@
       </jdbc-additional-properties>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
+    <data-source source="LOCAL" name="shequ-user" uuid="d1bd1059-c819-49c4-aa9a-07beec0beb9b">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>权限表</remarks>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://82.157.68.223:3306/shequ-user</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="shequ-acl" uuid="a09f33a1-ada6-4824-9596-c3b490c80b64">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>权限表</remarks>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://82.157.68.223:3306/shequ-acl</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="shequ-sys" uuid="c68f52b6-a34c-4f7b-bfdb-7fbb226511d9">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>权限表</remarks>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://82.157.68.223:3306/shequ-sys</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="shequ-activity" uuid="03a3ad56-5ab1-4715-9d6a-2254cf6995ff">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>权限表</remarks>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://82.157.68.223:3306/shequ-activity</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="shequ-product" uuid="0764afd5-6fdc-443b-8be1-692808c3afd5">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>权限表</remarks>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://82.157.68.223:3306</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="Redis" uuid="5578efaa-9845-4abb-98c9-afdc8aa74f28">
+      <driver-ref>redis</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>jdbc.RedisDriver</jdbc-driver>
+      <jdbc-url>jdbc:redis://192.168.31.67:6379/0</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index f3439dd..65d3203 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -15,6 +15,7 @@
     <file url="file://$PROJECT_DIR$/xlcs-parent/service-client/service-user-client/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/xlcs-parent/service-client/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/xlcs-parent/service-client/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/xlcs-parent/service-doc/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/xlcs-parent/service-gateway/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/xlcs-parent/service/service-acl/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/xlcs-parent/service/service-activity/src/main/java" charset="UTF-8" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 98f644b..65bc734 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="AnalysisProjectProfileManager">
-    <option name="PROJECT_PROFILE" />
-    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
-    <list size="0" />
-  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FindBugsConfigurable">
+    <option name="make" value="true" />
+    <option name="effort" value="default" />
+    <option name="priority" value="Medium" />
+    <option name="excludeFilter" value="" />
+  </component>
   <component name="JavaDocConfiguration">
     <GENERAL>
       <MODE>UPDATE</MODE>
@@ -213,7 +214,6 @@
         <option value="$PROJECT_DIR$/xlcs-parent/pom.xml" />
       </list>
     </option>
-    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
diff --git a/.idea/qaplug_profiles.xml b/.idea/qaplug_profiles.xml
new file mode 100644
index 0000000..3dfd21f
--- /dev/null
+++ b/.idea/qaplug_profiles.xml
@@ -0,0 +1,465 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AnalysisProjectProfileManager">
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+    <scopes />
+    <profiles>
+      <profile profile_name="Project Default" version="1.0" is_locked="false">
+        <coding_rule class="AM_CREATES_EMPTY_JAR_FILE_ENTRY" level="MAJOR" enabled="true" />
+        <coding_rule class="AM_CREATES_EMPTY_ZIP_FILE_ENTRY" level="MAJOR" enabled="true" />
+        <coding_rule class="AT_OPERATION_SEQUENCE_ON_CONCURRENT_ABSTRACTION" level="CRITICAL" enabled="false" />
+        <coding_rule class="BAC_BAD_APPLET_CONSTRUCTOR" level="MAJOR" enabled="false" />
+        <coding_rule class="BC_BAD_CAST_TO_ABSTRACT_COLLECTION" level="MAJOR" enabled="true" />
+        <coding_rule class="BC_BAD_CAST_TO_CONCRETE_COLLECTION" level="CRITICAL" enabled="true" />
+        <coding_rule class="BC_EQUALS_METHOD_SHOULD_WORK_FOR_ALL_OBJECTS" level="CRITICAL" enabled="true" />
+        <coding_rule class="BC_IMPOSSIBLE_CAST" level="BLOCKER" enabled="true" />
+        <coding_rule class="BC_IMPOSSIBLE_DOWNCAST" level="MAJOR" enabled="false" />
+        <coding_rule class="BC_IMPOSSIBLE_DOWNCAST_OF_TOARRAY" level="MAJOR" enabled="false" />
+        <coding_rule class="BC_IMPOSSIBLE_INSTANCEOF" level="CRITICAL" enabled="true" />
+        <coding_rule class="BC_UNCONFIRMED_CAST" level="CRITICAL" enabled="true" />
+        <coding_rule class="BC_UNCONFIRMED_CAST_OF_RETURN_VALUE" level="CRITICAL" enabled="false" />
+        <coding_rule class="BC_VACUOUS_INSTANCEOF" level="CRITICAL" enabled="true" />
+        <coding_rule class="BIT_ADD_OF_SIGNED_BYTE" level="CRITICAL" enabled="true" />
+        <coding_rule class="BIT_AND" level="CRITICAL" enabled="true" />
+        <coding_rule class="BIT_AND_ZZ" level="CRITICAL" enabled="true" />
+        <coding_rule class="BIT_IOR" level="CRITICAL" enabled="true" />
+        <coding_rule class="BIT_IOR_OF_SIGNED_BYTE" level="CRITICAL" enabled="true" />
+        <coding_rule class="BIT_SIGNED_CHECK" level="CRITICAL" enabled="true" />
+        <coding_rule class="BIT_SIGNED_CHECK_HIGH_BIT" level="CRITICAL" enabled="true" />
+        <coding_rule class="BOA_BADLY_OVERRIDDEN_ADAPTER" level="CRITICAL" enabled="true" />
+        <coding_rule class="BSHIFT_WRONG_ADD_PRIORITY" level="MAJOR" enabled="false" />
+        <coding_rule class="BX_BOXING_IMMEDIATELY_UNBOXED" level="MAJOR" enabled="true" />
+        <coding_rule class="BX_BOXING_IMMEDIATELY_UNBOXED_TO_PERFORM_COERCION" level="MAJOR" enabled="true" />
+        <coding_rule class="BX_UNBOXED_AND_COERCED_FOR_TERNARY_OPERATOR" level="MAJOR" enabled="true" />
+        <coding_rule class="BX_UNBOXING_IMMEDIATELY_REBOXED" level="CRITICAL" enabled="false" />
+        <coding_rule class="CAA_COVARIANT_ARRAY_ELEMENT_STORE" level="MAJOR" enabled="false" />
+        <coding_rule class="CAA_COVARIANT_ARRAY_FIELD" level="MAJOR" enabled="false" />
+        <coding_rule class="CAA_COVARIANT_ARRAY_LOCAL" level="MAJOR" enabled="false" />
+        <coding_rule class="CAA_COVARIANT_ARRAY_RETURN" level="MAJOR" enabled="false" />
+        <coding_rule class="CD_CIRCULAR_DEPENDENCY" level="MAJOR" enabled="false" />
+        <coding_rule class="CI_CONFUSED_INHERITANCE" level="MINOR" enabled="true" />
+        <coding_rule class="CNT_ROUGH_CONSTANT_VALUE" level="MAJOR" enabled="false" />
+        <coding_rule class="CN_IDIOM" level="MAJOR" enabled="true" />
+        <coding_rule class="CN_IDIOM_NO_SUPER_CALL" level="MAJOR" enabled="true" />
+        <coding_rule class="CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE" level="MAJOR" enabled="true" />
+        <coding_rule class="CO_ABSTRACT_SELF" level="MAJOR" enabled="true" />
+        <coding_rule class="CO_COMPARETO_INCORRECT_FLOATING" level="MAJOR" enabled="false" />
+        <coding_rule class="CO_COMPARETO_RESULTS_MIN_VALUE" level="CRITICAL" enabled="false" />
+        <coding_rule class="CO_SELF_NO_OBJECT" level="MAJOR" enabled="true" />
+        <coding_rule class="DB_DUPLICATE_BRANCHES" level="CRITICAL" enabled="true" />
+        <coding_rule class="DB_DUPLICATE_SWITCH_CLAUSES" level="CRITICAL" enabled="true" />
+        <coding_rule class="DC_DOUBLECHECK" level="MAJOR" enabled="true" />
+        <coding_rule class="DC_PARTIALLY_CONSTRUCTED" level="MAJOR" enabled="false" />
+        <coding_rule class="DE_MIGHT_DROP" level="MAJOR" enabled="true" />
+        <coding_rule class="DE_MIGHT_IGNORE" level="MAJOR" enabled="true" />
+        <coding_rule class="DLS_DEAD_LOCAL_INCREMENT_IN_RETURN" level="MAJOR" enabled="false" />
+        <coding_rule class="DLS_DEAD_LOCAL_STORE" level="CRITICAL" enabled="true" />
+        <coding_rule class="DLS_DEAD_LOCAL_STORE_IN_RETURN" level="CRITICAL" enabled="true" />
+        <coding_rule class="DLS_DEAD_LOCAL_STORE_OF_NULL" level="CRITICAL" enabled="true" />
+        <coding_rule class="DLS_DEAD_LOCAL_STORE_SHADOWS_FIELD" level="CRITICAL" enabled="false" />
+        <coding_rule class="DLS_DEAD_STORE_OF_CLASS_LITERAL" level="CRITICAL" enabled="true" />
+        <coding_rule class="DLS_OVERWRITTEN_INCREMENT" level="CRITICAL" enabled="true" />
+        <coding_rule class="DL_SYNCHRONIZATION_ON_BOOLEAN" level="CRITICAL" enabled="true" />
+        <coding_rule class="DL_SYNCHRONIZATION_ON_BOXED_PRIMITIVE" level="CRITICAL" enabled="true" />
+        <coding_rule class="DL_SYNCHRONIZATION_ON_SHARED_CONSTANT" level="CRITICAL" enabled="true" />
+        <coding_rule class="DL_SYNCHRONIZATION_ON_UNSHARED_BOXED_PRIMITIVE" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_ANNOTATION_IS_NOT_VISIBLE_TO_REFLECTION" level="MAJOR" enabled="true" />
+        <coding_rule class="DMI_ARGUMENTS_WRONG_ORDER" level="CRITICAL" enabled="false" />
+        <coding_rule class="DMI_BAD_MONTH" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_BIGDECIMAL_CONSTRUCTED_FROM_DOUBLE" level="CRITICAL" enabled="false" />
+        <coding_rule class="DMI_BLOCKING_METHODS_ON_URL" level="BLOCKER" enabled="true" />
+        <coding_rule class="DMI_CALLING_NEXT_FROM_HASNEXT" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_COLLECTIONS_SHOULD_NOT_CONTAIN_THEMSELVES" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_COLLECTION_OF_URLS" level="BLOCKER" enabled="true" />
+        <coding_rule class="DMI_CONSTANT_DB_PASSWORD" level="BLOCKER" enabled="true" />
+        <coding_rule class="DMI_DOH" level="CRITICAL" enabled="false" />
+        <coding_rule class="DMI_EMPTY_DB_PASSWORD" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_ENTRY_SETS_MAY_REUSE_ENTRY_OBJECTS" level="CRITICAL" enabled="false" />
+        <coding_rule class="DMI_FUTILE_ATTEMPT_TO_CHANGE_MAXPOOL_SIZE_OF_SCHEDULED_THREAD_POOL_EXECUTOR" level="MINOR" enabled="true" />
+        <coding_rule class="DMI_HARDCODED_ABSOLUTE_FILENAME" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_INVOKING_HASHCODE_ON_ARRAY" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_INVOKING_TOSTRING_ON_ANONYMOUS_ARRAY" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_INVOKING_TOSTRING_ON_ARRAY" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_LONG_BITS_TO_DOUBLE_INVOKED_ON_INT" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_NONSERIALIZABLE_OBJECT_WRITTEN" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_RANDOM_USED_ONLY_ONCE" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_SCHEDULED_THREAD_POOL_EXECUTOR_WITH_ZERO_CORE_THREADS" level="MINOR" enabled="true" />
+        <coding_rule class="DMI_THREAD_PASSED_WHERE_RUNNABLE_EXPECTED" level="MAJOR" enabled="true" />
+        <coding_rule class="DMI_UNSUPPORTED_METHOD" level="MAJOR" enabled="true" />
+        <coding_rule class="DMI_USELESS_SUBSTRING" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_USING_REMOVEALL_TO_CLEAR_COLLECTION" level="CRITICAL" enabled="true" />
+        <coding_rule class="DMI_VACUOUS_CALL_TO_EASYMOCK_METHOD" level="MINOR" enabled="true" />
+        <coding_rule class="DMI_VACUOUS_SELF_COLLECTION_CALL" level="CRITICAL" enabled="true" />
+        <coding_rule class="DM_BOOLEAN_CTOR" level="MAJOR" enabled="true" />
+        <coding_rule class="DM_BOXED_PRIMITIVE_FOR_COMPARE" level="MAJOR" enabled="false" />
+        <coding_rule class="DM_BOXED_PRIMITIVE_FOR_PARSING" level="MAJOR" enabled="false" />
+        <coding_rule class="DM_BOXED_PRIMITIVE_TOSTRING" level="MAJOR" enabled="true" />
+        <coding_rule class="DM_CONVERT_CASE" level="INFO" enabled="true" />
+        <coding_rule class="DM_DEFAULT_ENCODING" level="CRITICAL" enabled="false" />
+        <coding_rule class="DM_EXIT" level="MAJOR" enabled="true" />
+        <coding_rule class="DM_FP_NUMBER_CTOR" level="MAJOR" enabled="true" />
+        <coding_rule class="DM_GC" level="MAJOR" enabled="true" />
+        <coding_rule class="DM_INVALID_MIN_MAX" level="MAJOR" enabled="false" />
+        <coding_rule class="DM_MONITOR_WAIT_ON_CONDITION" level="MAJOR" enabled="true" />
+        <coding_rule class="DM_NEW_FOR_GETCLASS" level="MAJOR" enabled="true" />
+        <coding_rule class="DM_NEXTINT_VIA_NEXTDOUBLE" level="MAJOR" enabled="true" />
+        <coding_rule class="DM_NUMBER_CTOR" level="CRITICAL" enabled="true" />
+        <coding_rule class="DM_RUN_FINALIZERS_ON_EXIT" level="MAJOR" enabled="true" />
+        <coding_rule class="DM_STRING_CTOR" level="MAJOR" enabled="true" />
+        <coding_rule class="DM_STRING_TOSTRING" level="INFO" enabled="true" />
+        <coding_rule class="DM_STRING_VOID_CTOR" level="MAJOR" enabled="true" />
+        <coding_rule class="DM_USELESS_THREAD" level="MAJOR" enabled="true" />
+        <coding_rule class="DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED" level="MAJOR" enabled="true" />
+        <coding_rule class="DP_DO_INSIDE_DO_PRIVILEGED" level="MAJOR" enabled="true" />
+        <coding_rule class="EC_ARRAY_AND_NONARRAY" level="CRITICAL" enabled="true" />
+        <coding_rule class="EC_BAD_ARRAY_COMPARE" level="CRITICAL" enabled="true" />
+        <coding_rule class="EC_INCOMPATIBLE_ARRAY_COMPARE" level="MAJOR" enabled="false" />
+        <coding_rule class="EC_NULL_ARG" level="CRITICAL" enabled="true" />
+        <coding_rule class="EC_UNRELATED_CLASS_AND_INTERFACE" level="CRITICAL" enabled="true" />
+        <coding_rule class="EC_UNRELATED_INTERFACES" level="CRITICAL" enabled="true" />
+        <coding_rule class="EC_UNRELATED_TYPES" level="CRITICAL" enabled="true" />
+        <coding_rule class="EC_UNRELATED_TYPES_USING_POINTER_EQUALITY" level="CRITICAL" enabled="true" />
+        <coding_rule class="EI_EXPOSE_REP" level="MAJOR" enabled="true" />
+        <coding_rule class="EI_EXPOSE_REP2" level="MAJOR" enabled="true" />
+        <coding_rule class="EI_EXPOSE_STATIC_REP2" level="MAJOR" enabled="true" />
+        <coding_rule class="EQ_ABSTRACT_SELF" level="MAJOR" enabled="true" />
+        <coding_rule class="EQ_ALWAYS_FALSE" level="BLOCKER" enabled="true" />
+        <coding_rule class="EQ_ALWAYS_TRUE" level="BLOCKER" enabled="true" />
+        <coding_rule class="EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS" level="MAJOR" enabled="true" />
+        <coding_rule class="EQ_COMPARETO_USE_OBJECT_EQUALS" level="CRITICAL" enabled="true" />
+        <coding_rule class="EQ_COMPARING_CLASS_NAMES" level="MAJOR" enabled="true" />
+        <coding_rule class="EQ_DOESNT_OVERRIDE_EQUALS" level="MAJOR" enabled="false" />
+        <coding_rule class="EQ_DONT_DEFINE_EQUALS_FOR_ENUM" level="MAJOR" enabled="true" />
+        <coding_rule class="EQ_GETCLASS_AND_CLASS_CONSTANT" level="CRITICAL" enabled="true" />
+        <coding_rule class="EQ_OTHER_NO_OBJECT" level="MAJOR" enabled="true" />
+        <coding_rule class="EQ_OTHER_USE_OBJECT" level="MAJOR" enabled="true" />
+        <coding_rule class="EQ_OVERRIDING_EQUALS_NOT_SYMMETRIC" level="MAJOR" enabled="true" />
+        <coding_rule class="EQ_SELF_NO_OBJECT" level="MAJOR" enabled="true" />
+        <coding_rule class="EQ_SELF_USE_OBJECT" level="MAJOR" enabled="true" />
+        <coding_rule class="EQ_UNUSUAL" level="MINOR" enabled="true" />
+        <coding_rule class="ES_COMPARING_PARAMETER_STRING_WITH_EQ" level="MAJOR" enabled="true" />
+        <coding_rule class="ES_COMPARING_STRINGS_WITH_EQ" level="MAJOR" enabled="true" />
+        <coding_rule class="ESync_EMPTY_SYNC" level="MAJOR" enabled="true" />
+        <coding_rule class="FB_MISSING_EXPECTED_WARNING" level="CRITICAL" enabled="false" />
+        <coding_rule class="FB_UNEXPECTED_WARNING" level="CRITICAL" enabled="false" />
+        <coding_rule class="FE_FLOATING_POINT_EQUALITY" level="CRITICAL" enabled="true" />
+        <coding_rule class="FE_TEST_IF_EQUAL_TO_NOT_A_NUMBER" level="CRITICAL" enabled="true" />
+        <coding_rule class="FI_EMPTY" level="MAJOR" enabled="true" />
+        <coding_rule class="FI_EXPLICIT_INVOCATION" level="MAJOR" enabled="true" />
+        <coding_rule class="FI_FINALIZER_NULLS_FIELDS" level="MAJOR" enabled="true" />
+        <coding_rule class="FI_FINALIZER_ONLY_NULLS_FIELDS" level="MAJOR" enabled="true" />
+        <coding_rule class="FI_MISSING_SUPER_CALL" level="MAJOR" enabled="true" />
+        <coding_rule class="FI_NULLIFY_SUPER" level="CRITICAL" enabled="true" />
+        <coding_rule class="FI_PUBLIC_SHOULD_BE_PROTECTED" level="MAJOR" enabled="true" />
+        <coding_rule class="FI_USELESS" level="MINOR" enabled="true" />
+        <coding_rule class="FL_MATH_USING_FLOAT_PRECISION" level="CRITICAL" enabled="true" />
+        <coding_rule class="GC_UNCHECKED_TYPE_IN_GENERIC_CALL" level="CRITICAL" enabled="true" />
+        <coding_rule class="GC_UNRELATED_TYPES" level="CRITICAL" enabled="true" />
+        <coding_rule class="HE_EQUALS_NO_HASHCODE" level="MAJOR" enabled="true" />
+        <coding_rule class="HE_EQUALS_USE_HASHCODE" level="CRITICAL" enabled="true" />
+        <coding_rule class="HE_HASHCODE_NO_EQUALS" level="CRITICAL" enabled="true" />
+        <coding_rule class="HE_HASHCODE_USE_OBJECT_EQUALS" level="CRITICAL" enabled="true" />
+        <coding_rule class="HE_INHERITS_EQUALS_USE_HASHCODE" level="CRITICAL" enabled="true" />
+        <coding_rule class="HE_SIGNATURE_DECLARES_HASHING_OF_UNHASHABLE_CLASS" level="CRITICAL" enabled="true" />
+        <coding_rule class="HE_USE_OF_UNHASHABLE_CLASS" level="CRITICAL" enabled="true" />
+        <coding_rule class="HRS_REQUEST_PARAMETER_TO_COOKIE" level="MAJOR" enabled="true" />
+        <coding_rule class="HRS_REQUEST_PARAMETER_TO_HTTP_HEADER" level="MAJOR" enabled="true" />
+        <coding_rule class="HSC_HUGE_SHARED_STRING_CONSTANT" level="CRITICAL" enabled="true" />
+        <coding_rule class="IA_AMBIGUOUS_INVOCATION_OF_INHERITED_OR_OUTER_METHOD" level="MAJOR" enabled="true" />
+        <coding_rule class="ICAST_BAD_SHIFT_AMOUNT" level="CRITICAL" enabled="true" />
+        <coding_rule class="ICAST_IDIV_CAST_TO_DOUBLE" level="CRITICAL" enabled="true" />
+        <coding_rule class="ICAST_INTEGER_MULTIPLY_CAST_TO_LONG" level="CRITICAL" enabled="true" />
+        <coding_rule class="ICAST_INT_2_LONG_AS_INSTANT" level="CRITICAL" enabled="false" />
+        <coding_rule class="ICAST_INT_CAST_TO_DOUBLE_PASSED_TO_CEIL" level="CRITICAL" enabled="true" />
+        <coding_rule class="ICAST_INT_CAST_TO_FLOAT_PASSED_TO_ROUND" level="CRITICAL" enabled="true" />
+        <coding_rule class="ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT" level="CRITICAL" enabled="true" />
+        <coding_rule class="IC_INIT_CIRCULARITY" level="CRITICAL" enabled="true" />
+        <coding_rule class="IC_SUPERCLASS_USES_SUBCLASS_DURING_INITIALIZATION" level="MAJOR" enabled="true" />
+        <coding_rule class="IIL_ELEMENTS_GET_LENGTH_IN_LOOP" level="MAJOR" enabled="false" />
+        <coding_rule class="IIL_PATTERN_COMPILE_IN_LOOP" level="MAJOR" enabled="false" />
+        <coding_rule class="IIL_PATTERN_COMPILE_IN_LOOP_INDIRECT" level="MAJOR" enabled="false" />
+        <coding_rule class="IIL_PREPARE_STATEMENT_IN_LOOP" level="MAJOR" enabled="false" />
+        <coding_rule class="IIO_INEFFICIENT_INDEX_OF" level="MAJOR" enabled="false" />
+        <coding_rule class="IIO_INEFFICIENT_LAST_INDEX_OF" level="MAJOR" enabled="false" />
+        <coding_rule class="IJU_ASSERT_METHOD_INVOKED_FROM_RUN_METHOD" level="CRITICAL" enabled="true" />
+        <coding_rule class="IJU_BAD_SUITE_METHOD" level="CRITICAL" enabled="true" />
+        <coding_rule class="IJU_NO_TESTS" level="CRITICAL" enabled="true" />
+        <coding_rule class="IJU_SETUP_NO_SUPER" level="CRITICAL" enabled="true" />
+        <coding_rule class="IJU_SUITE_NOT_STATIC" level="CRITICAL" enabled="true" />
+        <coding_rule class="IJU_TEARDOWN_NO_SUPER" level="CRITICAL" enabled="true" />
+        <coding_rule class="IL_CONTAINER_ADDED_TO_ITSELF" level="CRITICAL" enabled="true" />
+        <coding_rule class="IL_INFINITE_LOOP" level="CRITICAL" enabled="true" />
+        <coding_rule class="IL_INFINITE_RECURSIVE_LOOP" level="CRITICAL" enabled="true" />
+        <coding_rule class="IMA_INEFFICIENT_MEMBER_ACCESS" level="MAJOR" enabled="false" />
+        <coding_rule class="IMSE_DONT_CATCH_IMSE" level="MAJOR" enabled="true" />
+        <coding_rule class="IM_AVERAGE_COMPUTATION_COULD_OVERFLOW" level="CRITICAL" enabled="true" />
+        <coding_rule class="IM_BAD_CHECK_FOR_ODD" level="CRITICAL" enabled="true" />
+        <coding_rule class="IM_MULTIPLYING_RESULT_OF_IREM" level="CRITICAL" enabled="true" />
+        <coding_rule class="INT_BAD_COMPARISON_WITH_INT_VALUE" level="CRITICAL" enabled="false" />
+        <coding_rule class="INT_BAD_COMPARISON_WITH_NONNEGATIVE_VALUE" level="CRITICAL" enabled="true" />
+        <coding_rule class="INT_BAD_COMPARISON_WITH_SIGNED_BYTE" level="CRITICAL" enabled="true" />
+        <coding_rule class="INT_BAD_REM_BY_1" level="CRITICAL" enabled="true" />
+        <coding_rule class="INT_VACUOUS_BIT_OPERATION" level="CRITICAL" enabled="true" />
+        <coding_rule class="INT_VACUOUS_COMPARISON" level="CRITICAL" enabled="true" />
+        <coding_rule class="IO_APPENDING_TO_OBJECT_OUTPUT_STREAM" level="CRITICAL" enabled="true" />
+        <coding_rule class="IP_PARAMETER_IS_DEAD_BUT_OVERWRITTEN" level="CRITICAL" enabled="true" />
+        <coding_rule class="IS2_INCONSISTENT_SYNC" level="CRITICAL" enabled="true" />
+        <coding_rule class="ISC_INSTANTIATE_STATIC_CLASS" level="MAJOR" enabled="true" />
+        <coding_rule class="IS_FIELD_NOT_GUARDED" level="CRITICAL" enabled="true" />
+        <coding_rule class="ITA_INEFFICIENT_TO_ARRAY" level="CRITICAL" enabled="true" />
+        <coding_rule class="IT_NO_SUCH_ELEMENT" level="MINOR" enabled="true" />
+        <coding_rule class="J2EE_STORE_OF_NON_SERIALIZABLE_OBJECT_INTO_SESSION" level="CRITICAL" enabled="true" />
+        <coding_rule class="JCIP_FIELD_ISNT_FINAL_IN_IMMUTABLE_CLASS" level="MINOR" enabled="true" />
+        <coding_rule class="JLM_JSR166_LOCK_MONITORENTER" level="CRITICAL" enabled="true" />
+        <coding_rule class="JLM_JSR166_UTILCONCURRENT_MONITORENTER" level="CRITICAL" enabled="false" />
+        <coding_rule class="JML_JSR166_CALLING_WAIT_RATHER_THAN_AWAIT" level="CRITICAL" enabled="false" />
+        <coding_rule class="LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE" level="MAJOR" enabled="false" />
+        <coding_rule class="LI_LAZY_INIT_STATIC" level="CRITICAL" enabled="true" />
+        <coding_rule class="LI_LAZY_INIT_UPDATE_STATIC" level="CRITICAL" enabled="true" />
+        <coding_rule class="ME_ENUM_FIELD_SETTER" level="MAJOR" enabled="false" />
+        <coding_rule class="ME_MUTABLE_ENUM_FIELD" level="MAJOR" enabled="false" />
+        <coding_rule class="MF_CLASS_MASKS_FIELD" level="MAJOR" enabled="true" />
+        <coding_rule class="MF_METHOD_MASKS_FIELD" level="MAJOR" enabled="true" />
+        <coding_rule class="ML_SYNC_ON_FIELD_TO_GUARD_CHANGING_THAT_FIELD" level="MAJOR" enabled="true" />
+        <coding_rule class="ML_SYNC_ON_UPDATED_FIELD" level="MAJOR" enabled="true" />
+        <coding_rule class="MSF_MUTABLE_SERVLET_FIELD" level="MAJOR" enabled="true" />
+        <coding_rule class="MS_CANNOT_BE_FINAL" level="MAJOR" enabled="true" />
+        <coding_rule class="MS_EXPOSE_REP" level="CRITICAL" enabled="true" />
+        <coding_rule class="MS_FINAL_PKGPROTECT" level="MAJOR" enabled="true" />
+        <coding_rule class="MS_MUTABLE_ARRAY" level="MAJOR" enabled="true" />
+        <coding_rule class="MS_MUTABLE_COLLECTION" level="MAJOR" enabled="false" />
+        <coding_rule class="MS_MUTABLE_COLLECTION_PKGPROTECT" level="MAJOR" enabled="false" />
+        <coding_rule class="MS_MUTABLE_HASHTABLE" level="MAJOR" enabled="true" />
+        <coding_rule class="MS_OOI_PKGPROTECT" level="MAJOR" enabled="true" />
+        <coding_rule class="MS_PKGPROTECT" level="MAJOR" enabled="true" />
+        <coding_rule class="MS_SHOULD_BE_FINAL" level="MAJOR" enabled="true" />
+        <coding_rule class="MS_SHOULD_BE_REFACTORED_TO_BE_FINAL" level="CRITICAL" enabled="false" />
+        <coding_rule class="MTIA_SUSPECT_SERVLET_INSTANCE_FIELD" level="CRITICAL" enabled="true" />
+        <coding_rule class="MTIA_SUSPECT_STRUTS_INSTANCE_FIELD" level="CRITICAL" enabled="true" />
+        <coding_rule class="MWN_MISMATCHED_NOTIFY" level="CRITICAL" enabled="true" />
+        <coding_rule class="MWN_MISMATCHED_WAIT" level="CRITICAL" enabled="true" />
+        <coding_rule class="NM_BAD_EQUAL" level="MAJOR" enabled="false" />
+        <coding_rule class="NM_CLASS_NAMING_CONVENTION" level="MAJOR" enabled="false" />
+        <coding_rule class="NM_CLASS_NOT_EXCEPTION" level="MAJOR" enabled="true" />
+        <coding_rule class="NM_CONFUSING" level="MAJOR" enabled="true" />
+        <coding_rule class="NM_FIELD_NAMING_CONVENTION" level="MAJOR" enabled="false" />
+        <coding_rule class="NM_FUTURE_KEYWORD_USED_AS_IDENTIFIER" level="MAJOR" enabled="true" />
+        <coding_rule class="NM_FUTURE_KEYWORD_USED_AS_MEMBER_IDENTIFIER" level="MAJOR" enabled="true" />
+        <coding_rule class="NM_LCASE_HASHCODE" level="MAJOR" enabled="false" />
+        <coding_rule class="NM_LCASE_TOSTRING" level="MAJOR" enabled="false" />
+        <coding_rule class="NM_METHOD_CONSTRUCTOR_CONFUSION" level="MAJOR" enabled="true" />
+        <coding_rule class="NM_METHOD_NAMING_CONVENTION" level="MAJOR" enabled="false" />
+        <coding_rule class="NM_SAME_SIMPLE_NAME_AS_INTERFACE" level="MAJOR" enabled="true" />
+        <coding_rule class="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS" level="MAJOR" enabled="true" />
+        <coding_rule class="NM_VERY_CONFUSING" level="MAJOR" enabled="true" />
+        <coding_rule class="NM_VERY_CONFUSING_INTENTIONAL" level="MAJOR" enabled="true" />
+        <coding_rule class="NM_WRONG_PACKAGE" level="MAJOR" enabled="true" />
+        <coding_rule class="NM_WRONG_PACKAGE_INTENTIONAL" level="MAJOR" enabled="true" />
+        <coding_rule class="NN_NAKED_NOTIFY" level="CRITICAL" enabled="true" />
+        <coding_rule class="NOISE_FIELD_REFERENCE" level="MAJOR" enabled="false" />
+        <coding_rule class="NOISE_METHOD_CALL" level="MAJOR" enabled="false" />
+        <coding_rule class="NOISE_NULL_DEREFERENCE" level="MAJOR" enabled="false" />
+        <coding_rule class="NOISE_OPERATION" level="MAJOR" enabled="false" />
+        <coding_rule class="NO_NOTIFY_NOT_NOTIFYALL" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_ALWAYS_NULL" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_ALWAYS_NULL_EXCEPTION" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_ARGUMENT_MIGHT_BE_NULL" level="MAJOR" enabled="true" />
+        <coding_rule class="NP_BOOLEAN_RETURN_NULL" level="MAJOR" enabled="true" />
+        <coding_rule class="NP_CLONE_COULD_RETURN_NULL" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_CLOSING_NULL" level="MAJOR" enabled="false" />
+        <coding_rule class="NP_DEREFERENCE_OF_READLINE_VALUE" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_GUARANTEED_DEREF" level="BLOCKER" enabled="true" />
+        <coding_rule class="NP_GUARANTEED_DEREF_ON_EXCEPTION_PATH" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_IMMEDIATE_DEREFERENCE_OF_READLINE" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_LOAD_OF_KNOWN_NULL_VALUE" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_METHOD_PARAMETER_TIGHTENS_ANNOTATION" level="MAJOR" enabled="false" />
+        <coding_rule class="NP_METHOD_RETURN_RELAXING_ANNOTATION" level="MAJOR" enabled="false" />
+        <coding_rule class="NP_NONNULL_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" level="CRITICAL" enabled="false" />
+        <coding_rule class="NP_NONNULL_PARAM_VIOLATION" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_NONNULL_RETURN_VIOLATION" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_NULL_INSTANCEOF" level="BLOCKER" enabled="true" />
+        <coding_rule class="NP_NULL_ON_SOME_PATH" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_NULL_ON_SOME_PATH_EXCEPTION" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_NULL_ON_SOME_PATH_MIGHT_BE_INFEASIBLE" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_NULL_PARAM_DEREF" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_NULL_PARAM_DEREF_ALL_TARGETS_DANGEROUS" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_NULL_PARAM_DEREF_NONVIRTUAL" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_OPTIONAL_RETURN_NULL" level="MAJOR" enabled="false" />
+        <coding_rule class="NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_STORE_INTO_NONNULL_FIELD" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_SYNC_AND_NULL_CHECK_FIELD" level="MAJOR" enabled="true" />
+        <coding_rule class="NP_TOSTRING_COULD_RETURN_NULL" level="CRITICAL" enabled="true" />
+        <coding_rule class="NP_UNWRITTEN_FIELD" level="MAJOR" enabled="false" />
+        <coding_rule class="NP_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD" level="CRITICAL" enabled="false" />
+        <coding_rule class="NS_DANGEROUS_NON_SHORT_CIRCUIT" level="CRITICAL" enabled="true" />
+        <coding_rule class="NS_NON_SHORT_CIRCUIT" level="MAJOR" enabled="true" />
+        <coding_rule class="OBL_UNSATISFIED_OBLIGATION" level="CRITICAL" enabled="false" />
+        <coding_rule class="OBL_UNSATISFIED_OBLIGATION_EXCEPTION_EDGE" level="CRITICAL" enabled="false" />
+        <coding_rule class="ODR_OPEN_DATABASE_RESOURCE" level="CRITICAL" enabled="true" />
+        <coding_rule class="ODR_OPEN_DATABASE_RESOURCE_EXCEPTION_PATH" level="CRITICAL" enabled="true" />
+        <coding_rule class="OS_OPEN_STREAM" level="CRITICAL" enabled="true" />
+        <coding_rule class="OS_OPEN_STREAM_EXCEPTION_PATH" level="CRITICAL" enabled="true" />
+        <coding_rule class="PS_PUBLIC_SEMAPHORES" level="CRITICAL" enabled="true" />
+        <coding_rule class="PT_ABSOLUTE_PATH_TRAVERSAL" level="CRITICAL" enabled="false" />
+        <coding_rule class="PT_RELATIVE_PATH_TRAVERSAL" level="CRITICAL" enabled="false" />
+        <coding_rule class="PZLA_PREFER_ZERO_LENGTH_ARRAYS" level="MAJOR" enabled="true" />
+        <coding_rule class="PZ_DONT_REUSE_ENTRY_OBJECTS_IN_ITERATORS" level="CRITICAL" enabled="false" />
+        <coding_rule class="QBA_QUESTIONABLE_BOOLEAN_ASSIGNMENT" level="CRITICAL" enabled="true" />
+        <coding_rule class="QF_QUESTIONABLE_FOR_LOOP" level="CRITICAL" enabled="true" />
+        <coding_rule class="RANGE_ARRAY_INDEX" level="MAJOR" enabled="false" />
+        <coding_rule class="RANGE_ARRAY_LENGTH" level="MAJOR" enabled="false" />
+        <coding_rule class="RANGE_ARRAY_OFFSET" level="MAJOR" enabled="false" />
+        <coding_rule class="RANGE_STRING_INDEX" level="MAJOR" enabled="false" />
+        <coding_rule class="RCN_REDUNDANT_COMPARISON_OF_NULL_AND_NONNULL_VALUE" level="CRITICAL" enabled="true" />
+        <coding_rule class="RCN_REDUNDANT_COMPARISON_TWO_NULL_VALUES" level="CRITICAL" enabled="true" />
+        <coding_rule class="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE" level="CRITICAL" enabled="true" />
+        <coding_rule class="RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE" level="CRITICAL" enabled="true" />
+        <coding_rule class="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" level="CRITICAL" enabled="true" />
+        <coding_rule class="RC_REF_COMPARISON" level="CRITICAL" enabled="true" />
+        <coding_rule class="RC_REF_COMPARISON_BAD_PRACTICE" level="MAJOR" enabled="false" />
+        <coding_rule class="RC_REF_COMPARISON_BAD_PRACTICE_BOOLEAN" level="MAJOR" enabled="false" />
+        <coding_rule class="REC_CATCH_EXCEPTION" level="MAJOR" enabled="true" />
+        <coding_rule class="RE_BAD_SYNTAX_FOR_REGULAR_EXPRESSION" level="CRITICAL" enabled="true" />
+        <coding_rule class="RE_CANT_USE_FILE_SEPARATOR_AS_REGULAR_EXPRESSION" level="CRITICAL" enabled="true" />
+        <coding_rule class="RE_POSSIBLE_UNINTENDED_PATTERN" level="CRITICAL" enabled="true" />
+        <coding_rule class="RI_REDUNDANT_INTERFACES" level="MAJOR" enabled="true" />
+        <coding_rule class="RR_NOT_CHECKED" level="MAJOR" enabled="true" />
+        <coding_rule class="RS_READOBJECT_SYNC" level="CRITICAL" enabled="true" />
+        <coding_rule class="RU_INVOKE_RUN" level="MAJOR" enabled="true" />
+        <coding_rule class="RV_01_TO_INT" level="MAJOR" enabled="true" />
+        <coding_rule class="RV_ABSOLUTE_VALUE_OF_HASHCODE" level="CRITICAL" enabled="true" />
+        <coding_rule class="RV_ABSOLUTE_VALUE_OF_RANDOM_INT" level="CRITICAL" enabled="true" />
+        <coding_rule class="RV_CHECK_COMPARETO_FOR_SPECIFIC_RETURN_VALUE" level="CRITICAL" enabled="false" />
+        <coding_rule class="RV_CHECK_FOR_POSITIVE_INDEXOF" level="MINOR" enabled="true" />
+        <coding_rule class="RV_DONT_JUST_NULL_CHECK_READLINE" level="MAJOR" enabled="true" />
+        <coding_rule class="RV_EXCEPTION_NOT_THROWN" level="CRITICAL" enabled="true" />
+        <coding_rule class="RV_NEGATING_RESULT_OF_COMPARETO" level="CRITICAL" enabled="false" />
+        <coding_rule class="RV_REM_OF_HASHCODE" level="CRITICAL" enabled="true" />
+        <coding_rule class="RV_REM_OF_RANDOM_INT" level="CRITICAL" enabled="true" />
+        <coding_rule class="RV_RETURN_VALUE_IGNORED" level="MINOR" enabled="true" />
+        <coding_rule class="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE" level="MAJOR" enabled="true" />
+        <coding_rule class="RV_RETURN_VALUE_IGNORED_INFERRED" level="CRITICAL" enabled="false" />
+        <coding_rule class="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT" level="MAJOR" enabled="false" />
+        <coding_rule class="RV_RETURN_VALUE_OF_PUTIFABSENT_IGNORED" level="MAJOR" enabled="false" />
+        <coding_rule class="RpC_REPEATED_CONDITIONAL_TEST" level="MAJOR" enabled="true" />
+        <coding_rule class="SA_FIELD_DOUBLE_ASSIGNMENT" level="CRITICAL" enabled="true" />
+        <coding_rule class="SA_FIELD_SELF_ASSIGNMENT" level="CRITICAL" enabled="true" />
+        <coding_rule class="SA_FIELD_SELF_COMPARISON" level="CRITICAL" enabled="true" />
+        <coding_rule class="SA_FIELD_SELF_COMPUTATION" level="CRITICAL" enabled="true" />
+        <coding_rule class="SA_LOCAL_DOUBLE_ASSIGNMENT" level="CRITICAL" enabled="true" />
+        <coding_rule class="SA_LOCAL_SELF_ASSIGNMENT" level="CRITICAL" enabled="true" />
+        <coding_rule class="SA_LOCAL_SELF_ASSIGNMENT_INSTEAD_OF_FIELD" level="CRITICAL" enabled="false" />
+        <coding_rule class="SA_LOCAL_SELF_COMPARISON" level="CRITICAL" enabled="true" />
+        <coding_rule class="SA_LOCAL_SELF_COMPUTATION" level="CRITICAL" enabled="true" />
+        <coding_rule class="SBSC_USE_STRINGBUFFER_CONCATENATION" level="CRITICAL" enabled="true" />
+        <coding_rule class="SC_START_IN_CTOR" level="CRITICAL" enabled="true" />
+        <coding_rule class="SE_BAD_FIELD" level="MINOR" enabled="false" />
+        <coding_rule class="SE_BAD_FIELD_INNER_CLASS" level="MINOR" enabled="true" />
+        <coding_rule class="SE_BAD_FIELD_STORE" level="CRITICAL" enabled="true" />
+        <coding_rule class="SE_COMPARATOR_SHOULD_BE_SERIALIZABLE" level="MAJOR" enabled="true" />
+        <coding_rule class="SE_INNER_CLASS" level="MAJOR" enabled="true" />
+        <coding_rule class="SE_METHOD_MUST_BE_PRIVATE" level="MAJOR" enabled="true" />
+        <coding_rule class="SE_NONFINAL_SERIALVERSIONID" level="CRITICAL" enabled="true" />
+        <coding_rule class="SE_NONLONG_SERIALVERSIONID" level="MAJOR" enabled="true" />
+        <coding_rule class="SE_NONSTATIC_SERIALVERSIONID" level="MAJOR" enabled="true" />
+        <coding_rule class="SE_NO_SERIALVERSIONID" level="MAJOR" enabled="true" />
+        <coding_rule class="SE_NO_SUITABLE_CONSTRUCTOR" level="MAJOR" enabled="true" />
+        <coding_rule class="SE_NO_SUITABLE_CONSTRUCTOR_FOR_EXTERNALIZATION" level="MAJOR" enabled="true" />
+        <coding_rule class="SE_PRIVATE_READ_RESOLVE_NOT_INHERITED" level="MAJOR" enabled="true" />
+        <coding_rule class="SE_READ_RESOLVE_IS_STATIC" level="MAJOR" enabled="true" />
+        <coding_rule class="SE_READ_RESOLVE_MUST_RETURN_OBJECT" level="MAJOR" enabled="true" />
+        <coding_rule class="SE_TRANSIENT_FIELD_NOT_RESTORED" level="MAJOR" enabled="true" />
+        <coding_rule class="SE_TRANSIENT_FIELD_OF_NONSERIALIZABLE_CLASS" level="MAJOR" enabled="true" />
+        <coding_rule class="SF_DEAD_STORE_DUE_TO_SWITCH_FALLTHROUGH" level="MAJOR" enabled="false" />
+        <coding_rule class="SF_DEAD_STORE_DUE_TO_SWITCH_FALLTHROUGH_TO_THROW" level="MAJOR" enabled="false" />
+        <coding_rule class="SF_SWITCH_FALLTHROUGH" level="MAJOR" enabled="false" />
+        <coding_rule class="SF_SWITCH_NO_DEFAULT" level="MAJOR" enabled="false" />
+        <coding_rule class="SIC_INNER_SHOULD_BE_STATIC" level="MAJOR" enabled="true" />
+        <coding_rule class="SIC_INNER_SHOULD_BE_STATIC_ANON" level="MAJOR" enabled="true" />
+        <coding_rule class="SIC_INNER_SHOULD_BE_STATIC_NEEDS_THIS" level="MAJOR" enabled="true" />
+        <coding_rule class="SIC_THREADLOCAL_DEADLY_EMBRACE" level="MAJOR" enabled="false" />
+        <coding_rule class="SIO_SUPERFLUOUS_INSTANCEOF" level="CRITICAL" enabled="true" />
+        <coding_rule class="SI_INSTANCE_BEFORE_FINALS_ASSIGNED" level="CRITICAL" enabled="true" />
+        <coding_rule class="SP_SPIN_ON_FIELD" level="MAJOR" enabled="true" />
+        <coding_rule class="SQL_BAD_PREPARED_STATEMENT_ACCESS" level="CRITICAL" enabled="true" />
+        <coding_rule class="SQL_BAD_RESULTSET_ACCESS" level="CRITICAL" enabled="true" />
+        <coding_rule class="SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE" level="CRITICAL" enabled="true" />
+        <coding_rule class="SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING" level="CRITICAL" enabled="true" />
+        <coding_rule class="SR_NOT_CHECKED" level="MAJOR" enabled="true" />
+        <coding_rule class="SS_SHOULD_BE_STATIC" level="MAJOR" enabled="true" />
+        <coding_rule class="STCAL_INVOKE_ON_STATIC_CALENDAR_INSTANCE" level="CRITICAL" enabled="true" />
+        <coding_rule class="STCAL_INVOKE_ON_STATIC_DATE_FORMAT_INSTANCE" level="CRITICAL" enabled="true" />
+        <coding_rule class="STCAL_STATIC_CALENDAR_INSTANCE" level="CRITICAL" enabled="true" />
+        <coding_rule class="STCAL_STATIC_SIMPLE_DATE_FORMAT_INSTANCE" level="CRITICAL" enabled="true" />
+        <coding_rule class="STI_INTERRUPTED_ON_CURRENTTHREAD" level="CRITICAL" enabled="true" />
+        <coding_rule class="STI_INTERRUPTED_ON_UNKNOWNTHREAD" level="CRITICAL" enabled="true" />
+        <coding_rule class="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" level="CRITICAL" enabled="true" />
+        <coding_rule class="SWL_SLEEP_WITH_LOCK_HELD" level="CRITICAL" enabled="true" />
+        <coding_rule class="SW_SWING_METHODS_INVOKED_IN_SWING_THREAD" level="MAJOR" enabled="true" />
+        <coding_rule class="TLW_TWO_LOCK_WAIT" level="MAJOR" enabled="true" />
+        <coding_rule class="TQ_ALWAYS_VALUE_USED_WHERE_NEVER_REQUIRED" level="CRITICAL" enabled="true" />
+        <coding_rule class="TQ_COMPARING_VALUES_WITH_INCOMPATIBLE_TYPE_QUALIFIERS" level="CRITICAL" enabled="false" />
+        <coding_rule class="TQ_EXPLICIT_UNKNOWN_SOURCE_VALUE_REACHES_ALWAYS_SINK" level="CRITICAL" enabled="true" />
+        <coding_rule class="TQ_EXPLICIT_UNKNOWN_SOURCE_VALUE_REACHES_NEVER_SINK" level="CRITICAL" enabled="true" />
+        <coding_rule class="TQ_MAYBE_SOURCE_VALUE_REACHES_ALWAYS_SINK" level="CRITICAL" enabled="true" />
+        <coding_rule class="TQ_MAYBE_SOURCE_VALUE_REACHES_NEVER_SINK" level="CRITICAL" enabled="true" />
+        <coding_rule class="TQ_NEVER_VALUE_USED_WHERE_ALWAYS_REQUIRED" level="CRITICAL" enabled="true" />
+        <coding_rule class="TQ_UNKNOWN_VALUE_USED_WHERE_ALWAYS_STRICTLY_REQUIRED" level="CRITICAL" enabled="false" />
+        <coding_rule class="UCF_USELESS_CONTROL_FLOW" level="CRITICAL" enabled="true" />
+        <coding_rule class="UCF_USELESS_CONTROL_FLOW_NEXT_LINE" level="CRITICAL" enabled="true" />
+        <coding_rule class="UC_USELESS_CONDITION" level="MAJOR" enabled="false" />
+        <coding_rule class="UC_USELESS_CONDITION_TYPE" level="MAJOR" enabled="false" />
+        <coding_rule class="UC_USELESS_OBJECT" level="MAJOR" enabled="false" />
+        <coding_rule class="UC_USELESS_OBJECT_STACK" level="MAJOR" enabled="false" />
+        <coding_rule class="UC_USELESS_VOID_METHOD" level="MAJOR" enabled="false" />
+        <coding_rule class="UG_SYNC_SET_UNSYNC_GET" level="MAJOR" enabled="true" />
+        <coding_rule class="UI_INHERITANCE_UNSAFE_GETRESOURCE" level="MAJOR" enabled="true" />
+        <coding_rule class="UL_UNRELEASED_LOCK" level="CRITICAL" enabled="true" />
+        <coding_rule class="UL_UNRELEASED_LOCK_EXCEPTION_PATH" level="CRITICAL" enabled="true" />
+        <coding_rule class="UMAC_UNCALLABLE_METHOD_OF_ANONYMOUS_CLASS" level="CRITICAL" enabled="true" />
+        <coding_rule class="UM_UNNECESSARY_MATH" level="CRITICAL" enabled="true" />
+        <coding_rule class="UPM_UNCALLED_PRIVATE_METHOD" level="CRITICAL" enabled="true" />
+        <coding_rule class="URF_UNREAD_FIELD" level="MAJOR" enabled="true" />
+        <coding_rule class="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD" level="CRITICAL" enabled="false" />
+        <coding_rule class="UR_UNINIT_READ" level="MAJOR" enabled="true" />
+        <coding_rule class="UR_UNINIT_READ_CALLED_FROM_SUPER_CONSTRUCTOR" level="MAJOR" enabled="false" />
+        <coding_rule class="USM_USELESS_ABSTRACT_METHOD" level="MAJOR" enabled="false" />
+        <coding_rule class="USM_USELESS_SUBCLASS_METHOD" level="MAJOR" enabled="false" />
+        <coding_rule class="UUF_UNUSED_FIELD" level="MAJOR" enabled="true" />
+        <coding_rule class="UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD" level="CRITICAL" enabled="false" />
+        <coding_rule class="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" level="MAJOR" enabled="false" />
+        <coding_rule class="UWF_NULL_FIELD" level="CRITICAL" enabled="true" />
+        <coding_rule class="UWF_UNWRITTEN_FIELD" level="MAJOR" enabled="false" />
+        <coding_rule class="UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD" level="CRITICAL" enabled="false" />
+        <coding_rule class="UW_UNCOND_WAIT" level="MAJOR" enabled="true" />
+        <coding_rule class="VA_FORMAT_STRING_BAD_ARGUMENT" level="CRITICAL" enabled="true" />
+        <coding_rule class="VA_FORMAT_STRING_BAD_CONVERSION" level="CRITICAL" enabled="true" />
+        <coding_rule class="VA_FORMAT_STRING_BAD_CONVERSION_FROM_ARRAY" level="MAJOR" enabled="true" />
+        <coding_rule class="VA_FORMAT_STRING_BAD_CONVERSION_TO_BOOLEAN" level="MAJOR" enabled="true" />
+        <coding_rule class="VA_FORMAT_STRING_EXPECTED_MESSAGE_FORMAT_SUPPLIED" level="MAJOR" enabled="false" />
+        <coding_rule class="VA_FORMAT_STRING_EXTRA_ARGUMENTS_PASSED" level="MAJOR" enabled="true" />
+        <coding_rule class="VA_FORMAT_STRING_ILLEGAL" level="CRITICAL" enabled="true" />
+        <coding_rule class="VA_FORMAT_STRING_MISSING_ARGUMENT" level="CRITICAL" enabled="true" />
+        <coding_rule class="VA_FORMAT_STRING_NO_PREVIOUS_ARGUMENT" level="CRITICAL" enabled="true" />
+        <coding_rule class="VA_FORMAT_STRING_USES_NEWLINE" level="CRITICAL" enabled="false" />
+        <coding_rule class="VA_PRIMITIVE_ARRAY_PASSED_TO_OBJECT_VARARG" level="CRITICAL" enabled="true" />
+        <coding_rule class="VO_VOLATILE_INCREMENT" level="CRITICAL" enabled="false" />
+        <coding_rule class="VO_VOLATILE_REFERENCE_TO_ARRAY" level="MAJOR" enabled="true" />
+        <coding_rule class="VR_UNRESOLVABLE_REFERENCE" level="MAJOR" enabled="false" />
+        <coding_rule class="WA_AWAIT_NOT_IN_LOOP" level="CRITICAL" enabled="true" />
+        <coding_rule class="WA_NOT_IN_LOOP" level="CRITICAL" enabled="true" />
+        <coding_rule class="WL_USING_GETCLASS_RATHER_THAN_CLASS_LITERAL" level="CRITICAL" enabled="true" />
+        <coding_rule class="WMI_WRONG_MAP_ITERATOR" level="CRITICAL" enabled="true" />
+        <coding_rule class="WS_WRITEOBJECT_SYNC" level="CRITICAL" enabled="true" />
+        <coding_rule class="XFB_XML_FACTORY_BYPASS" level="CRITICAL" enabled="true" />
+        <coding_rule class="XSS_REQUEST_PARAMETER_TO_JSP_WRITER" level="CRITICAL" enabled="true" />
+        <coding_rule class="XSS_REQUEST_PARAMETER_TO_SEND_ERROR" level="CRITICAL" enabled="true" />
+        <coding_rule class="XSS_REQUEST_PARAMETER_TO_SERVLET_WRITER" level="CRITICAL" enabled="true" />
+      </profile>
+    </profiles>
+    <list size="0" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/ServiceAclApplication.xml b/.idea/runConfigurations/ServiceAclApplication.xml
index 5e65474..932eb2c 100644
--- a/.idea/runConfigurations/ServiceAclApplication.xml
+++ b/.idea/runConfigurations/ServiceAclApplication.xml
@@ -3,9 +3,8 @@
     <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
     <module name="service-acl" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="com.yovinchen.xlcs.ServiceAclApplication" />
-    <option name="VM_PARAMETERS" value="-javaagent:$PROJECT_DIR$/../skywalking-agent/skywalking-agent.jar -Dskywalking.agent.service_name=Acl -Dskywalking.collector.backend_service=10.211.55.50:11800" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/ServiceActivityApplication.xml b/.idea/runConfigurations/ServiceActivityApplication.xml
index 3920e96..13a429c 100644
--- a/.idea/runConfigurations/ServiceActivityApplication.xml
+++ b/.idea/runConfigurations/ServiceActivityApplication.xml
@@ -3,9 +3,8 @@
     <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
     <module name="service-activity" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="com.yovinchen.xlcs.ServiceActivityApplication" />
-    <option name="VM_PARAMETERS" value="-javaagent:$PROJECT_DIR$/../skywalking-agent/skywalking-agent.jar -Dskywalking.agent.service_name=Activity -Dskywalking.collector.backend_service=10.211.55.50:11800" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/ServiceGatewayApplication.xml b/.idea/runConfigurations/ServiceGatewayApplication.xml
index 05660d2..c08d71c 100644
--- a/.idea/runConfigurations/ServiceGatewayApplication.xml
+++ b/.idea/runConfigurations/ServiceGatewayApplication.xml
@@ -2,9 +2,8 @@
   <configuration default="false" name="ServiceGatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
     <module name="service-gateway" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="com.yovinchen.xlcs.ServiceGatewayApplication" />
-    <option name="VM_PARAMETERS" value="-javaagent:$PROJECT_DIR$/../skywalking-agent/skywalking-agent.jar -Dskywalking.agent.service_name=Gateway -Dskywalking.collector.backend_service=10.211.55.50:11800" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/ServicePaymentApplication.xml b/.idea/runConfigurations/ServicePaymentApplication.xml
index a709dfe..15da9b9 100644
--- a/.idea/runConfigurations/ServicePaymentApplication.xml
+++ b/.idea/runConfigurations/ServicePaymentApplication.xml
@@ -3,9 +3,8 @@
     <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
     <module name="service-payment" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="com.yovinchen.xlcs.ServicePaymentApplication" />
-    <option name="VM_PARAMETERS" value="-javaagent:$PROJECT_DIR$/../skywalking-agent/skywalking-agent.jar -Dskywalking.agent.service_name=Payment -Dskywalking.collector.backend_service=10.211.55.50:11800" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/ServiceUserApplication.xml b/.idea/runConfigurations/ServiceUserApplication.xml
index c8b5958..50b7277 100644
--- a/.idea/runConfigurations/ServiceUserApplication.xml
+++ b/.idea/runConfigurations/ServiceUserApplication.xml
@@ -3,9 +3,8 @@
     <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
     <module name="service-user" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="com.yovinchen.xlcs.ServiceUserApplication" />
-    <option name="VM_PARAMETERS" value="-javaagent:$PROJECT_DIR$/../skywalking-agent/skywalking-agent.jar -Dskywalking.agent.service_name=User -Dskywalking.collector.backend_service=10.211.55.50:11800" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/xlcs-user/.hbuilderx/launch.json b/xlcs-user/.hbuilderx/launch.json
index cac109a..be9dee9 100644
--- a/xlcs-user/.hbuilderx/launch.json
+++ b/xlcs-user/.hbuilderx/launch.json
@@ -4,16 +4,19 @@
   "version": "0.0",
   "configurations": [
     {
-      "default": {
-        "launchtype": "local"
-      },
-      "h5": {
-        "launchtype": "local"
-      },
-      "mp-weixin": {
-        "launchtype": "local"
-      },
-      "type": "uniCloud"
+		"app-plus": {
+			"launchtype": "local"
+		},
+		"default": {
+			"launchtype": "local"
+		},
+		"h5": {
+			"launchtype": "local"
+		},
+		"mp-weixin": {
+			"launchtype": "local"
+		},
+		"type": "uniCloud"
     }
   ]
 }
diff --git a/xlcs-user/common/http.api.js b/xlcs-user/common/http.api.js
index a2457b7..d4c3b71 100644
--- a/xlcs-user/common/http.api.js
+++ b/xlcs-user/common/http.api.js
@@ -27,10 +27,10 @@ const post_update_user = '/user/weixin/auth/updateUser' // 更新用户信息
 const get_find_user_order = '/order/auth/findUserOrderPage' // 获取用户订单信息
 const get_weixin_payment = '/payment/weixin/createJsapi' // 获取微信支付信息
 const get_order_status = '/payment/weixin/queryPayStatus' // 获取订单状态
-
-// 后续需求
 const get_account_login = '/user/h5/login' // 用户登陆
 const post_register = '/user/h5/register' // 用户注册
+
+// 后续需求
 const post_h5_update_user = '/user/h5/auth/updateUser' // 更新用户信息
 const get_alipay_payment = '/payment/alipay/createJsapi' // 获取支付宝支付信息
 const get_order_alipay_status = '/payment/alipay/queryPayStatus' // 获取订单状态
@@ -42,7 +42,7 @@ const install = (Vue, vm) => {
 	// 获取首页数据
 	const getHomeIndex = () => vm.$u.get(get_home_index);
 	/*---------------------------------------------------------
-		提货点模块
+	    提货点模块
 	---------------------------------------------------------*/
 	// 根据经纬度获取地址信息
 	const getBaiduMapAddress = (o) => vm.$u.get(get_baidu_map_address + `${o.latitude},${o.longitude}`)
@@ -60,7 +60,7 @@ const install = (Vue, vm) => {
 		showLoading: false
 	})
 	/*---------------------------------------------------------
-		商品模块
+	    商品模块
 	---------------------------------------------------------*/
 	// 获取分类
 	const getCategories = () => vm.$u.get(get_categories, {
@@ -75,14 +75,14 @@ const install = (Vue, vm) => {
 	// 商品详情
 	const getHomeItem = (o) => vm.$u.get(get_home_item + `/${o.skuId}`);
 	/*---------------------------------------------------------
-		秒杀模块
+	    秒杀模块
 	---------------------------------------------------------*/
 	// 从缓存中查询时间段列表
 	const getFindAllSeckillTimeList = () => vm.$u.get(get_find_all_sec_kill_time_list);
 	// 从缓存中读取秒杀sku
 	const getFindSeckillSkuList = (o) => vm.$u.get(get_find_sec_kill_sku_list + `/${o.timeName}`);
 	/*---------------------------------------------------------
-		购物车模块
+	    购物车模块
 	---------------------------------------------------------*/
 	// 加入购物车
 	const getAddToCart = (o) => vm.$u.get(get_add_to_cart + `/${o.skuId}/${o.skuNum}`, {
@@ -118,12 +118,14 @@ const install = (Vue, vm) => {
 	const getOrderInfo = (o) => vm.$u.get(get_order_info + `/${o.orderId}`)
 	// 获取微信支付信息
 	const getWxPayment = (o) => vm.$u.get(get_weixin_payment + `/${o.orderNo}`)
+	// 获取支付宝支付信息
+	const getAliPayment = (o) => vm.$u.get(get_alipay_payment + `/${o.orderNo}`)
 
 	// 获取订单状态信息
 	const getOrderStatus = (o) => vm.$u.get(get_order_status + `/${o.orderNo}`)
 
 	/*---------------------------------------------------------
-		用户登陆
+	    用户登陆
 	---------------------------------------------------------*/
 	// 微信用户登陆
 	const getWxLogin = (o) => vm.$u.get(get_wx_login + `/${o.code}`, {
@@ -131,10 +133,8 @@ const install = (Vue, vm) => {
 	})
 	// 账号密码登登录
 	const getAccountLogin = (o) => vm.$u.post(get_account_login, o)
-
-
+	// 用户注册
 	const postRegister = (o) => vm.$u.post(post_register, o)
-	// '/user/h5/register' // 用户注册
 	// 更新用户信息
 	const postUpdateUser = (o) => vm.$u.post(post_update_user, {
 		...o,
@@ -168,6 +168,7 @@ const install = (Vue, vm) => {
 		postSubmitOrder,
 		getOrderInfo,
 		getWxPayment,
+		getAliPayment,
 		getWxLogin,
 		getAccountLogin,
 		postRegister,
diff --git a/xlcs-user/common/http.interceptor.js b/xlcs-user/common/http.interceptor.js
index 1bb22c7..4530a9e 100644
--- a/xlcs-user/common/http.interceptor.js
+++ b/xlcs-user/common/http.interceptor.js
@@ -21,7 +21,7 @@ const install = (Vue, vm) => {
 		} else if (res.code == 208) {
 			// 未登陆，token过期
 			uni.reLaunch({
-				url: '/pages/login/login'
+                url: '/pages/loginh5/loginh5'
 			})
 			return false;
 		} else {
diff --git a/xlcs-user/pages/cart/cart.vue b/xlcs-user/pages/cart/cart.vue
index 8bb9387..e41ba19 100644
--- a/xlcs-user/pages/cart/cart.vue
+++ b/xlcs-user/pages/cart/cart.vue
@@ -14,36 +14,22 @@
           <view v-for="(cartInfoListItem, index) in getCartInfoList" :key="index">
             <u-card :border="false" :padding="10" :show-head="showMultiCheckbox(index)">
               <view slot="head" class="u-m-10">
-                <u-checkbox
-                    :name="getMultiCheckedIds(index)"
-                    :value="getMultiCheckCart(index)"
-                    active-color="red"
-                    shape="circle"
-                    @change="changeMultiChecked"
-                ></u-checkbox>
+                <u-checkbox :name="getMultiCheckedIds(index)" :value="getMultiCheckCart(index)"
+                            active-color="red" shape="circle" @change="changeMultiChecked"></u-checkbox>
                 <text>{{ cartInfoListItem.activityRule.ruleDesc }}</text>
               </view>
               <view slot="body">
                 <view v-for="(cartInfoItem, idx) in cartInfoListItem.cartInfoList" :key="idx">
                   <!-- 动态class绑定是为了确保最后一条底部线条不显示 -->
-                  <view :class="{ 'u-border-bottom': idx !== cartInfoListItem.cartInfoList.length - 1 }"
-                        class="u-body-item u-flex u-col-between u-p-10">
-                    <u-checkbox
-                        v-model="cartInfoItem.isChecked"
-                        :name="cartInfoItem.skuId"
-                        active-color="red"
-                        shape="circle"
-                        @change="changeChecked"
-                    ></u-checkbox>
-                    <ListImgItem
-                        :lazyLoad="false"
-                        :showBottom="cartInfoItem.skuType === 0 && cartInfoItem.isNewPerson === 1"
-                        :showLeft="cartInfoItem.skuType === 1"
-                        :showRight="false"
-                        :src="cartInfoItem.imgUrl"
-                        height="200rpx"
-                        width="200rpx"
-                    ></ListImgItem>
+                  <view
+                      :class="{ 'u-border-bottom': idx !== cartInfoListItem.cartInfoList.length - 1 }"
+                      class="u-body-item u-flex u-col-between u-p-10">
+                    <u-checkbox v-model="cartInfoItem.isChecked" :name="cartInfoItem.skuId"
+                                active-color="red" shape="circle" @change="changeChecked"></u-checkbox>
+                    <ListImgItem :lazyLoad="false"
+                                 :showBottom="cartInfoItem.skuType === 0 && cartInfoItem.isNewPerson === 1"
+                                 :showLeft="cartInfoItem.skuType === 1" :showRight="false"
+                                 :src="cartInfoItem.imgUrl" height="200rpx" width="200rpx"></ListImgItem>
                     <view class="u-p-b-20 u-m-l-20" style="flex:1">
                       <view class="u-font-lg">{{ cartInfoItem.skuName }}</view>
                       <view class="u-flex u-row-between">
@@ -51,7 +37,8 @@
                           <text>￥</text>
                           <text>{{ cartInfoItem.cartPrice }}</text>
                         </view>
-                        <AddToCart :shopDetail="cartInfoItem" :skuId="cartInfoItem.skuId"></AddToCart>
+                        <AddToCart :shopDetail="cartInfoItem" :skuId="cartInfoItem.skuId">
+                        </AddToCart>
                       </view>
                     </view>
                   </view>
@@ -79,7 +66,9 @@
                 <view class="u-font-xs u-type-info">
                   优惠券优惠:￥{{ getCartPriceInfo.couponReduceAmount }}
                   <text class="u-font-xs u-m-l-20 u-type-info">原价:</text>
-                  <text class="u-font-xs u-type-info">￥{{ getCartPriceInfo.originalTotalAmount }}</text>
+                  <text
+                      class="u-font-xs u-type-info">￥{{ getCartPriceInfo.originalTotalAmount }}
+                  </text>
                 </view>
               </view>
             </view>
@@ -95,8 +84,8 @@
       </view>
     </view>
 
-    <CouponInfoList :couponInfoList="getCartCouponInfoList"
-                    :showCouponInfoList.sync="showCouponInfoList"></CouponInfoList>
+    <CouponInfoList :couponInfoList="getCartCouponInfoList" :showCouponInfoList.sync="showCouponInfoList">
+    </CouponInfoList>
   </view>
 </template>
 
@@ -122,7 +111,9 @@ export default {
     ])
   },
   methods: {
-    ...mapActions('cartModule', ['getActivityCartListAction', 'changeCheckCartAction', 'changeMultiCheckedCartAction', 'changeAllCheckCartAction']),
+    ...mapActions('cartModule', ['getActivityCartListAction', 'changeCheckCartAction',
+      'changeMultiCheckedCartAction', 'changeAllCheckCartAction'
+    ]),
     ...mapActions('cartModule', ['getCartListAction']),
     // 到分类页购买商品
     gotoCategory() {
@@ -133,20 +124,31 @@ export default {
     // 修改单个商品选中状态
     changeChecked(detail) {
       let isChecked = 1;
-      const {name: skuId, value} = detail;
+      const {
+        name: skuId,
+        value
+      } = detail;
       if (!value) isChecked = 0;
-      this.changeCheckCartAction({skuId, isChecked});
+      this.changeCheckCartAction({
+        skuId,
+        isChecked
+      });
     },
     // 修改多个商品的选中状态
     changeMultiChecked(detail) {
       let skuIdList = [];
       skuIdList = detail.name.split(',');
       const isChecked = detail.value === true ? 1 : 0;
-      this.changeMultiCheckedCartAction({skuIdList, isChecked});
+      this.changeMultiCheckedCartAction({
+        skuIdList,
+        isChecked
+      });
     },
     // 全部选中/返选
     changeAllSelected(detail) {
-      this.changeAllCheckCartAction({isChecked: detail.value === true ? 1 : 0});
+      this.changeAllCheckCartAction({
+        isChecked: detail.value === true ? 1 : 0
+      });
     },
     // 跳转至确认订单
     gotoConfirmOrder() {
@@ -156,7 +158,9 @@ export default {
   // 思考：为什么需要将请求放置于onShow钩子函数中，
   // 主要考虑tabs切换后需要进行实时数据的获取
   onShow() {
-    this.getActivityCartListAction({showLoading: true});
+    this.getActivityCartListAction({
+      showLoading: true
+    });
   },
   mounted() {
     // 需要获取购物车数据列表，将最新获取的数据渲染到页面
diff --git a/xlcs-user/pages/login/login.vue b/xlcs-user/pages/login/login.vue
index c0330ec..4763038 100644
--- a/xlcs-user/pages/login/login.vue
+++ b/xlcs-user/pages/login/login.vue
@@ -22,6 +22,8 @@
       </view>
       <view class="buttons">
         <button class="otherBtn" @click="goToRegister">注册</button>
+        <!-- 添加空白间距 -->
+        <div style="width: 20px; display: inline-block;"></div>
         <button class="otherBtn" @click="goToLogin">账号密码登录</button>
       </view>
     </view>
diff --git a/xlcs-user/pages/loginh5/loginh5.vue b/xlcs-user/pages/loginh5/loginh5.vue
new file mode 100644
index 0000000..23915dd
--- /dev/null
+++ b/xlcs-user/pages/loginh5/loginh5.vue
@@ -0,0 +1,166 @@
+<template>
+  <view class="wrap">
+    <view class="content">
+      <view class="title">欢迎登录小鹿超市</view>
+    </view>
+    <view class="buttom">
+      <view class="loginType">
+        <view class="accountLogin item">
+          <input v-model="username" class="input" placeholder="请输入账号" type="text"/>
+          <input v-model="password" class="input" placeholder="请输入密码" type="password"/>
+          <button :disabled="isLogin" class="loginBtn" @click="loginWithAccount">
+            账号密码登录
+          </button>
+        </view>
+      </view>
+      <view class="hint">
+        登录代表同意
+        <text class="link">小鹿超市用户协议、隐私政策，</text>
+        并授权使用您的小鹿超市账号信息（如昵称、头像、收获地址）以便您统一管理
+      </view>
+      <view class="buttons">
+        <button class="otherBtn" @click="goToRegister">注册</button>
+        <!-- 添加空白间距 -->
+        <div style="width: 20px; display: inline-block;"></div>
+        <button class="otherBtn" @click="goToWechatLogin">微信登录</button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      isLogin: false,
+      username: '',
+      password: ''
+    };
+  },
+  methods: {
+    async loginWithAccount() {
+      this.isLogin = true;
+      // 做账号密码登录逻辑，替换以下代码为实际的登录操作
+      try {
+        // 假设这里进行了账号密码登录，并获取到了 token
+        const result = await this.$u.api.getAccountLogin({
+          phone: this.username,
+          password: this.password
+        });
+        console.log(result, result.token, "<<<")
+        // 将token值进行本地缓存存储
+        uni.setStorage({
+          key: 'token',
+          data: result.token,
+          success: async () => {
+            // 更新用户信息
+            // await this.$u.api.postUpdateUser({
+            //   sex,
+            //   photoUrl,
+            //   nickName
+            // });
+            // 路由跳转至首页
+            uni.reLaunch({
+              url: '/pages/index/index',
+            });
+          }
+        });
+      } catch (error) {
+        console.error('登录失败:', error);
+      } finally {
+        this.isLogin = false;
+      }
+    },
+    goToRegister() {
+      uni.navigateTo({
+        url: '/pages/register/register',
+      });
+    },
+    goToWechatLogin() {
+      uni.navigateTo({
+        url: '/pages/login/login',
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+// 样式略有修改以适应账号密码登录的布局
+.wrap {
+  font-size: 28rpx;
+
+  .content {
+    width: 600rpx;
+    margin: 80rpx auto 0;
+
+    .title {
+      text-align: left;
+      font-size: 60rpx;
+      font-weight: 500;
+      margin-bottom: 100rpx;
+    }
+  }
+
+  .otherBtn {
+    width: 240rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    text-align: center;
+    background-color: #ccc;
+    color: #fff;
+    font-size: 24rpx;
+    border: none;
+    border-radius: 10rpx;
+    cursor: pointer;
+    background-color: #1aad19; // 更改微信登录按钮的背景颜色
+  }
+
+  .buttom {
+    .loginType {
+      display: flex;
+      justify-content: center;
+      padding: 20rpx;
+
+      .accountLogin {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .input {
+          width: 400rpx;
+          height: 80rpx;
+          margin-bottom: 20rpx;
+          padding: 0 20rpx;
+          font-size: 28rpx;
+          border: 1px solid #ccc;
+          border-radius: 10rpx;
+        }
+
+        .loginBtn {
+          width: 400rpx;
+          height: 80rpx;
+          line-height: 80rpx;
+          text-align: center;
+          background-color: rgb(83, 194, 64);
+          color: #fff;
+          font-size: 28rpx;
+          border: none;
+          border-radius: 10rpx;
+          cursor: pointer;
+        }
+      }
+    }
+
+    .hint {
+      padding: 20rpx 40rpx;
+      font-size: 24rpx;
+      color: #666;
+
+      .link {
+        color: rgb(83, 194, 64);
+      }
+    }
+  }
+}
+</style>
diff --git a/xlcs-user/pages/my/my.vue b/xlcs-user/pages/my/my.vue
index a770de3..63035f0 100644
--- a/xlcs-user/pages/my/my.vue
+++ b/xlcs-user/pages/my/my.vue
@@ -107,12 +107,12 @@
                   <view class="u-font-xs">提货码</view>
                 </view>
               </u-col>
-              <!-- 							<u-col span="3">
-                              <view class="gg-order-item" @click="gotoMyPickUpLocation">
-                                <view class="iconfont icon-dianpu"></view>
-                                <view class="u-font-xs">提货点管理</view>
-                              </view>
-                            </u-col> -->
+              <u-col span="3">
+                <view class="gg-order-item" @click="logout">
+                  <view class="iconfont icon-dianpu"></view>
+                  <view class="u-font-xs">退出登录</view>
+                </view>
+              </u-col>
               <u-col span="3">
                 <view class="gg-order-item">
                   <view class="iconfont icon-miaosha"></view>
@@ -204,11 +204,12 @@ export default {
     gotoOrderList(index) {
       this.$u.route('/pagesOrder/orderList/orderList?current=' + index);
     },
-    // gotoMyPickUpLocation() {
-    // 	uni.navigateTo({
-    // 		url: '/pagesLocation/myPickUpLocation/myPickUpLocation'
-    // 	});
-    // }
+    logout() {
+      uni.removeStorageSync('token');
+      uni.navigateTo({
+        url: '/pages/loginh5/loginh5'
+      });
+    }
   },
   async mounted() {
     this.userInfo = uni.getStorageSync('userInfo');
diff --git a/xlcs-user/pages/register/register.vue b/xlcs-user/pages/register/register.vue
new file mode 100644
index 0000000..3ebea2f
--- /dev/null
+++ b/xlcs-user/pages/register/register.vue
@@ -0,0 +1,151 @@
+<template>
+  <view class="wrap">
+    <view class="content">
+      <view class="title">欢迎注册小鹿超市</view>
+    </view>
+    <view class="buttom">
+      <view class="loginType">
+        <view class="accountLogin item">
+          <input v-model="username" class="input" placeholder="请输入手机号" type="text"/>
+          <input v-model="password" class="input" placeholder="请输入密码" type="password"/>
+          <button :disabled="isLogin" class="loginBtn" @click="register">
+            注册
+          </button>
+        </view>
+      </view>
+      <view class="hint">
+        注册代表同意
+        <text class="link">小鹿超市用户协议、隐私政策，</text>
+        并授权使用您的小鹿超市账号信息（如昵称、头像、收获地址）以便您统一管理
+      </view>
+      <view class="buttons">
+        <button class="otherBtn" @click="goToLogin">账号密码登录</button>
+        <!-- 添加空白间距 -->
+        <div style="width: 20px; display: inline-block;"></div>
+        <button class="otherBtn" @click="goToWechatLogin">微信登录</button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      isLogin: false,
+      username: '',
+      password: ''
+    };
+  },
+  methods: {
+    async register() {
+      this.isLogin = true;
+      try {
+        const result = await this.$u.api.postRegister({
+          phone: this.username,
+          password: this.password
+        });
+        console.log('注册成功:', result);
+        // 路由跳转至登录
+        uni.reLaunch({
+          url: '/pages/loginh5/loginh5',
+        });
+      } catch (error) {
+        console.error('登录失败:', error);
+      } finally {
+        this.isLogin = false;
+      }
+    },
+    goToLogin() {
+      uni.navigateTo({
+        url: '/pages/loginh5/loginh5',
+      });
+    },
+    goToWechatLogin() {
+      uni.navigateTo({
+        url: '/pages/login/login',
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+// 样式略有修改以适应账号密码登录的布局
+.wrap {
+  font-size: 28rpx;
+
+  .content {
+    width: 600rpx;
+    margin: 80rpx auto 0;
+
+    .title {
+      text-align: left;
+      font-size: 60rpx;
+      font-weight: 500;
+      margin-bottom: 100rpx;
+    }
+  }
+
+  .otherBtn {
+    width: 240rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    text-align: center;
+    background-color: #ccc;
+    color: #fff;
+    font-size: 24rpx;
+    border: none;
+    border-radius: 10rpx;
+    cursor: pointer;
+    background-color: #1aad19; // 更改微信登录按钮的背景颜色
+  }
+
+  .buttom {
+    .loginType {
+      display: flex;
+      justify-content: center;
+      padding: 20rpx;
+
+      .accountLogin {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .input {
+          width: 400rpx;
+          height: 80rpx;
+          margin-bottom: 20rpx;
+          padding: 0 20rpx;
+          font-size: 28rpx;
+          border: 1px solid #ccc;
+          border-radius: 10rpx;
+        }
+
+        .loginBtn {
+          width: 400rpx;
+          height: 80rpx;
+          line-height: 80rpx;
+          text-align: center;
+          background-color: rgb(83, 194, 64);
+          color: #fff;
+          font-size: 28rpx;
+          border: none;
+          border-radius: 10rpx;
+          cursor: pointer;
+        }
+      }
+    }
+
+    .hint {
+      padding: 20rpx 40rpx;
+      font-size: 24rpx;
+      color: #666;
+
+      .link {
+        color: rgb(83, 194, 64);
+      }
+    }
+  }
+}
+</style>
diff --git a/xlcs-user/pagesOrder/confirmOrder/confirmOrder.vue b/xlcs-user/pagesOrder/confirmOrder/confirmOrder.vue
index 4d187c3..9c35569 100644
--- a/xlcs-user/pagesOrder/confirmOrder/confirmOrder.vue
+++ b/xlcs-user/pagesOrder/confirmOrder/confirmOrder.vue
@@ -14,10 +14,10 @@
                 </u-card> -->
 
         <u-card :padding="10" :show-head="true">
-          <view slot="head" class="u-m-10">提货人联系方式</view>
+          <view slot="head" class="u-m-10">联系方式</view>
           <view slot="body" class="u-m-10">
-            <u-input v-model="sumbitOrderForm.receiverName" class="u-p-b-20" placeholder="请输入提货人姓名"/>
-            <u-input v-model="sumbitOrderForm.receiverPhone" placeholder="请输入提货人电话" type="number"/>
+            <u-input v-model="sumbitOrderForm.receiverName" class="u-p-b-20" placeholder="请输入姓名"/>
+            <u-input v-model="sumbitOrderForm.receiverPhone" placeholder="请输入电话" type="number"/>
           </view>
         </u-card>
 
@@ -32,15 +32,10 @@
                 <!-- 动态class绑定是为了确保最后一条底部线条不显示 -->
                 <view :class="{ 'u-border-bottom': idx !== cartInfoListItem.cartInfoList.length - 1 }"
                       class="u-body-item u-flex u-col-between u-p-10">
-                  <ListImgItem
-                      :lazyLoad="false"
-                      :showBottom="cartInfoItem.skuType === 0 && cartInfoItem.isNewPerson === 1"
-                      :showLeft="cartInfoItem.skuType === 1"
-                      :showRight="false"
-                      :src="cartInfoItem.imgUrl"
-                      height="200rpx"
-                      width="200rpx"
-                  ></ListImgItem>
+                  <ListImgItem :lazyLoad="false"
+                               :showBottom="cartInfoItem.skuType === 0 && cartInfoItem.isNewPerson === 1"
+                               :showLeft="cartInfoItem.skuType === 1" :showRight="false"
+                               :src="cartInfoItem.imgUrl" height="200rpx" width="200rpx"></ListImgItem>
                   <view class="u-p-b-20 u-m-l-20" style="flex:1">
                     <view>{{ cartInfoItem.skuName }}</view>
                     <view>购买数量：{{ cartInfoItem.skuNum }}</view>
@@ -61,25 +56,25 @@
         <u-card v-if="getCartCouponInfoList.length > 0" :padding="10" :show-head="false">
           <view slot="body">
             <view class="coupon">
-              <view
-                  v-for="couponInfoItem in getCartCouponInfoList"
-                  :key="couponInfoItem.id"
-                  :class="{ selected: couponInfoItem.selected }"
-                  class="content u-m-b-20"
-                  @click="switchCouponInfoItem(couponInfoItem)"
-              >
+              <view v-for="couponInfoItem in getCartCouponInfoList" :key="couponInfoItem.id"
+                    :class="{ selected: couponInfoItem.selected }" class="content u-m-b-20"
+                    @click="switchCouponInfoItem(couponInfoItem)">
                 <view class="left">
                   <view class="sum">
                     ￥
                     <text class="num">{{ couponInfoItem.amount }}</text>
                   </view>
-                  <view class="type">{{ couponInfoItem.couponType === 'FULL_REDUCTION' ? '满减券' : '现金券' }}</view>
+                  <view class="type">
+                    {{ couponInfoItem.couponType === 'FULL_REDUCTION' ? '满减券' : '现金券' }}
+                  </view>
                   <view class="type">{{ getRangeType(couponInfoItem.rangeType) }}</view>
                 </view>
                 <view class="centre">
                   <view class="title">{{ couponInfoItem.couponName }}</view>
                   <view class="u-type-info">{{ couponInfoItem.rangeDesc }}</view>
-                  <view class="valid-date">过期时间：{{ dayjs(couponInfoItem.expireTime).format('YYYY-MM-DD') }}</view>
+                  <view class="valid-date">
+                    过期时间：{{ dayjs(couponInfoItem.expireTime).format('YYYY-MM-DD') }}
+                  </view>
                 </view>
                 <view class="right">
                   <block v-if="couponInfoItem.isSelect === 1">
@@ -111,7 +106,9 @@
                 <view class="u-font-xs u-type-info">
                   优惠券优惠:￥{{ getCartPriceInfo.couponReduceAmount }}
                   <text class="u-font-xs u-m-l-20 u-type-info">原价:</text>
-                  <text class="u-font-xs u-type-info">￥{{ getCartPriceInfo.originalTotalAmount }}</text>
+                  <text
+                      class="u-font-xs u-type-info">￥{{ getCartPriceInfo.originalTotalAmount }}
+                  </text>
                 </view>
               </view>
             </view>
@@ -144,7 +141,9 @@ export default {
   },
   computed: {
     ...mapState('orderModule', ['order']),
-    ...mapGetters('orderModule', ['getCartInfoList', 'getSelectedCount', 'getCartPriceInfo', 'getLeaderAddressVo', 'showMultiCheckbox', 'getCartCouponInfoList']),
+    ...mapGetters('orderModule', ['getCartInfoList', 'getSelectedCount', 'getCartPriceInfo', 'getLeaderAddressVo',
+      'showMultiCheckbox', 'getCartCouponInfoList'
+    ]),
     getRangeType() {
       return function (rangeType) {
         switch (rangeType) {
diff --git a/xlcs-user/pagesOrder/getOrderInfo/getOrderInfo.vue b/xlcs-user/pagesOrder/getOrderInfo/getOrderInfo.vue
index 940e394..9278e9f 100644
--- a/xlcs-user/pagesOrder/getOrderInfo/getOrderInfo.vue
+++ b/xlcs-user/pagesOrder/getOrderInfo/getOrderInfo.vue
@@ -9,11 +9,11 @@
       <scroll-view class="gg-cart-sv-container" scroll-y="true">
         <!-- 提货点 -->
         <u-card :padding="10" :show-head="true">
-          <view slot="head" class="u-m-10">提货人联系方式</view>
+          <view slot="head" class="u-m-10">联系方式</view>
           <view slot="body" class="u-m-10">
-            <view class="u-p-20">收货人员：{{ order.receiverName }}</view>
+            <view class="u-p-20">姓名：{{ order.receiverName }}</view>
             <view class="u-p-20">联系方式：{{ order.receiverPhone }}</view>
-            <view class="u-p-20">提货地点：{{ order.receiverAddress }}</view>
+            <view class="u-p-20">地点：{{ order.receiverAddress }}</view>
           </view>
         </u-card>
 
@@ -28,8 +28,11 @@
                   <view class="u-font-xl">{{ orderItem.skuName }}</view>
                   <view>单价：￥{{ orderItem.skuPrice }}</view>
                   <view>数量：{{ orderItem.skuNum }}</view>
-                  <view v-if="orderItem.splitActivityAmount > 0">活动金额:￥{{ orderItem.splitActivityAmount }}</view>
-                  <view v-if="orderItem.splitCouponAmount > 0">优惠券额:￥{{ orderItem.splitCouponAmount }}</view>
+                  <view v-if="orderItem.splitActivityAmount > 0">
+                    活动金额:￥{{ orderItem.splitActivityAmount }}
+                  </view>
+                  <view v-if="orderItem.splitCouponAmount > 0">优惠券额:￥{{ orderItem.splitCouponAmount }}
+                  </view>
                   <view>
                     小计：
                     <text class="u-type-error">￥{{ orderItem.splitTotalAmount }}</text>
@@ -69,7 +72,8 @@
 
       <view class="gg-navigation">
         <view class="navigation">
-          <view class="buy btn u-line-1" @click="payOrder">支付订单</view>
+          <view class="buy btn u-line-1" @click="payWxOrder">微信支付订单</view>
+          <view class="buy btn u-line-1" @click="payAliOrder">支付宝支付订单</view>
         </view>
       </view>
     </view>
@@ -91,7 +95,9 @@ export default {
   },
   methods: {
     async getOrderInfoById(orderId) {
-      const result = await this.$u.api.getOrderInfo({orderId});
+      const result = await this.$u.api.getOrderInfo({
+        orderId
+      });
       this.order = result;
     },
     copyOrderNo() {
@@ -106,8 +112,10 @@ export default {
         }
       });
     },
-    async payOrder() {
-      const result = await this.$u.api.getWxPayment({orderNo: this.order.orderNo});
+    async payWxOrder() {
+      const result = await this.$u.api.getWxPayment({
+        orderNo: this.order.orderNo
+      });
       wx.requestPayment({
         timeStamp: result.timeStamp,
         nonceStr: result.nonceStr,
@@ -115,7 +123,9 @@ export default {
         signType: 'MD5',
         paySign: result.paySign,
         success: res => {
-          this.$u.api.getOrderStatus({orderNo: this.order.orderNo});
+          this.$u.api.getOrderStatus({
+            orderNo: this.order.orderNo
+          });
           uni.showToast({
             title: '支付成功',
             icon: 'none'
@@ -131,7 +141,46 @@ export default {
           });
         }
       });
+    },
+    async payAliOrder() {
+      try {
+        const result = await this.$u.api.getAliPayment({
+          orderNo: this.order.orderNo
+        });
+
+        my.tradePay({
+          tradeNO: result.tradeNO,
+          success: res => {
+            if (res.resultCode === '9000') {
+              this.$u.api.getOrderStatus({
+                orderNo: this.order.orderNo
+              });
+              uni.showToast({
+                title: '支付成功',
+                icon: 'none'
+              });
+              uni.switchTab({
+                url: '/pages/index/index'
+              });
+            } else {
+              throw new Error('支付失败');
+            }
+          },
+          fail: err => {
+            uni.showToast({
+              icon: 'none',
+              title: err.errorMessage || '支付失败'
+            });
+          }
+        });
+      } catch (error) {
+        uni.showToast({
+          icon: 'none',
+          title: error.message || '支付失败'
+        });
+      }
     }
+
   },
   mounted() {
     this.getOrderInfoById(this.orderId);
diff --git a/xlcs-user/pagesOrder/orderList/orderList.vue b/xlcs-user/pagesOrder/orderList/orderList.vue
index 19560d4..5ce6f81 100644
--- a/xlcs-user/pagesOrder/orderList/orderList.vue
+++ b/xlcs-user/pagesOrder/orderList/orderList.vue
@@ -36,7 +36,9 @@
                 </view>
                 <view class="total">
                   <text class="total-price">
-                    <text class="decimal">现价：￥{{ res.totalAmount }} 原价：￥{{ res.originalTotalAmount }}</text>
+                    <text class="decimal">现价：￥{{ res.totalAmount }}
+                      原价：￥{{ res.originalTotalAmount }}
+                    </text>
                   </text>
                 </view>
                 <view class="bottom">
@@ -45,6 +47,7 @@
                   </view>
                   <view class="logistics btn">查看物流</view>
                   <view class="exchange btn">卖了换钱</view>
+                  <button class="evaluate btn" @click="getOrderInfo(res.id)">订单详情</button>
                   <view class="evaluate btn">评价</view>
                 </view>
               </view>
@@ -63,14 +66,19 @@ export default {
   data() {
     return {
       // 订单列表
-      orderList: [[], [], [], [], []],
+      orderList: [
+        [],
+        [],
+        [],
+        [],
+        []
+      ],
       // 订单类型、状态与数量
-      list: [
-        {
-          name: '待付款',
-          orderStatus: 'UNPAID',
-          count: 0
-        },
+      list: [{
+        name: '待付款',
+        orderStatus: 'UNPAID',
+        count: 0
+      },
         {
           name: '待发货',
           orderStatus: 'WAITING_DELEVER',
@@ -159,6 +167,9 @@ export default {
         this.loadStatus.splice(idx, 1, 'nomore');
       }
     },
+    async getOrderInfo(id) {
+      this.$u.route(`/pagesOrder/getOrderInfo/getOrderInfo?orderId=${id}`);
+    },
     // tab栏切换
     change(index) {
       this.swiperCurrent = index;