Compare commits

...

5 Commits

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
45 changed files with 5144 additions and 2544 deletions

View File

@ -28,6 +28,7 @@
"qrcode.vue": "^3.3.3", "qrcode.vue": "^3.3.3",
"qs": "^6.10.1", "qs": "^6.10.1",
"reconnectingwebsocket": "^1.0.0", "reconnectingwebsocket": "^1.0.0",
"sass": "^1.50.1",
"snabbdom": "^3.5.1", "snabbdom": "^3.5.1",
"store": "^2.0.12", "store": "^2.0.12",
"v-viewer": "^3.0.11", "v-viewer": "^3.0.11",

File diff suppressed because it is too large Load Diff

View File

@ -26,9 +26,7 @@ import 'bootstrap-icons/font/bootstrap-icons.css'
import { VueClipboard } from '@soerenmartius/vue3-clipboard' //复制插件 https://github.com/soerenmartius/vue3-clipboard import { VueClipboard } from '@soerenmartius/vue3-clipboard' //复制插件 https://github.com/soerenmartius/vue3-clipboard
import icons from './icons' import icons from './icons'
import infoBox from '@/utils/infoBox' import infoBox from '@/utils/infoBox'
import { setSiteInfos } from './oemconfig' import { setSiteInfos } from './oemconfig'
import { setGlobalApp } from '@/config/appConfig' import { setGlobalApp } from '@/config/appConfig'

View File

@ -14,7 +14,9 @@
"paths": { "paths": {
"@/*": [ "@/*": [
"src/*" "src/*"
] ],
"~/*": ["./src/*"],
"pinia": ["./node_modules/pinia"]
}, },
}, },
"include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue", "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue",

View File

@ -3,37 +3,37 @@
"@babel/parser@^7.16.4": "@babel/parser@^7.16.4":
"integrity" "sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==" version "7.17.0"
"resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz" resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz"
"version" "7.17.0" integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==
"@vitejs/plugin-vue@^1.6.0": "@vitejs/plugin-vue@^1.6.0":
"integrity" "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==" version "1.10.2"
"resolved" "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz" resolved "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz"
"version" "1.10.2" integrity sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==
"@vue/compiler-core@3.2.30": "@vue/compiler-core@3.2.30":
"integrity" "sha512-64fq1KfcR+k3Vlw+IsBM2VhV5B+2IP3YxvKU8LWCDLrkmlXtbf2eMK6+0IwX5KP41D0f1gzryIiXR7P8cB9O5Q==" version "3.2.30"
"resolved" "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.30.tgz" resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.30.tgz"
"version" "3.2.30" integrity sha512-64fq1KfcR+k3Vlw+IsBM2VhV5B+2IP3YxvKU8LWCDLrkmlXtbf2eMK6+0IwX5KP41D0f1gzryIiXR7P8cB9O5Q==
dependencies: dependencies:
"@babel/parser" "^7.16.4" "@babel/parser" "^7.16.4"
"@vue/shared" "3.2.30" "@vue/shared" "3.2.30"
"estree-walker" "^2.0.2" estree-walker "^2.0.2"
"source-map" "^0.6.1" source-map "^0.6.1"
"@vue/compiler-dom@3.2.30": "@vue/compiler-dom@3.2.30":
"integrity" "sha512-t7arHz2SXLCXlF2fdGDFVbhENbGMez254Z5edUqb//6WXJU1lC7GvSkUE7i5x8WSjgfqt60i0V8zdmk16rvLdw==" version "3.2.30"
"resolved" "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.30.tgz" resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.30.tgz"
"version" "3.2.30" integrity sha512-t7arHz2SXLCXlF2fdGDFVbhENbGMez254Z5edUqb//6WXJU1lC7GvSkUE7i5x8WSjgfqt60i0V8zdmk16rvLdw==
dependencies: dependencies:
"@vue/compiler-core" "3.2.30" "@vue/compiler-core" "3.2.30"
"@vue/shared" "3.2.30" "@vue/shared" "3.2.30"
"@vue/compiler-sfc@3.2.30": "@vue/compiler-sfc@3.2.30":
"integrity" "sha512-P/5YpILtcQY92z72gxhkyOUPHVskEzhSrvYi91Xcr+csOxaDaYU5OqOxCzZKcf3Og70Tat404vO1OHrwprN90A==" version "3.2.30"
"resolved" "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.30.tgz" resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.30.tgz"
"version" "3.2.30" integrity sha512-P/5YpILtcQY92z72gxhkyOUPHVskEzhSrvYi91Xcr+csOxaDaYU5OqOxCzZKcf3Og70Tat404vO1OHrwprN90A==
dependencies: dependencies:
"@babel/parser" "^7.16.4" "@babel/parser" "^7.16.4"
"@vue/compiler-core" "3.2.30" "@vue/compiler-core" "3.2.30"
@ -41,277 +41,277 @@
"@vue/compiler-ssr" "3.2.30" "@vue/compiler-ssr" "3.2.30"
"@vue/reactivity-transform" "3.2.30" "@vue/reactivity-transform" "3.2.30"
"@vue/shared" "3.2.30" "@vue/shared" "3.2.30"
"estree-walker" "^2.0.2" estree-walker "^2.0.2"
"magic-string" "^0.25.7" magic-string "^0.25.7"
"postcss" "^8.1.10" postcss "^8.1.10"
"source-map" "^0.6.1" source-map "^0.6.1"
"@vue/compiler-ssr@3.2.30": "@vue/compiler-ssr@3.2.30":
"integrity" "sha512-OUh3MwAu/PsD7VN3UOdBbTkltkrUCNouSht47+CMRzpUR5+ta7+xyMAVHeq8wg4YZenWaJimbR5TL35Ka4Vk6g==" version "3.2.30"
"resolved" "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.30.tgz" resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.30.tgz"
"version" "3.2.30" integrity sha512-OUh3MwAu/PsD7VN3UOdBbTkltkrUCNouSht47+CMRzpUR5+ta7+xyMAVHeq8wg4YZenWaJimbR5TL35Ka4Vk6g==
dependencies: dependencies:
"@vue/compiler-dom" "3.2.30" "@vue/compiler-dom" "3.2.30"
"@vue/shared" "3.2.30" "@vue/shared" "3.2.30"
"@vue/reactivity-transform@3.2.30": "@vue/reactivity-transform@3.2.30":
"integrity" "sha512-Le5XzCJyK3qTjoTnvQG/Ehu8fYjayauMNFyMaEnwFlm/avDofpuibpS9u+/6AgzsGnVWN+i0Jgf25bJd9DIwMw==" version "3.2.30"
"resolved" "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.30.tgz" resolved "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.30.tgz"
"version" "3.2.30" integrity sha512-Le5XzCJyK3qTjoTnvQG/Ehu8fYjayauMNFyMaEnwFlm/avDofpuibpS9u+/6AgzsGnVWN+i0Jgf25bJd9DIwMw==
dependencies: dependencies:
"@babel/parser" "^7.16.4" "@babel/parser" "^7.16.4"
"@vue/compiler-core" "3.2.30" "@vue/compiler-core" "3.2.30"
"@vue/shared" "3.2.30" "@vue/shared" "3.2.30"
"estree-walker" "^2.0.2" estree-walker "^2.0.2"
"magic-string" "^0.25.7" magic-string "^0.25.7"
"@vue/reactivity@3.2.30": "@vue/reactivity@3.2.30":
"integrity" "sha512-qlNKbkRn2JiGxVUEdoXbLAy+vcuHUCcq+YH2uXWz0BNMvXY2plmz+oqsw+694llwmYLkke5lbdYF4DIupisIkg==" version "3.2.30"
"resolved" "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.30.tgz" resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.30.tgz"
"version" "3.2.30" integrity sha512-qlNKbkRn2JiGxVUEdoXbLAy+vcuHUCcq+YH2uXWz0BNMvXY2plmz+oqsw+694llwmYLkke5lbdYF4DIupisIkg==
dependencies: dependencies:
"@vue/shared" "3.2.30" "@vue/shared" "3.2.30"
"@vue/runtime-core@3.2.30": "@vue/runtime-core@3.2.30":
"integrity" "sha512-RTi7xH0Ht/6wfbo2WFBMJTEiyWFTqGhrksJm8lz6E+auO6lXZ6Eq3gPNfLt47GDWCm4xyrv+rs5R4UbarPEQ1Q==" version "3.2.30"
"resolved" "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.30.tgz" resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.30.tgz"
"version" "3.2.30" integrity sha512-RTi7xH0Ht/6wfbo2WFBMJTEiyWFTqGhrksJm8lz6E+auO6lXZ6Eq3gPNfLt47GDWCm4xyrv+rs5R4UbarPEQ1Q==
dependencies: dependencies:
"@vue/reactivity" "3.2.30" "@vue/reactivity" "3.2.30"
"@vue/shared" "3.2.30" "@vue/shared" "3.2.30"
"@vue/runtime-dom@3.2.30": "@vue/runtime-dom@3.2.30":
"integrity" "sha512-a3+jrncDvEFQmB+v9k0VyT4/Y3XO6OAueCroXXY4yLyr6PJeyxljweV5TzvW0rvVzH9sZO0QAvG76Lo+6C92Qw==" version "3.2.30"
"resolved" "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.30.tgz" resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.30.tgz"
"version" "3.2.30" integrity sha512-a3+jrncDvEFQmB+v9k0VyT4/Y3XO6OAueCroXXY4yLyr6PJeyxljweV5TzvW0rvVzH9sZO0QAvG76Lo+6C92Qw==
dependencies: dependencies:
"@vue/runtime-core" "3.2.30" "@vue/runtime-core" "3.2.30"
"@vue/shared" "3.2.30" "@vue/shared" "3.2.30"
"csstype" "^2.6.8" csstype "^2.6.8"
"@vue/server-renderer@3.2.30": "@vue/server-renderer@3.2.30":
"integrity" "sha512-pzb8J/w+JdZVOtuKFlirGqrs4GP60FXGDJySw3WV2pCetuFstaacDrnymEeSo3ohAD+Qjv7zAG+Y7OvkdxQxmQ==" version "3.2.30"
"resolved" "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.30.tgz" resolved "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.30.tgz"
"version" "3.2.30" integrity sha512-pzb8J/w+JdZVOtuKFlirGqrs4GP60FXGDJySw3WV2pCetuFstaacDrnymEeSo3ohAD+Qjv7zAG+Y7OvkdxQxmQ==
dependencies: dependencies:
"@vue/compiler-ssr" "3.2.30" "@vue/compiler-ssr" "3.2.30"
"@vue/shared" "3.2.30" "@vue/shared" "3.2.30"
"@vue/shared@3.2.30": "@vue/shared@3.2.30":
"integrity" "sha512-B3HouBtUxcfu2w2d+VhdLcVBXKYYhXiFMAfQ+hoe8NUhKkPRkWDIqhpuehCZxVQ3S2dN1P1WfKGlxGC+pfmxGg==" version "3.2.30"
"resolved" "https://registry.npmjs.org/@vue/shared/-/shared-3.2.30.tgz" resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.30.tgz"
"version" "3.2.30" integrity sha512-B3HouBtUxcfu2w2d+VhdLcVBXKYYhXiFMAfQ+hoe8NUhKkPRkWDIqhpuehCZxVQ3S2dN1P1WfKGlxGC+pfmxGg==
"base64-js@^1.3.1": base64-js@^1.3.1:
"integrity" "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" version "1.5.1"
"resolved" "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz" resolved "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz"
"version" "1.5.1" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
"buffer@^5.7.0": buffer@^5.7.0:
"integrity" "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==" version "5.7.1"
"resolved" "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz" resolved "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz"
"version" "5.7.1" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
dependencies: dependencies:
"base64-js" "^1.3.1" base64-js "^1.3.1"
"ieee754" "^1.1.13" ieee754 "^1.1.13"
"csstype@^2.6.8": csstype@^2.6.8:
"integrity" "sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==" version "2.6.19"
"resolved" "https://registry.npmjs.org/csstype/-/csstype-2.6.19.tgz" resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.19.tgz"
"version" "2.6.19" integrity sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==
"dayjs@^1.11.5": dayjs@^1.11.5:
"integrity" "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==" version "1.11.5"
"resolved" "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz" resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz"
"version" "1.11.5" integrity sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==
"echarts@^5.2.2": echarts@^5.2.2:
"integrity" "sha512-yxuBfeIH5c+0FsoRP60w4De6omXhA06c7eUYBsC1ykB6Ys2yK5fSteIYWvkJ4xJVLQgCvAdO8C4mN6MLeJpBaw==" version "5.2.2"
"resolved" "https://registry.npmjs.org/echarts/-/echarts-5.2.2.tgz" resolved "https://registry.npmjs.org/echarts/-/echarts-5.2.2.tgz"
"version" "5.2.2" integrity sha512-yxuBfeIH5c+0FsoRP60w4De6omXhA06c7eUYBsC1ykB6Ys2yK5fSteIYWvkJ4xJVLQgCvAdO8C4mN6MLeJpBaw==
dependencies: dependencies:
"tslib" "2.3.0" tslib "2.3.0"
"zrender" "5.2.1" zrender "5.2.1"
"esbuild-windows-64@0.13.15": esbuild-windows-64@0.13.15:
"integrity" "sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ==" version "0.13.15"
"resolved" "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.15.tgz" resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.15.tgz"
"version" "0.13.15" integrity sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ==
"esbuild@^0.13.12": esbuild@^0.13.12:
"integrity" "sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw==" version "0.13.15"
"resolved" "https://registry.npmjs.org/esbuild/-/esbuild-0.13.15.tgz" resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.13.15.tgz"
"version" "0.13.15" integrity sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw==
optionalDependencies: optionalDependencies:
"esbuild-android-arm64" "0.13.15" esbuild-android-arm64 "0.13.15"
"esbuild-darwin-64" "0.13.15" esbuild-darwin-64 "0.13.15"
"esbuild-darwin-arm64" "0.13.15" esbuild-darwin-arm64 "0.13.15"
"esbuild-freebsd-64" "0.13.15" esbuild-freebsd-64 "0.13.15"
"esbuild-freebsd-arm64" "0.13.15" esbuild-freebsd-arm64 "0.13.15"
"esbuild-linux-32" "0.13.15" esbuild-linux-32 "0.13.15"
"esbuild-linux-64" "0.13.15" esbuild-linux-64 "0.13.15"
"esbuild-linux-arm" "0.13.15" esbuild-linux-arm "0.13.15"
"esbuild-linux-arm64" "0.13.15" esbuild-linux-arm64 "0.13.15"
"esbuild-linux-mips64le" "0.13.15" esbuild-linux-mips64le "0.13.15"
"esbuild-linux-ppc64le" "0.13.15" esbuild-linux-ppc64le "0.13.15"
"esbuild-netbsd-64" "0.13.15" esbuild-netbsd-64 "0.13.15"
"esbuild-openbsd-64" "0.13.15" esbuild-openbsd-64 "0.13.15"
"esbuild-sunos-64" "0.13.15" esbuild-sunos-64 "0.13.15"
"esbuild-windows-32" "0.13.15" esbuild-windows-32 "0.13.15"
"esbuild-windows-64" "0.13.15" esbuild-windows-64 "0.13.15"
"esbuild-windows-arm64" "0.13.15" esbuild-windows-arm64 "0.13.15"
"estree-walker@^2.0.2": estree-walker@^2.0.2:
"integrity" "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" version "2.0.2"
"resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz" resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
"version" "2.0.2" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
"function-bind@^1.1.1": function-bind@^1.1.1:
"integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" version "1.1.1"
"resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
"version" "1.1.1" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
"gm-crypto@^0.1.8": gm-crypto@^0.1.8:
"integrity" "sha512-gbTkobkbj3F70HJDQNhN9JNTvcR3O1YQJ0xGc8jTc4bZ1KuikmkjuFm5kZhyUbWxK/PwWDpPuTNyGwRYOopBLw==" version "0.1.8"
"resolved" "https://registry.npmmirror.com/gm-crypto/-/gm-crypto-0.1.8.tgz" resolved "https://registry.npmmirror.com/gm-crypto/-/gm-crypto-0.1.8.tgz"
"version" "0.1.8" integrity sha512-gbTkobkbj3F70HJDQNhN9JNTvcR3O1YQJ0xGc8jTc4bZ1KuikmkjuFm5kZhyUbWxK/PwWDpPuTNyGwRYOopBLw==
dependencies: dependencies:
"buffer" "^5.7.0" buffer "^5.7.0"
"jsbn" "^1.1.0" jsbn "^1.1.0"
"to-arraybuffer" "^1.0.1" to-arraybuffer "^1.0.1"
"has@^1.0.3": has@^1.0.3:
"integrity" "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==" version "1.0.3"
"resolved" "https://registry.npmjs.org/has/-/has-1.0.3.tgz" resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
"version" "1.0.3" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
dependencies: dependencies:
"function-bind" "^1.1.1" function-bind "^1.1.1"
"ieee754@^1.1.13": ieee754@^1.1.13:
"integrity" "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" version "1.2.1"
"resolved" "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz" resolved "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz"
"version" "1.2.1" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
"is-core-module@^2.8.1": is-core-module@^2.8.1:
"integrity" "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==" version "2.8.1"
"resolved" "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz" resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"
"version" "2.8.1" integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
dependencies: dependencies:
"has" "^1.0.3" has "^1.0.3"
"js-base64@^3.7.2": js-base64@^3.7.2:
"integrity" "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==" version "3.7.2"
"resolved" "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.2.tgz" resolved "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.2.tgz"
"version" "3.7.2" integrity sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==
"jsbarcode@^3.11.5": jsbarcode@^3.11.5:
"integrity" "sha512-zv3KsH51zD00I/LrFzFSM6dst7rDn0vIMzaiZFL7qusTjPZiPtxg3zxetp0RR7obmjTw4f6NyGgbdkBCgZUIrA==" version "3.11.5"
"resolved" "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.5.tgz" resolved "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.5.tgz"
"version" "3.11.5" integrity sha512-zv3KsH51zD00I/LrFzFSM6dst7rDn0vIMzaiZFL7qusTjPZiPtxg3zxetp0RR7obmjTw4f6NyGgbdkBCgZUIrA==
"jsbn@^1.1.0": jsbn@^1.1.0:
"integrity" "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" version "1.1.0"
"resolved" "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz" resolved "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz"
"version" "1.1.0" integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
"magic-string@^0.25.7": magic-string@^0.25.7:
"integrity" "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==" version "0.25.7"
"resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz" resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz"
"version" "0.25.7" integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
dependencies: dependencies:
"sourcemap-codec" "^1.4.4" sourcemap-codec "^1.4.4"
"nanoid@^3.2.0": nanoid@^3.2.0:
"integrity" "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==" version "3.2.0"
"resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz" resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz"
"version" "3.2.0" integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
"path-parse@^1.0.7": path-parse@^1.0.7:
"integrity" "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" version "1.0.7"
"resolved" "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
"version" "1.0.7" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
"picocolors@^1.0.0": picocolors@^1.0.0:
"integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" version "1.0.0"
"resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz" resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
"version" "1.0.0" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
"postcss@^8.1.10", "postcss@^8.4.5": postcss@^8.1.10, postcss@^8.4.5:
"integrity" "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==" version "8.4.6"
"resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz"
"version" "8.4.6" integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==
dependencies: dependencies:
"nanoid" "^3.2.0" nanoid "^3.2.0"
"picocolors" "^1.0.0" picocolors "^1.0.0"
"source-map-js" "^1.0.2" source-map-js "^1.0.2"
"resolve@^1.20.0": resolve@^1.20.0:
"integrity" "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==" version "1.22.0"
"resolved" "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz" resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"
"version" "1.22.0" integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
dependencies: dependencies:
"is-core-module" "^2.8.1" is-core-module "^2.8.1"
"path-parse" "^1.0.7" path-parse "^1.0.7"
"supports-preserve-symlinks-flag" "^1.0.0" supports-preserve-symlinks-flag "^1.0.0"
"rollup@^2.59.0": rollup@^2.59.0:
"integrity" "sha512-1Sbcs4OuW+aD+hhqpIRl+RqooIpF6uQcfzU/QSI7vGkwADY6cM4iLsBGRM2CGLXDTDN5y/yShohFmnKegSPWzg==" version "2.67.1"
"resolved" "https://registry.npmjs.org/rollup/-/rollup-2.67.1.tgz" resolved "https://registry.npmjs.org/rollup/-/rollup-2.67.1.tgz"
"version" "2.67.1" integrity sha512-1Sbcs4OuW+aD+hhqpIRl+RqooIpF6uQcfzU/QSI7vGkwADY6cM4iLsBGRM2CGLXDTDN5y/yShohFmnKegSPWzg==
optionalDependencies: optionalDependencies:
"fsevents" "~2.3.2" fsevents "~2.3.2"
"source-map-js@^1.0.2": source-map-js@^1.0.2:
"integrity" "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" version "1.0.2"
"resolved" "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
"version" "1.0.2" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
"source-map@^0.6.1": source-map@^0.6.1:
"integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" version "0.6.1"
"resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
"version" "0.6.1" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
"sourcemap-codec@^1.4.4": sourcemap-codec@^1.4.4:
"integrity" "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" version "1.4.8"
"resolved" "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz" resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"
"version" "1.4.8" integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
"supports-preserve-symlinks-flag@^1.0.0": supports-preserve-symlinks-flag@^1.0.0:
"integrity" "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" version "1.0.0"
"resolved" "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
"version" "1.0.0" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
"throttle-debounce@^3.0.1": throttle-debounce@^3.0.1:
"integrity" "sha1-MvlNhN+olPeGyaHykOemRbahmrs=" version "3.0.1"
"resolved" "https://rg.cnpmjs.org/throttle-debounce/download/throttle-debounce-3.0.1.tgz" resolved "https://rg.cnpmjs.org/throttle-debounce/download/throttle-debounce-3.0.1.tgz"
"version" "3.0.1" integrity sha1-MvlNhN+olPeGyaHykOemRbahmrs=
"to-arraybuffer@^1.0.1": to-arraybuffer@^1.0.1:
"integrity" "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==" version "1.0.1"
"resolved" "https://registry.npmmirror.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz" resolved "https://registry.npmmirror.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"
"version" "1.0.1" integrity sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==
"tslib@2.3.0": tslib@2.3.0:
"integrity" "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" version "2.3.0"
"resolved" "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz" resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"
"version" "2.3.0" integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
"vite@^2.5.10": vite@^2.5.10:
"integrity" "sha512-Mq8et7f3aK0SgSxjDNfOAimZGW9XryfHRa/uV0jseQSilg+KhYDSoNb9h1rknOy6SuMkvNDLKCYAYYUMCE+IgQ==" version "2.7.13"
"resolved" "https://registry.npmjs.org/vite/-/vite-2.7.13.tgz" resolved "https://registry.npmjs.org/vite/-/vite-2.7.13.tgz"
"version" "2.7.13" integrity sha512-Mq8et7f3aK0SgSxjDNfOAimZGW9XryfHRa/uV0jseQSilg+KhYDSoNb9h1rknOy6SuMkvNDLKCYAYYUMCE+IgQ==
dependencies: dependencies:
"esbuild" "^0.13.12" esbuild "^0.13.12"
"postcss" "^8.4.5" postcss "^8.4.5"
"resolve" "^1.20.0" resolve "^1.20.0"
"rollup" "^2.59.0" rollup "^2.59.0"
optionalDependencies: optionalDependencies:
"fsevents" "~2.3.2" fsevents "~2.3.2"
"vue@^3.0.4", "vue@3.2.30": vue@^3.0.4, vue@3.2.30:
"integrity" "sha512-ZmTFWVJUX2XADkuOB8GcLTuxnBLogjJBTNVrM7WsTnjqRQ+VR8bLNrvNsbn8vj/LaP5+0WFAPrpngOYE2x+e+Q==" version "3.2.30"
"resolved" "https://registry.npmjs.org/vue/-/vue-3.2.30.tgz" resolved "https://registry.npmjs.org/vue/-/vue-3.2.30.tgz"
"version" "3.2.30" integrity sha512-ZmTFWVJUX2XADkuOB8GcLTuxnBLogjJBTNVrM7WsTnjqRQ+VR8bLNrvNsbn8vj/LaP5+0WFAPrpngOYE2x+e+Q==
dependencies: dependencies:
"@vue/compiler-dom" "3.2.30" "@vue/compiler-dom" "3.2.30"
"@vue/compiler-sfc" "3.2.30" "@vue/compiler-sfc" "3.2.30"
@ -319,23 +319,23 @@
"@vue/server-renderer" "3.2.30" "@vue/server-renderer" "3.2.30"
"@vue/shared" "3.2.30" "@vue/shared" "3.2.30"
"vue3-barcode@^1.0.1": vue3-barcode@^1.0.1:
"integrity" "sha512-i9XU0iyLSLSQsWSbsmGoqiKr3kwflmyqbdmk1euITTna/f4aEbbibRRSv4rTLzriaSTGlXp3+iWxyEhimzNPBQ==" version "1.0.1"
"resolved" "https://registry.npmjs.org/vue3-barcode/-/vue3-barcode-1.0.1.tgz" resolved "https://registry.npmjs.org/vue3-barcode/-/vue3-barcode-1.0.1.tgz"
"version" "1.0.1" integrity sha512-i9XU0iyLSLSQsWSbsmGoqiKr3kwflmyqbdmk1euITTna/f4aEbbibRRSv4rTLzriaSTGlXp3+iWxyEhimzNPBQ==
dependencies: dependencies:
"@vitejs/plugin-vue" "^1.6.0" "@vitejs/plugin-vue" "^1.6.0"
"jsbarcode" "^3.11.5" jsbarcode "^3.11.5"
"vue" "^3.0.4" vue "^3.0.4"
"wxbarcode@^1.0.2": wxbarcode@^1.0.2:
"integrity" "sha1-zgLjSP8AYwHZIBd21sn1rZATFLU=" version "1.0.2"
"resolved" "https://registry.npmjs.org/wxbarcode/-/wxbarcode-1.0.2.tgz" resolved "https://registry.npmjs.org/wxbarcode/-/wxbarcode-1.0.2.tgz"
"version" "1.0.2" integrity sha1-zgLjSP8AYwHZIBd21sn1rZATFLU=
"zrender@5.2.1": zrender@5.2.1:
"integrity" "sha512-M3bPGZuyLTNBC6LiNKXJwSCtglMp8XUEqEBG+2MdICDI3d1s500Y4P0CzldQGsqpRVB7fkvf3BKQQRxsEaTlsw==" version "5.2.1"
"resolved" "https://registry.npmjs.org/zrender/-/zrender-5.2.1.tgz" resolved "https://registry.npmjs.org/zrender/-/zrender-5.2.1.tgz"
"version" "5.2.1" integrity sha512-M3bPGZuyLTNBC6LiNKXJwSCtglMp8XUEqEBG+2MdICDI3d1s500Y4P0CzldQGsqpRVB7fkvf3BKQQRxsEaTlsw==
dependencies: dependencies:
"tslib" "2.3.0" tslib "2.3.0"

View File

@ -13,7 +13,7 @@
<script type="module" src="/main.js"></script> <script type="module" src="/main.js"></script>
<script> <script>
// 生成当前时间的时间戳 // 生成当前时间的时间戳
document.write('<script src="/index.js?v='+Math.random()+'"><\/script>'); // document.write('<script src="/index.js?v='+Math.random()+'"><\/script>');
</script> </script>
<!-- <script> <!-- <script>

View File

@ -1,6 +1,6 @@
{ {
"name" : "聚合收银台", "name" : "聚合收银台",
"appid" : "__UNI__71D61A3", "appid" : "__UNI__31F107A",
"description" : "聚合收银台", "description" : "聚合收银台",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",
@ -107,10 +107,10 @@
}, },
"vueVersion" : "3", "vueVersion" : "3",
"h5" : { "h5" : {
"router" : { // "router" : {
"mode" : "history", // "mode" : "history",
"base" : "/cashier" // "base" : "/cashier"
}, // },
"sdkConfigs" : { "sdkConfigs" : {
"maps" : {} "maps" : {}
} }

View File

@ -4,5 +4,5 @@
js-base64@^3.7.5: js-base64@^3.7.5:
version "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== integrity sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==

109
jeepay-ui-uapp-face/package-lock.json generated Normal file
View File

@ -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=="
}
}
}

View File

@ -4,12 +4,12 @@
base64-js@^1.3.1: base64-js@^1.3.1:
version "1.5.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== integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
buffer@^5.7.0: buffer@^5.7.0:
version "5.7.1" 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== integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
dependencies: dependencies:
base64-js "^1.3.1" base64-js "^1.3.1"
@ -17,12 +17,12 @@ buffer@^5.7.0:
dayjs@^1.11.7: dayjs@^1.11.7:
version "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== integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
gm-crypto@^0.1.8: gm-crypto@^0.1.8:
version "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== integrity sha512-gbTkobkbj3F70HJDQNhN9JNTvcR3O1YQJ0xGc8jTc4bZ1KuikmkjuFm5kZhyUbWxK/PwWDpPuTNyGwRYOopBLw==
dependencies: dependencies:
buffer "^5.7.0" buffer "^5.7.0"
@ -31,20 +31,20 @@ gm-crypto@^0.1.8:
ieee754@^1.1.13: ieee754@^1.1.13:
version "1.2.1" 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== integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
js-base64@^3.7.4: js-base64@^3.7.4:
version "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== integrity sha512-wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ==
jsbn@^1.1.0: jsbn@^1.1.0:
version "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== integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
to-arraybuffer@^1.0.1: to-arraybuffer@^1.0.1:
version "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== integrity sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==

View File

@ -275,9 +275,6 @@ text {
min-height: 100vh; min-height: 100vh;
/* #endif */ /* #endif */
} }
.bg-gray{
background-color: #F9F9F9;
}
.w-full{ .w-full{
width: 100%; width: 100%;
} }

View File

@ -4,7 +4,7 @@
<slot name="title"> <slot name="title">
</slot> </slot>
<view class="item" @tap.stop="itemClick(index)" v-for="(item,index) in props.list" :key="index"> <view class="item" @tap.stop="itemClick(index)" v-for="(item,index) in props.list" :key="index">
<button class="bg-fff" hover-class="btn-hover-class">{{item}}</button> <button class="bg-fff btn" hover-class="btn-hover-class">{{item}}</button>
</view> </view>
<view class="bock-gary"></view> <view class="bock-gary"></view>
<view class="cancel-btn" @tap="close"> <view class="cancel-btn" @tap="close">
@ -82,6 +82,9 @@ import { ref } from 'vue';
text-align: center; text-align: center;
font-size: 32rpx; font-size: 32rpx;
border-bottom: 1px solid $bg; border-bottom: 1px solid $bg;
.btn{
border-radius: 0;
}
} }
} }
} }

View File

@ -10,9 +10,14 @@
<script setup> <script setup>
import { import {
computed, computed,
ref ref,
watch
} from 'vue'; } from 'vue';
const props = defineProps({ const props = defineProps({
show:{
type: Boolean,
default: false
},
zIndex: { zIndex: {
type: [Number, String] type: [Number, String]
}, },
@ -22,7 +27,10 @@
} }
}) })
const emits = defineEmits(['close', 'toggle', 'open']) const emits = defineEmits(['close', 'toggle', 'open'])
let show = ref(false) watch(()=>props.show,(newval)=>{
show.value=newval
})
let show = ref(props.show)
function close() { function close() {
show.value = false show.value = false

View File

@ -20,12 +20,12 @@
}, },
borderColor:{ borderColor:{
type: String, type: String,
default: '#707070', default: '#bbb',
}, },
size: { size: {
//px //px
type: Number, type: Number,
default: 14, default: 16,
}, },
// v-modal // v-modal
modelValue: { modelValue: {
@ -56,6 +56,7 @@
if(props.disabled){ if(props.disabled){
return return
} }
emits('click')
let currentVal=props.modelValue let currentVal=props.modelValue
let type=typeof currentVal let type=typeof currentVal
if(type==='number'){ if(type==='number'){

View File

@ -1,11 +1,27 @@
<template> <template>
<view class="u-flex tabs"> <view class="u-relative bg border-r-16">
<view class="u-flex-1 u-text-center item"
:class="{active:index===current}" <view class="u-flex tabs zhanwei u-relative">
@tap="changeCurrent(index)" v-for="(item,index) in props.list" :key="index"> <view class="active-block" :style="computedBlockStyle">
{{item}} </view>
<view class="u-flex-1 u-text-center item"
:class="{active:index===current}"
@tap="changeCurrent(index)" v-for="(item,index) in props.list" :key="index">
{{item}}
</view>
</view>
<view class="u-flex tabs u-absolute position-all">
<view class="u-flex-1 u-text-center item"
:class="{active:index===current}"
@tap="changeCurrent(index)" v-for="(item,index) in props.list" :key="index">
{{item}}
</view>
</view> </view>
</view> </view>
</template> </template>
<script setup> <script setup>
@ -28,6 +44,14 @@ import { computed, ref, watch } from 'vue';
current.value=index current.value=index
emit('update:modelValue',index) emit('update:modelValue',index)
} }
const computedBlockStyle=computed(()=>{
const oneWidth= 100/props.list.length
const left= current.value*oneWidth
return{
width:oneWidth+'%',
left:left+'%'
}
})
watch(()=>current.value,()=>{ watch(()=>current.value,()=>{
emit('change',current.value) emit('change',current.value)
}) })
@ -35,20 +59,57 @@ import { computed, ref, watch } from 'vue';
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.tabs{ .zhanwei{
padding: 4rpx 10rpx; .item{
opacity: 0;
}
}
.bg{
background: #E6F0FF; background: #E6F0FF;
border-radius: 16rpx 16rpx 16rpx 16rpx; padding: 4rpx 10rpx;
font-family: Source Han Sans CN, Source Han Sans CN; }
.border-r-16{
border-radius: 16rpx;
}
.active-block{
background-color: $my-main-color;
color: #fff;
top: 4rpx;
bottom: 4rpx;
left: 10rpx;
position: absolute;
border-radius: 8rpx;
transition: all .2s ease-in-out;
overflow: hidden;
z-index: 1;
}
.tabs{
border-radius: 16rpx;
font-size: 28rpx; font-size: 28rpx;
color: #318AFE; color: #318AFE;
z-index: 2;
.active-block{
background-color: $my-main-color;
color: #fff;
top: 4rpx;
bottom: 4rpx;
left: 0;
position: absolute;
border-radius: 8rpx;
transition: all .2s ease-in-out;
overflow: hidden;
z-index: 1;
}
.item{ .item{
padding: 8rpx 0; padding: 8rpx 0;
transition: all .3s ease-in-out; transition: all .2s ease-in-out;
position: relative;
background-color: transparent;
z-index: 2;
} }
.item.active{ .item.active{
border-radius: 8rpx 8rpx 8rpx 8rpx; border-radius: 8rpx;
background-color: $my-main-color; // background-color: $my-main-color;
color: #fff; color: #fff;
} }
} }

View File

@ -0,0 +1,33 @@
import http from './http.js'
const request=http.request
/**
* 增加打印机
* @returns
*/
export function tbPrintMachine(data, method = 'post') {
return request({
url: '/api/tbPrintMachine',
method: method,
data: {
shopId: uni.getStorageSync('shopId'),
...data
}
})
}
/**
* 打印机列表
* @returns
*/
export function tbPrintMachineGet(params) {
return request({
url: '/api/tbPrintMachine',
method: 'get',
params: {
shopId: uni.getStorageSync('shopId'),
sort: '',
...params
}
})
}

View File

@ -0,0 +1,280 @@
<template>
<!-- 基础赠送设置切换 -->
<view class="foundation">
<view :class="[switchTop==1?'active':'']" @click="switchTop =1">
基础设置
</view>
<view :class="[switchTop==2?'active':'']" @click="switchTop=2">
赠送设置
</view>
</view>
<view class="content">
<view class="content1">
<view>
折扣名称
</view>
<input type="text" placeholder="填写名称" />
<hr style="margin-top: 24rpx;color: #E5E5E5;" />
</view>
<view class="content1">
<view>
折扣%
</view>
<input type="text" placeholder="填写名称" />
<hr style="margin-top: 24rpx;color: #E5E5E5;" />
</view>
<view class="content1">
<view>
使用门槛
</view>
<input type="text" placeholder="隔多少元,可用 " />
<hr style="margin-top: 24rpx;color: #E5E5E5;" />
</view>
<view class="content1">
<view>
优惠券类型
</view>
<radio-group @change="radioChange" style="margin-top: 16rpx;">
<radio style="transform:scale(0.7)">单次折扣券</radio>
<radio style="transform:scale(0.7)">储值折扣券</radio>
</radio-group>
<view class="siwtichStyle">
<span>最大抵扣金额</span>
<switch color="#FFCC33" style="transform:scale(0.7)" />
</view>
<hr style="margin-top: 24rpx;color: #E5E5E5;" />
</view>
<view class="content1">
<view>
抵扣规则
</view>
从最高价开始抵扣
<view class="siwtichStyle">
<span>可抵扣件数</span>
<switch color="#FFCC33" style="transform:scale(0.7)" />
</view>
<hr style="margin-top: 24rpx;color: #E5E5E5;" />
</view>
<view class="content1">
<view>
有效期类型
</view>
领券后有效期内可用
<view class="siwtichStyle">
<span>有效期</span>
<input type="text" placeholder="填写天数 " />
</view>
<hr style="margin-top: 24rpx;color: #E5E5E5;" />
</view>
<view class="content1">
<view>
隔天生效
</view>
<input type="text" placeholder="隔多少天,生效 " />
<hr style="margin-top: 24rpx;color: #E5E5E5;" />
</view>
<view class="content1">
<view>
总发放数量
</view>
<input type="text" placeholder="填写数量" />
<hr style="margin-top: 24rpx;color: #E5E5E5;" />
</view>
<view class="content2">
<view class="">
可用门店
</view>
<view class="">
<span>进本店可用</span>
<span>></span>
</view>
</view>
<view class="content2">
<view class="">
可用商品
</view>
<view class="">
<span>指定商品可用</span>
<span>></span>
</view>
<view class="siwtichStyle">
<!-- <span>选择商品</span> -->
<!-- <view class=""> -->
<span>选择商品</span>
<input type="text" placeholder="选择指定商品 " />
<span>></span>
<!-- </view> -->
</view>
</view>
<view class="content2">
<view class="">
</view>
<view class="">
<span>更多设置</span>
<span>></span>
</view>
</view>
<view class="content2">
<view>
指定时间段可用
</view>
<radio-group @change="radioChange" style="margin-top: 16rpx;">
<radio style="transform:scale(0.7)">全时段可用</radio>
<radio style="transform:scale(0.7)">指定时段可用</radio>
</radio-group>
</view>
<view class="content2">
<view class="">
发放方式
</view>
<view class="">
<span>用户不可自行领取</span>
<span>></span>
</view>
</view>
<view class="content1">
<view>
每人领取限量
</view>
不限量
<hr style="margin-top: 24rpx;color: #E5E5E5;" />
<view class="siwtichStyle2">
<span>不限量</span>
<switch color="#FFCC33" style="transform:scale(0.7)" />
</view>
</view>
</view>
</template>
<script setup>
import {
reactive,
ref,
toRef,
watch
} from 'vue';
let switchTop = ref(1)
</script>
<style lang="scss">
.foundation {
width: 694rpx;
height: 70rpx;
background: #E6F0FF;
border-radius: 12rpx 12rpx 12rpx 12rpx;
display: flex;
align-items: center;
margin: 36rpx auto;
>view {
text-align: center;
width: 344rpx;
height: 56rpx;
line-height: 56rpx;
color: #318AFE;
}
.active {
margin: auto;
width: 344rpx;
height: 56rpx;
background: #318AFE;
color: #fff;
border-radius: 12rpx 12rpx 12rpx 12rpx;
}
}
.content {
width: 750rpx;
background: #F9F9F9;
padding: 32rpx;
.content1 {
background-color: #fff;
padding: 32rpx 24rpx;
>input {
margin-top: 16rpx;
}
>view {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: bold;
font-size: 28rpx;
color: #333333;
}
.siwtichStyle {
margin-top: 24rpx;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 24rpx;
width: 646rpx;
height: 104rpx;
background: #F9F9F9;
border-radius: 12rpx 12rpx 12rpx 12rpx;
}
.siwtichStyle2 {
margin-top: 24rpx;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 24rpx;
width: 646rpx;
border-radius: 12rpx 12rpx 12rpx 12rpx;
}
}
.content2 {
padding: 32rpx 24rpx;
margin: 32rpx 0;
box-sizing: border-box;
width: 694rpx;
background: #FFFFFF;
border-radius: 18rpx 18rpx 18rpx 18rpx;
>view:first-child {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: bold;
font-size: 28rpx;
color: #333333;
}
>view:nth-child(2) {
display: flex;
justify-content: space-between;
margin-top: 16rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 28rpx;
color: #333333;
}
>view:nth-child(3) {
display: flex;
justify-content: space-between;
margin-top: 16rpx;
background: #FFFFFF;
width: 646rpx;
height: 154rpx;
background: #F9F9F9;
border-radius: 12rpx 12rpx 12rpx 12rpx;
}
.siwtichStyle {
margin-top: 24rpx;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 24rpx;
width: 646rpx;
height: 104rpx;
background: #F9F9F9;
border-radius: 12rpx 12rpx 12rpx 12rpx;
}
}
}
</style>

View File

@ -0,0 +1,515 @@
<template>
<!-- 顶部菜单 -->
<view class="tagClass">
<view class="tag-item" @tap="pageData.status.active=index" :class="{active:index===pageData.status.active}"
v-for="(item,index) in pageData.status.list" :key="index">
{{item}}
</view>
</view>
<!-- 搜搜 -->
<view class="search">
<view class="inputsearch">
搜索优惠券名称
</view>
<view class="searchBtn">
搜索
</view>
</view>
<!-- 内容 -->
<view class="couponContent">
<view class="couponContentList">
<view class="couponContentListTop">
<view>
充值20元优惠券
</view>
<view>
ID:258792
</view>
</view>
<view class="couponContentListcontent">
<view>
<view>
使用门槛
</view>
<view>
满200.00元减20.00
</view>
</view>
<view>
<view>
券类型
</view>
<view>
店铺领取可用
</view>
</view>
<view>
<view>
使用门槛
</view>
<view>
满200.00元减20.00
</view>
</view>
<view>
<view>
使用门槛
</view>
<view>
满200.00元减20.00
</view>
</view>
<view>
<view>
使用门槛门槛
</view>
<view>
满200.00元减20.00
</view>
</view>
<view class="JQclass">
</view>
</view>
<view class="couponContentListcontent2">
<view class="">
<view class="">
1000
</view>
<view class="">
发放数量
</view>
</view>
<view class="">
<view class="">
1000
</view>
<view class="">
发放数量
</view>
</view>
<view class="">
<view class="">
1000
</view>
<view class="">
发放数量
</view>
</view>
<view class="">
<view class="">
1000
</view>
<view class="">
发放数量
</view>
</view>
</view>
<view class="couponContentListbottom">
<button>编辑</button>
<button>删除</button>
<button>同步</button>
</view>
</view>
</view>
<view class="couponContent">
<view class="couponContentList">
<view class="couponContentListTop">
<view>
充值20元优惠券
</view>
<view>
ID:258792
</view>
</view>
<view class="couponContentListcontent">
<view>
<view>
使用门槛
</view>
<view>
满200.00元减20.00
</view>
</view>
<view>
<view>
券类型
</view>
<view>
店铺领取可用
</view>
</view>
<view>
<view>
使用门槛
</view>
<view>
满200.00元减20.00
</view>
</view>
<view>
<view>
使用门槛
</view>
<view>
满200.00元减20.00
</view>
</view>
<view>
<view>
使用门槛门槛
</view>
<view>
满200.00元减20.00
</view>
</view>
<view class="JQclass">
</view>
</view>
<view class="couponContentListcontent2">
<view class="">
<view class="">
1000
</view>
<view class="">
发放数量
</view>
</view>
<view class="">
<view class="">
1000
</view>
<view class="">
发放数量
</view>
</view>
<view class="">
<view class="">
1000
</view>
<view class="">
发放数量
</view>
</view>
<view class="">
<view class="">
1000
</view>
<view class="">
发放数量
</view>
</view>
</view>
<view class="couponContentListbottom">
<button>编辑</button>
<button>删除</button>
<button>同步</button>
</view>
</view>
</view>
<view class="couponContent">
<view class="couponContentList">
<view class="couponContentListTop">
<view>
充值20元优惠券
</view>
<view>
ID:258792
</view>
</view>
<view class="couponContentListcontent">
<view>
<view>
使用门槛
</view>
<view>
满200.00元减20.00
</view>
</view>
<view>
<view>
券类型
</view>
<view>
店铺领取可用
</view>
</view>
<view>
<view>
使用门槛
</view>
<view>
满200.00元减20.00
</view>
</view>
<view>
<view>
使用门槛
</view>
<view>
满200.00元减20.00
</view>
</view>
<view>
<view>
使用门槛门槛
</view>
<view>
满200.00元减20.00
</view>
</view>
<view class="JQclass">
</view>
</view>
<view class="couponContentListcontent2">
<view class="">
<view class="">
1000
</view>
<view class="">
发放数量
</view>
</view>
<view class="">
<view class="">
1000
</view>
<view class="">
发放数量
</view>
</view>
<view class="">
<view class="">
1000
</view>
<view class="">
发放数量
</view>
</view>
<view class="">
<view class="">
1000
</view>
<view class="">
发放数量
</view>
</view>
</view>
<view class="couponContentListbottom">
<button>编辑</button>
<button>删除</button>
<button>同步</button>
</view>
</view>
</view>
<view class="bottomPop">
<button @click="adddiscount">+添加满减优惠券</button>
</view>
</template>
<script setup>
import go from '@/commons/utils/go.js'
import {
reactive,
ref,
toRef,
watch
} from 'vue';
const pageData = reactive({
status: {
list: ['全部', '储存中储存中', '已取完', '已过期', '储存中', '已取完', '已过期', ],
active: 0,
}
})
const adddiscount = ()=>{
go.to('PAGES_COUPON_DISCOUNTCOUPONS')
}
</script>
<style lang='scss'>
.tagClass {
width: 100%;
white-space: nowrap;
overflow-x: auto;
-webkit-overflow-scrolling: touch;
margin-top: 44rpx;
.tag-item {
display: inline-block;
padding: 8rpx 22rpx;
margin-left: 16rpx;
border-radius: 4rpx 4rpx 4rpx 4rpx;
text-align: center;
color: #666;
background: #F7F7FA;
&.active {
background: #E6F0FF;
color: $my-main-color;
}
}
}
.tagClass::-webkit-scrollbar {
display: none;
}
.search {
display: flex;
justify-content: center;
align-items: center;
padding: 32rpx;
.inputsearch {
color: #999999;
width: 542rpx;
height: 60rpx;
line-height: 60rpx;
background: #F9F9F9;
border-radius: 32rpx 32rpx 32rpx 32rpx;
}
.searchBtn {
width: 120rpx;
height: 60rpx;
line-height: 60rpx;
margin-left: 32rpx;
text-align: center;
color: #FFFFFF;
background: #318AFE;
border-radius: 32rpx 32rpx 32rpx 32rpx;
}
}
.couponContent {
background-color: #f9f9f9;
padding: 32rpx 0;
.couponContentList {
width: 694rpx;
height: 544rpx;
background: #FFFFFF;
border-radius: 18rpx 18rpx 18rpx 18rpx;
margin: 0 auto;
padding: 32rpx 24rpx;
.couponContentListTop {
display: flex;
justify-content: space-between;
align-items: center;
>view:last-child {
width: 98rpx;
height: 36rpx;
line-height: 36rpx;
text-align: center;
background: #F7F7FA;
border-radius: 4rpx 4rpx 4rpx 4rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
font-size: 18rpx;
color: #999999;
}
}
.couponContentListcontent {
margin-top: 24rpx;
padding-top: 1rpx;
width: 646rpx;
height: 228rpx;
background: #F9F9F9;
border-radius: 12rpx 12rpx 12rpx 12rpx;
position: relative;
>view {
display: flex;
align-items: center;
margin-top: 12rpx;
>view:first-child {
width: 180rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 24rpx;
color: #666666;
text-align: right;
}
>view:last-child {
margin-left: 48rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 24rpx;
color: #333333;
line-height: 0rpx;
}
}
.JQclass {
width: 48rpx;
height: 48rpx;
background-color: #318AFE;
position: absolute;
right: 48rpx;
top: 90rpx;
}
}
.couponContentListcontent2 {
display: flex;
justify-content: space-between;
text-align: center;
padding-top: 24rpx;
}
.couponContentListbottom {
margin-top: 24rpx;
>button {
float: right;
width: 140rpx;
height: 56rpx;
margin-right: 22rpx;
line-height: 56rpx;
text-align: center;
background: #FFFFFF;
border-radius: 28rpx 28rpx 28rpx 28rpx;
border: 2rpx solid #E5E5E5;
font-size: 28rpx;
}
>button:first-child {
background-color: #318afe;
color: #fff;
}
}
}
}
.bottomPop {
position: fixed;
bottom: 0;
left: 0;
height: 150rpx;
width: 100%;
background-color: #fff;
>button {
width: 530rpx;
margin: 30rpx 0;
margin-left: 50%;
transform: translateX(-50%);
height: 80rpx;
line-height: 80rpx;
color: #fff;
background: #318AFE;
border-radius: 56rpx 56rpx 56rpx 56rpx;
}
}
</style>

View File

@ -0,0 +1,216 @@
<template>
<view class="page-gray color-333 u-font-28">
<view class="block">
<picker-item title="打印机类型" v-model="brands.selIndex" rangeKey="name" :list="brands.list"></picker-item>
<view class="u-p-b-24 u-m-b-24 border-bottom">
<view class="title">设备尺寸</view>
<view class="u-m-t-16">
<radio-group class="u-flex u-flex-wrap" @change="sizeChange">
<label class="radio u-m-r-60" v-for="(item,index) in deciveSize.list" :key="index">
<radio :value="''+index" :checked="index === deciveSize.selIndex" class="scale7" />
<text>{{item.label}}</text>
</label>
</radio-group>
</view>
</view>
<view class="u-p-b-14 u-m-b-24 border-bottom">
<view class="title">名称</view>
<view class="">
<uni-easyinput :inputBorder="false" :padding-none="true" v-model="form.form"
placeholder="设置打印机名称"></uni-easyinput>
</view>
</view>
<view class="u-p-b-14 u-m-b-24 border-bottom">
<view class="title">设备号</view>
<view class="">
<uni-easyinput :inputBorder="false" :padding-none="true" v-model="form.form"
placeholder="输入设备号"></uni-easyinput>
</view>
</view>
<picker-item title="打印份数" v-model="printerNums.selIndex" rangeKey="label"
:list="printerNums.list"></picker-item>
<picker-item title="出品模式" v-model="form.config.model" rangeKey="name" rangeValue="value"
:list="models"></picker-item>
<picker-item title="打印类型" v-model="form.subType" rangeKey="name" rangeValue="value"
:list="subTypes"></picker-item>
<picker-item title="尾部留空"
v-model="form.config.feet" rangeKey="name" rangeValue="value"
:list="feets"></picker-item>
<view class="u-p-b-24 u-flex u-row-between u-m-b-24 border-bottom">
<view class="title">自动切刀</view>
<view class="">
<my-switch v-model="form.config.autoCut"></my-switch>
</view>
</view>
<view class="u-p-b-24 u-flex u-row-between u-m-b-24 border-bottom">
<view class="title">状态</view>
<view class="">
<my-switch v-model="form.config.autoCut"></my-switch>
</view>
</view>
<view class="u-p-b-24 u-flex u-row-between u-m-b-24 border-bottom">
<view class="title">排序</view>
<view class="">
<uni-number-box v-model="form.sort" ></uni-number-box>
</view>
</view>
<view class="u-p-b-24 u-m-b-24 border-bottom">
<view class="title font-bold">商品分类</view>
<view class="u-m-t-16 u-flex u-row-between " @click="categoryShow">
<view class="color-333" v-if="form.sort">{{form.sort}}</view>
<view class="color-999" v-else>请选择</view>
<uni-icons type="right" color="#999" size="16"></uni-icons>
</view>
</view>
</view>
<view style="height: 60rpx;"></view>
<view class="">
<view class="btn">
<my-button shape="circle" @click="save">保存</my-button>
</view>
</view>
<!-- 选择分类 -->
<choose-category v-model="chooseCategoryShow"></choose-category>
</view>
</template>
<script setup>
import {
devices,
models,
subTypes
} from '@/pagePrinter/devices.js'
import {
onLoad,
onShow
} from '@dcloudio/uni-app'
import {
ref,
onBeforeUnmount,
reactive,
computed,
watch
} from 'vue';
import go from '@/commons/utils/go.js';
import pickerItem from './components/picker-item.vue';
import myRadioGroup from './components/my-radio-group.vue';
import * as Api from '@/http/yskApi/devices.js'
import chooseCategory from './components/choose-category.vue';
//
let chooseCategoryShow=ref(false)
function categoryShow(){
chooseCategoryShow.value=true
}
//
const brands = reactive({
list: devices,
selIndex: '',
})
//
const deciveSize = reactive({
list: [{
label: '58mm',
value: '0'
},
{
label: '80mm',
value: '1'
},
],
selIndex: 1
})
function sizeChange(e) {
deciveSize.selIndex = e.detail.value
}
//
const printerNums = reactive({
list: new Array(4).fill(1).map((v, index) => {
return {
label: index * 1 + 1 + '份',
value: '' + index
}
}),
selIndex: 0
})
//
const feets = ref([0,1,2,3,4,5,8].map(v=>{
return v+'行'
}))
const form = reactive({
id: '',
contentType: '',
config: {
width: '80mm', //
printerNum: 1, //
categoryList: '', //
model: 'normal', // ,
feet: '0',
autoCut: 0
},
name: '',
subType: 'kitchen', //
status: 0,
sort: ''
})
function save() {
}
watch(() => form.config.model, (newval) => {
console.log(newval);
})
const option = reactive({})
onLoad((opt) => {
console.log(opt);
Object.assign(option, opt)
})
onBeforeUnmount(() => {
})
onShow(() => {})
</script>
<style lang="scss" scoped>
.page-gray {
padding: 32rpx 28rpx;
}
.block {
background-color: #fff;
padding: 32rpx 24rpx;
border-radius: 18rpx;
margin-bottom: 32rpx;
box-shadow: 0 0 5px #eee;
}
.title {
font-weight: 700;
}
.radio {
display: flex;
align-items: center;
}
.fixed_b{
left: 30rpx;
right: 30rpx;
bottom: calc(env(safe-area-inset-bottom) + 10rpx);
/* #ifdef H5 */
bottom: 30rpx;
/* #endif */
}
</style>

View File

@ -0,0 +1,46 @@
<template>
<my-mask :show="modelValue">
<view class="bg-fff content">
<view class="u-flex u-row-between u-p-30">
<view>选择分类</view>
<view>
<uni-icons @click="changeShow" type="closeempty"></uni-icons>
</view>
</view>
<scroll-view scroll-y="true" style="height: 70vh;">
</scroll-view>
<view class="u-flex u-row-between gap-20 u-p-30">
<view class="u-flex-1">
<my-button type="cancel" @tap="changeShow">取消</my-button>
</view>
<view class="u-flex-1">
<my-button>确定</my-button>
</view>
</view>
</view>
</my-mask>
</template>
<script setup>
const props=defineProps({
modelValue:{
type: Boolean,
default: false
}
})
const emits=defineEmits(['update:modelValue'])
function changeShow(isShow){
const show=isShow?true:false
emits('update:modelValue',show)
}
</script>
<style lang="scss" scoped>
.content{
position: absolute;
bottom: 0;
left: 0;
right: 0;
}
</style>

View File

@ -0,0 +1,70 @@
<template>
<radio-group class="u-flex u-flex-wrap" @change="change">
<label class="radio u-m-r-60" v-for="(item,itemIndex) in list" :key="index">
<radio :value="index" :checked="itemChecked(item,itemIndex)" class="scale7" />
<text>{{item.label}}</text>
</label>
</radio-group>
</template>
<script setup>
import {
computed,
ref,
watch
} from 'vue';
const props = defineProps({
rangeValue: {
type: [String, Number],
default: ''
},
rangeKey: {
type: String,
default: 'label'
},
list: {
type: Array,
default: () => []
},
title: {
type: String,
default: '标题'
},
modelValue: {
type: [String, Number],
default: ''
}
})
function itemChecked(item,itemIndex){
if(!props.rangeValue){
return itemIndex==index.value
}
return item[props.rangeValue]=props.list[index.value][props.rangeKey]
}
function findIndex() {
return props.list.findIndex(v => v[props.rangeValue] == props.modelValue)
}
function findValue() {
return props.list[index.value][props.rangeValue]
}
const computedIndex = props.rangeValue ? findIndex() : props.modelValue
const index = ref(computedIndex)
const emits = defineEmits(['update:modelValue'], )
watch(() => index.value, (newval) => {
const value = props.rangeValue ? findValue() : newval
console.log(value);
emits('update:modelValue', value)
})
function change(e) {
index.value = e.detail.value
}
const selText = computed(() => {
const item = props.list[index.value]
return item ? item[props.rangeKey] : ''
})
</script>
<style>
</style>

View File

@ -0,0 +1,87 @@
<template>
<view class="u-p-b-24 u-m-b-24 border-bottom">
<view class="title font-bold">{{title}}</view>
<picker
@change="change"
:range-key="rangeKey"
:value="index"
:range="list">
<view class="u-m-t-16 u-flex u-row-between ">
<view class="color-333" v-if="selText">{{selText}}</view>
<view class="color-999" v-else>请选择</view>
<uni-icons type="right" color="#999" size="16"></uni-icons>
</view>
</picker>
</view>
</template>
<script setup>
import {
computed,
ref, watch
} from 'vue';
const props = defineProps({
rangeValue:{
type: [String, Number],
default: ''
},
rangeKey:{
type:String,
default:'label'
},
list: {
type: Array,
default: () => []
},
title: {
type: String,
default: '标题'
},
modelValue: {
type: [String, Number],
default: ''
}
})
function isObj(obj){
return typeof obj ==='object'
}
function findIndex(){
return props.list.findIndex(v=>{
if(isObj(v)){
return v[props.rangeValue]==props.modelValue
}else{
return v==props.modelValue
}
})
}
function findValue(){
const item=props.list[index.value]
if(isObj(item)){
return item[props.rangeValue]
}else{
return item
}
}
const computedIndex=props.rangeValue? findIndex(): props.modelValue
const index = ref(computedIndex)
const emits = defineEmits(['update:modelValue'], )
watch(()=>index.value,(newval)=>{
const value=props.rangeValue?findValue() :newval
console.log(value);
emits('update:modelValue',value)
})
function change(e){
index.value=e.detail.value
}
const selText=computed(()=>{
const item=props.list[index.value]
if(item&&isObj(item)){
return item?item[props.rangeKey]:''
}else{
return item
}
})
</script>
<style>
</style>

View File

@ -0,0 +1,44 @@
export const devices = [
{
value: 'printer',
name: '本地'
},
{
value: 'yxyPrinter',
name: '云想印'
},
{
value: 'fePrinter',
name: '飞鹅'
}
]
export const models = [
{
value: 'normal',
name: '普通出单'
},
{
value: 'one',
name: '一菜一品'
},
{
value: 'category',
name: '分类出单'
}
]
export const subTypes = [
{
value: 'kitchen',
name: '出品'
},
{
value: 'cash',
name: '小票'
},
{
value: 'label',
name: '标签'
}
]

View File

@ -0,0 +1,106 @@
<template>
<view class="default-box-padding bg-fff u-font-28 border-r-12 box-shadow u-m-b-30">
<view class="u-flex u-row-between u-p-b-24 border-bottom">
<view class="u-flex">
<!-- <text>{{ subTypesName(data.subType)}}</text> -->
<text>{{ data.name}}</text>
<text class="color-999 u-font-24">{{data.address}}</text>
</view>
<view class="u-flex u-col-center">
<template v-if="data.status">
<text class="online" >在线状态正常</text>
</template>
<template v-else>
<image class="icon-warning" src="/pagePrinter/static/icon/icon-warning.svg" mode=""></image>
<text class="leave u-m-l-10" >离线</text>
</template>
</view>
</view>
<view class="u-m-t-24">
<view class="u-flex u-row-between">
<view class="u-flex u-col-center">
<image class="icon" src="/pagePrinter/static/icon/icon-setting.svg" mode=""></image>
<view class="color-666 u-m-l-10">设置</view>
</view>
<view>
{{modelsName(data.config.model)}}
</view>
</view>
<view class="u-flex u-row-between u-m-t-32">
<view class="u-flex u-col-center">
<image class="icon" src="/pagePrinter/static/icon/icon-type.svg" mode=""></image>
<view class="color-666 u-m-l-10">类型</view>
</view>
<view>
{{subTypesName(data.subType)}}
</view>
</view>
<view class="u-flex u-row-between u-m-t-32">
<view class="u-flex u-col-center">
<image class="icon" src="/pagePrinter/static/icon/icon-category.svg" mode=""></image>
<view class="color-666 u-m-l-10">分类</view>
</view>
<view>
{{devicesName(data.contentType)}}
</view>
</view>
<view class="u-m-t-32 u-flex u-row-right gap-20">
<my-button shape="circle" :width="140" :height="56" type="cancel" plain>删除</my-button>
<my-button shape="circle" :width="140" :height="56" plain>编辑</my-button>
</view>
</view>
</view>
</template>
<script setup>
import { devices, models, subTypes } from '@/pagePrinter/devices.js'
const props = defineProps({
data: {
type: Object,
default: () => {}
}
})
function devicesName(value) {
return devices.find(item => item.value == value).name
}
function modelsName(value) {
return models.find(item => item.value == value).name
}
function subTypesName(value) {
return subTypes.find(item => item.value == value).name
}
function timeFilter(s) {
return dayjs(s).format('YYYY-MM-DD HH:mm:ss')
}
</script>
<style lang="scss" scoped>
.border-bottom{
border-bottom: 1px solid rgb(240,240,240);
}
.box-shadow {
box-shadow: 0 0 5px #eee;
}
.online{
color: #0FC161;
}
.leave{
color:#999 ;
}
.icon-warning{
width: 34rpx;
height: 30rpx;
}
.icon{
width: 24rpx;
height: 24rpx;
}
</style>

View File

@ -0,0 +1,63 @@
<template>
<view class="min-page bg-gray u-p-30 u-flex u-flex-col u-row-center">
<div class="w-full" v-for="item in pageData.list " :key="item.id">
<printer-item :data="item"></printer-item>
</div>
<view v-if="!pageData.list.length&&pageData.hasAjax">
<my-img-empty ></my-img-empty>
</view>
<view style="height: 100rpx;"></view>
<view class="fixed_b u-fixed">
<my-button shape="circle" @tap="toAdd">
<view>
<text>+</text>
<text>添加云打印机</text>
</view>
</my-button>
</view>
</view>
</template>
<script setup>
import go from '@/commons/utils/go.js'
import {
onMounted,
reactive
} from 'vue';
import printerItem from './components/printer-item.vue';
import * as Api from '@/http/yskApi/devices.js'
const pageData = reactive({
list: [],
hasAjax:false,
query: {
sort: '',
name: '',
contentType: ''
}
})
function toAdd(){
go.to('PAGES_PRINTER_ADD',{
a:1
})
}
async function init() {
const res =await Api.tbPrintMachineGet(pageData.query)
pageData.hasAjax=true
console.log(res);
pageData.list = res.filter(v=>v.address)
}
onMounted(() => {
init()
})
</script>
<style lang="scss" scoped>
.fixed_b{
left: 110rpx;
right: 110rpx;
bottom: calc(env(safe-area-inset-bottom) + 10rpx);
/* #ifdef H5 */
bottom: 30rpx;
/* #endif */
}
</style>

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12"><defs><style>.a{fill:#ebd4d4;}.b{clip-path:url(#a);}.c{fill:#666;}</style><clipPath id="a"><circle class="a" cx="6" cy="6" r="6" transform="translate(94 212)"/></clipPath></defs><g class="b" transform="translate(-94 -212)"><path class="c" d="M71.825,64a.672.672,0,0,1,.711.711v.711h.711a.672.672,0,0,1,.711.711v4.98a.672.672,0,0,1-.711.711h-.711v1.423a.672.672,0,0,1-.711.711H66.134a.672.672,0,0,1-.711-.711V71.825h-.711A.672.672,0,0,1,64,71.114v-4.98a.672.672,0,0,1,.711-.711h.711v-.711A.672.672,0,0,1,66.134,64Zm0,5.691H66.134v3.557h5.691Zm1.423-3.557H64.711v4.98h.711V69.691a.672.672,0,0,1,.711-.711h5.691a.672.672,0,0,1,.711.711v1.423h.711Zm-.711.711v.711h-.711v-.711Zm-.711-2.134H66.134v.711h5.691Z" transform="translate(31.02 149.02)"/></g></svg>

After

Width:  |  Height:  |  Size: 878 B

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12"><defs><style>.a{fill:#ebd4d4;}.b{clip-path:url(#a);}.c{fill:#666;}</style><clipPath id="a"><circle class="a" cx="6" cy="6" r="6" transform="translate(107 189)"/></clipPath></defs><g class="b" transform="translate(-107 -189)"><path class="c" d="M11.347,4.3c-.067-.354-.283-.583-.551-.583h-.058a1.4,1.4,0,0,1-1.4-1.4,1.6,1.6,0,0,1,.122-.535.736.736,0,0,0-.248-.89L9.192.875,7.77.085,7.752.077a.751.751,0,0,0-.3-.061.814.814,0,0,0-.579.236A2.054,2.054,0,0,1,5.764.873,2.058,2.058,0,0,1,4.648.241.814.814,0,0,0,4.065,0a.75.75,0,0,0-.3.059L3.751.066,2.279.875,2.261.887a.735.735,0,0,0-.25.889,1.585,1.585,0,0,1,.123.536,1.4,1.4,0,0,1-1.4,1.4H.672c-.267,0-.483.229-.55.583A7.288,7.288,0,0,0,0,5.421a7.287,7.287,0,0,0,.12,1.123c.067.354.283.583.551.583H.731a1.4,1.4,0,0,1,1.4,1.4,1.6,1.6,0,0,1-.122.535.737.737,0,0,0,.248.89l.017.012,1.4.78.018.008a.742.742,0,0,0,.3.061.8.8,0,0,0,.583-.246A2.053,2.053,0,0,1,5.7,9.91a2.071,2.071,0,0,1,1.14.673.8.8,0,0,0,.587.251h0a.741.741,0,0,0,.3-.059l.018-.008,1.446-.8.017-.012a.736.736,0,0,0,.249-.889,1.614,1.614,0,0,1-.123-.536,1.4,1.4,0,0,1,1.4-1.4H10.8c.268,0,.484-.229.551-.583a7.223,7.223,0,0,0,.12-1.123A7.259,7.259,0,0,0,11.347,4.3ZM4,10.006l-1.22-.682A2.331,2.331,0,0,0,2.94,8.53,2.208,2.208,0,0,0,.9,6.328a6.122,6.122,0,0,1-.094-.906A6.136,6.136,0,0,1,.9,4.515a2.207,2.207,0,0,0,2.038-2.2,2.33,2.33,0,0,0-.163-.792l1.3-.713h0a3.876,3.876,0,0,0,.493.418,2.1,2.1,0,0,0,1.2.454A2.106,2.106,0,0,0,6.95,1.234a3.857,3.857,0,0,0,.49-.41h0l1.252.7a2.332,2.332,0,0,0-.163.793,2.207,2.207,0,0,0,2.038,2.2,6.154,6.154,0,0,1,.094.907,6.13,6.13,0,0,1-.094.907,2.207,2.207,0,0,0-2.038,2.2,2.329,2.329,0,0,0,.163.793l-1.267.7a3.935,3.935,0,0,0-.495-.437A2.1,2.1,0,0,0,5.7,9.1a2.1,2.1,0,0,0-1.216.473A3.966,3.966,0,0,0,4,10.006ZM7.74,5.414a2.03,2.03,0,1,0-2.03,2.03A2.033,2.033,0,0,0,7.74,5.414ZM5.71,4.189A1.225,1.225,0,1,1,4.485,5.414,1.226,1.226,0,0,1,5.71,4.189Z" transform="translate(107.266 189.583)"/></g></svg>

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12"><defs><style>.a{fill:#ebd4d4;}.b{clip-path:url(#a);}.c{fill:#666;}</style><clipPath id="a"><circle class="a" cx="6" cy="6" r="6" transform="translate(92 207)"/></clipPath></defs><g class="b" transform="translate(-92 -207)"><g transform="translate(8.104 122.991)"><path class="c" d="M94.819,87.957,90.794,89.44a1.178,1.178,0,0,1-.8,0L85.816,87.96a.738.738,0,0,1,0-1.4l4.179-1.485a1.177,1.177,0,0,1,.8,0l4.025,1.483a.738.738,0,0,1,0,1.392Zm-.262-.713-4.025-1.483a.42.42,0,0,0-.284,0l-4.179,1.485a.014.014,0,0,0-.012.017.014.014,0,0,0,.012.017l4.179,1.485a.417.417,0,0,0,.284,0l4.025-1.483a.014.014,0,0,0,.012-.016.014.014,0,0,0-.012-.018Zm-8.742,5.4,4.421,1.6a.457.457,0,0,0,.315,0l4.259-1.6a.37.37,0,1,1,.262.692l-4.259,1.6a1.208,1.208,0,0,1-.422.076,1.2,1.2,0,0,1-.409-.072l-4.422-1.6a.37.37,0,1,1,.254-.695Z" transform="translate(-0.414)"/><path class="c" d="M89.978,501.885a1.2,1.2,0,0,1-.409-.072l-4.422-1.6a.37.37,0,1,1,.253-.7l4.421,1.6a.459.459,0,0,0,.315,0l4.259-1.6a.37.37,0,0,1,.262.692l-4.259,1.6a1.2,1.2,0,0,1-.421.077Z" transform="translate(0 -409.627)"/></g></g></svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="17.37" height="15" viewBox="0 0 17.37 15"><defs><style>.a{fill:#ff9f2e;}</style></defs><path class="a" d="M104.051,176.877h17.37l-8.684-15Zm9.474-2.369h-1.579V172.93h1.579Zm0-3.157h-1.579v-3.158h1.579Z" transform="translate(-104.051 -161.877)"/></svg>

After

Width:  |  Height:  |  Size: 298 B

View File

@ -21,7 +21,7 @@
</view> </view>
<view class="u-m-t-24"> <view class="u-m-t-24">
{{item.selectSpecResult}}
<uni-data-checkbox @change="createResult" multiple :selectedColor="color.ColorMain" <uni-data-checkbox @change="createResult" multiple :selectedColor="color.ColorMain"
v-model="item.selectSpecResult" :localdata="item.value"></uni-data-checkbox> v-model="item.selectSpecResult" :localdata="item.value"></uni-data-checkbox>

View File

@ -0,0 +1,22 @@
<template>
<view>
123
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>

View File

@ -3,7 +3,7 @@
<view class="my-bg-main" :style="{'background-color':returnStutasColor(data.status)}"> <view class="my-bg-main" :style="{'background-color':returnStutasColor(data.status)}">
<view class="u-flex u-row-between"> <view class="u-flex u-row-between">
<view class="u-font-32 ">{{data.name}}</view> <view class="u-font-32 ">{{data.name}}</view>
<view class="u-flex" @tap="more"> <view class="u-flex" @tap.stop="more">
<uni-icons type="more-filled" color="#fff" size="16"></uni-icons> <uni-icons type="more-filled" color="#fff" size="16"></uni-icons>
</view> </view>
</view> </view>

View File

@ -21,7 +21,8 @@
<view class="search-box"> <view class="search-box">
<view class="search-btn u-flex" @tap="showSearch" :style="{width:search.show?'694rpx':'164rpx'}"> <view class="search-btn u-flex" @tap="showSearch" :style="{width:search.show?'694rpx':'164rpx'}">
<image src="@/static/iconImg/icon-search.svg" class="input-icon" /> <image src="@/static/iconImg/icon-search.svg" class="input-icon" />
<view class="u-flex-1 u-p-l-10"><input v-model="search.keyword" @confirm="searchConfirm" type="text" <view class="u-flex-1 u-p-l-10">
<input v-model="search.keyword" @confirm="searchConfirm" type="text"
placeholder-style="font-size:28rpx;" placeholder="搜索" /></view> placeholder-style="font-size:28rpx;" placeholder="搜索" /></view>
<view @tap.stop="hideSearch" v-if="search.show">取消</view> <view @tap.stop="hideSearch" v-if="search.show">取消</view>
</view> </view>
@ -54,22 +55,6 @@
<view class="u-m-t-10">0/12</view> <view class="u-m-t-10">0/12</view>
</view> </view>
</view> </view>
<!-- <view class=" u-p-l-28 item" >
<view>室内</view>
<view class="u-m-t-10 ">0/12</view>
</view>
<view class="item u-p-l-28">
<view>室外</view>
<view class="u-m-t-10">0/12</view>
</view>
<view class="item u-p-l-28">
<view>小桌</view>
<view class="u-m-t-10">0/12</view>
</view>
<view class="item u-p-l-28">
<view>测试桌</view>
<view class="u-m-t-10">0/12</view>
</view> -->
</view> </view>
<view class="u-m-t-30 u-flex u-flex-wrap u-row-between"> <view class="u-m-t-30 u-flex u-flex-wrap u-row-between">
@ -341,6 +326,10 @@
return v.status == status.list[status.active].key return v.status == status.list[status.active].key
}); });
}) })
watch(() => times.active, (newval) => {
setTimer()
})
function tableUpdate() { function tableUpdate() {
query.page = 0 query.page = 0
@ -364,7 +353,7 @@
setTimer() setTimer()
}) })
onHide(()=>{ onHide(()=>{
clearInterval(timer)
}) })
onShow(opt => { onShow(opt => {
setTimer() setTimer()

View File

@ -23,16 +23,16 @@
<view class="u-p-30"> <view class="u-p-30">
<view class="data-statistics"> <view class="data-statistics">
<view class="u-font-32">数据统计</view> <view class="u-font-32">数据统计</view>
<view class="u-m-t-40 u-flex"> <view class="u-m-t-40 u-flex u-row-between">
<view class="u-flex-1 after-r"> <view class=" ">
<view>会员数</view> <view>会员数</view>
<view class="u-m-t-10 u-font-36 font-bold">{{pageData.allShopInfo.userTotal}}</view> <view class="u-m-t-10 u-font-36 font-bold">{{pageData.allShopInfo.userTotal}}</view>
</view> </view>
<view class="u-flex-1 after-r"> <view class="line-l-r u-p-l-30 u-p-r-30">
<view>会员余额</view> <view>会员余额</view>
<view class="u-m-t-10 u-font-36 font-bold">{{pageData.allShopInfo.balanceTotal}}</view> <view class="u-m-t-10 u-font-36 font-bold">{{pageData.allShopInfo.balanceTotal}}</view>
</view> </view>
<view class="u-flex-1"> <view class="">
<view>充值金额</view> <view>充值金额</view>
<view class="u-m-t-10 u-font-36 font-bold">{{pageData.allShopInfo.chageTotal}}</view> <view class="u-m-t-10 u-font-36 font-bold">{{pageData.allShopInfo.chageTotal}}</view>
</view> </view>
@ -367,14 +367,31 @@
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.after-r { .after-r,.after-l {
position: relative; position: relative;
} }
.line-l-r{
position: relative;
&::after,&:before{
position: absolute;
content: '';
top: 0;
bottom: 0;
width: 2px;
border-radius: 2px;
background-color: rgba(255, 255, 255, .3);
}
&::after{
right: 0;
}
&::before{
left: 0;
}
}
.after-r::after { .after-r::after {
position: absolute; position: absolute;
content: ''; content: '';
right: 40rpx; right: -40rpx;
top: 0; top: 0;
bottom: 0; bottom: 0;
width: 2px; width: 2px;

View File

@ -2,8 +2,8 @@
"easycom": { "easycom": {
"autoscan": true, "autoscan": true,
"custom": { "custom": {
"^my-(.*)":"@/components/my-components/my-$1.vue", "^my-(.*)": "@/components/my-components/my-$1.vue",
"^u-(.*)": "@/components/my-components/u-$1/u-$1.vue" "^u-(.*)": "@/components/my-components/u-$1/u-$1.vue"
} }
}, },
"pages": [{ "pages": [{
@ -875,18 +875,16 @@
}, },
{ {
"pageId": "PAGES_PRODUCT_INVOICING_LIST", "pageId": "PAGES_PRODUCT_INVOICING_LIST",
"path" : "invoicing-list/invoicing-list", "path": "invoicing-list/invoicing-list",
"style" : "style": {
{ "navigationBarTitleText": "库存记录"
"navigationBarTitleText" : "库存记录"
} }
}, },
{ {
"pageId": "PAGES_PRODUCT_INVOICING_CHECK", "pageId": "PAGES_PRODUCT_INVOICING_CHECK",
"path" : "invoicing-check/invoicing-check", "path": "invoicing-check/invoicing-check",
"style" : "style": {
{ "navigationBarTitleText": "库存盘点"
"navigationBarTitleText" : "库存盘点"
} }
} }
@ -997,10 +995,16 @@
}, },
{ {
"pageId": "PAGES_CRESATE_ORDER_DETAIL", "pageId": "PAGES_CRESATE_ORDER_DETAIL",
"path" : "order-detail/order-detail", "path": "order-detail/order-detail",
"style" : "style": {
{ "navigationBarTitleText": "订单详情"
"navigationBarTitleText" : "订单详情" }
},
{
"pageId": "PAGES_CRESATE_ORDER_PAY",
"path": "pay-order/pay-order",
"style": {
"navigationBarTitleText": "结账"
} }
} }
@ -1172,28 +1176,73 @@
{ {
"root": "pageStoringWine", "root": "pageStoringWine",
"pages": [{ "pages": [{
"pageId": "PAGES_STORING_WINE_INDEX", "pageId": "PAGES_STORING_WINE_INDEX",
"path": "index/index", "path": "index/index",
"style": {
"navigationBarTitleText": "存酒管理"
}
},
{
"pageId": "PAGES_STORING_WINE_EDIT",
"path": "storing-wine/storing-wine",
"style": {
"navigationBarTitleText": "存酒"
}
},
{
"pageId": "PAGES_STORING_WINE_RECORD_DETAIL",
"path": "record-details/record-details",
"style": {
"navigationBarTitleText": "记录详情"
}
}
]
},
{
"root": "pageCoupon",
"pages": [{
"pageId": "PAGES_COUPON_INDEX",
"path": "index",
"style": { "style": {
"navigationBarTitleText": "存酒管理" "navigationBarTitleText": "优惠券管理"
} }
}, }, {
{ "pageId": "PAGES_COUPON_DISCOUNTCOUPONS",
"pageId": "PAGES_STORING_WINE_EDIT", "path": "discountCoupons",
"path" : "storing-wine/storing-wine", "style": {
"style" : "navigationBarTitleText": "添加折扣券"
{
"navigationBarTitleText" : "存酒"
}
},
{
"pageId": "PAGES_STORING_WINE_RECORD_DETAIL",
"path" : "record-details/record-details",
"style" :
{
"navigationBarTitleText" : "记录详情"
} }
}] }]
},
{
"root": "pageSalesSummary",
"pages": [{
"pageId": "PAGES_SALES_SUMMARY",
"path": "index",
"style": {
"navigationBarTitleText": "销售汇总"
}
}]
},
{
"root": "pagePrinter",
"pages": [{
"pageId": "PAGES_PRINTER_INDEX",
"path": "index/index",
"style": {
"navigationBarTitleText": "打印机"
}
},
{
"pageId": "PAGES_PRINTER_ADD",
"path": "add-printer/add-printer",
"style": {
// "navigationBarTitleText" : "添加/编辑云打印机"
"navigationBarTitleText": ""
}
}
]
} }
], ],
"globalStyle": { "globalStyle": {

View File

@ -89,6 +89,11 @@
icon: '/static/indexImg/icon-substitute-ordering.svg', icon: '/static/indexImg/icon-substitute-ordering.svg',
pageUrl: 'PAGES_CREATE_ORDER', pageUrl: 'PAGES_CREATE_ORDER',
}, },
{
title: '打印机',
icon: '/static/indexImg/icon-printer.svg',
pageUrl: 'PAGES_PRINTER_INDEX',
},
{ {
title: '进销存', title: '进销存',
icon: '/static/indexImg/icon-invoicing.svg', icon: '/static/indexImg/icon-invoicing.svg',
@ -183,8 +188,18 @@
title: '极速开票', title: '极速开票',
icon: '/static/indexImg/red-envelope.svg', icon: '/static/indexImg/red-envelope.svg',
pageUrl: 'PAGES_INVOICE' pageUrl: 'PAGES_INVOICE'
},
// {
// title: '',
// icon: '/static/indexImg/red-envelope.svg',
// pageUrl: 'PAGES_COUPON_INDEX'
// },
{
title: '销售汇总',
icon: '/static/indexImg/PAGE_SALES_SUMMARY.svg',
pageUrl: 'PAGES_SALES_SUMMARY'
} }
]; ];
// 广 // 广
if (storageManage.userInfo().userType != 1) { if (storageManage.userInfo().userType != 1) {

View File

@ -9,9 +9,10 @@
</view> </view>
</view> </view>
<view class="u-m-t-40 u-flex "> <view class="u-m-t-40 u-flex ">
<view>应付金额</view> <view>实收金额</view>
<view class="u-m-l-32 border-bottom u-flex-1"> <view class="u-m-l-32 border-bottom u-flex-1">
<uni-easyinput style="digit" @input="currentPriceChange" paddingNone :inputBorder="false" v-model="form.currentPrice" <uni-easyinput style="digit" @input="currentPriceInput" @change="currentPriceChange" paddingNone :inputBorder="false"
v-model="form.currentPrice"
placeholder="输入实际金额"></uni-easyinput> placeholder="输入实际金额"></uni-easyinput>
</view> </view>
</view> </view>
@ -19,7 +20,8 @@
<view>优惠折扣</view> <view>优惠折扣</view>
<view class="u-m-l-32 u-flex-1 u-flex border-bottom"> <view class="u-m-l-32 u-flex-1 u-flex border-bottom">
<view class="u-flex-1"> <view class="u-flex-1">
<uni-easyinput @input="discountChange" style="digit" paddingNone :inputBorder="false" v-model="form.discount" <uni-easyinput @input="discountInput" @change="discountChange" style="digit" paddingNone :inputBorder="false"
v-model="form.discount"
placeholder="输入折扣"></uni-easyinput> placeholder="输入折扣"></uni-easyinput>
</view> </view>
<view class="u-font-32 color-333">%</view> <view class="u-font-32 color-333">%</view>
@ -32,7 +34,7 @@
<view class="u-p-30"> <view class="u-p-30">
<view class="u-m-t-10"> <view class="u-m-t-10">
<my-button @tap="confirm" shape="circle" showShadow>修改</my-button> <my-button @tap="confirm" shape="circle" showShadow>修改</my-button>
<my-button type="cancel" bgColor="#fff" >取消</my-button> <my-button @tap="close" type="cancel" bgColor="#fff" >取消</my-button>
</view> </view>
</view> </view>
</template> </template>
@ -43,11 +45,12 @@
import { import {
reactive, reactive,
nextTick, nextTick,
ref ref,watch
} from 'vue'; } from 'vue';
import myModel from '@/components/my-components/my-model.vue' import myModel from '@/components/my-components/my-model.vue'
import myButton from '@/components/my-components/my-button.vue' import myButton from '@/components/my-components/my-button.vue'
import myTabs from '@/components/my-components/my-tabs.vue' import myTabs from '@/components/my-components/my-tabs.vue'
import infoBox from '@/commons/utils/infoBox.js'
const props = defineProps({ const props = defineProps({
title: { title: {
type: String, type: String,
@ -57,23 +60,42 @@
type: Array, type: Array,
default: [] default: []
}, },
price:{ price: {
type:Number, type: [Number,String],
default:0 default: 0
} }
}) })
function currentPriceInput(newval){
form.discount=(newval*100/form.price).toFixed()
}
function discountInput(newval){
form.currentPrice=(form.price*newval/100).toFixed(2)
}
function currentPriceChange(newval){ function currentPriceChange(newval){
nextTick(()=>{ if(newval<0){
form.discount=(newval*100/form.price).toFixed() form.currentPrice=0
}) form.discount=100
return infoBox.showToast('实收金额不能小于0')
}
if(newval>props.price){
form.currentPrice=props.price
form.discount=0
return infoBox.showToast('实收金额不能大于应付金额')
}
} }
function discountChange(newval){ function discountChange(newval){
nextTick(()=>{ if(newval<0){
form.currentPrice=(form.price*newval/100).toFixed(2) form.currentPrice=props.price
}) form.discount=0
return infoBox.showToast('优惠折扣不能小于0')
}
if(newval>100){
form.discount=100
form.currentPrice=0
return infoBox.showToast('优惠折扣不能大于100')
}
} }
const $form = { const $form = {
price:props.price, price:props.price,
currentPrice: props.price, currentPrice: props.price,
@ -82,7 +104,11 @@
const form = reactive({ const form = reactive({
...$form ...$form
}) })
watch(()=>props.price,(newval)=>{
console.log(newval);
form.price=newval
form.currentPrice=newval
})
function resetForm() { function resetForm() {
Object.assign(form, { Object.assign(form, {
...$form ...$form

View File

@ -78,12 +78,17 @@
import { import {
reactive, reactive,
nextTick, nextTick,
ref ref,
watch
} from 'vue'; } from 'vue';
import myModel from '@/components/my-components/my-model.vue' import myModel from '@/components/my-components/my-model.vue'
import myButton from '@/components/my-components/my-button.vue' import myButton from '@/components/my-components/my-button.vue'
import myTabs from '@/components/my-components/my-tabs.vue' import myTabs from '@/components/my-components/my-tabs.vue'
const props = defineProps({ const props = defineProps({
price: {
type: [Number,String],
default: 0
},
title: { title: {
type: String, type: String,
default: '' default: ''
@ -93,7 +98,9 @@
default: [] default: []
} }
}) })
function changeCauses(item) { function changeCauses(item) {
item.checked = !item.checked item.checked = !item.checked
} }
@ -151,7 +158,11 @@
const form = reactive({ const form = reactive({
...$form ...$form
}) })
watch(()=>props.price,(newval)=>{
console.log(newval);
form.price=newval
form.currentPrice=newval
})
function resetForm() { function resetForm() {
Object.assign(form, { Object.assign(form, {
...$form ...$form

View File

@ -207,10 +207,10 @@
</view> </view>
<model-discount title="菜品打折/减免" :ref="setModel" name="discount"></model-discount> <model-discount title="菜品打折/减免" :ref="setModel" name="discount" :price="allPrice"></model-discount>
<give-food title="赠菜" :ref="setModel" name="giveFood"></give-food> <give-food title="赠菜" :ref="setModel" name="giveFood"></give-food>
<my-remark title="单品备注" :ref="setModel" name="remark"></my-remark> <my-remark title="单品备注" :ref="setModel" name="remark"></my-remark>
<edit-discount title="优惠金额" :ref="setModel" name="editMoney"></edit-discount> <edit-discount title="优惠金额" :ref="setModel" name="editMoney" :price="allPrice"></edit-discount>
</view> </view>
@ -230,7 +230,7 @@
import modelDiscount from './components/discount' import modelDiscount from './components/discount'
import giveFood from './components/give-food' import giveFood from './components/give-food'
import myRemark from './components/remark' import myRemark from './components/remark'
import editDiscount from './components/edit-discount' import editDiscount from '@/pagesCreateOrder/components/edit-discount.vue'
import go from '@/commons/utils/go.js'; import go from '@/commons/utils/go.js';
import { import {
returnBoolean returnBoolean
@ -362,7 +362,6 @@
}) })
const allPrice = computed(() => { const allPrice = computed(() => {
return goods.list.reduce((prve, cur) => { return goods.list.reduce((prve, cur) => {
console.log(cur.salePrice * cur.number);
return prve + cur.salePrice * cur.number * (cur.isGift ? 0 : 1) return prve + cur.salePrice * cur.number * (cur.isGift ? 0 : 1)
}, 0).toFixed(2) }, 0).toFixed(2)
}) })

View File

@ -1,5 +1,5 @@
<template> <template>
<view class="default-box-padding bg-fff border-r-12 u-m-t-20"> <view class="default-box-padding bg-fff border-r-12 u-m-t-20" v-if="data.length">
<view class="u-font-32"> <view class="u-font-32">
<text></text> <text></text>
<text class="color-main font-bold"> {{goodsNumber}}</text> <text class="color-main font-bold"> {{goodsNumber}}</text>
@ -39,7 +39,7 @@
</view> </view>
<view> <view>
<text>小计</text> <text>小计</text>
<text class="font-bold u-font-32">16.00</text> <text class="font-bold u-font-32">{{allPrice}}</text>
</view> </view>
</view> </view>
@ -47,10 +47,12 @@
<view></view> <view></view>
<view> <view>
<text>总计</text> <text>总计</text>
<text class="font-bold u-font-32">16.00</text> <text class="font-bold u-font-32">{{allPrice}}</text>
</view> </view>
</view> </view>
<my-button type="cancel" :color="color.ColorMain">重新打印</my-button> <view class="u-m-t-30">
<my-button type="cancel" :color="color.ColorMain">重新打印</my-button>
</view>
</view> </view>
</view> </view>
</template> </template>
@ -86,7 +88,9 @@
width: 70rpx; width: 70rpx;
height: 70rpx; height: 70rpx;
} }
.border-bottom{
border-color: rgb(240, 240, 240);
}
.tag { .tag {
padding: 2rpx 8rpx; padding: 2rpx 8rpx;
border-radius: 8rpx; border-radius: 8rpx;

View File

@ -2,7 +2,7 @@
<view class="default-box-padding bg-fff border-r-12 u-m-t-20"> <view class="default-box-padding bg-fff border-r-12 u-m-t-20">
<view class="u-flex u-row-between"> <view class="u-flex u-row-between">
<view>订单状态</view> <view>订单状态</view>
<view>未支付</view> <view>{{returnStatus(data.status)}}</view>
</view> </view>
<view class="u-flex u-row-between u-m-t-20"> <view class="u-flex u-row-between u-m-t-20">
<view>订单类型</view> <view>订单类型</view>
@ -10,7 +10,7 @@
</view> </view>
<view class="u-flex u-row-between u-m-t-20"> <view class="u-flex u-row-between u-m-t-20">
<view>桌位号</view> <view>桌位号</view>
<view>A6</view> <view>{{table.name}}</view>
</view> </view>
<view class="u-flex u-row-between u-m-t-20"> <view class="u-flex u-row-between u-m-t-20">
<view>就餐人数</view> <view>就餐人数</view>
@ -28,10 +28,6 @@
<view>下单时间</view> <view>下单时间</view>
<view>2024-08-31 15:54:40</view> <view>2024-08-31 15:54:40</view>
</view> </view>
<view class="u-flex u-row-between u-m-t-20">
<view>下单时间</view>
<view>2024-08-31 15:54:40</view>
</view>
<view class="u-flex u-row-between u-m-t-20"> <view class="u-flex u-row-between u-m-t-20">
<view>订单编号</view> <view>订单编号</view>
<view>2024083115544056362</view> <view>2024083115544056362</view>
@ -44,6 +40,23 @@
</template> </template>
<script setup> <script setup>
const props = defineProps({
data: {
type: Object,
default: () => {}
},
table:{
type: Object,
default: () => {}
}
})
const statusMap={
unpaid:'未支付'
}
function returnStatus(status){
return statusMap[status]||''
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@ -3,10 +3,10 @@
<user-vue></user-vue> <user-vue></user-vue>
<view class="default-box-padding bg-fff border-r-12 u-m-t-20"> <view class="default-box-padding bg-fff border-r-12 u-m-t-20">
<text class="color-666">桌位号</text> <text class="color-666">桌位号</text>
<text class="font-bold">A6</text> <text class="font-bold">{{options.name}}</text>
</view> </view>
<goods-list :data="orderDetail.goodsList"></goods-list> <goods-list :data="orderDetail.goodsList"></goods-list>
<order-vue></order-vue> <order-vue :data="orderDetail.info" :table="options"></order-vue>
<step-vue></step-vue> <step-vue></step-vue>
<view style="height: 200rpx;"></view> <view style="height: 200rpx;"></view>
<view class="u-fixed bottom bg-fff "> <view class="u-fixed bottom bg-fff ">
@ -16,7 +16,8 @@
shape="circle" plain type="primary">加菜</my-button> shape="circle" plain type="primary">加菜</my-button>
</view> </view>
<view class="u-flex-1"> <view class="u-flex-1">
<my-button borderRadius="0 100rpx 100rpx 0" shape="circle" type="primary" >结账</my-button> <my-button @tap="toPay" borderRadius="0 100rpx 100rpx 0" shape="circle"
type="primary">结账</my-button>
</view> </view>
</view> </view>
</view> </view>
@ -31,36 +32,76 @@
import stepVue from './components/step.vue'; import stepVue from './components/step.vue';
import go from '@/commons/utils/go.js' import go from '@/commons/utils/go.js'
import { import {
onLoad,onHide onLoad,
onShow,
onHide
} from '@dcloudio/uni-app'; } from '@dcloudio/uni-app';
import { import {
reactive reactive
} from 'vue'; } from 'vue';
import OrderDetail from './page.js' import OrderDetail from './page.js'
const uiPage=new OrderDetail() const uiPage = new OrderDetail()
setTimeout(()=>{ setTimeout(() => {
uiPage.setVal('user',{name:1}) uiPage.setVal('user', {
},1500) name: 1
})
}, 1500)
function diancan() { function diancan() {
go.to('PAGES_CREATE_ORDER', { go.to('PAGES_CREATE_ORDER', {
tableId: options.tableId, tableId: options.tableId,
tableName: options.name tableName: options.name
}) })
} }
const orderDetail=reactive({ function toPay() {
goodsList:[] go.to('PAGES_CRESATE_ORDER_PAY', {
...orderDetail.info,
tableId: options.tableId,
tableName: options.name,
masterId: options.masterId,
})
}
const orderDetail = reactive({
goodsList: [],
info: {}
}) })
const options = reactive({}) const options = reactive({})
async function init(){ async function init() {
const {masterId}=await Api.$getMasterId(options) const {
masterId
} = await Api.$getMasterId(options)
console.log(masterId); console.log(masterId);
const {records} = await Api.getCart({ options.masterId=masterId
...options,masterId const {
records
} = await Api.getCart({
...options,
masterId
}) })
orderDetail.goodsList=records orderDetail.goodsList = records
const info = await Api.$createOrder({
masterId,
vipUserId: '',
tableId: options.tableId,
note: '',
postPay: true,
orderld: ''
})
orderDetail.info = info
} }
function watchEmit(){
uni.$off('orderDetail:update')
uni.$once('orderDetail:update',(newval)=>{
console.log(newval);
init()
})
}
onShow(()=>{
watchEmit()
})
onLoad((opt) => { onLoad((opt) => {
Object.assign(options, opt) Object.assign(options, opt)
console.log(options); console.log(options);

View File

@ -0,0 +1,209 @@
<template>
<view class="bg-gray min-page u-p-30 u-font-28">
<view class="u-p-t-60 u-p-b-60 u-text-center">
<view class="u-font-32 ">
<text class="price-fuhao"></text>
<text class="font-bold price">{{order.amount}}</text>
</view>
<view class="u-m-t-10 color-999 old-price">
<text class=""></text>
<text class=" ">{{order.amount}}</text>
</view>
<view class="u-m-t-10 u-flex u-row-center color-main">
<view @click="showModel('editMoney',true)">修改</view>
</view>
</view>
<view class="bg-fff box-shadow u-p-t-30 u-p-l-50 u-p-r-50 card top border-r-12 u-m-t-30">
<view class="u-flex border-bottom-dashed u-row-between u-p-b-30">
<view>优惠券</view>
<view class="color-999 u-flex u-col-center">
<text>选择优惠券</text>
<view class="u-flex u-col-center">
<uni-icons type="right"></uni-icons>
</view>
</view>
</view>
</view>
<view class="bg-fff box-shadow u-p-t-30 u-p-l-50 u-p-r-50 card bottom border-r-12 ">
<my-tabs :list="pays.list"></my-tabs>
<view class="list">
<view class="item" @click="changePayType(index)" v-for="(item,index) in pays.payTypes.list"
:key="index">
<view class="u-flex u-row-between u-p-t-30 u-p-b-30 border-bottom">
<view class="u-flex">
<image class="icon" :src="item.icon" mode=""></image>
<text class="u-m-l-10">{{item.payName}}</text>
</view>
<view class="u-flex color-999 u-font-24">
<!-- <view class="u-m-r-20">
<text>余额</text>
<text>0.00</text>
</view> -->
<my-radio @click="changePayType(index)" :modelValue="index==pays.payTypes.selIndex">
</my-radio>
</view>
</view>
</view>
</view>
</view>
<view class="u-m-t-60 u-p-b-30">
<my-button @click="payOrder">确认付款</my-button>
</view>
<edit-discount title="优惠金额" :ref="setModel" name="editMoney" :price="order.amount"></edit-discount>
</view>
</template>
<script setup>
import {
reactive,
onMounted
} from 'vue';
import {
onLoad
} from '@dcloudio/uni-app'
import * as Api from '@/http/yskApi/Instead.js'
import infoBox from '@/commons/utils/infoBox.js'
import editDiscount from '@/pagesCreateOrder/components/edit-discount.vue'
const pays = reactive({
list: ['普通支付', '混合支付'],
payTypes: {
list: [],
selIndex: 0
}
})
const models = new Map();
function setModel(el) {
if (el && el.$attrs['name']) {
models.set(el.$attrs['name'], el);
}
}
function showModel(key) {
const model = models.get(key)
model && model.open()
}
async function getPayType() {
const payTypeList = await Api.$getPayType()
pays.payTypes.list = payTypeList.filter(v=>v.payType!='scanCode')
}
function changePayType(i) {
pays.payTypes.selIndex = i
}
async function payOrder() {
const payType=pays.payTypes.list[pays.payTypes.selIndex].payType
await Api.$payOrder({
tableId: order.tableId,
masterId: order.masterId,
orderId: order.id,
payType,
vipUserId: order.userId,
discount: 1,
code: ''
})
infoBox.showToast('支付成功')
setTimeout(()=>{
uni.$emit('orderDetail:update')
uni.navigateBack()
},500)
}
onMounted(() => {
getPayType()
})
const order = reactive({
amount: 0
})
onLoad((opt) => {
Object.assign(order, opt)
})
</script>
<style lang="scss" scoped>
.box-shadow {
box-shadow: 0 0 5px #eee;
}
.icon {
width: 40rpx;
height: 40rpx;
}
.border-bottom-dashed {
border-bottom: 1px dashed #bbb;
}
.border-bottom {
border-color: rgb(240, 240, 240);
}
.list {
.item:last-child {
.border-bottom {
border-bottom: none;
}
}
}
.old-price {
text-decoration: line-through;
}
.price-fuhao {
font-size: 24px;
}
.price {
font-size: 32px;
}
$dotSize: 20rpx;
$position: calc($dotSize / (-2));
.card {
position: relative;
&::after,
&:before {
content: '';
display: block;
position: absolute;
background-color: #F9F9F9;
width: $dotSize;
height: $dotSize;
box-shadow: 0 0 5px #eee;
border-radius: 50%;
}
&.top {
&::after {
right: $position;
bottom: $position;
}
&:before {
left: $position;
bottom: $position;
}
}
&.bottom {
&::after {
right: $position;
top: $position;
}
&:before {
left: $position;
top: $position;
}
}
}
</style>

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32"><defs><style>.a{fill:#80bcff;}.b{clip-path:url(#a);}.c{fill:#4c99fe;}.d{fill:#fff;}.e{fill:#197dff;}</style><clipPath id="a"><rect class="a" width="32" height="32" transform="translate(76 613)"/></clipPath></defs><g class="b" transform="translate(-76 -613)"><g transform="translate(-0.51 -0.558)"><path class="c" d="M202.8,232.594H226.9a1.794,1.794,0,0,1,1.723,1.856v22.427a3.582,3.582,0,0,1-3.441,3.707H204.526a3.582,3.582,0,0,1-3.441-3.707V234.45A1.794,1.794,0,0,1,202.8,232.594Z" transform="translate(-122.041 384.039)"/><path class="c" d="M282.743,187.085H299.43a2.35,2.35,0,1,1,0,4.621H282.743a2.35,2.35,0,1,1,0-4.621Z" transform="translate(-197.833 427.409)"/><path class="d" d="M.117,13.411a.876.876,0,0,1,0-.874.845.845,0,0,1,.753-.423H13.726a.845.845,0,0,1,.753.423.876.876,0,0,1,0,.874.848.848,0,0,1-.733.424H.849A.846.846,0,0,1,.117,13.411ZM1.343,9.225a.829.829,0,0,1-.594-.253.87.87,0,0,1,0-1.217L5.292,3.14a.837.837,0,0,1,1.2,0l.017.018L8.694,5.324l3.342-3.4-.06-.06A.819.819,0,0,1,12.35.5L14.22.024a.8.8,0,0,1,.974.595.844.844,0,0,1,0,.4l-.469,1.9a.8.8,0,0,1-.974.595.78.78,0,0,1-.373-.216l-.144-.146L9.339,7.106A.841.841,0,0,1,8.7,7.4l0,0a.822.822,0,0,1-.488-.156h0L8.2,7.226l0,0-.012-.009,0,0L8.167,7.2l-.006,0-.01-.008-.006-.005-.009-.009-.006-.005-.01-.009,0,0,0,0L5.9,4.958,1.947,8.97a.837.837,0,0,1-.6.255Z" transform="translate(85.644 625.069)"/><path class="e" d="M2.781,2.482A2.579,2.579,0,0,1,0,.172Q0,.085.008,0H22.242q.008.085.008.172a2.579,2.579,0,0,1-2.781,2.31Z" transform="translate(82.129 616.633)"/></g></g></svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32"><defs><style>.a{fill:#80bcff;}.b{clip-path:url(#a);}.c{fill:#4c99fe;}.d{fill:#fff;}.e{fill:#197dff;}</style><clipPath id="a"><rect class="a" width="32" height="32" transform="translate(290 721)"/></clipPath></defs><g class="b" transform="translate(-290 -721)"><rect class="c" width="20" height="14" rx="1" transform="translate(296 723)"/><path class="c" d="M7.112,17H3a3,3,0,0,1-3-3V3A3,3,0,0,1,3,0H29a3,3,0,0,1,3,3V14a3,3,0,0,1-3,3h-4.11V12.769a1,1,0,0,0-1-1H8.112a1,1,0,0,0-1,1V17Z" transform="translate(290 733)"/><circle class="d" cx="1" cy="1" r="1" transform="translate(316 739)"/><path class="e" d="M7,14a1,1,0,0,1-1-1V10H26v3a1,1,0,0,1-1,1Z" transform="translate(290 723)"/><rect class="e" width="12" height="2" rx="1" transform="translate(300 746)"/></g></svg>

After

Width:  |  Height:  |  Size: 895 B