From d13405ee3f7250b1722a3b802e4577f0b669f18d Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Wed, 18 Sep 2024 16:27:53 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
http/yskApi/http.js | 20 +-
http/yskApi/shop.js | 76 +++++
pages.json | 22 ++
pages/index/index.vue | 5 +
pages/shopSetUp/index.vue | 567 +++++++++++++++++++++++++++++++++
pages/shopSetUp/shopList.vue | 161 ++++++++++
pages/shopSetUp/shopQRcode.vue | 142 +++++++++
7 files changed, 983 insertions(+), 10 deletions(-)
create mode 100644 http/yskApi/shop.js
create mode 100644 pages/shopSetUp/index.vue
create mode 100644 pages/shopSetUp/shopList.vue
create mode 100644 pages/shopSetUp/shopQRcode.vue
diff --git a/http/yskApi/http.js b/http/yskApi/http.js
index 7ae4cfb..1539cc3 100644
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -19,6 +19,13 @@ let baseUrl = 'https://admintestpapi.sxczgkj.cn'
// 多少 ms 以内, 不提示loading
const loadingShowTime = 200
+
+function getHeader( type ){
+ const headerObject={}
+ headerObject["Authorization"] = storageManage.token()
+ return headerObject
+}
+
// 通用处理逻辑
function commonsProcess(showLoading, httpReqCallback) {
@@ -141,18 +148,14 @@ function commonsProcess(showLoading, httpReqCallback) {
// 默认 显示loading(控制 xxs 内 不提示loading )
function req(uri, data, method = "GET", showLoading = true, extParams = {}) {
- let headerObject = {}
// headerObject[appConfig.tokenKey] = storageManage.token()
- headerObject["authorization"] = storageManage.token()
- headerObject["content-type"] = 'application/json'
-
return commonsProcess(showLoading, () => {
return uni.request(
Object.assign({
url: baseUrl + uri,
data: data,
method: method,
- header: headerObject
+ header: getHeader()
}, extParams)
)
})
@@ -171,8 +174,6 @@ function request(args) {
} = args
let headerObject = {}
// headerObject[appConfig.tokenKey] = storageManage.token()
- headerObject["satoken"] = storageManage.token()
- headerObject["content-type"] = 'application/json'
return commonsProcess(showLoading, () => {
return uni.request(
@@ -180,7 +181,7 @@ function request(args) {
url: baseUrl + url,
data: params||data,
method: method,
- header: headerObject
+ header: getHeader()
}, extParams)
)
})
@@ -193,7 +194,6 @@ function upload(uri, data, file, showLoading = true, extParams = {}) {
// 放置token
let headerObject = {}
// headerObject[appConfig.tokenKey] = storageManage.token()
- headerObject["satoken"] = storageManage.token()
return commonsProcess(showLoading, () => {
return uni.uploadFile(
@@ -202,7 +202,7 @@ function upload(uri, data, file, showLoading = true, extParams = {}) {
formData: data,
name: "file",
filePath: file.path,
- header: headerObject
+ header: getHeader()
}, extParams)
).then((httpData) => {
// uni.upload 返回bodyData 的是 string类型。 需要解析。
diff --git a/http/yskApi/shop.js b/http/yskApi/shop.js
new file mode 100644
index 0000000..454adf4
--- /dev/null
+++ b/http/yskApi/shop.js
@@ -0,0 +1,76 @@
+import http from './http.js'
+const request=http.request
+
+
+/**
+ * 获取店铺列表
+ * @returns
+ */
+export function getShopList(params) {
+ return request({
+ url: `/api/tbShopInfo`,
+ method: 'get',
+ params: {
+
+ }
+ })
+}
+
+/**
+ * 获取店铺数据
+ * @returns
+ */
+export function getShopInfo(params) {
+ return request({
+ url: `/api/tbShopInfo/${params}`,
+ method: 'get',
+ params: {
+
+ }
+ })
+}
+
+/**
+ * 更改店铺信息
+ * @returns
+ */
+export function editShopInfo(data) {
+ return request({
+ url: `/api/tbShopInfo`,
+ method: 'put',
+ data:{
+ // shopId: uni.getStorageSync('shopId'),
+ ...data
+ }
+ })
+}
+
+
+/**
+ * 获取店铺图片
+ * @returns
+ */
+export function getShopExtend(params) {
+ return request({
+ url: `/tbShopExtend`,
+ method: 'get',
+ params:{
+ shopId: uni.getStorageSync('shopId'),
+ }
+ })
+}
+
+/**
+ * 获取店铺图片
+ * @returns
+ */
+export function editShopExtend(data) {
+ return request({
+ url: `/tbShopExtend`,
+ method: 'put',
+ data:{
+ shopId: uni.getStorageSync('shopId'),
+ ...data
+ }
+ })
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index cf25ad3..ed1aaa2 100644
--- a/pages.json
+++ b/pages.json
@@ -100,6 +100,28 @@
"navigationStyle": "custom"
}
},
+ {
+ "pageId": "PAGES_SHOP_SETUP",
+ "path": "pages/shopSetUp/index",
+ "style": {
+ "navigationBarTitleText": "设置中心"
+ }
+ },
+ {
+ "pageId": "PAGES_SHOP_QRCODE",
+ "path": "pages/shopSetUp/shopQRcode",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "pageId": "PAGES_SHOP_LIST",
+ "path": "pages/shopSetUp/shopList",
+ "style": {
+ "navigationBarTitleText": "选择门店"
+ }
+ },
+
{
"pageId": "PAGES_USER_SETUP",
"path": "pages/userSetUp/userSetUp",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 563c10e..540c33e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -52,6 +52,11 @@
icon: '/static/indexImg/icon-cashier.svg',
pageUrl: 'PAGES_QUICK_PAY',
},
+ {
+ title: '设置中心',
+ icon: '/static/indexImg/icon-cashier.svg',
+ pageUrl: 'PAGES_SHOP_SETUP',
+ },
{
title: '商品管理',
icon: '/static/indexImg/icon-product-control.svg',
diff --git a/pages/shopSetUp/index.vue b/pages/shopSetUp/index.vue
new file mode 100644
index 0000000..6533cb0
--- /dev/null
+++ b/pages/shopSetUp/index.vue
@@ -0,0 +1,567 @@
+
+
+
+ 头像
+
+
+
+
+
+
+ 商户名称
+ {{ vdata.shopInfo.shopName }}
+
+
+ 商户电话
+ {{ vdata.shopInfo.phone }}
+
+
+
+ 营业状态
+
+
+
+ 门店详细地址
+ {{ vdata.shopInfo.address }}
+
+
+ 堂食功能
+
+
+
+ 允许打包
+
+
+
+ 是否开启会员支付
+
+
+
+
+ 桌位费{{vdata.shopInfo.tableFee}}
+
+
+
+
+
+
+
+ 店铺收款码
+
+
+
+ 店铺图片
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{vdata.extendInfo.title}}背景图片
+
+
+
+
+
+
+
+
+ 切换门店
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/shopSetUp/shopList.vue b/pages/shopSetUp/shopList.vue
new file mode 100644
index 0000000..b7ac304
--- /dev/null
+++ b/pages/shopSetUp/shopList.vue
@@ -0,0 +1,161 @@
+
+
+
+
+ 选择你要登录的门店
+
+
+
+ {{index+1}}
+
+
+ 双屿
+ 15333333333
+
+
+
+
+
+
+ 今日实收
+ 0.00
+
+
+ 今日实收
+ 0.00
+
+
+ 今日实收
+ 0.00
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/shopSetUp/shopQRcode.vue b/pages/shopSetUp/shopQRcode.vue
new file mode 100644
index 0000000..e2cc5a1
--- /dev/null
+++ b/pages/shopSetUp/shopQRcode.vue
@@ -0,0 +1,142 @@
+
+
+
+ 门店收款码
+
+
+
+
+ 下载收款码
+ 下载收款码样式
+
+
+
+
+
+
+
+
+
From ad93d41550fd30ea33b2e2bc24a73e9f63176ba5 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Wed, 18 Sep 2024 16:41:15 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0gh=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 4 +-
commons/utils/pushmsg/wxTextToSpeach.js | 2 +-
http/apiManager.js | 2 +-
http/http.js | 6 +-
node_modules/.package-lock.json | 365 +++++++++-
package-lock.json | 639 +++++++++++++++++-
pageProduct/add-Product/add-Product.vue | 4 +-
pageTable/index/components/table-item.vue | 3 +-
pages.json | 1 -
.../order-detail/components/step.vue | 12 +-
.../order-detail/components/user.vue | 2 +-
pagesCreateOrder/pay-order/pay-order.vue | 36 +-
12 files changed, 1026 insertions(+), 50 deletions(-)
diff --git a/App.vue b/App.vue
index 2a005e9..02c4faa 100644
--- a/App.vue
+++ b/App.vue
@@ -10,11 +10,11 @@ import { checkCurrVersion, getExtStoreId } from '@/commons/utils/versionManage.j
onLaunch(() => {
// console.log(uni.getExtConfigSync(),'uni.getExtConfigSync()')
- getExtStoreId();
+ // getExtStoreId();
uni.hideTabBar()
// appConfig.env.JEEPAY_BASE_URL = "https://b.rscygroup.com"
// 检查版本
- checkCurrVersion();
+ // checkCurrVersion();
});
diff --git a/commons/utils/pushmsg/wxTextToSpeach.js b/commons/utils/pushmsg/wxTextToSpeach.js
index c3a817a..bfd523d 100644
--- a/commons/utils/pushmsg/wxTextToSpeach.js
+++ b/commons/utils/pushmsg/wxTextToSpeach.js
@@ -16,7 +16,7 @@ export function getPushStatus () {
}
})
}
-getPushStatus()
+// getPushStatus()
// 创建 背景音乐
function createBgMusice (file) {
backgroundAudioManager = wx.getBackgroundAudioManager()
diff --git a/http/apiManager.js b/http/apiManager.js
index 1b6c526..c5e8c7a 100644
--- a/http/apiManager.js
+++ b/http/apiManager.js
@@ -621,4 +621,4 @@ export function $uploadImg(data) {
/* 获取上传form信息 */
export function $NewOssFilesForm(data) {
return http.req("/api/ossFiles/form", data, "POST")
-}
\ No newline at end of file
+}
diff --git a/http/http.js b/http/http.js
index f1a7564..9d21bed 100644
--- a/http/http.js
+++ b/http/http.js
@@ -70,9 +70,9 @@ function commonsProcess(showLoading, httpReqCallback){
// 提示信息
isShowErrorToast = true
- infoBox.showErrorToast('请登录').then(() => {
- go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH)
- })
+ // infoBox.showErrorToast('请登录').then(() => {
+ // go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH)
+ // })
return Promise.reject(bodyData) // 跳转到catch函数
}
// http响应码不正确
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index 03ca78c..8bc0ab5 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "jeepay-ui-uapp-merchant",
+ "name": "cashier_admin_app",
"lockfileVersion": 3,
"requires": true,
"packages": {
@@ -402,11 +402,48 @@
"ajv": "^8.8.2"
}
},
+ "node_modules/anymatch": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "normalize-path": "^3.0.0",
+ "picomatch": "^2.0.4"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
"node_modules/base64-js": {
"version": "1.5.1",
"resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
},
+ "node_modules/big.js": {
+ "version": "5.2.2",
+ "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
+ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/binary-extensions": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/braces": {
"version": "3.0.3",
"resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
@@ -489,6 +526,44 @@
],
"peer": true
},
+ "node_modules/chokidar": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz",
+ "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "anymatch": "~3.1.2",
+ "braces": "~3.0.2",
+ "glob-parent": "~5.1.2",
+ "is-binary-path": "~2.1.0",
+ "is-glob": "~4.0.1",
+ "normalize-path": "~3.0.0",
+ "readdirp": "~3.6.0"
+ },
+ "engines": {
+ "node": ">= 8.10.0"
+ },
+ "funding": {
+ "url": "https://paulmillr.com/funding/"
+ },
+ "optionalDependencies": {
+ "fsevents": "~2.3.2"
+ }
+ },
+ "node_modules/chokidar/node_modules/glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "is-glob": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
"node_modules/chrome-trace-event": {
"version": "1.0.4",
"resolved": "https://registry.npmmirror.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
@@ -499,6 +574,17 @@
"node": ">=6.0"
}
},
+ "node_modules/clipboard": {
+ "version": "2.0.11",
+ "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
+ "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+ "license": "MIT",
+ "dependencies": {
+ "good-listener": "^1.2.2",
+ "select": "^1.1.2",
+ "tiny-emitter": "^2.0.0"
+ }
+ },
"node_modules/commander": {
"version": "2.20.3",
"resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
@@ -531,9 +617,16 @@
}
},
"node_modules/dayjs": {
- "version": "1.11.6",
- "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz",
- "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="
+ "version": "1.11.13",
+ "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
+ "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+ "license": "MIT"
+ },
+ "node_modules/delegate": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
+ "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==",
+ "license": "MIT"
},
"node_modules/electron-to-chromium": {
"version": "1.4.816",
@@ -542,6 +635,16 @@
"dev": true,
"peer": true
},
+ "node_modules/emojis-list": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
+ "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 4"
+ }
+ },
"node_modules/enhanced-resolve": {
"version": "5.17.0",
"resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
@@ -668,8 +771,7 @@
"version": "2.1.0",
"resolved": "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
- "dev": true,
- "peer": true
+ "dev": true
},
"node_modules/fastq": {
"version": "1.17.1",
@@ -741,6 +843,15 @@
"to-arraybuffer": "^1.0.1"
}
},
+ "node_modules/good-listener": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
+ "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+ "license": "MIT",
+ "dependencies": {
+ "delegate": "^3.1.2"
+ }
+ },
"node_modules/graceful-fs": {
"version": "4.2.11",
"resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -772,6 +883,26 @@
"node": ">= 4"
}
},
+ "node_modules/immutable": {
+ "version": "4.3.7",
+ "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.7.tgz",
+ "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/is-binary-path": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "binary-extensions": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -827,6 +958,12 @@
"resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz",
"integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
},
+ "node_modules/jsencrypt": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
+ "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A==",
+ "license": "MIT"
+ },
"node_modules/json-parse-even-better-errors": {
"version": "2.3.1",
"resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -840,6 +977,29 @@
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true
},
+ "node_modules/json5": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "json5": "lib/cli.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/klona": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmmirror.com/klona/-/klona-2.0.6.tgz",
+ "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 8"
+ }
+ },
"node_modules/loader-runner": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -850,6 +1010,27 @@
"node": ">=6.11.5"
}
},
+ "node_modules/loader-utils": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ },
+ "engines": {
+ "node": ">=8.9.0"
+ }
+ },
+ "node_modules/lodash": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+ "license": "MIT"
+ },
"node_modules/merge-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -906,8 +1087,7 @@
"version": "2.6.2",
"resolved": "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz",
"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
- "dev": true,
- "peer": true
+ "dev": true
},
"node_modules/node-releases": {
"version": "2.0.14",
@@ -994,6 +1174,19 @@
"safe-buffer": "^5.1.0"
}
},
+ "node_modules/readdirp": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "picomatch": "^2.2.1"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
"node_modules/require-from-string": {
"version": "2.0.2",
"resolved": "https://registry.npmmirror.com/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -1056,6 +1249,115 @@
}
]
},
+ "node_modules/sass": {
+ "version": "1.78.0",
+ "resolved": "https://registry.npmmirror.com/sass/-/sass-1.78.0.tgz",
+ "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "chokidar": ">=3.0.0 <4.0.0",
+ "immutable": "^4.0.0",
+ "source-map-js": ">=0.6.2 <2.0.0"
+ },
+ "bin": {
+ "sass": "sass.js"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/sass-loader": {
+ "version": "10.5.2",
+ "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-10.5.2.tgz",
+ "integrity": "sha512-vMUoSNOUKJILHpcNCCyD23X34gve1TS7Rjd9uXHeKqhvBG39x6XbswFDtpbTElj6XdMFezoWhkh5vtKudf2cgQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "klona": "^2.0.4",
+ "loader-utils": "^2.0.0",
+ "neo-async": "^2.6.2",
+ "schema-utils": "^3.0.0",
+ "semver": "^7.3.2"
+ },
+ "engines": {
+ "node": ">= 10.13.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/webpack"
+ },
+ "peerDependencies": {
+ "fibers": ">= 3.1.0",
+ "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+ "sass": "^1.3.0",
+ "webpack": "^4.36.0 || ^5.0.0"
+ },
+ "peerDependenciesMeta": {
+ "fibers": {
+ "optional": true
+ },
+ "node-sass": {
+ "optional": true
+ },
+ "sass": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/sass-loader/node_modules/ajv": {
+ "version": "6.12.6",
+ "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/epoberezkin"
+ }
+ },
+ "node_modules/sass-loader/node_modules/ajv-keywords": {
+ "version": "3.5.2",
+ "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+ "dev": true,
+ "license": "MIT",
+ "peerDependencies": {
+ "ajv": "^6.9.1"
+ }
+ },
+ "node_modules/sass-loader/node_modules/json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/sass-loader/node_modules/schema-utils": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+ "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/json-schema": "^7.0.8",
+ "ajv": "^6.12.5",
+ "ajv-keywords": "^3.5.2"
+ },
+ "engines": {
+ "node": ">= 10.13.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/webpack"
+ }
+ },
"node_modules/schema-utils": {
"version": "4.2.0",
"resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
@@ -1075,6 +1377,25 @@
"url": "https://opencollective.com/webpack"
}
},
+ "node_modules/select": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
+ "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==",
+ "license": "MIT"
+ },
+ "node_modules/semver": {
+ "version": "7.6.3",
+ "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.3.tgz",
+ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+ "dev": true,
+ "license": "ISC",
+ "bin": {
+ "semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
"node_modules/serialize-javascript": {
"version": "6.0.2",
"resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
@@ -1106,6 +1427,16 @@
"node": ">=0.10.0"
}
},
+ "node_modules/source-map-js": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+ "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+ "dev": true,
+ "license": "BSD-3-Clause",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/source-map-support": {
"version": "0.5.21",
"resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
@@ -1250,6 +1581,12 @@
"url": "https://opencollective.com/webpack"
}
},
+ "node_modules/tiny-emitter": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+ "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
+ "license": "MIT"
+ },
"node_modules/to-arraybuffer": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -1326,6 +1663,18 @@
"punycode": "^2.1.0"
}
},
+ "node_modules/uview-plus": {
+ "version": "3.3.32",
+ "resolved": "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.3.32.tgz",
+ "integrity": "sha512-rl/Bw9uH7sNY8GAzKVv3Wel27wvUx08UuADEPxQB5U2LrkdHD2r6Cvk6BTbQbLKDTpFR7rrbVTQiK/DNKFIe4Q==",
+ "dependencies": {
+ "clipboard": "^2.0.11",
+ "dayjs": "^1.11.3"
+ },
+ "engines": {
+ "HBuilderX": "^3.1.0"
+ }
+ },
"node_modules/watchpack": {
"version": "2.4.1",
"resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.1.tgz",
diff --git a/package-lock.json b/package-lock.json
index 8ba5d7a..5261f6a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,22 @@
{
- "name": "jeepay-ui-uapp-merchant",
+ "name": "cashier_admin_app",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"dependencies": {
- "dayjs": "^1.11.6",
+ "clipboard": "^2.0.11",
+ "dayjs": "^1.11.13",
"gm-crypto": "^0.1.8",
- "js-base64": "^3.7.2"
+ "js-base64": "^3.7.2",
+ "jsencrypt": "^3.3.2",
+ "lodash": "^4.17.21",
+ "uview-plus": "^3.3.32"
},
"devDependencies": {
- "copy-webpack-plugin": "^12.0.2"
+ "copy-webpack-plugin": "^12.0.2",
+ "sass": "^1.78.0",
+ "sass-loader": "^10.5.2"
}
},
"node_modules/@jridgewell/gen-mapping": {
@@ -412,11 +418,48 @@
"ajv": "^8.8.2"
}
},
+ "node_modules/anymatch": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "normalize-path": "^3.0.0",
+ "picomatch": "^2.0.4"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
"node_modules/base64-js": {
"version": "1.5.1",
"resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
},
+ "node_modules/big.js": {
+ "version": "5.2.2",
+ "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
+ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/binary-extensions": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/braces": {
"version": "3.0.3",
"resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
@@ -499,6 +542,44 @@
],
"peer": true
},
+ "node_modules/chokidar": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz",
+ "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "anymatch": "~3.1.2",
+ "braces": "~3.0.2",
+ "glob-parent": "~5.1.2",
+ "is-binary-path": "~2.1.0",
+ "is-glob": "~4.0.1",
+ "normalize-path": "~3.0.0",
+ "readdirp": "~3.6.0"
+ },
+ "engines": {
+ "node": ">= 8.10.0"
+ },
+ "funding": {
+ "url": "https://paulmillr.com/funding/"
+ },
+ "optionalDependencies": {
+ "fsevents": "~2.3.2"
+ }
+ },
+ "node_modules/chokidar/node_modules/glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "is-glob": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
"node_modules/chrome-trace-event": {
"version": "1.0.4",
"resolved": "https://registry.npmmirror.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
@@ -509,6 +590,17 @@
"node": ">=6.0"
}
},
+ "node_modules/clipboard": {
+ "version": "2.0.11",
+ "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
+ "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+ "license": "MIT",
+ "dependencies": {
+ "good-listener": "^1.2.2",
+ "select": "^1.1.2",
+ "tiny-emitter": "^2.0.0"
+ }
+ },
"node_modules/commander": {
"version": "2.20.3",
"resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
@@ -541,9 +633,16 @@
}
},
"node_modules/dayjs": {
- "version": "1.11.6",
- "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz",
- "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="
+ "version": "1.11.13",
+ "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
+ "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+ "license": "MIT"
+ },
+ "node_modules/delegate": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
+ "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==",
+ "license": "MIT"
},
"node_modules/electron-to-chromium": {
"version": "1.4.816",
@@ -552,6 +651,16 @@
"dev": true,
"peer": true
},
+ "node_modules/emojis-list": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
+ "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 4"
+ }
+ },
"node_modules/enhanced-resolve": {
"version": "5.17.0",
"resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
@@ -678,8 +787,7 @@
"version": "2.1.0",
"resolved": "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
- "dev": true,
- "peer": true
+ "dev": true
},
"node_modules/fastq": {
"version": "1.17.1",
@@ -702,6 +810,21 @@
"node": ">=8"
}
},
+ "node_modules/fsevents": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+ }
+ },
"node_modules/glob-parent": {
"version": "6.0.2",
"resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -751,6 +874,15 @@
"to-arraybuffer": "^1.0.1"
}
},
+ "node_modules/good-listener": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
+ "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+ "license": "MIT",
+ "dependencies": {
+ "delegate": "^3.1.2"
+ }
+ },
"node_modules/graceful-fs": {
"version": "4.2.11",
"resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -782,6 +914,26 @@
"node": ">= 4"
}
},
+ "node_modules/immutable": {
+ "version": "4.3.7",
+ "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.7.tgz",
+ "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/is-binary-path": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "binary-extensions": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -837,6 +989,12 @@
"resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz",
"integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
},
+ "node_modules/jsencrypt": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
+ "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A==",
+ "license": "MIT"
+ },
"node_modules/json-parse-even-better-errors": {
"version": "2.3.1",
"resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -850,6 +1008,29 @@
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true
},
+ "node_modules/json5": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "json5": "lib/cli.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/klona": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmmirror.com/klona/-/klona-2.0.6.tgz",
+ "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 8"
+ }
+ },
"node_modules/loader-runner": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -860,6 +1041,27 @@
"node": ">=6.11.5"
}
},
+ "node_modules/loader-utils": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ },
+ "engines": {
+ "node": ">=8.9.0"
+ }
+ },
+ "node_modules/lodash": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+ "license": "MIT"
+ },
"node_modules/merge-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -916,8 +1118,7 @@
"version": "2.6.2",
"resolved": "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz",
"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
- "dev": true,
- "peer": true
+ "dev": true
},
"node_modules/node-releases": {
"version": "2.0.14",
@@ -1004,6 +1205,19 @@
"safe-buffer": "^5.1.0"
}
},
+ "node_modules/readdirp": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "picomatch": "^2.2.1"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
"node_modules/require-from-string": {
"version": "2.0.2",
"resolved": "https://registry.npmmirror.com/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -1066,6 +1280,115 @@
}
]
},
+ "node_modules/sass": {
+ "version": "1.78.0",
+ "resolved": "https://registry.npmmirror.com/sass/-/sass-1.78.0.tgz",
+ "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "chokidar": ">=3.0.0 <4.0.0",
+ "immutable": "^4.0.0",
+ "source-map-js": ">=0.6.2 <2.0.0"
+ },
+ "bin": {
+ "sass": "sass.js"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/sass-loader": {
+ "version": "10.5.2",
+ "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-10.5.2.tgz",
+ "integrity": "sha512-vMUoSNOUKJILHpcNCCyD23X34gve1TS7Rjd9uXHeKqhvBG39x6XbswFDtpbTElj6XdMFezoWhkh5vtKudf2cgQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "klona": "^2.0.4",
+ "loader-utils": "^2.0.0",
+ "neo-async": "^2.6.2",
+ "schema-utils": "^3.0.0",
+ "semver": "^7.3.2"
+ },
+ "engines": {
+ "node": ">= 10.13.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/webpack"
+ },
+ "peerDependencies": {
+ "fibers": ">= 3.1.0",
+ "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+ "sass": "^1.3.0",
+ "webpack": "^4.36.0 || ^5.0.0"
+ },
+ "peerDependenciesMeta": {
+ "fibers": {
+ "optional": true
+ },
+ "node-sass": {
+ "optional": true
+ },
+ "sass": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/sass-loader/node_modules/ajv": {
+ "version": "6.12.6",
+ "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/epoberezkin"
+ }
+ },
+ "node_modules/sass-loader/node_modules/ajv-keywords": {
+ "version": "3.5.2",
+ "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+ "dev": true,
+ "license": "MIT",
+ "peerDependencies": {
+ "ajv": "^6.9.1"
+ }
+ },
+ "node_modules/sass-loader/node_modules/json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/sass-loader/node_modules/schema-utils": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+ "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/json-schema": "^7.0.8",
+ "ajv": "^6.12.5",
+ "ajv-keywords": "^3.5.2"
+ },
+ "engines": {
+ "node": ">= 10.13.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/webpack"
+ }
+ },
"node_modules/schema-utils": {
"version": "4.2.0",
"resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
@@ -1085,6 +1408,25 @@
"url": "https://opencollective.com/webpack"
}
},
+ "node_modules/select": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
+ "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==",
+ "license": "MIT"
+ },
+ "node_modules/semver": {
+ "version": "7.6.3",
+ "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.3.tgz",
+ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+ "dev": true,
+ "license": "ISC",
+ "bin": {
+ "semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
"node_modules/serialize-javascript": {
"version": "6.0.2",
"resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
@@ -1116,6 +1458,16 @@
"node": ">=0.10.0"
}
},
+ "node_modules/source-map-js": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+ "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+ "dev": true,
+ "license": "BSD-3-Clause",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/source-map-support": {
"version": "0.5.21",
"resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
@@ -1260,6 +1612,12 @@
"url": "https://opencollective.com/webpack"
}
},
+ "node_modules/tiny-emitter": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+ "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
+ "license": "MIT"
+ },
"node_modules/to-arraybuffer": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -1336,6 +1694,18 @@
"punycode": "^2.1.0"
}
},
+ "node_modules/uview-plus": {
+ "version": "3.3.32",
+ "resolved": "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.3.32.tgz",
+ "integrity": "sha512-rl/Bw9uH7sNY8GAzKVv3Wel27wvUx08UuADEPxQB5U2LrkdHD2r6Cvk6BTbQbLKDTpFR7rrbVTQiK/DNKFIe4Q==",
+ "dependencies": {
+ "clipboard": "^2.0.11",
+ "dayjs": "^1.11.3"
+ },
+ "engines": {
+ "HBuilderX": "^3.1.0"
+ }
+ },
"node_modules/watchpack": {
"version": "2.4.1",
"resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.1.tgz",
@@ -1815,11 +2185,33 @@
"fast-deep-equal": "^3.1.3"
}
},
+ "anymatch": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+ "dev": true,
+ "requires": {
+ "normalize-path": "^3.0.0",
+ "picomatch": "^2.0.4"
+ }
+ },
"base64-js": {
"version": "1.5.1",
"resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
},
+ "big.js": {
+ "version": "5.2.2",
+ "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
+ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+ "dev": true
+ },
+ "binary-extensions": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+ "dev": true
+ },
"braces": {
"version": "3.0.3",
"resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
@@ -1865,6 +2257,33 @@
"dev": true,
"peer": true
},
+ "chokidar": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz",
+ "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+ "dev": true,
+ "requires": {
+ "anymatch": "~3.1.2",
+ "braces": "~3.0.2",
+ "fsevents": "~2.3.2",
+ "glob-parent": "~5.1.2",
+ "is-binary-path": "~2.1.0",
+ "is-glob": "~4.0.1",
+ "normalize-path": "~3.0.0",
+ "readdirp": "~3.6.0"
+ },
+ "dependencies": {
+ "glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "requires": {
+ "is-glob": "^4.0.1"
+ }
+ }
+ }
+ },
"chrome-trace-event": {
"version": "1.0.4",
"resolved": "https://registry.npmmirror.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
@@ -1872,6 +2291,16 @@
"dev": true,
"peer": true
},
+ "clipboard": {
+ "version": "2.0.11",
+ "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
+ "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+ "requires": {
+ "good-listener": "^1.2.2",
+ "select": "^1.1.2",
+ "tiny-emitter": "^2.0.0"
+ }
+ },
"commander": {
"version": "2.20.3",
"resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
@@ -1894,9 +2323,14 @@
}
},
"dayjs": {
- "version": "1.11.6",
- "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz",
- "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="
+ "version": "1.11.13",
+ "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
+ "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+ },
+ "delegate": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
+ "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
},
"electron-to-chromium": {
"version": "1.4.816",
@@ -1905,6 +2339,12 @@
"dev": true,
"peer": true
},
+ "emojis-list": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
+ "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+ "dev": true
+ },
"enhanced-resolve": {
"version": "5.17.0",
"resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
@@ -2008,8 +2448,7 @@
"version": "2.1.0",
"resolved": "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
- "dev": true,
- "peer": true
+ "dev": true
},
"fastq": {
"version": "1.17.1",
@@ -2029,6 +2468,13 @@
"to-regex-range": "^5.0.1"
}
},
+ "fsevents": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+ "dev": true,
+ "optional": true
+ },
"glob-parent": {
"version": "6.0.2",
"resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -2069,6 +2515,14 @@
"to-arraybuffer": "^1.0.1"
}
},
+ "good-listener": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
+ "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+ "requires": {
+ "delegate": "^3.1.2"
+ }
+ },
"graceful-fs": {
"version": "4.2.11",
"resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -2094,6 +2548,21 @@
"integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
"dev": true
},
+ "immutable": {
+ "version": "4.3.7",
+ "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.7.tgz",
+ "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+ "dev": true
+ },
+ "is-binary-path": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+ "dev": true,
+ "requires": {
+ "binary-extensions": "^2.0.0"
+ }
+ },
"is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -2137,6 +2606,11 @@
"resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz",
"integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
},
+ "jsencrypt": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
+ "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
+ },
"json-parse-even-better-errors": {
"version": "2.3.1",
"resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -2150,6 +2624,18 @@
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true
},
+ "json5": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+ "dev": true
+ },
+ "klona": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmmirror.com/klona/-/klona-2.0.6.tgz",
+ "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+ "dev": true
+ },
"loader-runner": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -2157,6 +2643,22 @@
"dev": true,
"peer": true
},
+ "loader-utils": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+ "dev": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
+ "lodash": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+ },
"merge-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -2201,8 +2703,7 @@
"version": "2.6.2",
"resolved": "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz",
"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
- "dev": true,
- "peer": true
+ "dev": true
},
"node-releases": {
"version": "2.0.14",
@@ -2257,6 +2758,15 @@
"safe-buffer": "^5.1.0"
}
},
+ "readdirp": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+ "dev": true,
+ "requires": {
+ "picomatch": "^2.2.1"
+ }
+ },
"require-from-string": {
"version": "2.0.2",
"resolved": "https://registry.npmmirror.com/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -2284,6 +2794,68 @@
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
"dev": true
},
+ "sass": {
+ "version": "1.78.0",
+ "resolved": "https://registry.npmmirror.com/sass/-/sass-1.78.0.tgz",
+ "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==",
+ "dev": true,
+ "requires": {
+ "chokidar": ">=3.0.0 <4.0.0",
+ "immutable": "^4.0.0",
+ "source-map-js": ">=0.6.2 <2.0.0"
+ }
+ },
+ "sass-loader": {
+ "version": "10.5.2",
+ "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-10.5.2.tgz",
+ "integrity": "sha512-vMUoSNOUKJILHpcNCCyD23X34gve1TS7Rjd9uXHeKqhvBG39x6XbswFDtpbTElj6XdMFezoWhkh5vtKudf2cgQ==",
+ "dev": true,
+ "requires": {
+ "klona": "^2.0.4",
+ "loader-utils": "^2.0.0",
+ "neo-async": "^2.6.2",
+ "schema-utils": "^3.0.0",
+ "semver": "^7.3.2"
+ },
+ "dependencies": {
+ "ajv": {
+ "version": "6.12.6",
+ "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "dev": true,
+ "requires": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ }
+ },
+ "ajv-keywords": {
+ "version": "3.5.2",
+ "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+ "dev": true,
+ "requires": {}
+ },
+ "json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
+ },
+ "schema-utils": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+ "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+ "dev": true,
+ "requires": {
+ "@types/json-schema": "^7.0.8",
+ "ajv": "^6.12.5",
+ "ajv-keywords": "^3.5.2"
+ }
+ }
+ }
+ },
"schema-utils": {
"version": "4.2.0",
"resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
@@ -2296,6 +2868,17 @@
"ajv-keywords": "^5.1.0"
}
},
+ "select": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
+ "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+ },
+ "semver": {
+ "version": "7.6.3",
+ "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.3.tgz",
+ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+ "dev": true
+ },
"serialize-javascript": {
"version": "6.0.2",
"resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
@@ -2318,6 +2901,12 @@
"dev": true,
"peer": true
},
+ "source-map-js": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+ "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+ "dev": true
+ },
"source-map-support": {
"version": "0.5.21",
"resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
@@ -2415,6 +3004,11 @@
}
}
},
+ "tiny-emitter": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+ "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+ },
"to-arraybuffer": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -2462,6 +3056,15 @@
"punycode": "^2.1.0"
}
},
+ "uview-plus": {
+ "version": "3.3.32",
+ "resolved": "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.3.32.tgz",
+ "integrity": "sha512-rl/Bw9uH7sNY8GAzKVv3Wel27wvUx08UuADEPxQB5U2LrkdHD2r6Cvk6BTbQbLKDTpFR7rrbVTQiK/DNKFIe4Q==",
+ "requires": {
+ "clipboard": "^2.0.11",
+ "dayjs": "^1.11.3"
+ }
+ },
"watchpack": {
"version": "2.4.1",
"resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.1.tgz",
diff --git a/pageProduct/add-Product/add-Product.vue b/pageProduct/add-Product/add-Product.vue
index 9b4779f..6268391 100644
--- a/pageProduct/add-Product/add-Product.vue
+++ b/pageProduct/add-Product/add-Product.vue
@@ -1,8 +1,8 @@
-
+
-
+
diff --git a/pageTable/index/components/table-item.vue b/pageTable/index/components/table-item.vue
index 8526c1c..1766218 100644
--- a/pageTable/index/components/table-item.vue
+++ b/pageTable/index/components/table-item.vue
@@ -129,8 +129,9 @@
function toOrderDetail() {
if(props.data.status=='using'){
+ const {tableId,name,status,amount,areaId}=props.data
go.to('PAGES_CRESATE_ORDER_DETAIL', {
- ...props.data
+ tableId,name,status,amount,areaId
})
}
}
diff --git a/pages.json b/pages.json
index ed1aaa2..71a3777 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,6 @@
"autoscan": true,
"custom": {
"^my-(.*)": "@/components/my-components/my-$1.vue",
- "^u-(.*)": "@/components/my-components/u-$1/u-$1.vue",
"^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
"^up-(.*)": "uview-plus/components/u-$1/u-$1.vue",
"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
diff --git a/pagesCreateOrder/order-detail/components/step.vue b/pagesCreateOrder/order-detail/components/step.vue
index e31c3fe..8de801f 100644
--- a/pagesCreateOrder/order-detail/components/step.vue
+++ b/pagesCreateOrder/order-detail/components/step.vue
@@ -1,11 +1,11 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/pagesCreateOrder/order-detail/components/user.vue b/pagesCreateOrder/order-detail/components/user.vue
index eca9e5c..2ad40f5 100644
--- a/pagesCreateOrder/order-detail/components/user.vue
+++ b/pagesCreateOrder/order-detail/components/user.vue
@@ -3,7 +3,7 @@
切换
-
+
未绑定手机号
diff --git a/pagesCreateOrder/pay-order/pay-order.vue b/pagesCreateOrder/pay-order/pay-order.vue
index 2a23842..044ca1f 100644
--- a/pagesCreateOrder/pay-order/pay-order.vue
+++ b/pagesCreateOrder/pay-order/pay-order.vue
@@ -59,7 +59,8 @@
+
diff --git a/pages/shopSetUp/index.vue b/pages/shopSetUp/index.vue
index 6533cb0..4dee8cc 100644
--- a/pages/shopSetUp/index.vue
+++ b/pages/shopSetUp/index.vue
@@ -7,11 +7,12 @@
-
+
+
商户名称
{{ vdata.shopInfo.shopName }}
-
+
商户电话
{{ vdata.shopInfo.phone }}
@@ -41,7 +42,7 @@
- 桌位费{{vdata.shopInfo.tableFee}}
+ 桌位费{{vdata.shopInfo.tableFee}}
@@ -84,19 +85,7 @@
切换门店
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -109,8 +98,6 @@ import go from '@/commons/utils/go.js'
import infoBox from '@/commons/utils/infoBox.js'
import { $uploadFile } from '@/http/yskApi/file.js'
-const jeepayPopupInputRef = ref()
-const popupRef = ref()
const uploadImg = ref()
const phone = ref(null)
const vdata = reactive({
@@ -135,8 +122,24 @@ onMounted(() => {
onShow(() => {
shopInfo();
+ uni.$on('refreshPreviousPage', (params) => {
+ // 这里执行刷新数据的操作,例如重新调用API获取数据
+ refreshData(params);
+ });
})
+let refreshData = (e) => {
+ let params = {
+ id : vdata.shopInfo.id,
+ }
+ for(let item in params){
+ params[e.name] = e.value;
+ }
+ vdata.type = e.name;
+ vdata.inputValue = e.value;
+ updateShopInfo(params,'input')
+}
+
/**
* 获取店铺信息
*/
@@ -187,7 +190,6 @@ let updateShopInfo = (params,type) => {
break;
}
}
- popupRef.value.close()
})
}
@@ -255,52 +257,6 @@ let extendTabClick = (item,index) => {
vdata.extendIndex = index;
}
-
-/**
- * 打开修改弹窗
- */
-let updateValue = ( label , type , value) => {
- vdata.label = label;
- vdata.type = type;
- vdata.inputValue = value;
- switch ( vdata.type ){
- case "shopName":
- vdata.inputType = 'text';
- vdata.maxLength = 999;
- break;
- case "phone":
- vdata.inputType = 'tel';
- vdata.maxLength = 12;
- break;
- case "tableFee":
- vdata.inputType = 'number';
- vdata.maxLength = 12;
- break;
- }
- popupRef.value.open()
-}
-
-/**
- * 确认修改
- */
-let confirmFunc = () => {
- let params = {
- id : vdata.shopInfo.id,
- }
- switch ( vdata.type ){
- case "shopName":
- params.shopName = vdata.inputValue;
- break;
- case "phone":
- params.phone = vdata.inputValue;
- break;
- case "tableFee":
- params.tableFee = vdata.inputValue;
- break;
- }
- updateShopInfo(params,'input');
-}
-
/**
* 是否免桌位费
*/
From 24afdabe3d3cee9498cf1e3196d9a3dd2bc0af6b Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Thu, 19 Sep 2024 14:34:20 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=94=B6=E6=AC=BE?=
=?UTF-8?q?=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/shopSetUp/index.vue | 2 +-
pages/shopSetUp/shopQRcode.vue | 108 ++++++++++++++++++++++++++-------
2 files changed, 88 insertions(+), 22 deletions(-)
diff --git a/pages/shopSetUp/index.vue b/pages/shopSetUp/index.vue
index 4dee8cc..29a08f6 100644
--- a/pages/shopSetUp/index.vue
+++ b/pages/shopSetUp/index.vue
@@ -49,7 +49,7 @@
-
+
店铺收款码
diff --git a/pages/shopSetUp/shopQRcode.vue b/pages/shopSetUp/shopQRcode.vue
index e2cc5a1..9519187 100644
--- a/pages/shopSetUp/shopQRcode.vue
+++ b/pages/shopSetUp/shopQRcode.vue
@@ -3,7 +3,7 @@
门店收款码
-
+
下载收款码
@@ -17,53 +17,98 @@
\ No newline at end of file
diff --git a/pageInvoicing/index/index.vue b/pageInvoicing/index/index.vue
index 3576166..4638b51 100644
--- a/pageInvoicing/index/index.vue
+++ b/pageInvoicing/index/index.vue
@@ -71,12 +71,14 @@
+
-
-
diff --git a/components/my-components/my-steps.vue b/components/my-components/my-steps.vue
deleted file mode 100644
index bf912b7..0000000
--- a/components/my-components/my-steps.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/http/yskApi/goods.js b/http/yskApi/goods.js
index 8f66df3..05a7af4 100644
--- a/http/yskApi/goods.js
+++ b/http/yskApi/goods.js
@@ -128,4 +128,9 @@ export function $tbProductV2(data) {
export function $tbProskuConV2(data) {
return http.req('/api/tbProskuCon/V2', data, 'POST')
}
+
+/* 修改商品相关(快捷接口) */
+export function $updateProductData(data) {
+ return http.req('/api/stock/updateProductData', data, 'POST')
+}
// v2 api end
\ No newline at end of file
diff --git a/http/yskApi/user.js b/http/yskApi/user.js
new file mode 100644
index 0000000..1b46450
--- /dev/null
+++ b/http/yskApi/user.js
@@ -0,0 +1,25 @@
+import http from './http.js'
+const request=http.request
+/**
+ * 用户详情
+ * @returns
+ */
+export function tbShopInfo(shopId) {
+ const _shopId=uni.getStorageSync('shopId')
+ return request({
+ url: `/api/tbShopInfo/${shopId||_shopId}`,
+ method: 'get'
+ })
+}
+
+/**
+ * 修改店铺信息
+ * @returns
+ */
+export function tbShopInfoPut(data) {
+ return request({
+ url: `/api/tbShopInfo`,
+ method: 'put',
+ data
+ })
+}
\ No newline at end of file
diff --git a/pageProduct/add-Product/add-Product-9-19-back.vue b/pageProduct/add-Product/add-Product-9-19-back.vue
new file mode 100644
index 0000000..5dc1ade
--- /dev/null
+++ b/pageProduct/add-Product/add-Product-9-19-back.vue
@@ -0,0 +1,2026 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+ {{item.desc}}
+
+
+
+
+
+
+
+
+ 注:第一张图为商品封面图,图片尺寸为750x750
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 名称
+ 操作
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+ 添加团购券分类
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择规格
+ 编辑规格
+
+
+
+
+
+
+
+ 组合名称
+ 售价
+ 库存数量
+
+
+ {{item.specSnap}}
+ {{item.salePrice}}
+ {{item.stockNumber}}
+
+
+
+
+
+
+
+
+
+
+
+ 套餐商品
+
+
+
+
+
+
+
+ 商品信息
+
+
+ 名称
+ 数量
+ 操作
+
+
+
+
+ {{product.name}}
+
+
+
+
+ x1
+
+
+
+
+
+
+
+
+ 添加商品
+
+
+
+
+
+
+
+
+
+
+ 删除分组
+
+
+
+
+
+
+ 添加分组
+
+
+
+
+ 规格属性
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 库存开关
+
+
+ 注:关闭则不计算出入库数据
+
+
+
+ 标签打印
+
+
+ 开启后: 收银完成后会自动打印对应数量的标签数
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+ 删除该商品
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 库存开关
+
+
+
+
+
+
+
+ 共享库存
+
+
+
+
+
+
+
+ 售罄
+
+
+
+
+
+
+
+
+
+ 上架
+
+
+
+
+
+
+
+ 库存记录
+
+
+ 库存盘点
+
+
+
+
+
+
+
+
+
+
+ 库存记录
+
+
+
+
+
+
+ 规格
+ 库存
+ 售罄
+ 上架
+ 操作
+
+
+
+ {{item.specSnap}}
+
+ {{item.stockNumber}}{{item.unitName}}
+
+
+
+
+
+
+ 库存盘点
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pageProduct/add-Product/add-Product.vue b/pageProduct/add-Product/add-Product.vue
index b13bd6f..a954931 100644
--- a/pageProduct/add-Product/add-Product.vue
+++ b/pageProduct/add-Product/add-Product.vue
@@ -1,7 +1,7 @@
-
+
@@ -11,19 +11,30 @@
err-show-type="toast" validateTrigger="submit" label-width="350" ref="Forms">
-
+
+
+
+
+
{{item.title}}
{{item.desc}}
-
+ -->
@@ -38,11 +49,6 @@
-
@@ -50,10 +56,6 @@
-
+
+
+ 删除该商品
+
+
保存
-
-
-
+
-
+ -->
-
+
-
-
-
-
-
-
- 库存开关
-
-
-
-
-
-
-
- 共享库存
-
-
-
-
-
-
-
- 售罄
-
-
-
-
-
-
-
-
-
- 上架
-
-
-
-
-
-
-
- 库存记录
-
-
- 库存盘点
-
-
-
-
-
-
-
-
-
-
- 库存记录
-
-
-
-
-
-
- 规格
- 库存
- 售罄
- 上架
- 操作
-
-
-
- {{item.specSnap}}
-
- {{item.stockNumber}}{{item.unitName}}
-
-
-
-
-
-
- 库存盘点
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存
- 取消
-
-
+
@@ -894,11 +762,8 @@
-
-
-
-
-
+
+
@@ -906,6 +771,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/pageProduct/add-Product/components/choose-haocai - 副本.vue b/pageProduct/add-Product/components/choose-haocai - 副本.vue
new file mode 100644
index 0000000..7ef8774
--- /dev/null
+++ b/pageProduct/add-Product/components/choose-haocai - 副本.vue
@@ -0,0 +1,57 @@
+
+
+ 选择状态
+
+
+
+ {{statusItem.label}}
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pageProduct/add-Product/components/choose-haocai.vue b/pageProduct/add-Product/components/choose-haocai.vue
new file mode 100644
index 0000000..0b5cf16
--- /dev/null
+++ b/pageProduct/add-Product/components/choose-haocai.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+ {{item.conName}}
+
+ 没有该耗材
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pageProduct/add-Product/components/edit-haocai.vue b/pageProduct/add-Product/components/edit-haocai.vue
new file mode 100644
index 0000000..e27798d
--- /dev/null
+++ b/pageProduct/add-Product/components/edit-haocai.vue
@@ -0,0 +1,359 @@
+
+
+
+
+ 商品名称
+
+
+ 绑定至规格
+ 绑定至规格
+
+
+
+ {{goods.name}}
+
+
+
+
+ 规格名称
+ {{item.specSnap}}
+
+ 序号
+
+ 耗材名称
+ 单位
+ 用量
+
+
+
+
+
+ {{haocaiIndex+1}}
+
+
+
+ {{item.name}}
+
+
+
+
+
+ {{item.unit}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 库存:{{item.stockNumber}}
+
+
+
+
+
+
+
+
+
+
+ 添加耗材
+
+
+
+
+
+
+
+
+
+
+ 序号
+
+ 耗材名称
+ 单位
+ 用量
+
+
+
+
+ {{index+1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 库存:{{item.stockNumber}}
+ {{item.conUnit}}
+
+
+
+
+
+
+
+
+
+
+
+ 添加耗材
+
+
+
+
+
+
+
+
+ 当某个耗材的使用库存不足时,商品自动
+ 售罄。
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pageProduct/add-specifications/add-specifications - 副本 (2).vue b/pageProduct/add-specifications/add-specifications - 副本 (2).vue
new file mode 100644
index 0000000..1b8fcac
--- /dev/null
+++ b/pageProduct/add-specifications/add-specifications - 副本 (2).vue
@@ -0,0 +1,499 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加规格
+
+
+
+
+
+
+
+
+
+
+ 删除规格组
+
+
+
+
+
+
+
+
+ 添加规格组
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pageProduct/add-specifications/add-specifications.vue b/pageProduct/add-specifications/add-specifications.vue
index 1b8fcac..46772d8 100644
--- a/pageProduct/add-specifications/add-specifications.vue
+++ b/pageProduct/add-specifications/add-specifications.vue
@@ -1,53 +1,62 @@
-
-
-
-
-
-
-
-
-
+
+ v-model="item.name" placeholder="规格组名" />
-
+
+
-
-
+
+ 名称
+ 加价
+
+
+
-
-
+
+ placeholder="选项名" />
-
-
+
+
-
+ type="digit" placeholder="填写价格" />
@@ -70,7 +79,7 @@
-
+
@@ -97,14 +106,10 @@
+
+
\ No newline at end of file
diff --git a/pageProduct/index/components/edit-guige.vue b/pageProduct/index/components/edit-guige.vue
new file mode 100644
index 0000000..cfb9db7
--- /dev/null
+++ b/pageProduct/index/components/edit-guige.vue
@@ -0,0 +1,141 @@
+
+
+
+
+ {{data.specSnap}}
+
+
+
+
+
+
+ 当前状态
+
+
+
+
+
+
+
+
+
+ 售罄
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pageProduct/index/components/edit-price.vue b/pageProduct/index/components/edit-price.vue
new file mode 100644
index 0000000..0cfd190
--- /dev/null
+++ b/pageProduct/index/components/edit-price.vue
@@ -0,0 +1,186 @@
+
+
+
+
+ 修改价格
+
+
+
+
+
+ 商品名称
+ {{data.name}}
+
+
+
+
+ {{data.name}}
+
+ 变动金额:
+ {{data.lowPrice-data._lowPrice}}
+
+
+
+
+
+ 元
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+ 变动金额:
+ {{item.lowPrice-item._lowPrice}}
+
+
+
+
+
+ 元
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pageProduct/index/components/edit-stock.vue b/pageProduct/index/components/edit-stock.vue
new file mode 100644
index 0000000..ef133de
--- /dev/null
+++ b/pageProduct/index/components/edit-stock.vue
@@ -0,0 +1,235 @@
+
+
+
+
+ 修改库存
+
+
+
+
+
+ 商品名称
+ {{data.name}}
+
+
+
+
+ {{data.name}}
+
+ 变动数量:
+ {{data.stockNumber-data._stockNumber}}
+
+
+
+
+
+ {{data.unitName||''}}
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+ 变动数量:
+ {{item.stockNumber-item._stockNumber}}
+
+
+
+
+
+ {{data.unitName||''}}
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+ 查看记录
+
+
+
+
+
+
+
+
+
+
+
+ 收起记录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pageProduct/index/components/goods.vue b/pageProduct/index/components/goods.vue
index 09ac0ba..65359d6 100644
--- a/pageProduct/index/components/goods.vue
+++ b/pageProduct/index/components/goods.vue
@@ -7,55 +7,81 @@
{{data.sort}}
-
- 库存:
- {{data.stockNumber}}
+
+ 库存:{{data.stockNumber}}
- 修改
+
+
+ 改价
+ 报损
+
-
+
-
-
-
+
+
+
+
+
- {{data.name}}
+ {{data.name}}
+
+
+
+ {{data.lowPrice}}
+
- ¥{{data.lowPrice}}
+
+
+
+ 规格:
+
+ {{item.specSnap||item.name}}
+ 上架中
+ 已下架
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
@@ -93,7 +119,7 @@
import {
ColorMain
} from '@/commons/color.js'
- const emits = defineEmits(['radioClick', 'changeClick', 'xiajia', 'del'])
+ const emits = defineEmits(['radioClick', 'changeClick', 'xiajia', 'del', 'changePrice', 'baosun', 'guigeClick','editStock'])
const props = defineProps({
index: {
type: Number
@@ -113,7 +139,8 @@
default: false
}
})
-
+
+
function isHotChange(e) {
$goodsIsHot({
@@ -155,6 +182,20 @@
emits('del', props.index)
}
+ function changePrice() {
+ emits('changePrice', props.index)
+ }
+
+ function baosun() {
+ emits('baosun', props.index)
+ }
+
+ function guigeClick(guigeIndex) {
+ emits('guigeClick', props.index, guigeIndex)
+ }
+ function editStock(){
+ emits('editStock', props.index)
+ }
//携带参数type edit跳转到商品添加页面,编辑与添加同一页面,根据type值来判断
function toEdit() {
go.to('PAGES_PRODUCT_ADD', {
@@ -174,9 +215,12 @@
border: 2rpx solid transparent;
}
+ .gap-10 {
+ gap: 10rpx;
+ }
+
.btn-primary {
border-color: $my-main-color;
- ;
color: $my-main-color;
}
@@ -194,8 +238,15 @@
}
.img {
- width: $imgSize;
- height: $imgSize;
+ position: absolute;
+ left: 0;
+ top: 0;
+ // width: $imgSize;
+ // height: $imgSize;
+ }
+
+ .info-p-l {
+ padding-left: 71px;
}
.icon-arrow-right {
@@ -219,6 +270,10 @@
// border: 2rpx solid #333333;
}
+ .color-red {
+ color: #F0465B;
+ }
+
.goods {
border-radius: 10rpx 10rpx 10rpx 10rpx;
background-color: #fff;
@@ -239,33 +294,37 @@
.skds {
gap: 10rpx 50rpx;
}
+ }
+ }
- .skd {
- padding: 14rpx 40rpx 14rpx 20rpx;
- background: #F0F2F5;
- border-radius: 4rpx;
- position: relative;
- color: #666;
- overflow: hidden;
- margin-bottom: 10rpx;
+ .skd {
+ padding: 14rpx 40rpx 14rpx 20rpx;
+ background: #F0F2F5;
+ border-radius: 4rpx;
+ position: relative;
+ color: #666;
+ overflow: hidden;
+ margin-bottom: 10rpx;
+ font-size: 24rpx;
- .tag {
- position: absolute;
- right: 0;
- top: 0;
- font-size: 12rpx;
- right: 0;
- padding: 2rpx 4rpx;
- border-radius: 0rpx 4rpx 4rpx 4rpx;
- }
-
- .tag-primary {
- background-color: $my-main-color;
- color: #fff;
- }
- }
+ .tag {
+ position: absolute;
+ right: 0;
+ top: 0;
+ font-size: 12rpx;
+ right: 0;
+ padding: 2rpx 4rpx;
+ border-radius: 0rpx 4rpx 4rpx 4rpx;
+ }
+ .tag-primary {
+ background-color: $my-main-color;
+ color: #fff;
+ }
+ .tag-gray {
+ background-color: rgb(144, 147, 153);
+ color: #fff;
}
}
\ No newline at end of file
diff --git a/pageProduct/index/index.vue b/pageProduct/index/index.vue
index e55fdba..41625f6 100644
--- a/pageProduct/index/index.vue
+++ b/pageProduct/index/index.vue
@@ -8,7 +8,8 @@
- {{pageData.categoryName||'分类' }}
+ {{pageData.categoryName||'分类' }}
-
+
@@ -53,9 +56,8 @@
+ @offShelf="offShelf" @allCheckedChange="allCheckedChange" @controlChange="controlChange"
+ @toggleCategory="toggleCategory" :bottom="pageData.componentBottom">
@@ -113,7 +115,19 @@
-
+
+
+
+
+
+
+
+
+
@@ -136,14 +150,25 @@
import myControl from './components/control.vue'
import myCategory from './components/category.vue'
import infoBox from "@/commons/utils/infoBox.js"
+ import editPrice from './components/edit-price.vue';
+ import editGuige from './components/edit-guige.vue';
+ import editStock from './components/edit-stock.vue';
+ import baosunVue from './components/baosun.vue';
import {
$tbProduct,
$upProSort,
$updateProduct,
$getProductDetail,
$delProduct,
- $updateProductStatus
+ $tbShopCategory,
+ $updateProductStatus,
+ $tbProductV2,
+ $updateProductData
} from "@/http/yskApi/goods.js"
+ import {
+ returnAllCategory
+ } from '@/pageProduct/util.js'
+
const pageData = reactive({
modelDesc: '是否下架',
stateCurrent: 0,
@@ -154,6 +179,7 @@
},
showGoodsDetail: false,
selGoodsIndex: '',
+ selGoods: {},
totalElements: 0,
totalPage: 0,
goodsList: [],
@@ -164,24 +190,179 @@
name: ''
},
category: '',
+ categoryList: [], //分类列表
categoryShow: false,
categoryName: '',
hasAjax: false
})
- watch(()=>pageData.query.categoryId,(newval)=>{
+ watch(() => pageData.query.categoryId, (newval) => {
getGoodsList()
})
+
+ const popup = reactive({
+ price: {
+ show: false
+ },
+ guige: {
+ show: false,
+ data: {},
+ goodsIndex: '',
+ guigeIndex: '',
+ },
+ stock: {
+ show: false
+ },
+ baosun: {
+ show: false
+ }
+ })
+
+ //报损弹窗展示
+ function baosunShow(index) {
+ pageData.selGoodsIndex = index
+ const goods = pageData.goodsList[index]
+ pageData.selGoods = goods
+ popup.baosun.show = true
+ }
+
+ // 修改价格弹窗展示
+ function changePriceShow(index) {
+ pageData.selGoodsIndex = index
+ const goods = pageData.goodsList[index]
+ goods.skuList = goods.skuList.map(v => {
+ return {
+ ...v,
+ _lowPrice: v.lowPrice
+ }
+ })
+ const lowPrice = goods.lowPrice.replace('¥', '') * 1
+ pageData.selGoods = {
+ ...goods,
+ lowPrice,
+ _lowPrice: lowPrice
+ }
+ popup.price.show = true
+ }
+
+
+
+
+ async function changePriceConfirm(goods) {
+ let goodsArr = []
+ if (goods.typeEnum == '单规格') {
+ goodsArr = [{
+ shopId: uni.getStorageSync('shopId'),
+ isSku: false,
+ id: goods.id,
+ key: 'salePrice',
+ value: goods.lowPrice
+ }]
+ } else {
+ goodsArr = goods.skuList.map(v => {
+ return {
+ shopId: uni.getStorageSync('shopId'),
+ isSku: true,
+ id: v.id,
+ key: 'salePrice',
+ value: v.lowPrice
+ }
+ })
+ }
+ const res = await $updateProductData(goodsArr)
+ popup.price.show = false
+ getGoodsList()
+ }
+
+
+ // 修改库存弹窗展示
+ function changeStockShow(index) {
+ pageData.selGoodsIndex = index
+ const goods = pageData.goodsList[index]
+ goods.skuList = goods.skuList.map(v => {
+ return {
+ ...v,
+ _stockNumber: v.stockNumber
+ }
+ })
+ const stockNumber = goods.stockNumber
+ pageData.selGoods = {
+ ...goods,
+ stockNumber,
+ _stockNumber: stockNumber
+ }
+ popup.stock.show = true
+ }
+ async function changeStockConfirm(goods) {
+ let goodsArr = []
+ // if (goods.typeEnum == '单规格') {
+ // goodsArr = [{
+ // shopId: uni.getStorageSync('shopId'),
+ // isSku: false,
+ // id: goods.id,
+ // key: 'stockNumber',
+ // value: goods.stockNumber
+ // }]
+ // } else {
+ // goodsArr = goods.skuList.map(v => {
+ // return {
+ // shopId: uni.getStorageSync('shopId'),
+ // isSku: true,
+ // id: v.id,
+ // key: 'stockNumber',
+ // value: v.stockNumber
+ // }
+ // })
+ // }
+ goodsArr = [{
+ shopId: uni.getStorageSync('shopId'),
+ isSku: false,
+ id: goods.id,
+ key: 'stockNumber',
+ value: goods.stockNumber
+ }]
+ const res = await $updateProductData(goodsArr)
+ popup.stock.show = false
+ getGoodsList()
+ }
+
+ //修改规格上下架,售罄
+ function editGuigeShow(goodsIndex, guigeIndex) {
+ console.log(goodsIndex, guigeIndex);
+ const goodsGuige = pageData.goodsList[goodsIndex].skuList[guigeIndex]
+ popup.guige.data = goodsGuige
+ popup.guige.goodsIndex = goodsIndex
+ popup.guige.guigeIndex = guigeIndex
+ popup.guige.show = true
+ }
+
+ function isGroundingChange(e) {
+ const {
+ goodsIndex,
+ guigeIndex
+ } = popup.guige
+ pageData.goodsList[goodsIndex].skuList[guigeIndex].isGrounding = e
+ }
+
+ function isPauseSaleChange(e) {
+ const {
+ goodsIndex,
+ guigeIndex
+ } = popup.guige
+ pageData.goodsList[goodsIndex].skuList[guigeIndex].isPauseSale = e
+ }
+
function onCategoryShowChange(show) {
console.log(show);
pageData.categoryShow = show
}
- function setCategory(category){
+
+ function setCategory(category) {
pageData.query.categoryId = category.id
pageData.categoryName = category.name
}
function getGoodsList() {
- $tbProduct(pageData.query).then(res => {
+ $tbProductV2(pageData.query).then(res => {
pageData.hasAjax = true
console.log(res);
pageData.goodsList = res.content.map(v => {
@@ -198,9 +379,18 @@
onShow(() => {
getGoodsList()
})
+ onLoad(() => {
+ $tbShopCategory({
+ page: 0,
+ size: 200
+ }).then(res => {
+ pageData.categoryList = returnAllCategory(res.content)
+ console.log(pageData.categoryList);
+ })
+ })
const tabsList = ['简洁', '详情']
- const statesTabsList = ['全部', '已售罄','在售中', '已下架']
+ const statesTabsList = ['全部', '已售罄', '在售中', '已下架']
const control = ref(null)
const model = ref(null)
const goodsStockModel = ref(null)
diff --git a/pageProduct/util.js b/pageProduct/util.js
new file mode 100644
index 0000000..86005cd
--- /dev/null
+++ b/pageProduct/util.js
@@ -0,0 +1,41 @@
+import {
+ $types
+} from '@/pageProduct/goodsData.js'
+export function returnSkuSnap(goods) {
+ const selectSpec = typeof goods.selectSpec === 'string' ? JSON.parse(goods.selectSpec) : goods.selectSpec
+ let result = selectSpec.map(v => {
+ return {
+ name: v.name,
+ value: v.selectSpecResult.join(',')
+ }
+ })
+ return result
+}
+export function returnTypeEnum(typeEnum) {
+ const item = $types.find(v => v.title == typeEnum)
+ let result = item ? item.value : undefined
+ return result
+}
+export function returnCategory(cateName, cateList) {
+ console.log(cateName);
+ console.log(cateList);
+ const item = cateList.find(v => v.name == cateName)
+ let result = item ? item : undefined
+ return result
+}
+export function returnAllCategory(arr) {
+ const result = arr.reduce((prve, cur) => {
+ prve.push(...[{
+ ...cur,
+ name: '' + cur.name,
+ childrenList: undefined
+ }, ...cur.childrenList.map(v => {
+ return {
+ ...v,
+ name: '' + v.name
+ }
+ })])
+ return prve
+ }, [])
+ return result
+}
diff --git a/pageTable/index/components/table-item.vue b/pageTable/index/components/table-item.vue
index 8026597..0d17cd7 100644
--- a/pageTable/index/components/table-item.vue
+++ b/pageTable/index/components/table-item.vue
@@ -125,11 +125,12 @@
function more() {
emits('more')
}
-
+
+
function diancan() {
go.to('PAGES_CREATE_ORDER', {
tableId: props.data.tableId,
- tableName: props.data.name
+ name: props.data.name
})
}
@@ -140,14 +141,16 @@
name,
status,
amount,
- areaId
+ areaId,
+ orderId
} = props.data
- go.to('PAGES_CRESATE_ORDER_DETAIL', {
+ go.to('PAGES_ORDER_DETAIL', {
tableId,
name,
status,
amount,
- areaId
+ areaId,
+ id:orderId
})
}
}
diff --git a/pages.json b/pages.json
index 629844b..5b56bb2 100644
--- a/pages.json
+++ b/pages.json
@@ -1218,6 +1218,22 @@
{
"navigationBarTitleText" : "订单详情"
}
+ },
+ {
+ "pageId": "PAGES_ORDER_PAY",
+ "path" : "pay-order/pay-order",
+ "style" :
+ {
+ "navigationBarTitleText" : "结账"
+ }
+ },
+ {
+ "pageId": "PAGES_ORDER_TUIKUAN",
+ "path" : "tuikuan/tuikuan",
+ "style" :
+ {
+ "navigationBarTitleText" : "退款"
+ }
}
]
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 760b2e7..ba674c4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -144,8 +144,7 @@
{
title: '成员管理',
icon: '/static/indexImg/icon-staff.svg',
- pageUrl: 'PAGES_USER',
- entId: 'ENT_UR_USER_LIST'
+ pageUrl: 'PAGES_USER'
},
{
title: '数据中心',
diff --git a/pagesCreateOrder/components/edit-discount.vue b/pagesCreateOrder/components/edit-discount.vue
index e1a3c8e..5ca910e 100644
--- a/pagesCreateOrder/components/edit-discount.vue
+++ b/pagesCreateOrder/components/edit-discount.vue
@@ -33,8 +33,10 @@
- 修改
- 取消
+ 修改
+
+ 取消
+
@@ -60,6 +62,10 @@
type: Array,
default: []
},
+ discount:{
+ type: [Number,String],
+ default:100
+ },
price: {
type: [Number,String],
default: 0
@@ -119,6 +125,9 @@
function open() {
model.value.open()
+ form.price=props.price
+ form.currentPrice=props.price
+ form.discount=props.discount
}
function close() {
@@ -127,11 +136,9 @@
const emits = defineEmits(['confirm'])
function confirm() {
- const {
- price,
- } = form
+ console.log(form);
+ emits('confirm',{...form,currentPrice:Number(form.currentPrice).toFixed(2)})
close()
- emits('confirm',form)
}
defineExpose({
open,
diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue
index 359e9e7..77e253a 100644
--- a/pagesCreateOrder/confirm-order/confirm-order.vue
+++ b/pagesCreateOrder/confirm-order/confirm-order.vue
@@ -6,9 +6,10 @@
选择用户
-
+
+
{{user.nickName}}
{{user.isVip?'会员':'' }}
余额:{{user.amount}}
@@ -16,69 +17,55 @@
积分:{{user.totalScore}}
-
+
就餐类型
-
-
-
-
+
+
+
+
-
+
选择桌码
{{table.name}}
不选择桌台
-
+
-
-
-
-
- 用餐人数(人)
-
-
- {{userNumbers.defaultCateIndex||''}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
- {{user.name}}
- {{user.isVip?'永久会员':'' }}
+ {{user.nickName}}
+ {{user.isVip?'会员':'' }}
余额
- 0.00
+ {{user.amount}}
积分
- 0
+ {{user.totalScore}}
已消费
@@ -86,10 +73,23 @@
-
-
-
-
+
+
+
+
+
+
+ 用餐人数(人)
+
+
+ {{userNumbers.defaultCateIndex||''}}
+
+
+
+
+
+
+
@@ -150,9 +150,9 @@
-
+