From 5137974b5cd48443f1cf38479957a5e92b0bdea4 Mon Sep 17 00:00:00 2001
From: 18796357645 <674126018@qq.com>
Date: Wed, 16 Jul 2025 10:06:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=A6=E6=83=85=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                      |  10 +-
 config.js                    |   1 +
 pages/device/index.vue       |   9 +-
 pages/deviceBind/index.vue   |   6 +-
 pages/deviceManage/index.vue | 291 +++++++++++++++------
 pages/index/index.vue        |  22 +-
 pages/mine/index.vue         |  64 +++--
 pages/mine/update.vue        | 484 +++++++++++++++++------------------
 pages/selectDevice/index.vue |  25 +-
 9 files changed, 536 insertions(+), 376 deletions(-)

diff --git a/App.vue b/App.vue
index 5714ce9..3863a4e 100644
--- a/App.vue
+++ b/App.vue
@@ -1,4 +1,8 @@
 <script>
+import {
+  BASE_API_URL,
+  BASE_IMG_URL
+} from "@/config.js";
 export default {
   onLaunch: function () {
     console.log("App Launch");
@@ -17,10 +21,10 @@ export default {
     console.log("App Hide");
   },
   methods: {
-	    async loginWithPhoneNumber (code) {
+    async loginWithPhoneNumber (code) {
       try {
         const res = await uni.request({
-          url: "https://online.totustec.com/api/api/front/wechat/authorize/login",
+          url: BASE_API_URL + "/api/front/wechat/authorize/login",
           method: "POST",
           data: { code },
           header: {
@@ -31,7 +35,7 @@ export default {
         if (res.statusCode == 200) {
           // 存储用户信息到本地缓存（uni-app接口）
           uni.setStorageSync("userInfo", res.data);
-        //   uni.showToast({ title: "登录成功" });
+          //   uni.showToast({ title: "登录成功" });
         }
       } catch (error) {
         // uni.showToast({ title: "登录失败", icon: "none" });
diff --git a/config.js b/config.js
index e98891c..8239b4c 100644
--- a/config.js
+++ b/config.js
@@ -2,6 +2,7 @@
 // 后端接口
 export const BASE_API_URL = "https://online.totustec.com/api";
 
+
 // 静态数据
 export const BASE_IMG_URL = "https://online.totustec.com/upload";
 
diff --git a/pages/device/index.vue b/pages/device/index.vue
index 5a3f9d9..3538d50 100644
--- a/pages/device/index.vue
+++ b/pages/device/index.vue
@@ -81,6 +81,11 @@
 </template>
 
 <script>
+import {
+  BASE_API_URL,
+  BASE_STOKECT_URL,
+  BASE_IMG_URL
+} from "@/config.js";
 export default {
   data () {
     return {
@@ -118,7 +123,7 @@ export default {
   methods: {
     // ---------------------- WebSocket 核心方法 ----------------------
     connectWebSocket () {
-      const wsUrl = 'ws://online.totustec.com/webSocket/vue';
+      const wsUrl = BASE_STOKECT_URL;
       // 初始化 WebSocket 连接（使用 uni-app 接口）
       this.socketTask = uni.connectSocket({
         url: wsUrl,
@@ -189,7 +194,7 @@ export default {
         // 从本地缓存获取用户信息
         const userInfo = uni.getStorageSync("userInfo") || {};
         const res = await uni.request({
-          url: "https://online.totustec.com/api/api/front/user/myDevice",
+          url: BASE_API_URL + "/api/front/user/myDevice",
           method: "GET",
           data: this.searchList,
           header: {
diff --git a/pages/deviceBind/index.vue b/pages/deviceBind/index.vue
index ec53464..c77bd54 100644
--- a/pages/deviceBind/index.vue
+++ b/pages/deviceBind/index.vue
@@ -54,6 +54,10 @@
 </template>
 
 <script>
+import {
+  BASE_API_URL,
+  BASE_IMG_URL
+} from "@/config.js";
 export default {
   data () {
     return {
@@ -106,7 +110,7 @@ export default {
     async bindDevice () {
       try {
         const res = await uni.request({
-          url: `https://online.totustec.com/api/api/front/device/bindingDevice`,
+          url: BASE_API_URL + '/api/front/device/bindingDevice',
           method: "GET",
           data: {
             deviceCode: this.deviceCode
diff --git a/pages/deviceManage/index.vue b/pages/deviceManage/index.vue
index 2484e25..f2b09c5 100644
--- a/pages/deviceManage/index.vue
+++ b/pages/deviceManage/index.vue
@@ -5,8 +5,7 @@
       <view class="top_nav_warp">
         <view>设备管理</view>
         <view class="back_button_warp" @click="goBack()">
-          <image class="back_button_icon"
-                 src="https://online.totustec.com/upload/minePage/mine_area_right.png"></image>
+          <image class="back_button_icon" src="https://online.totustec.com/upload/minePage/mine_area_right.png"></image>
         </view>
       </view>
     </view>
@@ -17,32 +16,45 @@
         <view class="select_device_warp">
           <view class="modal_warp">
             <view class="select_device_item" :class="{ device_active: getType == 'video' }"
-                  @click="getVideoImg('video')">
+              @click="getVideoImg('video')">
               获取视频
             </view>
-            <view class="select_device_item" :class="{ device_active: getType == 'img' }"
-                  @click="getVideoImg('img')">
+            <view class="select_device_item" :class="{ device_active: getType == 'img' }" @click="getVideoImg('img')">
               获取图片
             </view>
           </view>
         </view>
 
         <!-- 临时调试 -->
-        <!-- <video class="img_video_warp"  src="http://broadcasting.totustec.com/live/12345678.m3u8" v-if="socketData.videoUrl"></video> -->
-        <video class="img_video_warp" :src="socketData.videoUrl" v-if="socketData.videoUrl"></video>
-        <image class="img_video_warp" v-else :src="socketData.imageUrl"></image>
+
+        <!-- <video class="img_video_warp" :src="socketData.videoUrl" v-if="socketData.videoUrl"></video>
+        <image class="img_video_warp" v-else :src="socketData.imageUrl"></image> -->
+        <!-- 视频、图片区域（含加载动画） -->
+        <view class="media_container">
+          <!-- 加载动画（转圈效果） -->
+          <view class="loading_spinner" v-if="isMediaLoading">
+            <view class="spinner"></view>
+          </view>
+
+          <!-- 媒体内容 -->
+          <video class="img_video_warp" :src="socketData.videoUrl" v-if="socketData.videoUrl"
+            @loadedmetadata="isMediaLoading = false" @error="isMediaLoading = false"></video>
+
+          <image class="img_video_warp" v-else :src="socketData.imageUrl" @load="isMediaLoading = false"
+            @error="isMediaLoading = false"></image>
+        </view>
 
         <!-- 设备状态选择 -->
         <view class="select_device_warp">
           <view class="modal_warp">
             <view class="select_device_item device_model" :class="{ device_active: deviceType == 1 }"
-                  @click="deviceType = 1">设备状态
+              @click="deviceType = 1">设备状态
             </view>
             <view class="select_device_item device_model" :class="{ device_active: deviceType == 2 }"
-                  @click="deviceType = 2">设备日志
+              @click="deviceType = 2">设备日志
             </view>
             <view class="select_device_item device_model" :class="{ device_active: deviceType == 3 }"
-                  @click="deviceType = 3">设备控制
+              @click="deviceType = 3">设备控制
             </view>
           </view>
         </view>
@@ -79,32 +91,30 @@
                     </view>
                   </template>
 
-
-
                   <!-- 子状态处理 -->
                   <template v-else-if="field.isErrorStatus">
                     <view class="label_warp2">
-                      <view class="label_icon" :style="{ background: getStatusColor(deviceDetail.errorStatus) }">
+                      <view class="label_icon" :style="{ background: getStatusColor(deviceDetail.printStatus) }">
                       </view>
-                      <view class="label_text label_text2" :style="{ color: getStatusColor(deviceDetail.errorStatus) }">
-                        {{ getStatusText(deviceDetail.errorStatus) }}
+                      <view class="label_text label_text2" :style="{ color: getStatusColor(deviceDetail.printStatus) }">
+                        {{ getStatusText2(deviceDetail.printStatus) }}
                       </view>
                     </view>
                   </template>
 
-
-
                   <!-- 错误码处理 -->
-                  <template v-else-if="field.isErrorCode" >
+                  <template v-else-if="field.isErrorCode">
                     {{ deviceDetail.errorStatus === -1 ? '断开' : getStatusText(deviceDetail.errorStatus) }}
                   </template>
 
-
                   <!-- 当前时间特殊处理 -->
                   <template v-else-if="field.isCurrentTime">
                     {{ getCurrentTime() }}
                   </template>
-
+				  
+				  <template v-else>
+				    {{ deviceDetail[field.key] }}
+				  </template>
                 </view>
               </view>
               <view class="itemContent_line_warp">
@@ -114,7 +124,7 @@
               </view>
             </view>
           </view>
-
+			<!-- 打印详情 -->
           <view class="device_status_item" v-for="(field, idx) in statusTwoFields" :key="idx">
             <view class="statusItem_modal_warp">
               <view class="item_content_warp">
@@ -131,15 +141,16 @@
             </view>
           </view>
         </view>
-        <!-- 设备控制 -->
+       
+		<!-- 设备控制 -->
         <view class="device_control_warp" v-if="deviceType == 3">
           <view class="deviceN_input_warp">
             <view class="device_name_txt"> 请输入设备名称：</view>
             <view class="deviceN_input_area">
-              <input class="deviceN_input" type="text" v-model="deviceName" @input="onDeviceNameInput"/>
+              <input class="deviceN_input" type="text" v-model="deviceName" @input="onDeviceNameInput" />
               <view class="clear_deviceN_warp">
                 <image class="clear_deviceN_icon" @click="deviceName = ''" v-if="deviceName"
-                       src="https://online.totustec.com/upload/deviceManage/clear_deviceN_icon.png">
+                  src="https://online.totustec.com/upload/deviceManage/clear_deviceN_icon.png">
                 </image>
               </view>
             </view>
@@ -148,12 +159,11 @@
           <view class="device_operation_warp">
             <view class="device_operation_btn" @click="operationData('PRINT')" :style="{
               backgroundColor:
-                deviceDetail.status == 0 && deviceDetail.status != -1
+                deviceDetail.status == 0
                   ? '#ffffff'
                   : '#cccccc',
             }">
-              <image class="operation_btn_icon"
-                     src="https://online.totustec.com/upload/deviceManage/print_status1.png">
+              <image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status1.png">
               </image>
               <view class="operation_btn_txt">开始打印</view>
             </view>
@@ -166,8 +176,8 @@
                   ? '#ffffff'
                   : '#cccccc',
             }">
-              <image class="operation_btn_icon"
-                     src="https://online.totustec.com/upload/deviceManage/print_status1.png"></image>
+              <image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status1.png">
+              </image>
               <view class="operation_btn_txt">继续打印</view>
             </view>
           </view>
@@ -175,38 +185,35 @@
           <view class="device_operation_warp">
             <view class="device_operation_btn" @click="operationData('PAUSE')" :style="{
               backgroundColor:
-                (deviceDetail.status == 1 || deviceDetail.status == 2) && deviceDetail.status != -1
+                deviceDetail.status == 1 || deviceDetail.status == 2
                   ? '#ffffff'
                   : '#cccccc',
             }">
-              <image class="operation_btn_icon"
-                     src="https://online.totustec.com/upload/deviceManage/print_status1.png">
+              <!-- <image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status1.png">
+              </image> -->
+              <image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status1.png">
               </image>
               <view class="operation_btn_txt">暂停打印</view>
             </view>
 
             <view class="device_operation_btn" @click="operationData('EXIT')" :style="{
               backgroundColor:
-                deviceDetail.status != 0 && deviceDetail.status != -1
-                  ? '#ffffff'
-                  : '#cccccc',
+                deviceDetail.status != 0 && deviceDetail.status != -1 ? '#ffffff' : '#cccccc',
             }">
-              <image class="operation_btn_icon"
-                     src="https://online.totustec.com/upload/deviceManage/print_status1.png"></image>
+              <image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status1.png">
+              </image>
               <view class="operation_btn_txt">退出打印</view>
             </view>
           </view>
 
           <view class="device_operation_warp">
             <view class="device_operation_btn" @click="sendWsCommand('ALARM_CONTINUE')">
-              <image class="operation_btn_icon"
-                     src="https://online.totustec.com/upload/deviceManage/print_status2.png">
+              <image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status2.png">
               </image>
               <view class="operation_btn_txt">报警继续</view>
             </view>
             <view class="device_operation_btn" @click="sendWsCommand('ALARM_EXIT')">
-              <image class="operation_btn_icon"
-                     src="https://online.totustec.com/upload/deviceManage/print_status2.png">
+              <image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status2.png">
               </image>
               <view class="operation_btn_txt">报警退出</view>
             </view>
@@ -218,12 +225,13 @@
 </template>
 <script>
 import {
-  BASE_STOKECT_URL, BASE_IMG_URL
+  BASE_STOKECT_URL, BASE_IMG_URL, BASE_API_URL
 } from "@/config.js";
 
 export default {
-  data() {
+  data () {
     return {
+      isMediaLoading: false,
       deviceName: "",
       title: "Hello",
       statusBarHeight: 0,
@@ -232,6 +240,61 @@ export default {
       deviceCode: "", // 存储接收到的设备编码
       deviceDetail: {}, // 存储设备详情数据
       printInfo: {},//存储设备二级详情数据
+      // 子状态
+      childStatusMap: {
+        0: {
+          text: "空闲",
+          color: "#00d195"
+        },
+        1: {
+          text: "归零中",
+          color: "#00d195"
+        },
+        2: {
+          text: "下降中",
+          color: "#00d195"
+        },
+        3: {
+          text: "曝光中",
+          color: "#00d195"
+        },
+        4: {
+          text: "抬升中",
+          color: "#00d195"
+        },
+        5: {
+          text: "正在执行暂停动作中",
+          color: "#00d195"
+        },
+        6: {
+          text: "已暂停",
+          color: "#00d195"
+        },
+        7: {
+          text: "正在执行停止动作中",
+          color: "#00d195"
+        },
+        8: {
+          text: "已停止",
+          color: "#00d195"
+        },
+        9: {
+          text: "打印完成",
+          color: "#00d195"
+        },
+        10: {
+          text: "文件检测中",
+          color: "#00d195"
+        },
+        11: {
+          text: "加液中",
+          color: "#00d195"
+        },
+        12: {
+          text: "铲件中",
+          color: "#00d195"
+        },
+      },
       statusMap: {
         0: {
           text: "正常",
@@ -284,8 +347,8 @@ export default {
         {
           label: '错误码',
           key: 'errorStatus',
-          isErrorCode: true
-        },
+          isErrorCode: true,
+		  },
 
         {
           label: '当前时间',
@@ -331,7 +394,7 @@ export default {
       socketData: {},
     };
   },
-  onLoad(options) {
+  onLoad (options) {
     const systemInfo = wx.getSystemInfoSync();
     const {
       statusBarHeight, // 状态栏高度（单位：px）
@@ -349,12 +412,12 @@ export default {
 
     this.connectWebSocket(); // 初始化 WebSocket 连接
   },
-  onUnload() {
+  onUnload () {
     this.closeWebSocket(); // 页面卸载时关闭连接
   },
   methods: {
     // ---------------------- WebSocket 核心方法 ----------------------
-    connectWebSocket() {
+    connectWebSocket () {
       const wsUrl = BASE_STOKECT_URL;
 
       // 初始化 WebSocket 连接（使用 uni-app 接口）
@@ -372,7 +435,7 @@ export default {
       });
     },
 
-    listenSocketMessage() {
+    listenSocketMessage () {
       // 监听 WebSocket 消息
       uni.onSocketMessage((event) => {
         console.log("event", event);
@@ -383,7 +446,7 @@ export default {
       });
     },
 
-    closeWebSocket() {
+    closeWebSocket () {
       // 关闭连接并清理资源
       if (this.socketTask) {
         uni.closeSocket();
@@ -393,7 +456,7 @@ export default {
       clearTimeout(this.reconnectTimer);
     },
 
-    tryReconnect() {
+    tryReconnect () {
       // 自动重连机制
       clearTimeout(this.reconnectTimer);
       this.reconnectTimer = setTimeout(() => {
@@ -402,7 +465,7 @@ export default {
       }, this.reconnectInterval);
     },
 
-    updateDeviceStatus(message) {
+    updateDeviceStatus (message) {
       console.log("实时消息", message);
       // CLOSE、STATUS 你那就刷新接口就行
       if (message.msgType == "CLOSE" || message.msgType == "STATUS") {
@@ -417,10 +480,11 @@ export default {
       }
       // INFO 返回视频/图片地址
       if (message.msgType == "INFO") {
+        this.isMediaLoading = true;
         this.socketData = message.data;
         if (this.socketData.imageUrl) {
           this.socketData.imageUrl =
-              BASE_IMG_URL + message.data.imageUrl;
+            BASE_IMG_URL + message.data.imageUrl;
         }
       }
       // WRITEIMG 接收图片数据中
@@ -437,7 +501,7 @@ export default {
      * 发送 WebSocket 指令
      * @param {string} command - 指令值（如 PAUSE、CONTINUE 等）
      */
-    sendWsCommand(command) {
+    sendWsCommand (command) {
       if (!this.isSocketConnected) {
         console.warn("WebSocket 未连接，无法发送指令");
         return;
@@ -459,18 +523,18 @@ export default {
 
       // 发送消息（使用 uni-app 的 sendSocketMessage）
       uni
-          .sendSocketMessage({
-            data: JSON.stringify(message),
-          })
-          .then(() => {
-            console.log("指令发送成功:", message);
-          })
-          .catch((err) => {
-            console.error("指令发送失败:", err);
-          });
+        .sendSocketMessage({
+          data: JSON.stringify(message),
+        })
+        .then(() => {
+          console.log("指令发送成功:", message);
+        })
+        .catch((err) => {
+          console.error("指令发送失败:", err);
+        });
     },
 
-    operationData(type) {
+    operationData (type) {
       if (type == "PRINT") {
         if (this.deviceDetail.status == 0 && this.deviceDetail.status != -1) {
           this.sendWsCommand(type);
@@ -478,16 +542,16 @@ export default {
       }
       if (type == "CONTINUE") {
         if (
-            this.deviceDetail.status != 1 &&
-            this.deviceDetail.printStatus != 6 &&
-            this.deviceDetail.status != -1
+          this.deviceDetail.status != 1 &&
+          this.deviceDetail.printStatus != 6 &&
+          this.deviceDetail.status != -1
         ) {
           this.sendWsCommand(type);
         }
       }
       if (type == 'PAUSE') {
         if ((this.deviceDetail.status == 1 || this.deviceDetail.status == 2) && this.deviceDetail.status != -
-            1) {
+          1) {
           uni.showModal({
             title: '提示',
             content: '确定要暂停打印吗？',
@@ -517,7 +581,8 @@ export default {
         }
       }
     },
-    getVideoImg(type) {
+    getVideoImg (type) {
+      this.isMediaLoading = true;
       if (type == "img") {
         this.getType = "img";
         this.sendWsCommand("IMAGE");
@@ -527,20 +592,26 @@ export default {
       }
     },
     // 获取状态文字
-    getStatusText(status) {
+    getStatusText (status) {
       if (status == -1) {
         return "断开";
       }
       return this.statusMap[status]?.text || "";
     },
+    getStatusText2 (status) {
+      if (status == -1) {
+        return "断开";
+      }
+      return this.childStatusMap[status]?.text || "";
+    },
     // 获取状态颜色
-    getStatusColor(status) {
+    getStatusColor (status) {
       if (status == -1) {
         return "#999999";
       }
-      return this.statusMap[status]?.color; // 默认灰色
+      return this.childStatusMap[status]?.color; // 默认灰色
     },
-    getCurrentTime() {
+    getCurrentTime () {
       const date = new Date();
       const year = date.getFullYear();
       const month = String(date.getMonth() + 1).padStart(2, "0");
@@ -550,13 +621,13 @@ export default {
 
       return `${year}年${month}月${day}日${hours}时${minutes}分`;
     },
-    goBack() {
+    goBack () {
       uni.navigateBack();
     },
-    async getDeviceDetail() {
+    async getDeviceDetail () {
       try {
         const res = await uni.request({
-          url: `https://online.totustec.com/api/api/front/device/get`,
+          url: BASE_API_URL + '/api/front/device/get',
           method: "GET",
           data: {
             deviceCode: this.deviceCode,
@@ -571,7 +642,24 @@ export default {
           this.deviceDetail = res.data;
           this.printInfo = res.data.printInfo;
           console.log("设备详情:", this.deviceDetail);
-
+		//判断状态是否为断开		
+		// 判断状态是否为断开
+		if (res.data.status == -1) {
+		  uni.showToast({
+		    title: '设备处于断开状态，暂不支持查看',
+		    icon: 'none',
+		    duration: 2000, // 提示显示时长
+		    complete: () => {
+		      // 提示显示完成后跳转
+		      setTimeout(() => {
+		        uni.reLaunch({
+		          url: '/pages/index/index'
+		        });
+		      }, 1500); // 稍微延迟一点确保用户看到提示
+		    }
+		  });
+		  return;
+		}		
         }
       } catch (error) {
         console.error("获取设备详情失败:", error);
@@ -581,7 +669,7 @@ export default {
         });
       }
     },
-    onDeviceNameInput(e) {
+    onDeviceNameInput (e) {
       this.deviceName = e.detail.value;
       // console.log('输入内容：', e.detail.value);
     },
@@ -590,6 +678,51 @@ export default {
 </script>
 <!-- 临时样式 -->
 <style scoped>
+/* 媒体容器（相对定位，用于加载动画绝对定位） */
+.media_container {
+  position: relative;
+  width: 100%;
+  margin: 22rpx 0 32rpx 0;
+}
+
+/* 加载动画容器 */
+.loading_spinner {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.3);
+  /* 与媒体区域背景一致 */
+  border-radius: 20rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 10;
+  /* 确保在媒体上层显示 */
+}
+
+/* 转圈动画元素 */
+.spinner {
+  width: 60rpx;
+  height: 60rpx;
+  border: 6rpx solid rgba(255, 255, 255, 0.3);
+  border-top-color: #ffffff;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+/* 旋转动画定义 */
+@keyframes spin {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
 .operation_btn_icon {
   width: 40rpx;
   height: 40rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 47e5149..72d42dc 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -279,6 +279,10 @@
 </template>
 
 <script>
+import {
+  BASE_STOKECT_URL, BASE_IMG_URL, BASE_API_URL
+} from "@/config.js";
+
 export default {
   data () {
     return {
@@ -307,13 +311,13 @@ export default {
       reconnectInterval: 5000 // 重连间隔（5秒）
     };
   },
-   onShareAppMessage() {
-      return {
-        title: '欢迎是有Totustec',
-        path: '/pages/index/index',
-        imageUrl: 'https://online.totustec.com/upload/indexPage/logo.png'
-      }
-    },
+  onShareAppMessage () {
+    return {
+      title: '欢迎是有Totustec',
+      path: '/pages/index/index',
+      imageUrl: 'https://online.totustec.com/upload/indexPage/logo.png'
+    }
+  },
   onLoad () {
     const systemInfo = wx.getSystemInfoSync();
     const {
@@ -334,7 +338,7 @@ export default {
   methods: {
     // ---------------------- WebSocket 核心方法 ----------------------
     connectWebSocket () {
-      const wsUrl = 'ws://online.totustec.com/webSocket/vue';
+      const wsUrl = BASE_STOKECT_URL;
 
       // 初始化 WebSocket 连接（使用 uni-app 接口）
       this.socketTask = uni.connectSocket({
@@ -413,7 +417,7 @@ export default {
         // 从本地缓存获取用户信息
         const userInfo = uni.getStorageSync("userInfo") || {};
         const res = await uni.request({
-          url: "https://online.totustec.com/api/api/front/user/myDevice",
+          url: BASE_API_URL + "/api/front/user/myDevice",
           method: "GET",
           data: this.searchList,
           header: {
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 8a74b2a..7c37d7c 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -5,26 +5,22 @@
       <view class="top_nav_warp">我的</view>
       <view class="mine_area_warp">
         <view class="mimicry" @click="navigateToAccountSettings('/pages/mine/update')">
-          <view class="mine_area_left" >
-            <image class="mine_avater" :src="'https://online.totustec.com/upload' + userInfo.avatar"></image>
+          <view class="mine_area_left">
+            <image class="mine_avater" :src="avatarFun()"></image>
             <!-- <view class="mine_avater"></view> -->
             <view class="mine_info_warp">
-              <view class="mine_info_txt1" v-if="userInfo.nikeName">{{
-                userInfo.nikeName
-              }}</view>
+              <view class="mine_info_txt1" v-if="userInfo.token">{{userInfo.nikeName || '暂无昵称' }}</view>
               <view class="mine_info_txt1" @click="getLoginCode()" v-else>登录</view>
-              <view class="mine_info_txt2" >账户设置</view>
+              <view class="mine_info_txt2">账户设置</view>
             </view>
           </view>
           <image class="mine_area_right" src="https://online.totustec.com/upload/minePage/mine_area_right.png"></image>
         </view>
       </view>
-
       <view class="top_area_backimg">
         <image class="bg-image" src="https://online.totustec.com/upload/minePage/top_area_warp.png"></image>
       </view>
     </view>
-
     <view class="function_area1_warp">
       <view style="padding: 0 20rpx">
         <view class="function_area1_content">
@@ -51,15 +47,17 @@
           <image class="area2_item_right" src="https://online.totustec.com/upload/minePage/mine_area_right.png"></image>
         </view> -->
 
-        <view class="function_area2_item" style="border-bottom-left-radius: 20rpx; border-bottom-right-radius: 20rpx;">
+ <!--       <view class="function_area2_item" style="border-bottom-left-radius: 20rpx; border-bottom-right-radius: 20rpx;">
           <view class="area2_item_left">
-            <image class="area2_item_icon1" src="https://online.totustec.com/upload/minePage/area2_item_icon2.png"></image>
+            <image class="area2_item_icon1" src="https://online.totustec.com/upload/minePage/area2_item_icon2.png">
+            </image>
             <view class="area2_item_txt">分享小程序</view>
           </view>
           <button open-type="share" class="area2_item_right_btn">
-            <image class="area2_item_right" src="https://online.totustec.com/upload/minePage/mine_area_right.png"></image>
+            <image class="area2_item_right" src="https://online.totustec.com/upload/minePage/mine_area_right.png">
+            </image>
           </button>
-        </view>
+        </view> -->
       </view>
     </view>
 
@@ -68,6 +66,10 @@
 </template>
 
 <script>
+import {
+  BASE_API_URL,
+  BASE_IMG_URL
+} from "@/config.js";
 export default {
   data () {
     return {
@@ -87,27 +89,34 @@ export default {
         //   text: "我的收藏",
         // },
       ],
-      userInfo: {
-      },
+      userInfo: {},
+      avatarUrl: BASE_IMG_URL + "/file/image/",
+      user: BASE_IMG_URL + "/minePage/user.png", //用户默认图标
     };
+  },
+  computed: {
+
   },
   onLoad () {
     const systemInfo = wx.getSystemInfoSync();
     const {
       statusBarHeight, // 状态栏高度（单位：px）
     } = systemInfo;
-
     this.statusBarHeight = statusBarHeight;
-
     // 页面加载时获取缓存用户信息
     this.getUserInfoFromCache();
-
   },
   methods: {
+    avatarFun() {
+      if (this.userInfo.avatar) {
+        return this.avatarUrl + this.userInfo.avatar;
+      }
+      else {
+        return  this.user
+      }
+    },
     getUserInfoFromCache () {
       const userInfo = uni.getStorageSync("userInfo");
-      console.log('userInfo',userInfo);
-      
       if (userInfo) {
         this.userInfo = userInfo;
       }
@@ -119,12 +128,11 @@ export default {
         });
       }
     },
-	
-	navigateToAccountSettings(path) {	
-	   uni.navigateTo({
-	     url: path,
-	   });
-	  },
+    navigateToAccountSettings (path) {
+      uni.navigateTo({
+        url: path,
+      });
+    },
     getLoginCode () {
       uni.login({
         success: (res) => {
@@ -137,7 +145,7 @@ export default {
     async loginWithPhoneNumber (code) {
       try {
         const res = await uni.request({
-          url: "https://online.totustec.com/api/api/front/wechat/authorize/login",
+          url: BASE_API_URL + "/api/front/wechat/authorize/login",
           method: "POST",
           data: { code },
           header: {
@@ -146,7 +154,7 @@ export default {
         });
         if (res.statusCode == 200) {
           this.userInfo = res.data;
-          console.log('this.userInfo', this.userInfo);
+          // console.log('this.userInfo', this.userInfo);
           // 存储用户信息到本地缓存（uni-app接口）
           uni.setStorageSync("userInfo", this.userInfo);
           uni.showToast({ title: "登录成功" });
@@ -155,7 +163,7 @@ export default {
         uni.showToast({ title: "登录失败", icon: "none" });
       }
     },
-    onShareAppMessage() {
+    onShareAppMessage () {
       return {
         title: '欢迎体验Totustec',
         path: '/pages/index/index',
diff --git a/pages/mine/update.vue b/pages/mine/update.vue
index 11be03d..c6c0612 100644
--- a/pages/mine/update.vue
+++ b/pages/mine/update.vue
@@ -1,266 +1,266 @@
 <template>
-	<view class="contai_warp">
-		<!-- Top Navigation Bar -->
-		<view class="top_area_warp">
-			<view class="top_status_area" :style="{ height: statusBarHeight + 'px' }"></view>
-			<view class="top_nav_warp">
-				<view class="back_icon" @click="goBack">
-					<image :src="back" mode="aspectFit"></image>
-				</view>
-				<text>个人资料</text>
-			</view>
-		</view>
+  <view class="contai_warp">
+    <!-- Top Navigation Bar -->
+    <view class="top_area_warp">
+      <view class="top_status_area" :style="{ height: statusBarHeight + 'px' }"></view>
+      <view class="top_nav_warp">
+        <view class="back_icon" @click="goBack">
+          <image :src="back" mode="aspectFit"></image>
+        </view>
+        <text>个人资料</text>
+      </view>
+    </view>
 
-		<!-- Profile Content -->
-		<view class="profile_content">
-			<!-- Avatar Section -->
-			<view class="profile_item">
-				<text class="item_label">头像</text>
-				<view class="avatar_wrapper" @click="changeAvatar">
-					<image class="avatar" :src="userInfo.avatar || user" mode="aspectFill"></image>
-				</view>
-			</view>
+    <!-- Profile Content -->
+    <view class="profile_content">
+      <!-- Avatar Section -->
+      <view class="profile_item">
+        <text class="item_label">头像</text>
+        <view class="avatar_wrapper" @click="changeAvatar">
+          <image class="avatar" :src="avatarFun()" mode="aspectFill"></image>
+        </view>
+      </view>
 
-			<!-- Nickname Section -->
-			<view class="profile_item">
-				<text class="item_label">昵称</text>
-				<input class="nickname_input" v-model="userInfo.nikename" placeholder="请输入昵称" />
-			</view>
-			<!-- Save Button -->
-			<button class="save_btn" @click="saveProfile">保存修改</button>
+      <!-- Nickname Section -->
+      <view class="profile_item">
+        <text class="item_label">昵称</text>
+        <input class="nickname_input" v-model="userInfo.nikename" placeholder="请输入昵称"/>
+      </view>
+      <!-- Save Button -->
+      <button class="save_btn" @click="saveProfile">保存修改</button>
 
-		</view>
-	</view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import {
-		BASE_API_URL,
-		BASE_IMG_URL
-	} from "@/config.js";
-	export default {
-		data() {
-			return {
-				back: BASE_IMG_URL + "/minePage/back.png", //返回图标
-				user: BASE_IMG_URL + "/minePage/user.png", //用户默认图标
-				statusBarHeight: 0,
-				userInfo: {
-					nikename: "",
-					avatar: "",
-					phone: ""
-				}
-			};
-		},
-		onLoad() {
-			// Get system info for status bar height
-			const systemInfo = wx.getSystemInfoSync();
-			this.statusBarHeight = systemInfo.statusBarHeight;
-			this.getUserInfoFromCache();
-		},
-		methods: {
-			navigateToAccountSettings(path) {
-				uni.navigateTo({
-					url: path,
-				});
-			},
-			getUserInfoFromCache() {
-				const userInfo = uni.getStorageSync("userInfo");
-				if (userInfo) {
-					this.userInfo.nikename = userInfo.nikeName;
-					this.userInfo.avatar = BASE_IMG_URL + userInfo.avatar;
-				}
-			},
-			changeAvatar() {
-				uni.chooseImage({
-					count: 1,
-					sizeType: ['compressed'],
-					sourceType: ['album', 'camera'],
-					success: (res) => {
-						const tempFilePath = res.tempFilePaths[0];
-						const userInfo = uni.getStorageSync("userInfo") || {};
-						uni.uploadFile({
-							url: "https://online.totustec.com/api/api/front/user/pictures",
-							filePath: tempFilePath,
-							name: "file",
-							header: {
-								"Authorization": userInfo.token || ""
-							},
-							success: (uploadRes) => {
-								console.log(uploadRes)
-								this.userInfo.avatar =
-									"https://online.totustec.com/upload/file/image/" + uploadRes
-									.data;
-								uni.showToast({
-									title: "头像上传成功"
-								});
-								console.log(this.userInfo.avatar)
-							},
-							fail: () => {
-								uni.showToast({
-									title: "头像上传失败",
-									icon: "none"
-								});
-							}
-						});
-					}
-				});
-			},
-			async saveProfile() {
-				if (!this.userInfo.nikename.trim()) {
-					uni.showToast({
-						title: '昵称不能为空',
-						icon: 'none'
-					});
-					return;
-				}
-				try {
-					const userInfo = uni.getStorageSync("userInfo") || {};
-					const res = await uni.request({
-						url: BASE_API_URL + "/api/front/user/update",
-						method: "POST",
-						data: this.userInfo,
-						header: {
-							"Content-Type": "application/x-www-form-urlencoded",
-							"Authorization": userInfo.token || ""
-						},
-					});
-					if (res.statusCode == 200) {
-						uni.showToast({
-							title: "修改成功"
-						});
-						setTimeout(() => {
-							uni.reLaunch({
-								url: "/pages/mine/index",
-							});
-						}, 1000);
-					}
-				} catch (error) {
-					console.log(error)
-					uni.showToast({
-						title: "修改失败",
-						icon: "none"
-					});
-				}
-			},
-			goBack() {
-				uni.navigateBack();
-			}
-		}
-	};
+import {
+  BASE_API_URL,
+  BASE_IMG_URL
+} from "@/config.js";
+
+export default {
+  data() {
+    return {
+      back: BASE_IMG_URL + "/minePage/back.png", //返回图标
+      user: BASE_IMG_URL + "/minePage/user.png", //用户默认图标
+      avatarUrl: BASE_IMG_URL + "/file/image/",
+      statusBarHeight: 0,
+      userInfo: {
+        nikename: "",
+        avatar: "",
+        phone: ""
+      }
+    };
+  },
+  onLoad() {
+    // Get system info for status bar height
+    const systemInfo = wx.getSystemInfoSync();
+    this.statusBarHeight = systemInfo.statusBarHeight;
+    this.getUserInfoFromCache();
+  },
+  methods: {
+    avatarFun() {
+      if (this.userInfo.avatar) {
+        return this.avatarUrl + this.userInfo.avatar;
+      } else {
+        return this.user
+      }
+    },
+    getUserInfoFromCache() {
+      const userInfo = uni.getStorageSync("userInfo");
+      if (userInfo) {
+        this.userInfo.nikename = userInfo.nikeName;
+        this.userInfo.avatar = userInfo.avatar;
+      }
+    },
+    changeAvatar() {
+      uni.chooseImage({
+        count: 1,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: (res) => {
+          const tempFilePath = res.tempFilePaths[0];
+          const userInfo = uni.getStorageSync("userInfo") || {};
+          uni.uploadFile({
+            url: BASE_API_URL + "/api/front/user/pictures",
+            filePath: tempFilePath,
+            name: "file",
+            header: {"Authorization": userInfo.token || ""},
+            success: (uploadRes) => {
+              console.log(uploadRes)
+              this.userInfo.avatar = uploadRes.data;
+              uni.showToast({
+                title: "头像上传成功"
+              });
+              console.log(this.userInfo.avatar)
+            },
+            fail: () => {
+              uni.showToast({
+                title: "头像上传失败",
+                icon: "none"
+              });
+            }
+          });
+        }
+      });
+    },
+    async saveProfile() {
+      if (!this.userInfo.nikename.trim()) {
+        uni.showToast({
+          title: '昵称不能为空',
+          icon: 'none'
+        });
+        return;
+      }
+      try {
+        const userInfo = uni.getStorageSync("userInfo") || {};
+        const res = await uni.request({
+          url: BASE_API_URL + "/api/front/user/update",
+          method: "POST",
+          data: this.userInfo,
+          header: {
+            "Content-Type": "application/x-www-form-urlencoded",
+            "Authorization": userInfo.token || ""
+          },
+        });
+        if (res.statusCode == 200) {
+          uni.showToast({
+            title: "修改成功"
+          });
+          setTimeout(() => {
+            uni.reLaunch({
+              url: "/pages/mine/index",
+            });
+          }, 1000);
+        }
+      } catch (error) {
+        console.log(error)
+        uni.showToast({
+          title: "修改失败",
+          icon: "none"
+        });
+      }
+    },
+    goBack() {
+      uni.navigateBack();
+    }
+  }
+};
 </script>
 
 <style scoped>
-	.contai_warp {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		font-family: PingFang SC, PingFang SC !important;
-		min-height: 100vh;
-		background-color: #f1f6fc;
-	}
+.contai_warp {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  font-family: PingFang SC, PingFang SC !important;
+  min-height: 100vh;
+  background-color: #f1f6fc;
+}
 
-	/* Top Navigation Styles */
-	.top_area_warp {
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		position: relative;
-	}
+/* Top Navigation Styles */
+.top_area_warp {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
 
-	.top_status_area {
-		width: 100%;
-	}
+.top_status_area {
+  width: 100%;
+}
 
-	.top_nav_warp {
-		width: 100%;
-		height: 88rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #000000;
-		position: relative;
-		z-index: 5;
-	}
+.top_nav_warp {
+  width: 100%;
+  height: 88rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #000000;
+  position: relative;
+  z-index: 5;
+}
 
-	.back_icon {
-		position: absolute;
-		left: 20rpx;
-		width: 40rpx;
-		height: 40rpx;
-	}
+.back_icon {
+  position: absolute;
+  left: 20rpx;
+  width: 40rpx;
+  height: 40rpx;
+}
 
-	.back_icon image {
-		width: 100%;
-		height: 100%;
-	}
+.back_icon image {
+  width: 100%;
+  height: 100%;
+}
 
-	/* Profile Content Styles */
-	.profile_content {
-		width: 90%;
-		padding: 40rpx 30rpx;
-		background-color: #ffffff;
-		border-radius: 20rpx 20rpx 0 0;
-		margin-top: 20rpx;
-		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-	}
+/* Profile Content Styles */
+.profile_content {
+  width: 90%;
+  padding: 40rpx 30rpx;
+  background-color: #ffffff;
+  border-radius: 20rpx 20rpx 0 0;
+  margin-top: 20rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+}
 
-	.profile_item {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 30rpx 0;
-		border-bottom: 1rpx solid #f0f0f0;
-	}
+.profile_item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 30rpx 0;
+  border-bottom: 1rpx solid #f0f0f0;
+}
 
-	.item_label {
-		font-size: 28rpx;
-		color: #333;
-	}
+.item_label {
+  font-size: 28rpx;
+  color: #333;
+}
 
-	.avatar_wrapper {
-		position: relative;
-		width: 100rpx;
-		height: 100rpx;
-	}
+.avatar_wrapper {
+  position: relative;
+  width: 100rpx;
+  height: 100rpx;
+}
 
-	.avatar {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-	}
+.avatar {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+}
 
-	.edit_icon {
-		position: absolute;
-		right: -10rpx;
-		bottom: -10rpx;
-		width: 100rpx;
-		height: 100rpx;
-		background: #fff;
-		border-radius: 50%;
-		padding: 5rpx;
-		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
-	}
+.edit_icon {
+  position: absolute;
+  right: -10rpx;
+  bottom: -10rpx;
+  width: 100rpx;
+  height: 100rpx;
+  background: #fff;
+  border-radius: 50%;
+  padding: 5rpx;
+  box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
+}
 
-	.nickname_input {
-		text-align: right;
-		font-size: 28rpx;
-		color: #333;
-		flex: 1;
-		margin-left: 20rpx;
-	}
+.nickname_input {
+  text-align: right;
+  font-size: 28rpx;
+  color: #333;
+  flex: 1;
+  margin-left: 20rpx;
+}
 
-	.save_btn {
-		margin-top: 60rpx;
-		background-color: #0095de;
-		color: white;
-		border-radius: 50rpx;
-		font-size: 32rpx;
-	}
+.save_btn {
+  margin-top: 60rpx;
+  background-color: #0095de;
+  color: white;
+  border-radius: 50rpx;
+  font-size: 32rpx;
+}
 
-	.save_btn:active {
-		background-color: #ffffff;
-	}
-</style>
\ No newline at end of file
+.save_btn:active {
+  background-color: #ffffff;
+}
+</style>
diff --git a/pages/selectDevice/index.vue b/pages/selectDevice/index.vue
index dd2ae03..13b1088 100644
--- a/pages/selectDevice/index.vue
+++ b/pages/selectDevice/index.vue
@@ -24,7 +24,7 @@
             </div>
 
             <!-- 设备项右侧操作 -->
-            <div class="data_item_right" @click="handleView(item.deviceCode,item.status)">查看</div>
+            <div class="data_item_right" @click="handleView(item.deviceCode, item.status)">查看</div>
 
             <!-- 设备使用状态图标（根据状态显示） -->
             <image v-if="item.isInUse" class="in_use_warp"
@@ -37,6 +37,11 @@
 </template>
 
 <script>
+import {
+  BASE_API_URL,
+  BASE_STOKECT_URL,
+  BASE_IMG_URL
+} from "@/config.js";
 export default {
   data () {
     return {
@@ -76,7 +81,7 @@ export default {
   methods: {
     // ---------------------- WebSocket 核心方法 ----------------------
     connectWebSocket () {
-      const wsUrl = 'ws://online.totustec.com/webSocket/vue';
+      const wsUrl = BASE_STOKECT_URL;
 
       // 初始化 WebSocket 连接（使用 uni-app 接口）
       this.socketTask = uni.connectSocket({
@@ -128,19 +133,15 @@ export default {
       console.log('实时消息');
 
     },
-
-
-
-
     goBack () {
       uni.navigateBack();
     },
-    handleView (deviceCode,status) {
-      if(status == -1){
+    handleView (deviceCode, status) {
+      if (status == -1) {
         uni.showToast({
-            title: '设备处于断开状态，暂不支持查看',
-            icon: 'none'
-          });
+          title: '设备处于断开状态，暂不支持查看',
+          icon: 'none'
+        });
         return
       }
       console.log("data", deviceCode);
@@ -153,7 +154,7 @@ export default {
         // 从本地缓存获取用户信息
         const userInfo = uni.getStorageSync("userInfo") || {};
         const res = await uni.request({
-          url: "https://online.totustec.com/api/api/front/user/myDevice",
+          url: BASE_API_URL + "/api/front/user/myDevice",
           method: "GET",
           data: this.searchList,
           header: {