diff --git a/package.json b/package.json
index fde4335..4a632a4 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
"@zebra-ui/swiper": "^2.2.8",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.13",
+ "gdt-jsapi": "^1.9.51",
"luch-request": "^3.1.1",
"pinia": "^2.2.6",
"qs": "^6.13.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 16a74bc..15d7fa7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -65,6 +65,9 @@ importers:
dayjs:
specifier: ^1.11.13
version: 1.11.13
+ gdt-jsapi:
+ specifier: ^1.9.51
+ version: 1.9.51
luch-request:
specifier: ^3.1.1
version: 3.1.1
@@ -1298,6 +1301,9 @@ packages:
'@polka/url@1.0.0-next.28':
resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}
+ '@remax/mini-types@0.1.0':
+ resolution: {integrity: sha512-bVDcbUrp6p0PZwfS0xGVQS6k9f8B35BtZaYt/W/IGKh7VALYQ+tS2KcytLRmIJ/Vmohaw5ikIRN89I+frPdh4g==}
+
'@rollup/pluginutils@5.1.4':
resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==}
engines: {node: '>=14.0.0'}
@@ -2407,6 +2413,9 @@ packages:
function-bind@1.1.2:
resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+ gdt-jsapi@1.9.51:
+ resolution: {integrity: sha512-VN1iIK7kJU2g2oxY/n8waCREhWxcVwR8qHAE1keVnUJHI6mTdgTelICzq++niRRCaLqUVWC1pYvftEVgk4sq8A==}
+
generic-names@4.0.0:
resolution: {integrity: sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==}
@@ -5966,6 +5975,8 @@ snapshots:
'@polka/url@1.0.0-next.28': {}
+ '@remax/mini-types@0.1.0': {}
+
'@rollup/pluginutils@5.1.4(rollup@4.34.2)':
dependencies:
'@types/estree': 1.0.6
@@ -7208,6 +7219,11 @@ snapshots:
function-bind@1.1.2: {}
+ gdt-jsapi@1.9.51:
+ dependencies:
+ '@babel/runtime': 7.26.7
+ '@remax/mini-types': 0.1.0
+
generic-names@4.0.0:
dependencies:
loader-utils: 3.3.1
diff --git a/src/pages/tabbar/flowStatistics.vue b/src/pages/tabbar/flowStatistics.vue
index 537082c..b1b18d4 100644
--- a/src/pages/tabbar/flowStatistics.vue
+++ b/src/pages/tabbar/flowStatistics.vue
@@ -17,23 +17,32 @@
流水统计
-
-
- 筛选
+
+ 筛选
+
@@ -79,8 +88,6 @@
-
- aaa
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index ed049d3..3476035 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -48,6 +48,7 @@ import { filePath } from "@@/utils/file"
import { hooks, router, constant } from "@@/index"
import { userApi } from "@@/api"
import isDevEnv from "@/sheep/utils/isDevEnv"
+import dd from "gdt-jsapi"
interface MenuItem {
text: string
@@ -59,6 +60,7 @@ const state = reactive<{ wallet: any; userInfo: any; menuList: MenuItem[] }>({
wallet: [],
userInfo: {},
menuList: [
+ { text: "扫一扫", icon: "/static/icon/service_3.png", router: "" },
{ text: "钱包管理", icon: "/static/icon/service_3.png", router: "/pages/wallet/list" },
// { text: "包厢预定", icon: "/static/icon/service_4.png", router: "/pages/boxes/apply-list" },
// { text: "外来人员就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/foreign-list" },
@@ -179,7 +181,22 @@ const onTabMenu = async (v: MenuItem, i: number) => {
}
const isLogin = await hooks.useCheckLogin()
if (isLogin) {
- router.jump(v.router)
+ if (v.text === "扫一扫") {
+ console.log("扫一扫")
+ dd.scan({
+ type: "all",
+ })
+ .then((res) => {
+ console.log(res)
+ uni.showToast({
+ title: JSON.stringify(res),
+ icon: "none",
+ })
+ })
+ .catch()
+ } else {
+ router.jump(v.router)
+ }
}
}
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index 22dad9a..1e700f8 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -108,9 +108,9 @@ const doRefund = (v: any) => {
{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
-
+