From 09f4a7f7d05a19aff3b07899164b80033f569946 Mon Sep 17 00:00:00 2001 From: 1 <1> Date: Thu, 3 Jul 2025 08:57:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84=E9=87=8D?= =?UTF-8?q?=E8=AE=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env.config.js | 16 +- manifest.json | 370 +-- .../.vue-global-types/vue_99_0_0_0.d.ts | 74 +- pages.json | 6 +- pages/login/index.vue | 4 +- pages/tabBar/alert/index.vue | 2 +- pages/tabBar/home/index.vue | 2 +- pages/tabBar/home/navBar.vue | 8 +- pages/tabBar/trend/index.vue | 2 +- pagesA/home/device/status/addProgram.vue | 38 +- pagesA/home/device/status/base.vue | 2 +- pagesA/home/device/status/display.vue | 2354 +++++++++-------- pagesA/home/device/status/gateway.vue | 534 ++-- pagesA/home/device/status/index.vue | 5 +- pagesA/home/device/status/variable.vue | 2 +- pagesA/home/device/status/voice.vue | 12 +- pagesA/home/device/timing/index.vue | 2 +- pagesB/home/device/log/event.vue | 2 +- pagesB/home/device/log/order.vue | 2 +- pagesB/login/bindLogin.vue | 2 +- pagesB/login/register.vue | 2 +- pagesB/login/smsLogin.vue | 4 +- pagesB/login/waitLogin.vue | 2 +- pagesB/user/about.vue | 4 +- pagesB/user/message/index.vue | 2 +- pages_player/list/devicePlayer.vue | 2 +- pages_player/list/devicePlayerApp.vue | 2 +- 27 files changed, 1814 insertions(+), 1643 deletions(-) diff --git a/env.config.js b/env.config.js index 73e11a3..1c15b7d 100644 --- a/env.config.js +++ b/env.config.js @@ -17,19 +17,19 @@ let xinzhiKey = 'SBh45_yy21FU5ErV_'; const CONFIG = { // 开发环境配置 development: { - officialWebUrl: 'https://iot-xcwl.cn/', - baseUrl: 'https://iot-xcwl.cn/prod-api/', - mqttServer: protocalProd + 'iot-xcwl.cn/mqtt', - decoderUrl: 'https://iot-xcwl.cn/', + officialWebUrl: 'https://xaznkj.cn/', + baseUrl: 'https://xaznkj.cn/prod-api/', + mqttServer: protocalProd + 'xaznkj.cn/mqtt', + decoderUrl: 'https://xaznkj.cn/', qqmapKey, xinzhiKey, }, // 生产环境配置 production: { - officialWebUrl: 'https://iot-xcwl.cn/', - baseUrl: 'https://iot-xcwl.cn/prod-api/', - mqttServer: protocalProd + 'iot-xcwl.cn/mqtt', - decoderUrl: 'https://iot-xcwl.cn/', + officialWebUrl: 'https://xaznkj.cn/', + baseUrl: 'https://xaznkj.cn/prod-api/', + mqttServer: protocalProd + 'xaznkj.cn/mqtt', + decoderUrl: 'https://xaznkj.cn/', qqmapKey, xinzhiKey, } diff --git a/manifest.json b/manifest.json index acd049a..5cb682f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,186 +1,186 @@ { - "name": "芯程物联", - "appid": "__UNI__0B4DD99", - "description": "开源物联网平台", - "versionName": "1.0.0", - "versionCode": 260, - "transformPx": false, - "app-plus": { - "kernel": { - "ios": "WKWebview" - }, - "usingComponents": true, - "nvueCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "modules": { - "Barcode": {}, - "OAuth": {}, - "Camera": {} - }, - "distribute": { - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "minSdkVersion": 22, - "targetSdkVersion": 30, - "abiFilters": ["armeabi-v7a", "arm64-v8a"], - "permissionExternalStorage": { - "request": "none", - "prompt": "应用保存运行状态等信息，需要获取读写手机存储权限，请允许。" - }, - "permissionPhoneState": { - "request": "none", - "prompt": "为保证您正常、安全地使用，需要获取设备识别码使用权限，请允许。" - }, - "schemes": "fastbee" - }, - "ios": { - "idfa": true, - "privacyDescription": { - "NSLocationAlwaysUsageDescription": "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。", - "NSLocationAlwaysAndWhenInUseUsageDescription": "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。", - "NSLocalNetworkUsageDescription": "允许访问蜂窝网络，用于扫码/关联式添加设备", - "NSLocationWhenInUseUsageDescription": "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。" - }, - "dSYMs": false, - "urltypes": "fastbee" - }, - "sdkConfigs": { - "push": {}, - "statics": {}, - "maps": {}, - "ad": {}, - "oauth": { - "weixin": { - "appid": "wx6be3f0d7bf7154e1", - "appsecret": "b6c1d0da60bd5250857d211cdc64fdc9", - "UniversalLinks": "" - } - } - }, - "splashscreen": { - "iosStyle": "common", - "androidStyle": "default", - "alwaysShowBeforeRender": false, - "waiting": true, - "autoclose": false, - "delay": 0, - "android": { - "hdpi": "./static/logo.9.png", - "xhdpi": "./static/logo.9.png", - "xxhdpi": "./static/logo.9.png" - } - }, - "icons": { - "android": { - "hdpi": "unpackage/res/icons/72x72.png", - "xhdpi": "unpackage/res/icons/96x96.png", - "xxhdpi": "unpackage/res/icons/144x144.png", - "xxxhdpi": "unpackage/res/icons/192x192.png" - }, - "ios": { - "appstore": "unpackage/res/icons/1024x1024.png", - "ipad": { - "app": "unpackage/res/icons/76x76.png", - "app@2x": "unpackage/res/icons/152x152.png", - "notification": "unpackage/res/icons/20x20.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "proapp@2x": "unpackage/res/icons/167x167.png", - "settings": "unpackage/res/icons/29x29.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "spotlight": "unpackage/res/icons/40x40.png", - "spotlight@2x": "unpackage/res/icons/80x80.png" - }, - "iphone": { - "app@2x": "unpackage/res/icons/120x120.png", - "app@3x": "unpackage/res/icons/180x180.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "notification@3x": "unpackage/res/icons/60x60.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "settings@3x": "unpackage/res/icons/87x87.png", - "spotlight@2x": "unpackage/res/icons/80x80.png", - "spotlight@3x": "unpackage/res/icons/120x120.png" - } - } - } - }, - "uniStatistics": { - "enable": false - }, - "nativePlugins": {} - }, - "quickapp": {}, - "mp-weixin": { - "appid": "wx52ca113738fb0f64", - "setting": { - "urlCheck": false, - "minified": true, - "es6": true - }, - "usingComponents": true, - "uniStatistics": { - "enable": false - }, - "optimization": { - "subPackages": true - }, - "permission": { - "scope.userLocation": { - "desc": "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。" - } - }, - "requiredPrivateInfos": ["getLocation"], - "lazyCodeLoading": "requiredComponents" - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - }, - "uniStatistics": { - "enable": false - }, - "h5": { - "title": "蜂信物联", - "router": { - "mode": "hash", - "base": "./" - }, - "devServer": { - // "disableHostCheck": true, // 禁止访问本地host文件 - "port": 8090 - }, - "optimization": { - "treeShaking": { - "enable": false - } - }, - "template": "uni_modules/jessibuca/hybrid/index.html", - "sdkConfigs": { - "maps": { - "qqmap": { - "key": "4PDBZ-4KQKU-AX6VO-GU7NB-INDZJ-YBFXC" - } - } - } - } -} \ No newline at end of file + "name" : "芯程物联", + "appid" : "__UNI__0B4DD99", + "description" : "开源物联网平台", + "versionName" : "1.0.0", + "versionCode" : 260, + "transformPx" : false, + "app-plus" : { + "kernel" : { + "ios" : "WKWebview" + }, + "usingComponents" : true, + "nvueCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + "modules" : { + "Barcode" : {}, + "OAuth" : {}, + "Camera" : {} + }, + "distribute" : { + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "minSdkVersion" : 22, + "targetSdkVersion" : 30, + "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ], + "permissionExternalStorage" : { + "request" : "none", + "prompt" : "应用保存运行状态等信息，需要获取读写手机存储权限，请允许。" + }, + "permissionPhoneState" : { + "request" : "none", + "prompt" : "为保证您正常、安全地使用，需要获取设备识别码使用权限，请允许。" + }, + "schemes" : "fastbee" + }, + "ios" : { + "idfa" : true, + "privacyDescription" : { + "NSLocationAlwaysUsageDescription" : "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。", + "NSLocationAlwaysAndWhenInUseUsageDescription" : "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。", + "NSLocalNetworkUsageDescription" : "允许访问蜂窝网络，用于扫码/关联式添加设备", + "NSLocationWhenInUseUsageDescription" : "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。" + }, + "dSYMs" : false, + "urltypes" : "fastbee" + }, + "sdkConfigs" : { + "push" : {}, + "statics" : {}, + "maps" : {}, + "ad" : {}, + "oauth" : { + "weixin" : { + "appid" : "wx6be3f0d7bf7154e1", + "appsecret" : "b6c1d0da60bd5250857d211cdc64fdc9", + "UniversalLinks" : "" + } + } + }, + "splashscreen" : { + "iosStyle" : "common", + "androidStyle" : "default", + "alwaysShowBeforeRender" : false, + "waiting" : true, + "autoclose" : false, + "delay" : 0, + "android" : { + "hdpi" : "./static/logo.9.png", + "xhdpi" : "./static/logo.9.png", + "xxhdpi" : "./static/logo.9.png" + } + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } + } + }, + "uniStatistics" : { + "enable" : false + }, + "nativePlugins" : {} + }, + "quickapp" : {}, + "mp-weixin" : { + "appid" : "wx71a45919045c7e19", + "setting" : { + "urlCheck" : false, + "minified" : true, + "es6" : true + }, + "usingComponents" : true, + "uniStatistics" : { + "enable" : false + }, + "optimization" : { + "subPackages" : true + }, + "permission" : { + "scope.userLocation" : { + "desc" : "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。" + } + }, + "requiredPrivateInfos" : [ "getLocation" ], + "lazyCodeLoading" : "requiredComponents" + }, + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true + }, + "uniStatistics" : { + "enable" : false + }, + "h5" : { + "title" : "蜂信物联", + "router" : { + "mode" : "hash", + "base" : "./" + }, + "devServer" : { + // "disableHostCheck": true, // 禁止访问本地host文件 + "port" : 8090 + }, + "optimization" : { + "treeShaking" : { + "enable" : false + } + }, + "template" : "uni_modules/jessibuca/hybrid/index.html", + "sdkConfigs" : { + "maps" : { + "qqmap" : { + "key" : "4PDBZ-4KQKU-AX6VO-GU7NB-INDZJ-YBFXC" + } + } + } + } +} diff --git a/node_modules/.vue-global-types/vue_99_0_0_0.d.ts b/node_modules/.vue-global-types/vue_99_0_0_0.d.ts index 1c73e1f..be6912f 100644 --- a/node_modules/.vue-global-types/vue_99_0_0_0.d.ts +++ b/node_modules/.vue-global-types/vue_99_0_0_0.d.ts @@ -2,7 +2,6 @@ export {}; ; declare global { - const __VLS_intrinsicElements: __VLS_IntrinsicElements; const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any }; const __VLS_unref: typeof import('vue').unref; const __VLS_placeholder: any; @@ -24,10 +23,31 @@ export {}; N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N2] } : N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N3] } : { [K in N0]: unknown }; - type __VLS_FunctionalComponentProps = - '__ctx' extends keyof __VLS_PickNotAny ? K extends { __ctx?: { props?: infer P } } ? NonNullable

: never - : T extends (props: infer P, ...args: any) => any ? P : - {}; + type __VLS_FunctionalComponentCtx = __VLS_PickNotAny<'__ctx' extends keyof __VLS_PickNotAny + ? K extends { __ctx?: infer Ctx } ? NonNullable : never : any + , T extends (props: any, ctx: infer Ctx) => any ? Ctx : any + >; + type __VLS_FunctionalComponentProps = '__ctx' extends keyof __VLS_PickNotAny + ? K extends { __ctx?: { props?: infer P } } ? NonNullable

: never + : T extends (props: infer P, ...args: any) => any ? P + : {}; + type __VLS_FunctionalComponent = (props: (T extends { $props: infer Props } ? Props : {}) & Record, ctx?: any) => __VLS_Element & { + __ctx?: { + attrs?: any, + slots?: T extends { $slots: infer Slots } ? Slots : Record, + emit?: T extends { $emit: infer Emit } ? Emit : {}, + props?: (T extends { $props: infer Props } ? Props : {}) & Record, + expose?: (exposed: T) => void, + } + }; + type __VLS_NormalizeSlotReturns extends (...args: any) => infer K ? K : any> = R extends any[] ? { + [K in keyof R]: R[K] extends infer V + ? V extends Element ? V + : V extends new (...args: any) => infer R ? ReturnType<__VLS_FunctionalComponent> + : V extends (...args: any) => infer R ? R + : any + : never + } : R; type __VLS_IsFunction = K extends keyof T ? __VLS_IsAny extends false ? unknown extends T[K] @@ -35,13 +55,13 @@ export {}; : true : false : false; - type __VLS_NormalizeComponentEvent = ( + type __VLS_NormalizeComponentEvent = ( __VLS_IsFunction extends true ? Props - : __VLS_IsFunction extends true - ? { [K in onEvent]?: Events[Event] } - : __VLS_IsFunction extends true - ? { [K in onEvent]?: Events[CamelizedEvent] } + : __VLS_IsFunction extends true + ? { [K in onEvent]?: Emits[Event] } + : __VLS_IsFunction extends true + ? { [K in onEvent]?: Emits[CamelizedEvent] } : Props ) & Record; // fix https://github.com/vuejs/language-tools/issues/926 @@ -67,11 +87,16 @@ export {}; } > >; - type __VLS_PrettifyGlobal = { [K in keyof T]: T[K]; } & {}; - type __VLS_PickFunctionalComponentCtx = NonNullable<__VLS_PickNotAny< - '__ctx' extends keyof __VLS_PickNotAny ? K extends { __ctx?: infer Ctx } ? Ctx : never : any - , T extends (props: any, ctx: infer Ctx) => any ? Ctx : any - >>; + type __VLS_ResolveEmits< + Comp, + Emits, + TypeEmits = Comp extends { __typeEmits?: infer T } ? unknown extends T ? {} : import('vue').ShortEmitsToObject : {}, + NormalizedEmits = __VLS_NormalizeEmits extends infer E ? string extends keyof E ? {} : E : never, + > = __VLS_SpreadMerge; + type __VLS_ResolveDirectives = { + [K in Exclude & string as `v${Capitalize}`]: T[K]; + }; + type __VLS_PrettifyGlobal = { [K in keyof T as K]: T[K]; } & {}; type __VLS_UseTemplateRef = Readonly>; function __VLS_getVForSourceType>(source: T): [ @@ -87,10 +112,8 @@ export {}; key: keyof T, index: number, ][]; - // @ts-ignore - function __VLS_getSlotParams(slot: T): Parameters<__VLS_PickNotAny, (...args: any[]) => any>>; - // @ts-ignore - function __VLS_getSlotParam(slot: T): Parameters<__VLS_PickNotAny, (...args: any[]) => any>>[0]; + function __VLS_getSlotParameters(slot: S, decl?: D): + __VLS_PickNotAny, (...args: any) => any> extends (...args: infer P) => any ? P : any[]; function __VLS_asFunctionalDirective(dir: T): T extends import('vue').ObjectDirective ? NonNullable : T extends (...args: any) => any @@ -98,19 +121,10 @@ export {}; : (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void; function __VLS_makeOptional(t: T): { [K in keyof T]?: T[K] }; function __VLS_asFunctionalComponent any ? InstanceType : unknown>(t: T, instance?: K): - T extends new (...args: any) => any - ? (props: (K extends { $props: infer Props } ? Props : any) & Record, ctx?: any) => __VLS_Element & { - __ctx?: { - attrs?: any; - slots?: K extends { $slots: infer Slots } ? Slots : any; - emit?: K extends { $emit: infer Emit } ? Emit : any; - expose?(exposed: K): void; - props?: (K extends { $props: infer Props } ? Props : any) & Record; - } - } + T extends new (...args: any) => any ? __VLS_FunctionalComponent : T extends () => any ? (props: {}, ctx?: any) => ReturnType : T extends (...args: any) => any ? T - : (_: {} & Record, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {} & Record } }; + : __VLS_FunctionalComponent<{}>; function __VLS_functionalComponentArgsRest any>(t: T): 2 extends Parameters['length'] ? [any] : []; function __VLS_asFunctionalElement(tag: T, endTag?: T): (attrs: T & Record) => void; function __VLS_asFunctionalSlot(slot: S): S extends () => infer R ? (props: {}) => R : NonNullable; diff --git a/pages.json b/pages.json index 460aafc..a935de7 100644 --- a/pages.json +++ b/pages.json @@ -320,11 +320,11 @@ } }, { - "path": "/home/device/status/addProgram", + "path": "home/device/status/addProgram", "style": { - "navigationBarTitleText": "添加节目" + "navigationBarTitleText": "添加节目" } - } + } ] }, { diff --git a/pages/login/index.vue b/pages/login/index.vue index 551c794..acabb88 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -8,7 +8,7 @@ {{$tt('register.registration')}} - + @@ -152,7 +152,7 @@ diff --git a/pages/tabBar/home/navBar.vue b/pages/tabBar/home/navBar.vue index 53c3b46..3499b2d 100644 --- a/pages/tabBar/home/navBar.vue +++ b/pages/tabBar/home/navBar.vue @@ -4,7 +4,7 @@ @@ -25,7 +25,7 @@ @@ -50,7 +50,7 @@ @@ -179,7 +179,7 @@ width: 70rpx; height: 70rpx; margin-left: 6px; - background-image: url('https://iot-xcwl.cn/doc/photo/logo.png'); + background-image: url('https://xaznkj.cn/doc/photo/logo.png'); background-size: cover; filter: drop-shadow(0 2rpx 4rpx rgba(0, 0, 0, 0.2)); animation: scaleUp 0.5s ease; diff --git a/pages/tabBar/trend/index.vue b/pages/tabBar/trend/index.vue index a341fb0..45b04f4 100644 --- a/pages/tabBar/trend/index.vue +++ b/pages/tabBar/trend/index.vue @@ -46,7 +46,7 @@ - + diff --git a/pagesA/home/device/status/addProgram.vue b/pagesA/home/device/status/addProgram.vue index 0c4b345..adfe710 100644 --- a/pagesA/home/device/status/addProgram.vue +++ b/pagesA/home/device/status/addProgram.vue @@ -193,6 +193,19 @@ + + \ No newline at end of file diff --git a/pagesA/home/device/status/gateway.vue b/pagesA/home/device/status/gateway.vue index 1657ec5..004994d 100644 --- a/pagesA/home/device/status/gateway.vue +++ b/pagesA/home/device/status/gateway.vue @@ -7,10 +7,10 @@ - + - + @@ -19,270 +19,302 @@ - - - - - + + + 网关信息 + + + + 设备名称 + {{ device.deviceName || '未命名' }} + + + 设备ID + {{ device.deviceId || '未知' }} + + + 序列号 + {{ device.serialNumber || '未知' }} + + + 产品ID + {{ device.productId || '未知' }} + + + + - - - + + + + 子设备管理 + + + + 声卡在线 + + + + 显卡在线 + + + + + - - - + + + + + + + + + + + \ No newline at end of file diff --git a/pagesA/home/device/status/index.vue b/pagesA/home/device/status/index.vue index 86e3798..314c10b 100644 --- a/pagesA/home/device/status/index.vue +++ b/pagesA/home/device/status/index.vue @@ -64,7 +64,7 @@ this.isSubDev = newVal.subDeviceList && newVal.subDeviceList.length > 0; this.isRelayProduct = newVal.productName === '多路控制器'; this.isVoiceProduct = newVal.productName === '声卡'; - this.isGatewayProduct = newVal.productName === '网关卡兼容'; + this.isGatewayProduct = newVal.productName === '网关'; this.isdisplay = newVal.productName === '显卡设置'; @@ -92,8 +92,7 @@ this.isRelayProduct = this.device.productName === '继电器测试'; this.isVoiceProduct = this.device.productName === '声卡'; this.isGatewayProduct = this.device.productName === '网关卡兼容'; - this.isdisplay = newVal.productName === '显卡设置'; - + this.isdisplay = this.device.productName === '显卡设置'; console.log("create的数据", JSON.stringify(this.deviceInfo)) }, diff --git a/pagesA/home/device/status/variable.vue b/pagesA/home/device/status/variable.vue index f003a4d..3ab7a9b 100644 --- a/pagesA/home/device/status/variable.vue +++ b/pagesA/home/device/status/variable.vue @@ -137,7 +137,7 @@ - + diff --git a/pagesA/home/device/status/voice.vue b/pagesA/home/device/status/voice.vue index f1d877c..476f96a 100644 --- a/pagesA/home/device/status/voice.vue +++ b/pagesA/home/device/status/voice.vue @@ -26,7 +26,7 @@ - + @@ -56,7 +56,7 @@ 音频列表 - @@ -81,7 +81,7 @@ 播放列表 - @@ -118,7 +118,7 @@ {{ recordingStatus }} @@ -134,7 +134,7 @@ {{ isRecording ? '录音中...' : '按住说话' }} @@ -402,7 +402,7 @@ this.recordingStatus = '上传中...'; // 在 uni-app 中直接使用 uni.uploadFile，不需要 FormData - const uploadUrl = 'https://iot-xcwl.cn/common/upload/audio'; + const uploadUrl = 'https://xaznkj.cn/common/upload/audio'; const token = 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImU3MWM2OTg4LTNlMzMtNDYyMy05M2M3LWE4YzZmMTNlMjZkZSJ9.wgsL8b3WDmyuesG8JTA3LcNFp2FigkB90h6Inwxt7OFadH6rc5np5TjAyU1pzU2_b5cmG8BYXMEdAqEdJzoDcA'; diff --git a/pagesA/home/device/timing/index.vue b/pagesA/home/device/timing/index.vue index 041a5ee..79db7a7 100644 --- a/pagesA/home/device/timing/index.vue +++ b/pagesA/home/device/timing/index.vue @@ -74,7 +74,7 @@ :nomoreText="$tt('timing.nothing')" marginTop="20" @loadmore="loadMoreLogs" /> - + - + diff --git a/pagesB/home/device/log/order.vue b/pagesB/home/device/log/order.vue index 3447b7d..9a783c7 100644 --- a/pagesB/home/device/log/order.vue +++ b/pagesB/home/device/log/order.vue @@ -48,7 +48,7 @@ - + diff --git a/pagesB/login/bindLogin.vue b/pagesB/login/bindLogin.vue index 8982d4e..62659e8 100644 --- a/pagesB/login/bindLogin.vue +++ b/pagesB/login/bindLogin.vue @@ -1,7 +1,7 @@ diff --git a/pages_player/list/devicePlayer.vue b/pages_player/list/devicePlayer.vue index b277e50..fa7e128 100644 --- a/pages_player/list/devicePlayer.vue +++ b/pages_player/list/devicePlayer.vue @@ -1,6 +1,6 @@