合并代码

支付汇总
Merge branch 'y_dev' of e.coding.net:g-cphe0354/new-cashier/new-cashier into dwb
2024-09-10 11:04:40 +08:00 · 2024-09-10 10:33:36 +08:00 · 2024-09-10 09:43:48 +08:00 · 2024-09-10 09:43:37 +08:00 · 2024-09-09 17:47:19 +08:00 · 2024-09-03 11:32:15 +08:00
380 changed files with 52454 additions and 2611 deletions
--- a/jeepay-ui-merchant/package.json
+++ b/jeepay-ui-merchant/package.json
@@ -28,6 +28,7 @@
    "qrcode.vue": "^3.3.3",
    "qs": "^6.10.1",
    "reconnectingwebsocket": "^1.0.0",
+    "sass": "^1.50.1",
    "snabbdom": "^3.5.1",
    "store": "^2.0.12",
    "v-viewer": "^3.0.11",
--- a/jeepay-ui-merchant/pnpm-lock.yaml
+++ b/jeepay-ui-merchant/pnpm-lock.yaml
--- a/jeepay-ui-merchant/src/main.ts
+++ b/jeepay-ui-merchant/src/main.ts
@@ -26,9 +26,7 @@ import 'bootstrap-icons/font/bootstrap-icons.css'
 import { VueClipboard } from '@soerenmartius/vue3-clipboard' //复制插件 https://github.com/soerenmartius/vue3-clipboard

 import icons from './icons'
-
 import infoBox from '@/utils/infoBox'
-
 import { setSiteInfos } from './oemconfig'

 import { setGlobalApp } from '@/config/appConfig'
--- a/jeepay-ui-merchant/tsconfig.json
+++ b/jeepay-ui-merchant/tsconfig.json
@@ -14,7 +14,9 @@
    "paths": {
      "@/*": [
        "src/*"
-      ]
+      ],
+      "~/*": ["./src/*"],
+      "pinia": ["./node_modules/pinia"]
    },
  },
  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue",
--- a/jeepay-ui-uapp-agent/yarn.lock
+++ b/jeepay-ui-uapp-agent/yarn.lock
@@ -3,37 +3,37 @@


 "@babel/parser@^7.16.4":
-  "integrity" "sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw=="
-  "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz"
-  "version" "7.17.0"
+  version "7.17.0"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz"
+  integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==

 "@vitejs/plugin-vue@^1.6.0":
-  "integrity" "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw=="
-  "resolved" "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz"
-  "version" "1.10.2"
+  version "1.10.2"
+  resolved "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz"
+  integrity sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==

 "@vue/compiler-core@3.2.30":
-  "integrity" "sha512-64fq1KfcR+k3Vlw+IsBM2VhV5B+2IP3YxvKU8LWCDLrkmlXtbf2eMK6+0IwX5KP41D0f1gzryIiXR7P8cB9O5Q=="
-  "resolved" "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.30.tgz"
-  "version" "3.2.30"
+  version "3.2.30"
+  resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.30.tgz"
+  integrity sha512-64fq1KfcR+k3Vlw+IsBM2VhV5B+2IP3YxvKU8LWCDLrkmlXtbf2eMK6+0IwX5KP41D0f1gzryIiXR7P8cB9O5Q==
  dependencies:
    "@babel/parser" "^7.16.4"
    "@vue/shared" "3.2.30"
-    "estree-walker" "^2.0.2"
-    "source-map" "^0.6.1"
+    estree-walker "^2.0.2"
+    source-map "^0.6.1"

 "@vue/compiler-dom@3.2.30":
-  "integrity" "sha512-t7arHz2SXLCXlF2fdGDFVbhENbGMez254Z5edUqb//6WXJU1lC7GvSkUE7i5x8WSjgfqt60i0V8zdmk16rvLdw=="
-  "resolved" "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.30.tgz"
-  "version" "3.2.30"
+  version "3.2.30"
+  resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.30.tgz"
+  integrity sha512-t7arHz2SXLCXlF2fdGDFVbhENbGMez254Z5edUqb//6WXJU1lC7GvSkUE7i5x8WSjgfqt60i0V8zdmk16rvLdw==
  dependencies:
    "@vue/compiler-core" "3.2.30"
    "@vue/shared" "3.2.30"

 "@vue/compiler-sfc@3.2.30":
-  "integrity" "sha512-P/5YpILtcQY92z72gxhkyOUPHVskEzhSrvYi91Xcr+csOxaDaYU5OqOxCzZKcf3Og70Tat404vO1OHrwprN90A=="
-  "resolved" "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.30.tgz"
-  "version" "3.2.30"
+  version "3.2.30"
+  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.30.tgz"
+  integrity sha512-P/5YpILtcQY92z72gxhkyOUPHVskEzhSrvYi91Xcr+csOxaDaYU5OqOxCzZKcf3Og70Tat404vO1OHrwprN90A==
  dependencies:
    "@babel/parser" "^7.16.4"
    "@vue/compiler-core" "3.2.30"
@@ -41,277 +41,277 @@
    "@vue/compiler-ssr" "3.2.30"
    "@vue/reactivity-transform" "3.2.30"
    "@vue/shared" "3.2.30"
-    "estree-walker" "^2.0.2"
-    "magic-string" "^0.25.7"
-    "postcss" "^8.1.10"
-    "source-map" "^0.6.1"
+    estree-walker "^2.0.2"
+    magic-string "^0.25.7"
+    postcss "^8.1.10"
+    source-map "^0.6.1"

 "@vue/compiler-ssr@3.2.30":
-  "integrity" "sha512-OUh3MwAu/PsD7VN3UOdBbTkltkrUCNouSht47+CMRzpUR5+ta7+xyMAVHeq8wg4YZenWaJimbR5TL35Ka4Vk6g=="
-  "resolved" "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.30.tgz"
-  "version" "3.2.30"
+  version "3.2.30"
+  resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.30.tgz"
+  integrity sha512-OUh3MwAu/PsD7VN3UOdBbTkltkrUCNouSht47+CMRzpUR5+ta7+xyMAVHeq8wg4YZenWaJimbR5TL35Ka4Vk6g==
  dependencies:
    "@vue/compiler-dom" "3.2.30"
    "@vue/shared" "3.2.30"

 "@vue/reactivity-transform@3.2.30":
-  "integrity" "sha512-Le5XzCJyK3qTjoTnvQG/Ehu8fYjayauMNFyMaEnwFlm/avDofpuibpS9u+/6AgzsGnVWN+i0Jgf25bJd9DIwMw=="
-  "resolved" "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.30.tgz"
-  "version" "3.2.30"
+  version "3.2.30"
+  resolved "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.30.tgz"
+  integrity sha512-Le5XzCJyK3qTjoTnvQG/Ehu8fYjayauMNFyMaEnwFlm/avDofpuibpS9u+/6AgzsGnVWN+i0Jgf25bJd9DIwMw==
  dependencies:
    "@babel/parser" "^7.16.4"
    "@vue/compiler-core" "3.2.30"
    "@vue/shared" "3.2.30"
-    "estree-walker" "^2.0.2"
-    "magic-string" "^0.25.7"
+    estree-walker "^2.0.2"
+    magic-string "^0.25.7"

 "@vue/reactivity@3.2.30":
-  "integrity" "sha512-qlNKbkRn2JiGxVUEdoXbLAy+vcuHUCcq+YH2uXWz0BNMvXY2plmz+oqsw+694llwmYLkke5lbdYF4DIupisIkg=="
-  "resolved" "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.30.tgz"
-  "version" "3.2.30"
+  version "3.2.30"
+  resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.30.tgz"
+  integrity sha512-qlNKbkRn2JiGxVUEdoXbLAy+vcuHUCcq+YH2uXWz0BNMvXY2plmz+oqsw+694llwmYLkke5lbdYF4DIupisIkg==
  dependencies:
    "@vue/shared" "3.2.30"

 "@vue/runtime-core@3.2.30":
-  "integrity" "sha512-RTi7xH0Ht/6wfbo2WFBMJTEiyWFTqGhrksJm8lz6E+auO6lXZ6Eq3gPNfLt47GDWCm4xyrv+rs5R4UbarPEQ1Q=="
-  "resolved" "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.30.tgz"
-  "version" "3.2.30"
+  version "3.2.30"
+  resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.30.tgz"
+  integrity sha512-RTi7xH0Ht/6wfbo2WFBMJTEiyWFTqGhrksJm8lz6E+auO6lXZ6Eq3gPNfLt47GDWCm4xyrv+rs5R4UbarPEQ1Q==
  dependencies:
    "@vue/reactivity" "3.2.30"
    "@vue/shared" "3.2.30"

 "@vue/runtime-dom@3.2.30":
-  "integrity" "sha512-a3+jrncDvEFQmB+v9k0VyT4/Y3XO6OAueCroXXY4yLyr6PJeyxljweV5TzvW0rvVzH9sZO0QAvG76Lo+6C92Qw=="
-  "resolved" "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.30.tgz"
-  "version" "3.2.30"
+  version "3.2.30"
+  resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.30.tgz"
+  integrity sha512-a3+jrncDvEFQmB+v9k0VyT4/Y3XO6OAueCroXXY4yLyr6PJeyxljweV5TzvW0rvVzH9sZO0QAvG76Lo+6C92Qw==
  dependencies:
    "@vue/runtime-core" "3.2.30"
    "@vue/shared" "3.2.30"
-    "csstype" "^2.6.8"
+    csstype "^2.6.8"

 "@vue/server-renderer@3.2.30":
-  "integrity" "sha512-pzb8J/w+JdZVOtuKFlirGqrs4GP60FXGDJySw3WV2pCetuFstaacDrnymEeSo3ohAD+Qjv7zAG+Y7OvkdxQxmQ=="
-  "resolved" "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.30.tgz"
-  "version" "3.2.30"
+  version "3.2.30"
+  resolved "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.30.tgz"
+  integrity sha512-pzb8J/w+JdZVOtuKFlirGqrs4GP60FXGDJySw3WV2pCetuFstaacDrnymEeSo3ohAD+Qjv7zAG+Y7OvkdxQxmQ==
  dependencies:
    "@vue/compiler-ssr" "3.2.30"
    "@vue/shared" "3.2.30"

 "@vue/shared@3.2.30":
-  "integrity" "sha512-B3HouBtUxcfu2w2d+VhdLcVBXKYYhXiFMAfQ+hoe8NUhKkPRkWDIqhpuehCZxVQ3S2dN1P1WfKGlxGC+pfmxGg=="
-  "resolved" "https://registry.npmjs.org/@vue/shared/-/shared-3.2.30.tgz"
-  "version" "3.2.30"
+  version "3.2.30"
+  resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.30.tgz"
+  integrity sha512-B3HouBtUxcfu2w2d+VhdLcVBXKYYhXiFMAfQ+hoe8NUhKkPRkWDIqhpuehCZxVQ3S2dN1P1WfKGlxGC+pfmxGg==

-"base64-js@^1.3.1":
-  "integrity" "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-  "resolved" "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz"
-  "version" "1.5.1"
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==

-"buffer@^5.7.0":
-  "integrity" "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="
-  "resolved" "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz"
-  "version" "5.7.1"
+buffer@^5.7.0:
+  version "5.7.1"
+  resolved "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
  dependencies:
-    "base64-js" "^1.3.1"
-    "ieee754" "^1.1.13"
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"

-"csstype@^2.6.8":
-  "integrity" "sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ=="
-  "resolved" "https://registry.npmjs.org/csstype/-/csstype-2.6.19.tgz"
-  "version" "2.6.19"
+csstype@^2.6.8:
+  version "2.6.19"
+  resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.19.tgz"
+  integrity sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==

-"dayjs@^1.11.5":
-  "integrity" "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
-  "resolved" "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz"
-  "version" "1.11.5"
+dayjs@^1.11.5:
+  version "1.11.5"
+  resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz"
+  integrity sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==

-"echarts@^5.2.2":
-  "integrity" "sha512-yxuBfeIH5c+0FsoRP60w4De6omXhA06c7eUYBsC1ykB6Ys2yK5fSteIYWvkJ4xJVLQgCvAdO8C4mN6MLeJpBaw=="
-  "resolved" "https://registry.npmjs.org/echarts/-/echarts-5.2.2.tgz"
-  "version" "5.2.2"
+echarts@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.npmjs.org/echarts/-/echarts-5.2.2.tgz"
+  integrity sha512-yxuBfeIH5c+0FsoRP60w4De6omXhA06c7eUYBsC1ykB6Ys2yK5fSteIYWvkJ4xJVLQgCvAdO8C4mN6MLeJpBaw==
  dependencies:
-    "tslib" "2.3.0"
-    "zrender" "5.2.1"
+    tslib "2.3.0"
+    zrender "5.2.1"

-"esbuild-windows-64@0.13.15":
-  "integrity" "sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ=="
-  "resolved" "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.15.tgz"
-  "version" "0.13.15"
+esbuild-windows-64@0.13.15:
+  version "0.13.15"
+  resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.15.tgz"
+  integrity sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ==

-"esbuild@^0.13.12":
-  "integrity" "sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw=="
-  "resolved" "https://registry.npmjs.org/esbuild/-/esbuild-0.13.15.tgz"
-  "version" "0.13.15"
+esbuild@^0.13.12:
+  version "0.13.15"
+  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.13.15.tgz"
+  integrity sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw==
  optionalDependencies:
-    "esbuild-android-arm64" "0.13.15"
-    "esbuild-darwin-64" "0.13.15"
-    "esbuild-darwin-arm64" "0.13.15"
-    "esbuild-freebsd-64" "0.13.15"
-    "esbuild-freebsd-arm64" "0.13.15"
-    "esbuild-linux-32" "0.13.15"
-    "esbuild-linux-64" "0.13.15"
-    "esbuild-linux-arm" "0.13.15"
-    "esbuild-linux-arm64" "0.13.15"
-    "esbuild-linux-mips64le" "0.13.15"
-    "esbuild-linux-ppc64le" "0.13.15"
-    "esbuild-netbsd-64" "0.13.15"
-    "esbuild-openbsd-64" "0.13.15"
-    "esbuild-sunos-64" "0.13.15"
-    "esbuild-windows-32" "0.13.15"
-    "esbuild-windows-64" "0.13.15"
-    "esbuild-windows-arm64" "0.13.15"
+    esbuild-android-arm64 "0.13.15"
+    esbuild-darwin-64 "0.13.15"
+    esbuild-darwin-arm64 "0.13.15"
+    esbuild-freebsd-64 "0.13.15"
+    esbuild-freebsd-arm64 "0.13.15"
+    esbuild-linux-32 "0.13.15"
+    esbuild-linux-64 "0.13.15"
+    esbuild-linux-arm "0.13.15"
+    esbuild-linux-arm64 "0.13.15"
+    esbuild-linux-mips64le "0.13.15"
+    esbuild-linux-ppc64le "0.13.15"
+    esbuild-netbsd-64 "0.13.15"
+    esbuild-openbsd-64 "0.13.15"
+    esbuild-sunos-64 "0.13.15"
+    esbuild-windows-32 "0.13.15"
+    esbuild-windows-64 "0.13.15"
+    esbuild-windows-arm64 "0.13.15"

-"estree-walker@^2.0.2":
-  "integrity" "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-  "resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
-  "version" "2.0.2"
+estree-walker@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==

-"function-bind@^1.1.1":
-  "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-  "resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
-  "version" "1.1.1"
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==

-"gm-crypto@^0.1.8":
-  "integrity" "sha512-gbTkobkbj3F70HJDQNhN9JNTvcR3O1YQJ0xGc8jTc4bZ1KuikmkjuFm5kZhyUbWxK/PwWDpPuTNyGwRYOopBLw=="
-  "resolved" "https://registry.npmmirror.com/gm-crypto/-/gm-crypto-0.1.8.tgz"
-  "version" "0.1.8"
+gm-crypto@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.npmmirror.com/gm-crypto/-/gm-crypto-0.1.8.tgz"
+  integrity sha512-gbTkobkbj3F70HJDQNhN9JNTvcR3O1YQJ0xGc8jTc4bZ1KuikmkjuFm5kZhyUbWxK/PwWDpPuTNyGwRYOopBLw==
  dependencies:
-    "buffer" "^5.7.0"
-    "jsbn" "^1.1.0"
-    "to-arraybuffer" "^1.0.1"
+    buffer "^5.7.0"
+    jsbn "^1.1.0"
+    to-arraybuffer "^1.0.1"

-"has@^1.0.3":
-  "integrity" "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="
-  "resolved" "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
-  "version" "1.0.3"
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
  dependencies:
-    "function-bind" "^1.1.1"
+    function-bind "^1.1.1"

-"ieee754@^1.1.13":
-  "integrity" "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-  "resolved" "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz"
-  "version" "1.2.1"
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==

-"is-core-module@^2.8.1":
-  "integrity" "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="
-  "resolved" "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"
-  "version" "2.8.1"
+is-core-module@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"
+  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
  dependencies:
-    "has" "^1.0.3"
+    has "^1.0.3"

-"js-base64@^3.7.2":
-  "integrity" "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
-  "resolved" "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.2.tgz"
-  "version" "3.7.2"
+js-base64@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.2.tgz"
+  integrity sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==

-"jsbarcode@^3.11.5":
-  "integrity" "sha512-zv3KsH51zD00I/LrFzFSM6dst7rDn0vIMzaiZFL7qusTjPZiPtxg3zxetp0RR7obmjTw4f6NyGgbdkBCgZUIrA=="
-  "resolved" "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.5.tgz"
-  "version" "3.11.5"
+jsbarcode@^3.11.5:
+  version "3.11.5"
+  resolved "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.5.tgz"
+  integrity sha512-zv3KsH51zD00I/LrFzFSM6dst7rDn0vIMzaiZFL7qusTjPZiPtxg3zxetp0RR7obmjTw4f6NyGgbdkBCgZUIrA==

-"jsbn@^1.1.0":
-  "integrity" "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
-  "resolved" "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz"
-  "version" "1.1.0"
+jsbn@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz"
+  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==

-"magic-string@^0.25.7":
-  "integrity" "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA=="
-  "resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz"
-  "version" "0.25.7"
+magic-string@^0.25.7:
+  version "0.25.7"
+  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz"
+  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
  dependencies:
-    "sourcemap-codec" "^1.4.4"
+    sourcemap-codec "^1.4.4"

-"nanoid@^3.2.0":
-  "integrity" "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="
-  "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz"
-  "version" "3.2.0"
+nanoid@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz"
+  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==

-"path-parse@^1.0.7":
-  "integrity" "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-  "resolved" "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
-  "version" "1.0.7"
+path-parse@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==

-"picocolors@^1.0.0":
-  "integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-  "resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
-  "version" "1.0.0"
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==

-"postcss@^8.1.10", "postcss@^8.4.5":
-  "integrity" "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA=="
-  "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz"
-  "version" "8.4.6"
+postcss@^8.1.10, postcss@^8.4.5:
+  version "8.4.6"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz"
+  integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==
  dependencies:
-    "nanoid" "^3.2.0"
-    "picocolors" "^1.0.0"
-    "source-map-js" "^1.0.2"
+    nanoid "^3.2.0"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"

-"resolve@^1.20.0":
-  "integrity" "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="
-  "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"
-  "version" "1.22.0"
+resolve@^1.20.0:
+  version "1.22.0"
+  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"
+  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
  dependencies:
-    "is-core-module" "^2.8.1"
-    "path-parse" "^1.0.7"
-    "supports-preserve-symlinks-flag" "^1.0.0"
+    is-core-module "^2.8.1"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"

-"rollup@^2.59.0":
-  "integrity" "sha512-1Sbcs4OuW+aD+hhqpIRl+RqooIpF6uQcfzU/QSI7vGkwADY6cM4iLsBGRM2CGLXDTDN5y/yShohFmnKegSPWzg=="
-  "resolved" "https://registry.npmjs.org/rollup/-/rollup-2.67.1.tgz"
-  "version" "2.67.1"
+rollup@^2.59.0:
+  version "2.67.1"
+  resolved "https://registry.npmjs.org/rollup/-/rollup-2.67.1.tgz"
+  integrity sha512-1Sbcs4OuW+aD+hhqpIRl+RqooIpF6uQcfzU/QSI7vGkwADY6cM4iLsBGRM2CGLXDTDN5y/yShohFmnKegSPWzg==
  optionalDependencies:
-    "fsevents" "~2.3.2"
+    fsevents "~2.3.2"

-"source-map-js@^1.0.2":
-  "integrity" "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
-  "resolved" "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
-  "version" "1.0.2"
+source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==

-"source-map@^0.6.1":
-  "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
-  "version" "0.6.1"
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==

-"sourcemap-codec@^1.4.4":
-  "integrity" "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-  "resolved" "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"
-  "version" "1.4.8"
+sourcemap-codec@^1.4.4:
+  version "1.4.8"
+  resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==

-"supports-preserve-symlinks-flag@^1.0.0":
-  "integrity" "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
-  "resolved" "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
-  "version" "1.0.0"
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==

-"throttle-debounce@^3.0.1":
-  "integrity" "sha1-MvlNhN+olPeGyaHykOemRbahmrs="
-  "resolved" "https://rg.cnpmjs.org/throttle-debounce/download/throttle-debounce-3.0.1.tgz"
-  "version" "3.0.1"
+throttle-debounce@^3.0.1:
+  version "3.0.1"
+  resolved "https://rg.cnpmjs.org/throttle-debounce/download/throttle-debounce-3.0.1.tgz"
+  integrity sha1-MvlNhN+olPeGyaHykOemRbahmrs=

-"to-arraybuffer@^1.0.1":
-  "integrity" "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA=="
-  "resolved" "https://registry.npmmirror.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"
-  "version" "1.0.1"
+to-arraybuffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"
+  integrity sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==

-"tslib@2.3.0":
-  "integrity" "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-  "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"
-  "version" "2.3.0"
+tslib@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"
+  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==

-"vite@^2.5.10":
-  "integrity" "sha512-Mq8et7f3aK0SgSxjDNfOAimZGW9XryfHRa/uV0jseQSilg+KhYDSoNb9h1rknOy6SuMkvNDLKCYAYYUMCE+IgQ=="
-  "resolved" "https://registry.npmjs.org/vite/-/vite-2.7.13.tgz"
-  "version" "2.7.13"
+vite@^2.5.10:
+  version "2.7.13"
+  resolved "https://registry.npmjs.org/vite/-/vite-2.7.13.tgz"
+  integrity sha512-Mq8et7f3aK0SgSxjDNfOAimZGW9XryfHRa/uV0jseQSilg+KhYDSoNb9h1rknOy6SuMkvNDLKCYAYYUMCE+IgQ==
  dependencies:
-    "esbuild" "^0.13.12"
-    "postcss" "^8.4.5"
-    "resolve" "^1.20.0"
-    "rollup" "^2.59.0"
+    esbuild "^0.13.12"
+    postcss "^8.4.5"
+    resolve "^1.20.0"
+    rollup "^2.59.0"
  optionalDependencies:
-    "fsevents" "~2.3.2"
+    fsevents "~2.3.2"

-"vue@^3.0.4", "vue@3.2.30":
-  "integrity" "sha512-ZmTFWVJUX2XADkuOB8GcLTuxnBLogjJBTNVrM7WsTnjqRQ+VR8bLNrvNsbn8vj/LaP5+0WFAPrpngOYE2x+e+Q=="
-  "resolved" "https://registry.npmjs.org/vue/-/vue-3.2.30.tgz"
-  "version" "3.2.30"
+vue@^3.0.4, vue@3.2.30:
+  version "3.2.30"
+  resolved "https://registry.npmjs.org/vue/-/vue-3.2.30.tgz"
+  integrity sha512-ZmTFWVJUX2XADkuOB8GcLTuxnBLogjJBTNVrM7WsTnjqRQ+VR8bLNrvNsbn8vj/LaP5+0WFAPrpngOYE2x+e+Q==
  dependencies:
    "@vue/compiler-dom" "3.2.30"
    "@vue/compiler-sfc" "3.2.30"
@@ -319,23 +319,23 @@
    "@vue/server-renderer" "3.2.30"
    "@vue/shared" "3.2.30"

-"vue3-barcode@^1.0.1":
-  "integrity" "sha512-i9XU0iyLSLSQsWSbsmGoqiKr3kwflmyqbdmk1euITTna/f4aEbbibRRSv4rTLzriaSTGlXp3+iWxyEhimzNPBQ=="
-  "resolved" "https://registry.npmjs.org/vue3-barcode/-/vue3-barcode-1.0.1.tgz"
-  "version" "1.0.1"
+vue3-barcode@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/vue3-barcode/-/vue3-barcode-1.0.1.tgz"
+  integrity sha512-i9XU0iyLSLSQsWSbsmGoqiKr3kwflmyqbdmk1euITTna/f4aEbbibRRSv4rTLzriaSTGlXp3+iWxyEhimzNPBQ==
  dependencies:
    "@vitejs/plugin-vue" "^1.6.0"
-    "jsbarcode" "^3.11.5"
-    "vue" "^3.0.4"
+    jsbarcode "^3.11.5"
+    vue "^3.0.4"

-"wxbarcode@^1.0.2":
-  "integrity" "sha1-zgLjSP8AYwHZIBd21sn1rZATFLU="
-  "resolved" "https://registry.npmjs.org/wxbarcode/-/wxbarcode-1.0.2.tgz"
-  "version" "1.0.2"
+wxbarcode@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/wxbarcode/-/wxbarcode-1.0.2.tgz"
+  integrity sha1-zgLjSP8AYwHZIBd21sn1rZATFLU=

-"zrender@5.2.1":
-  "integrity" "sha512-M3bPGZuyLTNBC6LiNKXJwSCtglMp8XUEqEBG+2MdICDI3d1s500Y4P0CzldQGsqpRVB7fkvf3BKQQRxsEaTlsw=="
-  "resolved" "https://registry.npmjs.org/zrender/-/zrender-5.2.1.tgz"
-  "version" "5.2.1"
+zrender@5.2.1:
+  version "5.2.1"
+  resolved "https://registry.npmjs.org/zrender/-/zrender-5.2.1.tgz"
+  integrity sha512-M3bPGZuyLTNBC6LiNKXJwSCtglMp8XUEqEBG+2MdICDI3d1s500Y4P0CzldQGsqpRVB7fkvf3BKQQRxsEaTlsw==
  dependencies:
-    "tslib" "2.3.0"
+    tslib "2.3.0"
--- a/jeepay-ui-uapp-cashier/env/env.development.js
+++ b/jeepay-ui-uapp-cashier/env/env.development.js
@@ -1,7 +1,6 @@
 export default {
-	// 'JEEPAY_PAY_BASE_URL': 'https://pay.rscygroup.com' //支付网关URL
+	'JEEPAY_PAY_BASE_URL': 'https://pay.rscygroup.com' //支付网关URL
 	// 'JEEPAY_PAY_BASE_URL': 'http://192.168.1.45:9216' //支付网关URL
 	// 'JEEPAY_PAY_BASE_URL': 'https://pay.rscygroup.com' //支付网关URL
 	// 'JEEPAY_PAY_BASE_URL': 'https://pay.qilinshuzi.com' //支付网关URL
-	'JEEPAY_PAY_BASE_URL': 'https://payment.sxczgkj.cn/' //支付网关URL
 }
--- a/jeepay-ui-uapp-cashier/env/env.production.js
+++ b/jeepay-ui-uapp-cashier/env/env.production.js
@@ -1,7 +1,6 @@
 export default {
-	// 'JEEPAY_PAY_BASE_URL': 'https://pay.rscygroup.com' //支付网关URL
+	'JEEPAY_PAY_BASE_URL': 'https://pay.rscygroup.com' //支付网关URL
 	// 'JEEPAY_PAY_BASE_URL': 'http://192.168.1.8:9216' //支付网关URL
 	// 'JEEPAY_PAY_BASE_URL': 'https://pay.rscygroup.com' //支付网关URL
 	// 'JEEPAY_PAY_BASE_URL': 'https://pay.qilinshuzi.com' //支付网关URL
-	'JEEPAY_PAY_BASE_URL': 'https://payment.sxczgkj.cn/' //支付网关URL
 }
--- a/jeepay-ui-uapp-cashier/index.html
+++ b/jeepay-ui-uapp-cashier/index.html
@@ -13,7 +13,7 @@
    <script type="module" src="/main.js"></script>
 	<script>
 	  // 生成当前时间的时间戳
-         document.write('<script src="/index.js?v='+Math.random()+'"><\/script>');
+         // document.write('<script src="/index.js?v='+Math.random()+'"><\/script>');
 	</script>

 	<!-- <script>
--- a/jeepay-ui-uapp-cashier/manifest.json
+++ b/jeepay-ui-uapp-cashier/manifest.json
@@ -1,7 +1,7 @@
 {
    "name" : "聚合收银台",
-    "appid" : "__UNI__6D5B500",
-    "description" : "聚__UNI__6D5B500合收银台",
+    "appid" : "__UNI__31F107A",
+    "description" : "聚合收银台",
    "versionName" : "1.0.0",
    "versionCode" : "100",
    "transformPx" : false,
@@ -107,10 +107,10 @@
    },
    "vueVersion" : "3",
    "h5" : {
-        "router" : {
-            "mode" : "history",
-            "base" : "./"
-        },
+        // "router" : {
+        //     "mode" : "history",
+        //     "base" : "/cashier"
+        // },
        "sdkConfigs" : {
            "maps" : {}
        }
--- a/jeepay-ui-uapp-cashier/yarn.lock
+++ b/jeepay-ui-uapp-cashier/yarn.lock
@@ -4,5 +4,5 @@

 js-base64@^3.7.5:
  version "3.7.5"
-  resolved "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.5.tgz#21e24cf6b886f76d6f5f165bfcd69cc55b9e3fca"
+  resolved "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.5.tgz"
  integrity sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==
--- a/jeepay-ui-uapp-face/package-lock.json
+++ b/jeepay-ui-uapp-face/package-lock.json
@@ -0,0 +1,109 @@
+{
+  "name": "jeepay-ui-uapp-face",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "jeepay-ui-uapp-face",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "dayjs": "^1.11.7",
+        "gm-crypto": "^0.1.8",
+        "js-base64": "^3.7.4"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.7",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz",
+      "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="
+    },
+    "node_modules/gm-crypto": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/gm-crypto/-/gm-crypto-0.1.8.tgz",
+      "integrity": "sha512-gbTkobkbj3F70HJDQNhN9JNTvcR3O1YQJ0xGc8jTc4bZ1KuikmkjuFm5kZhyUbWxK/PwWDpPuTNyGwRYOopBLw==",
+      "dependencies": {
+        "buffer": "^5.7.0",
+        "jsbn": "^1.1.0",
+        "to-arraybuffer": "^1.0.1"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/js-base64": {
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.4.tgz",
+      "integrity": "sha512-wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ=="
+    },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+    },
+    "node_modules/to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA=="
+    }
+  }
+}
--- a/jeepay-ui-uapp-face/yarn.lock
+++ b/jeepay-ui-uapp-face/yarn.lock
@@ -4,12 +4,12 @@

 base64-js@^1.3.1:
  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==

 buffer@^5.7.0:
  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"
  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
  dependencies:
    base64-js "^1.3.1"
@@ -17,12 +17,12 @@ buffer@^5.7.0:

 dayjs@^1.11.7:
  version "1.11.7"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
+  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"
  integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==

 gm-crypto@^0.1.8:
  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/gm-crypto/-/gm-crypto-0.1.8.tgz#598de2aebffb6f5cff123f8dba1702205f5c2b75"
+  resolved "https://registry.npmjs.org/gm-crypto/-/gm-crypto-0.1.8.tgz"
  integrity sha512-gbTkobkbj3F70HJDQNhN9JNTvcR3O1YQJ0xGc8jTc4bZ1KuikmkjuFm5kZhyUbWxK/PwWDpPuTNyGwRYOopBLw==
  dependencies:
    buffer "^5.7.0"
@@ -31,20 +31,20 @@ gm-crypto@^0.1.8:

 ieee754@^1.1.13:
  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==

 js-base64@^3.7.4:
  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.4.tgz#af95b20f23efc8034afd2d1cc5b9d0adf7419037"
+  resolved "https://registry.npmjs.org/js-base64/-/js-base64-3.7.4.tgz"
  integrity sha512-wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ==

 jsbn@^1.1.0:
  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
+  resolved "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz"
  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==

 to-arraybuffer@^1.0.1:
  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  resolved "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"
  integrity sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==
--- a/jeepay-ui-uapp-merchant/App.vue
+++ b/jeepay-ui-uapp-merchant/App.vue
@@ -21,6 +21,7 @@ onLaunch(() => {
 <style lang="scss">
 /** 每个页面公共css */
@import '@/commons/style/global.scss';
+@import '@/commons/style/common.scss';

 /**  uni 组件样式覆盖 */
@import '@/commons/style/uni-overwrite.scss';
--- a/jeepay-ui-uapp-merchant/commons/color.js
+++ b/jeepay-ui-uapp-merchant/commons/color.js
@@ -0,0 +1,7 @@
+export const ColorMain= '#318AFE';
+export const ColorRed= '#F02C45';
+
+
+export default{
+	ColorMain,ColorRed
+}
--- a/jeepay-ui-uapp-merchant/commons/style/common.scss
+++ b/jeepay-ui-uapp-merchant/commons/style/common.scss
@@ -0,0 +1,378 @@
+.u-relative,
+.u-rela {
+	position: relative;
+}
+
+.u-absolute,
+.u-abso {
+	position: absolute;
+}
+.u-fixed,.u-fix{
+	position: fixed;
+}
+.left-top{
+	left: 0;
+	top: 0;
+}
+.u-overflow-hide{
+	overflow: hidden;
+}
+
+// nvue不能用标签命名样式，不能放在微信组件中，否则微信开发工具会报警告，无法使用标签名当做选择器
+/* #ifndef APP-NVUE */
+image {
+	display: inline-block;
+}
+
+// 在weex，也即nvue中，所有元素默认为border-box
+view,
+text {
+	box-sizing: border-box;
+}
+/* #endif */
+
+.u-font-xs {
+	font-size: 22rpx;
+}
+
+.u-font-sm {
+	font-size: 26rpx;
+}
+
+.u-font-md {
+	font-size: 28rpx;
+}
+
+.u-font-lg {
+	font-size: 30rpx;
+}
+
+.u-font-xl {
+	font-size: 34rpx;
+}
+
+.u-flex {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+}
+
+.u-flex-wrap {
+	flex-wrap: wrap;
+}
+
+.u-flex-nowrap {
+	flex-wrap: nowrap;
+}
+
+.u-col-center {
+	align-items: center;
+}
+
+.u-col-top {
+	align-items: flex-start;
+}
+
+.u-col-bottom {
+	align-items: flex-end;
+}
+
+.u-row-center {
+	justify-content: center;
+}
+
+.u-row-left {
+	justify-content: flex-start;
+}
+
+.u-row-right {
+	justify-content: flex-end;
+}
+
+.u-row-between {
+	justify-content: space-between;
+}
+
+.u-row-around {
+	justify-content: space-around;
+}
+
+.u-text-left {
+	text-align: left;
+}
+
+.u-text-center {
+	text-align: center;
+}
+
+.u-text-right {
+	text-align: right;
+}
+
+.u-flex-col {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+}
+
+// 定义flex等分
+@for $i from 0 through 12 {
+	.u-flex-#{$i} {
+		flex: $i;
+	}
+}
+
+// 定义字体(px)单位，小于20都为px单位字体
+@for $i from 9 to 20 {
+	.u-font-#{$i} {
+		font-size: $i + px;
+	}
+}
+
+// 定义字体(rpx)单位，大于或等于20的都为rpx单位字体
+@for $i from 20 through 40 {
+	.u-font-#{$i} {
+		font-size: $i + rpx;
+	}
+}
+
+// 定义内外边距，历遍1-80
+@for $i from 0 through 80 {
+	// 只要双数和能被5除尽的数
+	@if $i % 2 == 0 or $i % 5 == 0 {
+		// 得出：u-margin-30或者u-m-30
+		.u-margin-#{$i}, .u-m-#{$i} {
+			margin: $i + rpx!important;
+		}
+		
+		// 得出：u-padding-30或者u-p-30
+		.u-padding-#{$i}, .u-p-#{$i} {
+			padding: $i + rpx!important;
+		}
+		
+		@each $short, $long in l left, t top, r right, b bottom {
+			// 缩写版，结果如： u-m-l-30
+			// 定义外边距
+			.u-m-#{$short}-#{$i} {
+				margin-#{$long}: $i + rpx!important;
+			}
+			
+			// 定义内边距
+			.u-p-#{$short}-#{$i} {
+				padding-#{$long}: $i + rpx!important;
+			}
+			
+			// 完整版，结果如：u-margin-left-30
+			// 定义外边距
+			.u-margin-#{$long}-#{$i} {
+				margin-#{$long}: $i + rpx!important;
+			}
+			
+			// 定义内边距
+			.u-padding-#{$long}-#{$i} {
+				padding-#{$long}: $i + rpx!important;
+			}
+		}
+	}
+}
+
+// 重置nvue的默认关于flex的样式
+.u-reset-nvue {
+	flex-direction: row;
+	align-items: center;
+}
+
+/* start--文本行数限制--start */
+.u-line-1 {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.u-line-2 {
+    -webkit-line-clamp: 2;
+}
+
+.u-line-3 {
+    -webkit-line-clamp: 3;
+}
+
+.u-line-4 {
+    -webkit-line-clamp: 4;
+}
+
+.u-line-5 {
+    -webkit-line-clamp: 5;
+}
+
+.u-line-2, .u-line-3, .u-line-4, .u-line-5 {
+    overflow: hidden;
+	word-break: break-all;
+    text-overflow: ellipsis; 
+    display: -webkit-box; // 弹性伸缩盒
+    -webkit-box-orient: vertical; // 设置伸缩盒子元素排列方式
+}
+
+/* end--文本行数限制--end */
+
+
+/* start--不同颜色文字--start */
+.color-333{
+	color: #333;
+}
+.color-666{
+	color: #666;
+}
+.color-999{
+	color: #999;
+}
+.color-red{
+	color: $my-red-color;
+}
+.color-main{
+	color:$my-main-color
+}
+
+/* end--不同颜色文字--end */
+
+
+.tranistion{
+	transition: all .3s ease-in-out;
+}
+.tranistion-1{
+	transition: all .1s ease-in-out;
+}
+.tranistion-2{
+	transition: all .2s ease-in-out;
+}
+.font-bold{
+	font-weight: 700;
+}
+
+
+/* start--不同颜色背景--start */
+.my-bg-main{
+	background-color:$my-main-color
+}
+
+/* end--不同颜色背景--end */
+
+.safe-page{
+	padding-bottom: 60rpx!important;
+}
+::v-deep .uni-switch-input.uni-switch-input-checked{
+	border-color: $my-main-color;
+	    background-color: $my-main-color;
+}
+.min-page{
+	/* #ifdef H5 */
+	min-height: calc(100vh - 44px);
+	/* #endif */
+	/* #ifndef H5 */
+	min-height: 100vh;
+	/* #endif */
+}
+.w-full{
+	width: 100%;
+}
+.gap-20{
+	gap: 20rpx;
+}
+.color-000{
+	color: #000;
+}
+.color-fff{
+	color: #fff;
+}
+.bg-fff{
+	background-color: #fff;
+}
+.bg-gray{
+	background-color: #F9F9F9;
+}
+.overflow-hide{
+	/* #ifdef H5 */
+	height: calc(100vh - 44px);
+	/* #endif */
+	/* #ifndef H5 */
+	height: 100vh;
+	/* #endif */
+	overflow: hidden;
+}
+.no-wrap{
+	white-space: nowrap;
+}
+.border-r-12{
+	border-radius: 12rpx;
+}
+.border-r-18{
+	border-radius: 18rpx;
+}
+.border-top{
+	border-top: 1px solid #E5E5E5;
+}
+.border-bottom{
+	border-bottom: 1px solid #E5E5E5;
+}
+.scale7{
+	transform: scale(0.7);
+}
+.page-gray {
+	min-height: calc(100vh);
+	/* #ifdef H5 */
+	min-height: calc(100vh - var(--window-top));
+	/* #endif */
+	display: flex;
+	flex-direction: column;
+	background: #F9F9F9;
+}
+
+.safe-bottom{
+	padding-bottom: env(safe-area-inset-bottom);
+	/* #ifdef H5 */
+	padding-bottom: 28rpx;
+	/* #endif */
+}
+.position-all{
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+}
+.fixed-top{
+	position: fixed;
+	/* #ifdef H5 */
+	top: 44px;
+	/* #endif */
+	/* #ifndef H5 */
+	top: 0;
+	/* #endif */
+	left: 0;
+	right: 0;
+}
+.lh30 {
+	line-height: 30px;
+}
+.default-box-padding{
+	padding: 32rpx 28rpx;
+}
+.icon-arrow-down-fill {
+	width: 16rpx;
+	height: 10rpx;
+}
+.zIndex-999{
+	z-index: 999;
+}
+.icon-default-size{
+	width: 28rpx;
+	height: 28rpx;
+}
+::v-deep.uni-easyinput__placeholder-class{
+	font-size: 28rpx!important;
+}
+.filter-gray{
+	filter: grayscale(1);
+}
--- a/jeepay-ui-uapp-merchant/commons/style/vars.scss
+++ b/jeepay-ui-uapp-merchant/commons/style/vars.scss
@@ -37,3 +37,41 @@ $J-f-size30: 30rpx;

 // 常用边框颜色
 $v-b-color-ed: #ededed;
+
+//common.scss 分包页面以及组件里所用的颜色
+$my-main-color:#318AFE;
+$my-red-color:#F02C45;
+
+//my-components
+$u-main-color: #303133;
+$u-content-color: #606266;
+$u-tips-color: #909193;
+$u-light-color: #c0c4cc;
+$u-border-color: #dadbde;
+$u-bg-color: #f3f4f6;
+$u-disabled-color: #c8c9cc;
+
+$u-primary: #3c9cff;
+$u-primary-dark: #398ade;
+$u-primary-disabled: #9acafc;
+$u-primary-light: #ecf5ff;
+
+$u-warning: #f9ae3d;
+$u-warning-dark: #f1a532;
+$u-warning-disabled: #f9d39b;
+$u-warning-light: #fdf6ec;
+
+$u-success: #5ac725;
+$u-success-dark: #53c21d;
+$u-success-disabled: #a9e08f;
+$u-success-light: #f5fff0;
+
+$u-error: #f56c6c;
+$u-error-dark: #e45656;
+$u-error-disabled: #f7b2b2;
+$u-error-light: #fef0f0;
+
+$u-info: #909399;
+$u-info-dark: #767a82;
+$u-info-disabled: #c4c6c9;
+$u-info-light: #f4f4f5;
--- a/jeepay-ui-uapp-merchant/commons/table-status.js
+++ b/jeepay-ui-uapp-merchant/commons/table-status.js
@@ -0,0 +1,30 @@
+export const $status = {
+	pending: {
+		label: "挂单中",
+		type: "#E6A23C",
+	},
+	using: {
+		label: "开台中",
+		type: "rgb(250,85,85)",
+	},
+	paying: {
+		label: "结算中",
+		type: "#E6A23C",
+	},
+	idle: {
+		label: "空闲",
+		type: "#318AFE",
+	},
+	subscribe: {
+		label: "预定",
+		type: "#E6A23C",
+	},
+	closed: {
+		label: "关台",
+		type: "#ddd",
+	},
+	cleaning: {
+		label: "台桌清理中",
+		type: "#909399",
+	},
+}
--- a/jeepay-ui-uapp-merchant/commons/utils/format.js
+++ b/jeepay-ui-uapp-merchant/commons/utils/format.js
@@ -0,0 +1,54 @@
+/**
+ * 格式化价格函数，将价格限定在指定的最小值和最大值范围内，并保留两位小数。
+ * 
+ * @param {number} price - 需要格式化的价格。
+ * @param {number} min - 价格的最小值。
+ * @param {number} max - 价格的最大值，默认为100000000。
+ * @param {Boolean} returnIsArea - 是否返回值符合范围区间，默认为false。
+ * @returns {number} - 返回格式化后的价格，如果超出范围则返回最小值或最大值。
+ */
+export const formatPrice = (price,min=-Infinity, max = 100000000,returnIsArea=false ) => {
+    if(price === undefined || price === null||price===''){
+        return 0
+    }
+    // 将价格转换为浮点数并保留两位小数
+    const newval = parseFloat((Math.floor(price * 100) / 100).toFixed(2))
+    // 如果价格大于最大值，返回最大值
+    if (newval > max) {
+        return returnIsArea?{value:max,error:true}:max
+    }
+    // 如果价格小于最小值，返回最小值
+    if (newval < min) {
+        return returnIsArea?{value:min,error:true}:min
+    }
+    // 如果价格小于最小值，返回最小值
+    if (newval < min) {
+        return min
+    }
+    // 返回格式化后的价格
+    return newval
+}
+export function returnReverseVal(val, isReturnString = true) {
+  const isBol = typeof val === "boolean";
+  const isString = typeof val === "string";
+  let reverseNewval = "";
+  if (isBol) {
+    reverseNewval = !val;
+  }
+  if (isString) {
+    reverseNewval = val === "true" ? "false" : "true";
+  }
+  return reverseNewval;
+}
+export function returnBoolean(val) {
+  const isBol = typeof val === "boolean";
+  const isString = typeof val === "string";
+  let newval = "";
+  if (isBol) {
+    newval = val;
+  }
+  if (isString) {
+    newval = val === "true" ? true : false;
+  }
+  return newval;
+}
--- a/jeepay-ui-uapp-merchant/commons/utils/getDateArea.js
+++ b/jeepay-ui-uapp-merchant/commons/utils/getDateArea.js
@@ -0,0 +1,32 @@
+function getDayArea(date = new Date(), type) {
+	const now = date
+	if (type === 'start') {
+		const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+		return startOfDay
+	}
+	if (type === 'end') {
+		const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
+		return endOfDay;
+	}
+	return `${startOfDay}-${endOfDay}`
+}
+function getMonthArea(date = new Date(), type) {
+	let now = date
+	let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
+	let currentMonthEnd = new Date(now.getFullYear(), now.getMonth() + 1, 0 , 23, 59, 59, 999);
+	if (type === 'start') {
+		return currentMonthStart
+	}
+	if (type === 'end') {
+		return currentMonthEnd;
+	}
+	return {
+	    start: currentMonthStart,
+	    end: currentMonthEnd
+	};
+}
+
+
+export default {
+	getDayArea, getMonthArea
+}
--- a/jeepay-ui-uapp-merchant/commons/utils/getQueryString.js
+++ b/jeepay-ui-uapp-merchant/commons/utils/getQueryString.js
@@ -0,0 +1,13 @@
+/**
+ * 获取url链接参数
+ * @param {Object} url
+ * @param {Object} name
+ */
+export function getQueryString(url, name) {
+	var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
+	var r = url.substr(1).match(reg)
+	if (r != null) {
+		return r[2]
+	}
+	return null;
+}
--- a/jeepay-ui-uapp-merchant/commons/utils/go.js
+++ b/jeepay-ui-uapp-merchant/commons/utils/go.js
@@ -71,9 +71,7 @@ const model = {
 		if(pagesIdOrUrl.indexOf('PAGES_') == 0){
 			pagesIdOrUrl = ALL_PAGES[pagesIdOrUrl]
 		}
-		
 		pagesIdOrUrl += model.object2param(params)
-		
 		if(type == model.GO_TYPE_TO){
 			uni.navigateTo(Object.assign({ url: pagesIdOrUrl }, extObject))	
 		}
--- a/jeepay-ui-uapp-merchant/commons/utils/returrn-data.js
+++ b/jeepay-ui-uapp-merchant/commons/utils/returrn-data.js
@@ -0,0 +1,6 @@
+export const objToArrary = (obj) => {
+	return Object.entries(obj).map(([key, value]) => ({
+		key,
+		...value,
+	}))
+}
--- a/jeepay-ui-uapp-merchant/commons/utils/storageManage.js
+++ b/jeepay-ui-uapp-merchant/commons/utils/storageManage.js
@@ -52,6 +52,27 @@ const model = {
      return appCache.tokenVal
    }
  },
+  // 获取和放置shopId
+  shopId: (val, isDelete = false) => {
+    if (isDelete) {
+      appCache.shopId = ""
+      return uni.removeStorageSync('shopId')
+    }
+  
+    if (val) {
+      // 有值，为放置
+      appCache.shopId = val
+      uni.setStorageSync('shopId', val)
+    } else {
+      // 否则为获取
+  
+      if (!appCache.shopId) {
+        //缓存取不到，获取应用本地信息
+        appCache.shopId = uni.getStorageSync('shopId')
+      }
+      return appCache.shopId
+    }
+  },
  
  // 已经登录的用户记录
  loggedInUser: (addUserName = null, removeUserName = null) => {
--- a/jeepay-ui-uapp-merchant/commons/utils/useStroage.js
+++ b/jeepay-ui-uapp-merchant/commons/utils/useStroage.js
@@ -0,0 +1,14 @@
+export default {
+	get(key) {
+		return uni.getStorageSync(key)
+	},
+	set(key, value) {
+		uni.setStorageSync(key, value)
+	},
+	del(key) {
+		uni.removeStorageSync(key)
+	},
+	clear() {
+		uni.clearStorageSync()
+	}
+}
--- a/jeepay-ui-uapp-merchant/commons/week.js
+++ b/jeepay-ui-uapp-merchant/commons/week.js
@@ -0,0 +1 @@
+export const $weeks=['周一','周二','周三','周四','周五','周六','周日'];
--- a/jeepay-ui-uapp-merchant/components/JeepayTableList/JeepayTableList.vue
+++ b/jeepay-ui-uapp-merchant/components/JeepayTableList/JeepayTableList.vue
@@ -59,12 +59,8 @@ function refTable(isToFirst = false) {
 	return props.reqTableDataFunc(Object.assign({}, vdata.iPage, props.searchData)).then(({ bizData }) => {
 		Object.assign(vdata.apiResData, bizData); // 列表数据更新
 		if (bizData.records) {
-			if (isToFirst) {
-				vdata.allData = [...bizData.records]; // 利用展开语法代替forEach
-			} else {
 			vdata.allData.push(...bizData.records); // 利用展开语法代替forEach
 		}
-		}
 	});
 }

--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/color.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/color.js
@@ -0,0 +1,17 @@
+// 为了让用户能够自定义主题，会逐步弃用此文件，各颜色通过css提供
+// 为了给某些特殊场景使用和向后兼容，无需删除此文件(2020-06-20)
+const color = {
+    primary: '#3c9cff',
+    info: '#909399',
+    default: '#909399',
+    warning: '#f9ae3d',
+    error: '#f56c6c',
+    success: '#5ac725',
+    mainColor: '#303133',
+    contentColor: '#606266',
+    tipsColor: '#909399',
+    lightColor: '#c0c4cc',
+    borderColor: '#e4e7ed'
+}
+
+export default color
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/config.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/config.js
@@ -0,0 +1,33 @@
+const version = '3'
+
+// 开发环境才提示，生产环境不会提示
+if (process.env.NODE_ENV === 'development') {
+	console.log(`\n %c uview-plus V${version} %c https://ijry.github.io/uview-plus/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');
+}
+
+export default {
+    v: version,
+    version,
+    // 主题名称
+    type: [
+        'primary',
+        'success',
+        'info',
+        'error',
+        'warning'
+    ],
+    // 颜色部分，本来可以通过scss的:export导出供js使用，但是奈何nvue不支持
+    color: {
+        'u-primary': '#2979ff',
+        'u-warning': '#ff9900',
+        'u-success': '#19be6b',
+        'u-error': '#fa3534',
+        'u-info': '#909399',
+        'u-main-color': '#303133',
+        'u-content-color': '#606266',
+        'u-tips-color': '#909399',
+        'u-light-color': '#c0c4cc'
+    },
+	// 默认单位，可以通过配置为rpx，那么在用于传入组件大小参数为数值时，就默认为rpx
+	unit: 'px'
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props.js
@@ -0,0 +1,190 @@
+/**
+ * 此文件的作用为统一配置所有组件的props参数
+ * 借此用户可以全局覆盖组件的props默认值
+ * 无需在每个引入组件的页面中都配置一次
+ */
+import config from './config'
+
+import ActionSheet from './props/actionSheet'
+import Album from './props/album'
+import Alert from './props/alert'
+import Avatar from './props/avatar'
+import AvatarGroup from './props/avatarGroup'
+import Backtop from './props/backtop'
+import Badge from './props/badge'
+import Button from './props/button'
+import Calendar from './props/calendar'
+import CarKeyboard from './props/carKeyboard'
+import Cell from './props/cell'
+import CellGroup from './props/cellGroup'
+import Checkbox from './props/checkbox'
+import CheckboxGroup from './props/checkboxGroup'
+import CircleProgress from './props/circleProgress'
+import Code from './props/code'
+import CodeInput from './props/codeInput'
+import Col from './props/col'
+import Collapse from './props/collapse'
+import CollapseItem from './props/collapseItem'
+import ColumnNotice from './props/columnNotice'
+import CountDown from './props/countDown'
+import CountTo from './props/countTo'
+import DatetimePicker from './props/datetimePicker'
+import Divider from './props/divider'
+import Empty from './props/empty'
+import Form from './props/form'
+import GormItem from './props/formItem'
+import Gap from './props/gap'
+import Grid from './props/grid'
+import GridItem from './props/gridItem'
+import Icon from './props/icon'
+import Image from './props/image'
+import IndexAnchor from './props/indexAnchor'
+import IndexList from './props/indexList'
+import Input from './props/input'
+import Keyboard from './props/keyboard'
+import Line from './props/line'
+import LineProgress from './props/lineProgress'
+import Link from './props/link'
+import List from './props/list'
+import ListItem from './props/listItem'
+import LoadingIcon from './props/loadingIcon'
+import LoadingPage from './props/loadingPage'
+import Loadmore from './props/loadmore'
+import Modal from './props/modal'
+import Navbar from './props/navbar'
+import NoNetwork from './props/noNetwork'
+import NoticeBar from './props/noticeBar'
+import Notify from './props/notify'
+import NumberBox from './props/numberBox'
+import NumberKeyboard from './props/numberKeyboard'
+import Overlay from './props/overlay'
+import Parse from './props/parse'
+import Picker from './props/picker'
+import Popup from './props/popup'
+import Radio from './props/radio'
+import RadioGroup from './props/radioGroup'
+import Rate from './props/rate'
+import ReadMore from './props/readMore'
+import Row from './props/row'
+import RowNotice from './props/rowNotice'
+import ScrollList from './props/scrollList'
+import Search from './props/search'
+import Section from './props/section'
+import Skeleton from './props/skeleton'
+import Slider from './props/slider'
+import StatusBar from './props/statusBar'
+import Steps from './props/steps'
+import StepsItem from './props/stepsItem'
+import Sticky from './props/sticky'
+import Subsection from './props/subsection'
+import SwipeAction from './props/swipeAction'
+import SwipeActionItem from './props/swipeActionItem'
+import Swiper from './props/swiper'
+import SwipterIndicator from './props/swipterIndicator'
+import Switch from './props/switch'
+import Tabbar from './props/tabbar'
+import TabbarItem from './props/tabbarItem'
+import Tabs from './props/tabs'
+import Tag from './props/tag'
+import Text from './props/text'
+import Textarea from './props/textarea'
+import Toast from './props/toast'
+import Toolbar from './props/toolbar'
+import Tooltip from './props/tooltip'
+import Transition from './props/transition'
+import Upload from './props/upload'
+
+const {
+    color
+} = config
+
+export default {
+    ...ActionSheet,
+    ...Album,
+    ...Alert,
+    ...Avatar,
+    ...AvatarGroup,
+    ...Backtop,
+    ...Badge,
+    ...Button,
+    ...Calendar,
+    ...CarKeyboard,
+    ...Cell,
+    ...CellGroup,
+    ...Checkbox,
+    ...CheckboxGroup,
+    ...CircleProgress,
+    ...Code,
+    ...CodeInput,
+    ...Col,
+    ...Collapse,
+    ...CollapseItem,
+    ...ColumnNotice,
+    ...CountDown,
+    ...CountTo,
+    ...DatetimePicker,
+    ...Divider,
+    ...Empty,
+    ...Form,
+    ...GormItem,
+    ...Gap,
+    ...Grid,
+    ...GridItem,
+    ...Icon,
+    ...Image,
+    ...IndexAnchor,
+    ...IndexList,
+    ...Input,
+    ...Keyboard,
+    ...Line,
+    ...LineProgress,
+    ...Link,
+    ...List,
+    ...ListItem,
+    ...LoadingIcon,
+    ...LoadingPage,
+    ...Loadmore,
+    ...Modal,
+    ...Navbar,
+    ...NoNetwork,
+    ...NoticeBar,
+    ...Notify,
+    ...NumberBox,
+    ...NumberKeyboard,
+    ...Overlay,
+    ...Parse,
+    ...Picker,
+    ...Popup,
+    ...Radio,
+    ...RadioGroup,
+    ...Rate,
+    ...ReadMore,
+    ...Row,
+    ...RowNotice,
+    ...ScrollList,
+    ...Search,
+    ...Section,
+    ...Skeleton,
+    ...Slider,
+    ...StatusBar,
+    ...Steps,
+    ...StepsItem,
+    ...Sticky,
+    ...Subsection,
+    ...SwipeAction,
+    ...SwipeActionItem,
+    ...Swiper,
+    ...SwipterIndicator,
+    ...Switch,
+    ...Tabbar,
+    ...TabbarItem,
+    ...Tabs,
+    ...Tag,
+    ...Text,
+    ...Textarea,
+    ...Toast,
+    ...Toolbar,
+    ...Tooltip,
+    ...Transition,
+    ...Upload
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/actionSheet.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/actionSheet.js
@@ -0,0 +1,26 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:44:35
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/actionSheet.js
+ */
+export default {
+    // action-sheet组件
+    actionSheet: {
+        show: false,
+        title: '',
+        description: '',
+        actions: [],
+        index: '',
+        cancelText: '',
+        closeOnClickAction: true,
+        safeAreaInsetBottom: true,
+        openType: '',
+        closeOnClickOverlay: true,
+        round: 0,
+        wrapMaxHeight: '600px'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/album.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/album.js
@@ -0,0 +1,27 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:47:24
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/album.js
+ */
+export default {
+    // album 组件
+    album: {
+        urls: [],
+        keyName: '',
+        singleSize: 180,
+        multipleSize: 70,
+        space: 6,
+        singleMode: 'scaleToFill',
+        multipleMode: 'aspectFill',
+        maxCount: 9,
+        previewFullImage: true,
+        rowCount: 3,
+        showMore: true,
+        autoWrap: false,
+        unit: 'px'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/alert.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/alert.js
@@ -0,0 +1,22 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:48:53
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/alert.js
+ */
+export default {
+    // alert警告组件
+    alert: {
+        title: '',
+        type: 'warning',
+        description: '',
+        closable: false,
+        showIcon: false,
+        effect: 'light',
+        center: false,
+        fontSize: 14
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/avatar.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/avatar.js
@@ -0,0 +1,28 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:49:22
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/avatar.js
+ */
+export default {
+    // avatar 组件
+    avatar: {
+        src: '',
+        shape: 'circle',
+        size: 40,
+        mode: 'scaleToFill',
+        text: '',
+        bgColor: '#c0c4cc',
+        color: '#ffffff',
+        fontSize: 18,
+        icon: '',
+        mpAvatar: false,
+        randomBgColor: false,
+        defaultUrl: '',
+        colorIndex: '',
+        name: ''
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/avatarGroup.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/avatarGroup.js
@@ -0,0 +1,23 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:49:55
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/avatarGroup.js
+ */
+export default {
+    // avatarGroup 组件
+    avatarGroup: {
+        urls: [],
+        maxCount: 5,
+        shape: 'circle',
+        mode: 'scaleToFill',
+        showMore: true,
+        size: 40,
+        keyName: '',
+        gap: 0.5,
+		extraValue: 0
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/backtop.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/backtop.js
@@ -0,0 +1,27 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:50:18
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/backtop.js
+ */
+export default {
+    // backtop组件
+    backtop: {
+        mode: 'circle',
+        icon: 'arrow-upward',
+        text: '',
+        duration: 100,
+        scrollTop: 0,
+        top: 400,
+        bottom: 100,
+        right: 20,
+        zIndex: 9,
+        iconStyle: {
+            color: '#909399',
+            fontSize: '19px'
+        }
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/badge.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/badge.js
@@ -0,0 +1,27 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-23 19:51:50
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/badge.js
+ */
+export default {
+    // 徽标数组件
+    badge: {
+        isDot: false,
+        value: '',
+        show: true,
+        max: 999,
+        type: 'error',
+        showZero: false,
+        bgColor: null,
+        color: null,
+        shape: 'circle',
+        numberType: 'overflow',
+        offset: [],
+        inverted: false,
+        absolute: false
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/button.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/button.js
@@ -0,0 +1,42 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:51:27
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/button.js
+ */
+export default {
+    // button组件
+    button: {
+        hairline: false,
+        type: 'info',
+        size: 'normal',
+        shape: 'square',
+        plain: false,
+        disabled: false,
+        loading: false,
+        loadingText: '',
+        loadingMode: 'spinner',
+        loadingSize: 15,
+        openType: '',
+        formType: '',
+        appParameter: '',
+        hoverStopPropagation: true,
+        lang: 'en',
+        sessionFrom: '',
+        sendMessageTitle: '',
+        sendMessagePath: '',
+        sendMessageImg: '',
+        showMessageCard: false,
+        dataName: '',
+        throttleTime: 0,
+        hoverStartTime: 0,
+        hoverStayTime: 200,
+        text: '',
+        icon: '',
+        iconColor: '',
+        color: ''
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/calendar.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/calendar.js
@@ -0,0 +1,42 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:52:43
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/calendar.js
+ */
+export default {
+    // calendar 组件
+    calendar: {
+        title: '日期选择',
+        showTitle: true,
+        showSubtitle: true,
+        mode: 'single',
+        startText: '开始',
+        endText: '结束',
+        customList: [],
+        color: '#3c9cff',
+        minDate: 0,
+        maxDate: 0,
+        defaultDate: null,
+        maxCount: Number.MAX_SAFE_INTEGER, // Infinity
+        rowHeight: 56,
+        formatter: null,
+        showLunar: false,
+        showMark: true,
+        confirmText: '确定',
+        confirmDisabledText: '确定',
+        show: false,
+        closeOnClickOverlay: false,
+        readonly: false,
+        showConfirm: true,
+        maxRange: Number.MAX_SAFE_INTEGER, // Infinity
+        rangePrompt: '',
+        showRangePrompt: true,
+        allowSameDay: false,
+		round: 0,
+		monthNum: 3
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/carKeyboard.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/carKeyboard.js
@@ -0,0 +1,15 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:53:20
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/carKeyboard.js
+ */
+export default {
+    // 车牌号键盘
+    carKeyboard: {
+        random: false
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/cell.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/cell.js
@@ -0,0 +1,35 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-23 20:53:09
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/cell.js
+ */
+export default {
+	// cell组件的props
+	cell: {
+		customClass: '',
+		title: '',
+		label: '',
+		value: '',
+		icon: '',
+		disabled: false,
+		border: true,
+		center: false,
+		url: '',
+		linkType: 'navigateTo',
+		clickable: false,
+		isLink: false,
+		required: false,
+		arrowDirection: '',
+		iconStyle: {},
+		rightIconStyle: {},
+		rightIcon: 'arrow-right',
+		titleStyle: {},
+		size: '',
+		stop: true,
+		name: ''
+	}
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/cellGroup.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/cellGroup.js
@@ -0,0 +1,17 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:54:16
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/cellGroup.js
+ */
+export default {
+    // cell-group组件的props
+    cellGroup: {
+        title: '',
+        border: true,
+        customStyle: {}
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/checkbox.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/checkbox.js
@@ -0,0 +1,27 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-23 21:06:59
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/checkbox.js
+ */
+export default {
+    // checkbox组件
+    checkbox: {
+        name: '',
+        shape: '',
+        size: '',
+        checkbox: false,
+        disabled: '',
+        activeColor: '',
+        inactiveColor: '',
+        iconSize: '',
+        iconColor: '',
+        label: '',
+        labelSize: '',
+        labelColor: '',
+        labelDisabled: ''
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/checkboxGroup.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/checkboxGroup.js
@@ -0,0 +1,29 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:54:47
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/checkboxGroup.js
+ */
+export default {
+    // checkbox-group组件
+    checkboxGroup: {
+        name: '',
+        value: [],
+        shape: 'square',
+        disabled: false,
+        activeColor: '#2979ff',
+        inactiveColor: '#c8c9cc',
+        size: 18,
+        placement: 'row',
+        labelSize: 14,
+        labelColor: '#303133',
+        labelDisabled: false,
+        iconColor: '#ffffff',
+        iconSize: 12,
+        iconPlacement: 'left',
+        borderBottom: false
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/circleProgress.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/circleProgress.js
@@ -0,0 +1,15 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:55:02
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/circleProgress.js
+ */
+export default {
+    // circleProgress 组件
+    circleProgress: {
+        percentage: 30
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/code.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/code.js
@@ -0,0 +1,21 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:55:27
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/code.js
+ */
+
+export default {
+    // code 组件
+    code: {
+        seconds: 60,
+        startText: '获取验证码',
+        changeText: 'X秒重新获取',
+        endText: '重新获取',
+        keepRunning: false,
+        uniqueKey: ''
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/codeInput.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/codeInput.js
@@ -0,0 +1,29 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:55:58
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/codeInput.js
+ */
+export default {
+    // codeInput 组件
+    codeInput: {
+		adjustPosition: true,
+        maxlength: 6,
+        dot: false,
+        mode: 'box',
+        hairline: false,
+        space: 10,
+        value: '',
+        focus: false,
+        bold: false,
+        color: '#606266',
+        fontSize: 18,
+        size: 35,
+        disabledKeyboard: false,
+        borderColor: '#c9cacc',
+		disabledDot: true
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/col.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/col.js
@@ -0,0 +1,19 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:56:12
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/col.js
+ */
+export default {
+    // col 组件
+    col: {
+        span: 12,
+        offset: 0,
+        justify: 'start',
+        align: 'stretch',
+        textAlign: 'left'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/collapse.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/collapse.js
@@ -0,0 +1,17 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:56:30
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/collapse.js
+ */
+export default {
+    // collapse 组件
+    collapse: {
+        value: null,
+        accordion: false,
+        border: true
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/collapseItem.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/collapseItem.js
@@ -0,0 +1,26 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:56:42
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/collapseItem.js
+ */
+export default {
+    // collapseItem 组件
+    collapseItem: {
+        title: '',
+        value: '',
+        label: '',
+        disabled: false,
+        isLink: true,
+        clickable: true,
+        border: true,
+        align: 'left',
+        name: '',
+        icon: '',
+        duration: 300,
+        showRight: true
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/columnNotice.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/columnNotice.js
@@ -0,0 +1,24 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:57:16
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/columnNotice.js
+ */
+export default {
+    // columnNotice 组件
+    columnNotice: {
+        text: '',
+        icon: 'volume',
+        mode: '',
+        color: '#f9ae3d',
+        bgColor: '#fdf6ec',
+        fontSize: 14,
+        speed: 80,
+        step: false,
+        duration: 1500,
+        disableTouch: true
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/countDown.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/countDown.js
@@ -0,0 +1,18 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:11:29
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/countDown.js
+ */
+export default {
+    // u-count-down 计时器组件
+    countDown: {
+        time: 0,
+        format: 'HH:mm:ss',
+        autoStart: true,
+        millisecond: false
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/countTo.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/countTo.js
@@ -0,0 +1,25 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:57:32
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/countTo.js
+ */
+export default {
+    // countTo 组件
+    countTo: {
+        startVal: 0,
+        endVal: 0,
+        duration: 2000,
+        autoplay: true,
+        decimals: 0,
+        useEasing: true,
+        decimal: '.',
+        color: '#606266',
+        fontSize: 22,
+        bold: false,
+        separator: ''
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/datetimePicker.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/datetimePicker.js
@@ -0,0 +1,37 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:57:48
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/datetimePicker.js
+ */
+export default {
+    // datetimePicker 组件
+    datetimePicker: {
+        show: false,
+		popupMode: 'bottom',
+        showToolbar: true,
+        value: '',
+        title: '',
+        mode: 'datetime',
+        maxDate: new Date(new Date().getFullYear() + 10, 0, 1).getTime(),
+        minDate: new Date(new Date().getFullYear() - 10, 0, 1).getTime(),
+        minHour: 0,
+        maxHour: 23,
+        minMinute: 0,
+        maxMinute: 59,
+        filter: null,
+        formatter: null,
+        loading: false,
+        itemHeight: 44,
+        cancelText: '取消',
+        confirmText: '确认',
+        cancelColor: '#909193',
+        confirmColor: '#3c9cff',
+        visibleItemCount: 5,
+        closeOnClickOverlay: false,
+        defaultIndex: []
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/divider.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/divider.js
@@ -0,0 +1,23 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 16:58:03
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/divider.js
+ */
+export default {
+    // divider组件
+    divider: {
+        dashed: false,
+        hairline: true,
+        dot: false,
+        textPosition: 'center',
+        text: '',
+        textSize: 14,
+        textColor: '#909399',
+        lineColor: '#dcdfe6'
+    }
+
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/empty.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/empty.js
@@ -0,0 +1,26 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:03:27
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/empty.js
+ */
+export default {
+    // empty组件
+    empty: {
+        icon: '',
+        text: '',
+        textColor: '#c0c4cc',
+        textSize: 14,
+        iconColor: '#c0c4cc',
+        iconSize: 90,
+        mode: 'data',
+        width: 160,
+        height: 160,
+        show: true,
+        marginTop: 0
+    }
+
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/form.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/form.js
@@ -0,0 +1,22 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:03:49
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/form.js
+ */
+export default {
+    // form 组件
+    form: {
+        model: {},
+        rules: {},
+        errorType: 'message',
+        borderBottom: true,
+        labelPosition: 'left',
+        labelWidth: 45,
+        labelAlign: 'left',
+        labelStyle: {}
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/formItem.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/formItem.js
@@ -0,0 +1,24 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:04:32
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/formItem.js
+ */
+export default {
+    // formItem 组件
+    formItem: {
+        label: '',
+        prop: '',
+        rules: [],
+        borderBottom: '',
+        labelPosition: '',
+        labelWidth: '',
+        rightIcon: '',
+        leftIcon: '',
+        required: false,
+        leftIconStyle: '',
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/gap.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/gap.js
@@ -0,0 +1,19 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:05:25
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/gap.js
+ */
+export default {
+    // gap组件
+    gap: {
+        bgColor: 'transparent',
+        height: 20,
+        marginTop: 0,
+        marginBottom: 0,
+        customStyle: {}
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/grid.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/grid.js
@@ -0,0 +1,17 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:05:57
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/grid.js
+ */
+export default {
+    // grid组件
+    grid: {
+        col: 3,
+        border: false,
+        align: 'left'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/gridItem.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/gridItem.js
@@ -0,0 +1,16 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:06:13
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/gridItem.js
+ */
+export default {
+    // grid-item组件
+    gridItem: {
+        name: null,
+        bgColor: 'transparent'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/icon.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/icon.js
@@ -0,0 +1,36 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 18:00:14
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/icon.js
+ */
+import config from '../config'
+
+const {
+    color
+} = config
+export default {
+    // icon组件
+    icon: {
+        name: '',
+        color: color['u-content-color'],
+        size: '16px',
+        bold: false,
+        index: '',
+        hoverClass: '',
+        customPrefix: 'uicon',
+        label: '',
+        labelPos: 'right',
+        labelSize: '15px',
+        labelColor: color['u-content-color'],
+        space: '3px',
+        imgMode: '',
+        width: '',
+        height: '',
+        top: 0,
+        stop: false
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/image.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/image.js
@@ -0,0 +1,30 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:01:51
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/image.js
+ */
+export default {
+    // image组件
+    image: {
+        src: '',
+        mode: 'aspectFill',
+        width: '300',
+        height: '225',
+        shape: 'square',
+        radius: 0,
+        lazyLoad: true,
+        showMenuByLongpress: true,
+        loadingIcon: 'photo',
+        errorIcon: 'error-circle',
+        showLoading: true,
+        showError: true,
+        fade: true,
+        webp: false,
+        duration: 500,
+        bgColor: '#f3f4f6'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/indexAnchor.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/indexAnchor.js
@@ -0,0 +1,19 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:13:15
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/indexAnchor.js
+ */
+export default {
+    // indexAnchor 组件
+    indexAnchor: {
+        text: '',
+        color: '#606266',
+        size: 14,
+        bgColor: '#dedede',
+        height: 32
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/indexList.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/indexList.js
@@ -0,0 +1,20 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:13:35
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/indexList.js
+ */
+export default {
+    // indexList 组件
+    indexList: {
+        inactiveColor: '#606266',
+        activeColor: '#5677fc',
+        indexList: [],
+        sticky: true,
+        customNavHeight: 0,
+        safeBottomFix: false
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/input.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/input.js
@@ -0,0 +1,48 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:13:55
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/input.js
+ */
+export default {
+	// index 组件
+	input: {
+		value: '',
+		type: 'text',
+		fixed: false,
+		disabled: false,
+		disabledColor: '#f5f7fa',
+		clearable: false,
+		password: false,
+		maxlength: 140,
+		placeholder: null,
+		placeholderClass: 'input-placeholder',
+		placeholderStyle: 'color: #c0c4cc',
+		showWordLimit: false,
+		confirmType: 'done',
+		confirmHold: false,
+		holdKeyboard: false,
+		focus: false,
+		autoBlur: false,
+		disableDefaultPadding: false,
+		cursor: -1,
+		cursorSpacing: 30,
+		selectionStart: -1,
+		selectionEnd: -1,
+		adjustPosition: true,
+		inputAlign: 'left',
+		fontSize: '15px',
+		color: '#303133',
+		prefixIcon: '',
+		prefixIconStyle: '',
+		suffixIcon: '',
+		suffixIconStyle: '',
+		border: 'surround',
+		readonly: false,
+		shape: 'square',
+		formatter: null
+	}
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/keyboard.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/keyboard.js
@@ -0,0 +1,30 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:07:49
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/keyboard.js
+ */
+export default {
+    // 键盘组件
+    keyboard: {
+        mode: 'number',
+        dotDisabled: false,
+        tooltip: true,
+        showTips: true,
+        tips: '',
+        showCancel: true,
+        showConfirm: true,
+        random: false,
+        safeAreaInsetBottom: true,
+        closeOnClickOverlay: true,
+        show: false,
+        overlay: true,
+        zIndex: 10075,
+        cancelText: '取消',
+        confirmText: '确定',
+        autoChange: false
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/line.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/line.js
@@ -0,0 +1,20 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:04:49
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/line.js
+ */
+export default {
+    // line组件
+    line: {
+        color: '#d6d7d9',
+        length: '100%',
+        direction: 'row',
+        hairline: true,
+        margin: 0,
+        dashed: false
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/lineProgress.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/lineProgress.js
@@ -0,0 +1,19 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:14:11
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/lineProgress.js
+ */
+export default {
+    // lineProgress 组件
+    lineProgress: {
+        activeColor: '#19be6b',
+        inactiveColor: '#ececec',
+        percentage: 0,
+        showText: true,
+        height: 12
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/link.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/link.js
@@ -0,0 +1,26 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:45:36
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/link.js
+ */
+import config from '../config'
+
+const {
+    color
+} = config
+export default {
+    // link超链接组件props参数
+    link: {
+        color: color['u-primary'],
+        fontSize: 15,
+        underLine: false,
+        href: '',
+        mpTips: '链接已复制，请在浏览器打开',
+        lineColor: '',
+        text: ''
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/list.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/list.js
@@ -0,0 +1,28 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:14:53
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/list.js
+ */
+export default {
+    // list 组件
+    list: {
+        showScrollbar: false,
+        lowerThreshold: 50,
+        upperThreshold: 0,
+        scrollTop: 0,
+        offsetAccuracy: 10,
+        enableFlex: false,
+        pagingEnabled: false,
+        scrollable: true,
+        scrollIntoView: '',
+        scrollWithAnimation: false,
+        enableBackToTop: false,
+        height: 0,
+        width: 0,
+        preLoadScreen: 1
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/listItem.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/listItem.js
@@ -0,0 +1,15 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:15:40
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/listItem.js
+ */
+export default {
+    // listItem 组件
+    listItem: {
+        anchor: ''
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/loadingIcon.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/loadingIcon.js
@@ -0,0 +1,30 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:45:47
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/loadingIcon.js
+ */
+import config from '../config'
+
+const {
+    color
+} = config
+export default {
+    // loading-icon加载中图标组件
+    loadingIcon: {
+        show: true,
+        color: color['u-tips-color'],
+        textColor: color['u-tips-color'],
+        vertical: false,
+        mode: 'spinner',
+        size: 24,
+        textSize: 15,
+        text: '',
+        timingFunction: 'ease-in-out',
+        duration: 1200,
+        inactiveColor: ''
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/loadingPage.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/loadingPage.js
@@ -0,0 +1,24 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:00:23
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/loadingPage.js
+ */
+export default {
+    // loading-page组件
+    loadingPage: {
+        loadingText: '正在加载',
+        image: '',
+        loadingMode: 'circle',
+        loading: false,
+        bgColor: '#ffffff',
+        color: '#C8C8C8',
+        fontSize: 19,
+        iconSize: 28,
+        loadingColor: '#C8C8C8',
+        zIndex: 10
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/loadmore.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/loadmore.js
@@ -0,0 +1,32 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:15:26
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/loadmore.js
+ */
+export default {
+    // loadmore 组件
+    loadmore: {
+        status: 'loadmore',
+        bgColor: 'transparent',
+        icon: true,
+        fontSize: 14,
+		iconSize: 17,
+        color: '#606266',
+        loadingIcon: 'spinner',
+        loadmoreText: '加载更多',
+        loadingText: '正在加载...',
+        nomoreText: '没有更多了',
+        isDot: false,
+        iconColor: '#b7b7b7',
+        marginTop: 10,
+        marginBottom: 10,
+        height: 'auto',
+        line: false,
+		lineColor: '#E6E8EB',
+		dashed: false,
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/modal.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/modal.js
@@ -0,0 +1,31 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:15:59
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/modal.js
+ */
+export default {
+    // modal 组件
+    modal: {
+        show: false,
+        title: '',
+        content: '',
+        confirmText: '确认',
+        cancelText: '取消',
+        showConfirmButton: true,
+        showCancelButton: false,
+        confirmColor: '#2979ff',
+        cancelColor: '#606266',
+        buttonReverse: false,
+        zoom: true,
+        asyncClose: false,
+        closeOnClickOverlay: false,
+        negativeTop: 0,
+        width: '650rpx',
+        confirmButtonShape: '',
+        contentTextAlign: 'left'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/navbar.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/navbar.js
@@ -0,0 +1,32 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:16:18
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/navbar.js
+ */
+import color from '../color'
+export default {
+    // navbar 组件
+    navbar: {
+        safeAreaInsetTop: true,
+        placeholder: false,
+        fixed: true,
+        border: false,
+        leftIcon: 'arrow-left',
+        leftText: '',
+        rightText: '',
+        rightIcon: '',
+        title: '',
+        bgColor: '#ffffff',
+        titleWidth: '400rpx',
+        height: '44px',
+		leftIconSize: 20,
+		leftIconColor: color.mainColor,
+		autoBack: false,
+		titleStyle: ''
+    }
+
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/noNetwork.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/noNetwork.js
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/noticeBar.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/noticeBar.js
@@ -0,0 +1,27 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:17:13
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/noticeBar.js
+ */
+export default {
+    // noticeBar
+    noticeBar: {
+        text: [],
+        direction: 'row',
+        step: false,
+        icon: 'volume',
+        mode: '',
+        color: '#f9ae3d',
+        bgColor: '#fdf6ec',
+        speed: 80,
+        fontSize: 14,
+        duration: 2000,
+        disableTouch: true,
+        url: '',
+        linkType: 'navigateTo'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/notify.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/notify.js
@@ -0,0 +1,22 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:10:21
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/notify.js
+ */
+export default {
+    // notify组件
+    notify: {
+        top: 0,
+        type: 'primary',
+        color: '#ffffff',
+        bgColor: '',
+        message: '',
+        duration: 3000,
+        fontSize: 15,
+        safeAreaInsetTop: false
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/numberBox.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/numberBox.js
@@ -0,0 +1,35 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:11:46
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/numberBox.js
+ */
+export default {
+    // 步进器组件
+    numberBox: {
+        name: '',
+        value: 0,
+        min: 1,
+        max: Number.MAX_SAFE_INTEGER,
+        step: 1,
+        integer: false,
+        disabled: false,
+        disabledInput: false,
+        asyncChange: false,
+        inputWidth: 35,
+        showMinus: true,
+        showPlus: true,
+        decimalLength: null,
+        longPress: true,
+        color: '#323233',
+        buttonSize: 30,
+        bgColor: '#EBECEE',
+        cursorSpacing: 100,
+        disableMinus: false,
+        disablePlus: false,
+        iconStyle: ''
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/numberKeyboard.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/numberKeyboard.js
@@ -0,0 +1,17 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:08:05
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/numberKeyboard.js
+ */
+export default {
+    // 数字键盘
+    numberKeyboard: {
+        mode: 'number',
+        dotDisabled: false,
+        random: false
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/overlay.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/overlay.js
@@ -0,0 +1,18 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:06:50
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/overlay.js
+ */
+export default {
+    // overlay组件
+    overlay: {
+        show: false,
+        zIndex: 10070,
+        duration: 300,
+        opacity: 0.5
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/parse.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/parse.js
@@ -0,0 +1,22 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:17:33
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/parse.js
+ */
+export default {
+    // parse
+    parse: {
+        copyLink: true,
+        errorImg: '',
+        lazyLoad: false,
+        loadingImg: '',
+        pauseVideo: true,
+        previewImg: true,
+        setTitle: true,
+        showImgMenu: true
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/picker.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/picker.js
@@ -0,0 +1,30 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:18:20
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/picker.js
+ */
+export default {
+    // picker
+    picker: {
+        show: false,
+		popupMode: 'bottom',
+        showToolbar: true,
+        title: '',
+        columns: [],
+        loading: false,
+        itemHeight: 44,
+        cancelText: '取消',
+        confirmText: '确定',
+        cancelColor: '#909193',
+        confirmColor: '#3c9cff',
+        visibleItemCount: 5,
+        keyName: 'text',
+        closeOnClickOverlay: false,
+        defaultIndex: [],
+		immediateChange: true
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/popup.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/popup.js
@@ -0,0 +1,29 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:06:33
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/popup.js
+ */
+export default {
+    // popup组件
+    popup: {
+        show: false,
+        overlay: true,
+        mode: 'bottom',
+        duration: 300,
+        closeable: false,
+        overlayStyle: {},
+        closeOnClickOverlay: true,
+        zIndex: 10075,
+        safeAreaInsetBottom: true,
+        safeAreaInsetTop: false,
+        closeIconPos: 'top-right',
+        round: 0,
+        zoom: true,
+        bgColor: '',
+        overlayOpacity: 0.5
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/radio.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/radio.js
@@ -0,0 +1,27 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:02:34
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/radio.js
+ */
+export default {
+    // radio组件
+    radio: {
+        name: '',
+        shape: '',
+        disabled: '',
+        labelDisabled: '',
+        activeColor: '',
+        inactiveColor: '',
+        iconSize: '',
+        labelSize: '',
+        label: '',
+        labelColor: '',
+        size: '',
+        iconColor: '',
+        placement: ''
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/radioGroup.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/radioGroup.js
@@ -0,0 +1,30 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:03:12
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/radioGroup.js
+ */
+export default {
+    // radio-group组件
+    radioGroup: {
+        value: '',
+        disabled: false,
+        shape: 'circle',
+        activeColor: '#2979ff',
+        inactiveColor: '#c8c9cc',
+        name: '',
+        size: 18,
+        placement: 'row',
+        label: '',
+        labelColor: '#303133',
+        labelSize: 14,
+        labelDisabled: false,
+        iconColor: '#ffffff',
+        iconSize: 12,
+        borderBottom: false,
+        iconPlacement: 'left'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/rate.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/rate.js
@@ -0,0 +1,26 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:05:09
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/rate.js
+ */
+export default {
+    // rate组件
+    rate: {
+        value: 1,
+        count: 5,
+        disabled: false,
+        size: 18,
+        inactiveColor: '#b2b2b2',
+        activeColor: '#FA3534',
+        gutter: 4,
+        minCount: 1,
+        allowHalf: false,
+        activeIcon: 'star-fill',
+        inactiveIcon: 'star',
+        touchable: true
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/readMore.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/readMore.js
@@ -0,0 +1,22 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:18:41
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/readMore.js
+ */
+export default {
+    // readMore
+    readMore: {
+        showHeight: 400,
+        toggle: false,
+        closeText: '展开阅读全文',
+        openText: '收起',
+        color: '#2979ff',
+        fontSize: 14,
+        textIndent: '2em',
+        name: ''
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/row.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/row.js
@@ -0,0 +1,17 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:18:58
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/row.js
+ */
+export default {
+    // row
+    row: {
+        gutter: 0,
+        justify: 'start',
+        align: 'center'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/rowNotice.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/rowNotice.js
@@ -0,0 +1,21 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:19:13
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/rowNotice.js
+ */
+export default {
+    // rowNotice
+    rowNotice: {
+        text: '',
+        icon: 'volume',
+        mode: '',
+        color: '#f9ae3d',
+        bgColor: '#fdf6ec',
+        fontSize: 14,
+        speed: 80
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/scrollList.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/scrollList.js
@@ -0,0 +1,20 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:19:28
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/scrollList.js
+ */
+export default {
+    // scrollList
+    scrollList: {
+        indicatorWidth: 50,
+        indicatorBarWidth: 20,
+        indicator: true,
+        indicatorColor: '#f2f2f2',
+        indicatorActiveColor: '#3c9cff',
+        indicatorStyle: ''
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/search.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/search.js
@@ -0,0 +1,37 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:19:45
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/search.js
+ */
+export default {
+    // search
+    search: {
+        shape: 'round',
+        bgColor: '#f2f2f2',
+        placeholder: '请输入关键字',
+        clearabled: true,
+        focus: false,
+        showAction: true,
+        actionStyle: {},
+        actionText: '搜索',
+        inputAlign: 'left',
+        inputStyle: {},
+        disabled: false,
+        borderColor: 'transparent',
+        searchIconColor: '#909399',
+        searchIconSize: 22,
+        color: '#606266',
+        placeholderColor: '#909399',
+        searchIcon: 'search',
+        margin: '0',
+        animation: false,
+        value: '',
+        maxlength: '-1',
+        height: 32,
+        label: null
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/section.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/section.js
@@ -0,0 +1,24 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:07:33
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/section.js
+ */
+export default {
+    // u-section组件
+    section: {
+        title: '',
+        subTitle: '更多',
+        right: true,
+        fontSize: 15,
+        bold: true,
+        color: '#303133',
+        subColor: '#909399',
+        showLine: true,
+        lineColor: '',
+        arrow: true
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/skeleton.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/skeleton.js
@@ -0,0 +1,25 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:20:14
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/skeleton.js
+ */
+export default {
+    // skeleton
+    skeleton: {
+        loading: true,
+        animate: true,
+        rows: 0,
+        rowsWidth: '100%',
+        rowsHeight: 18,
+        title: true,
+        titleWidth: '50%',
+        titleHeight: 18,
+        avatar: false,
+        avatarSize: 32,
+        avatarShape: 'circle'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/slider.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/slider.js
@@ -0,0 +1,27 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:08:25
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/slider.js
+ */
+export default {
+    // slider组件
+    slider: {
+        value: 0,
+        blockSize: 18,
+        min: 0,
+        max: 100,
+        step: 1,
+        activeColor: '#2979ff',
+        inactiveColor: '#c0c4cc',
+        blockColor: '#ffffff',
+        showValue: false,
+		disabled:false,
+        blockStyle: {},
+        useNative: false,
+        height: '2px'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/statusBar.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/statusBar.js
@@ -0,0 +1,15 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:20:39
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/statusBar.js
+ */
+export default {
+    // statusBar
+    statusBar: {
+        bgColor: 'transparent'
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/steps.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/steps.js
@@ -0,0 +1,21 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:12:37
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/steps.js
+ */
+export default {
+    // steps组件
+    steps: {
+        direction: 'row',
+        current: 0,
+        activeColor: '#3c9cff',
+        inactiveColor: '#969799',
+        activeIcon: '',
+        inactiveIcon: '',
+        dot: false
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/stepsItem.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/stepsItem.js
@@ -0,0 +1,18 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:12:55
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/stepsItem.js
+ */
+export default {
+    // steps-item组件
+    stepsItem: {
+        title: '',
+        desc: '',
+        iconSize: 17,
+        error: false
+    }
+}
--- a/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/sticky.js
+++ b/jeepay-ui-uapp-merchant/components/my-components/libs/config/props/sticky.js
@@ -0,0 +1,20 @@
+/*
+ * @Author       : LQ
+ * @Description  :
+ * @version      : 1.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : LQ
+ * @lastTime     : 2021-08-20 17:01:30
+ * @FilePath     : /u-view2.0/uview-ui/libs/config/props/sticky.js
+ */
+export default {
+    // sticky组件
+    sticky: {
+        offsetTop: 0,
+        customNavHeight: 0,
+        disabled: false,
+        bgColor: 'transparent',
+        zIndex: '',
+        index: ''
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
YeMingfei666	7a65454718	合并代码	2024-09-10 11:04:40 +08:00
duan	cfed2474ae	支付汇总	2024-09-10 10:33:36 +08:00
duan	042dcf03a6	Merge branch 'y_dev' of e.coding.net:g-cphe0354/new-cashier/new-cashier into dwb	2024-09-10 09:43:48 +08:00
duan	c550a9d623	合并代码	2024-09-10 09:43:37 +08:00
YeMingfei666	34853b8783	增加部分公共样式修改部分公共组件代码修改台桌，代课下单逻辑代码增加支付页面修改用户列表页面	2024-09-09 17:47:19 +08:00
YeMingfei666	da5f7ca916	请求处理代理商品管理商品分类用户管理桌台代客下单进销存交班预定座位充值管理存酒管理	2024-09-03 11:32:15 +08:00
				`@@ -0,0 +1 @@`
				`export const $weeks=['周一','周二','周三','周四','周五','周六','周日'];`