From 127adcd5248fbe496cdcf2afcf5e2859efd96da8 Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Wed, 13 Aug 2025 20:45:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/config.js  |  46 +++---
 common/js/mqtt.js    |  28 ++--
 manifest.json        |   8 +-
 pages/mine/about.vue | 100 ++++++-------
 pages/mine/setup.vue | 348 +++++++++++++++++++++----------------------
 5 files changed, 265 insertions(+), 265 deletions(-)

diff --git a/common/js/config.js b/common/js/config.js
index 93daeaf..d284685 100644
--- a/common/js/config.js
+++ b/common/js/config.js
@@ -1,23 +1,23 @@
-const debug = true // true 是连地服务端本地，false 是连接线上
-
-const development = {
-    domain: 'http://192.168.1.62:10215',
-}
-
-const production = {
-    domain: 'https://pqmcn.com:8092/api',
-}
-
-const config = debug ? development : production
-
-// #ifdef H5
-if (process.env.NODE_ENV === 'development') {
-    config.domain = '/api'
-} else {
-    config.domain = window.location.origin
-}
-// #endif
-
-config.static = config.domain + '/system-boot/file/download?filePath='
-
-export default config
+const debug = false // true 是连地服务端本地，false 是连接线上
+
+const development = {
+    domain: 'http://192.168.1.62:10215',
+}
+
+const production = {
+    domain: 'https://pqmcn.com:8092/api',
+}
+
+const config = debug ? development : production
+
+// #ifdef H5
+if (process.env.NODE_ENV === 'development') {
+    config.domain = '/api'
+} else {
+    config.domain = window.location.origin
+}
+// #endif
+
+config.static = config.domain + '/system-boot/file/download?filePath='
+
+export default config
diff --git a/common/js/mqtt.js b/common/js/mqtt.js
index f2b0376..69d7664 100644
--- a/common/js/mqtt.js
+++ b/common/js/mqtt.js
@@ -1,14 +1,14 @@
-// export const MQTT_IP = 'pqmcn.com:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
-export const MQTT_IP = '192.168.1.24:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
-
-const MQTT_USERNAME = 't_user'//mqtt用户名
-const MQTT_PASSWORD = 'njcnpqs'//密码
-
-export const MQTT_OPTIONS = {
-    connectTimeout: 5000,
-    clientId: '',
-    username: MQTT_USERNAME,
-    password: MQTT_PASSWORD,
-    clean: false,
-    Qos: 1,
-}
+export const MQTT_IP = 'pqmcn.com:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
+// export const MQTT_IP = '192.168.1.24:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
+
+const MQTT_USERNAME = 't_user'//mqtt用户名
+const MQTT_PASSWORD = 'njcnpqs'//密码
+
+export const MQTT_OPTIONS = {
+    connectTimeout: 5000,
+    clientId: '',
+    username: MQTT_USERNAME,
+    password: MQTT_PASSWORD,
+    clean: false,
+    Qos: 1,
+}
diff --git a/manifest.json b/manifest.json
index ae15d6e..f91453f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "灿能物联",
     "appid" : "__UNI__88BC25B",
     "description" : "",
-    "versionName" : "1.6.6",
-    "versionCode" : 166,
+    "versionName" : "1.6.7",
+    "versionCode" : 167,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */
@@ -144,8 +144,8 @@
             "proxy" : {
                 "/api" : {
                     "https" : true,
-                    // "target" : "https://pqmcn.com:8092/api",
-                    "target" : "http://192.168.1.62:10215",
+                    "target" : "https://pqmcn.com:8092/api",
+                    // "target" : "http://192.168.1.62:10215",
                     "changOrigin" : true,
                     "pathRewrite" : {
                         "/api" : ""
diff --git a/pages/mine/about.vue b/pages/mine/about.vue
index 593c454..250f10b 100644
--- a/pages/mine/about.vue
+++ b/pages/mine/about.vue
@@ -1,50 +1,50 @@
-<template>
-    <Cn-page :loading="loading">
-        <view slot="body">
-            <view class="about">
-                <image src="/static/logo.png" class="logo"></image>
-                <view class="name">灿能物联</view>
-                <view class="version">Version 1.6.1</view>
-            </view>
-        </view>
-    </Cn-page>
-</template>
-<script>
-export default {
-    data() {
-        return {
-            loading: false,
-        }
-    },
-    methods: {},
-}
-</script>
-<style lang="scss">
-.about {
-    box-sizing: border-box;
-    padding: 34rpx;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    overflow: hidden;
-    .logo {
-        margin-top: 200rpx;
-        height: 120rpx;
-        width: 120rpx;
-    }
-
-    .name {
-        margin-top: 80rpx;
-        font-size: 40rpx;
-        font-weight: 700;
-        color: #333;
-    }
-
-    .version {
-        margin-top: 20rpx;
-        font-size: 38rpx;
-        color: #333;
-    }
-}
-</style>
+<template>
+    <Cn-page :loading="loading">
+        <view slot="body">
+            <view class="about">
+                <image src="/static/logo.png" class="logo"></image>
+                <view class="name">灿能物联</view>
+                <view class="version">Version 1.6.6</view>
+            </view>
+        </view>
+    </Cn-page>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            loading: false,
+        }
+    },
+    methods: {},
+}
+</script>
+<style lang="scss">
+.about {
+    box-sizing: border-box;
+    padding: 34rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+    .logo {
+        margin-top: 200rpx;
+        height: 120rpx;
+        width: 120rpx;
+    }
+
+    .name {
+        margin-top: 80rpx;
+        font-size: 40rpx;
+        font-weight: 700;
+        color: #333;
+    }
+
+    .version {
+        margin-top: 20rpx;
+        font-size: 38rpx;
+        color: #333;
+    }
+}
+</style>
diff --git a/pages/mine/setup.vue b/pages/mine/setup.vue
index 74922c3..cd5ddab 100644
--- a/pages/mine/setup.vue
+++ b/pages/mine/setup.vue
@@ -1,174 +1,174 @@
-<template>
-    <view :loading="loading">
-        <view class="mine">
-            <view class="mine-nav" @click="jump('changePhone')" style="box-shadow: 0 4rpx 8rpx #e7e7e74c">
-                <view class="mine-nav-label">更换手机号</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <view class="mine-nav" @click="jump('changePwd')">
-                <view class="mine-nav-label">修改密码</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <view class="mine-nav" @click="jump('deleteUser')" style="border-bottom: none">
-                <view class="mine-nav-label">账号注销</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <!-- <view class="mine-nav" @click="jump('setupMessage')" style="margin-top:20rpx;border-bottom: none; ">
-                <view class="mine-nav-label">消息配置</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view> -->
-            <view class="mine-nav" @click="jump('agreement')" style="margin-top: 20rpx">
-                <view class="mine-nav-label">用户协议</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <view class="mine-nav" @click="jump('policy')">
-                <view class="mine-nav-label">隐私政策</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <view class="mine-nav" @click="jump('system')">
-                <view class="mine-nav-label">系统介绍</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <view class="mine-nav" @click="jump('book')">
-                <view class="mine-nav-label">使用手册</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <!-- <view class="mine-nav" @click="jump('database')">
-                <view class="mine-nav-label">资料库</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view> -->
-            <view class="mine-nav" @click="jump('company')">
-                <view class="mine-nav-label">公司介绍</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <!-- <view class="mine-nav" @click="jump('feedback')">
-                <view class="mine-nav-label">意见反馈</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view> -->
-            <!-- @click="jump('about')" -->
-            <view class="mine-nav" style="border-bottom: none">
-                <view class="mine-nav-label">版本信息</view>
-                <view style="color: #828282; font-size: 14rpx">当前版本V1.6.6</view>
-                <!-- <uni-icons type="forward" color="#aaa" size="20"></uni-icons> -->
-            </view>
-            <view class="mine-nav" @click="jump('layout')" style="margin-top: 20rpx; border-bottom: none">
-                <view class="mine-nav-label" style="text-align: center">退出登录</view>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-import { queryPersonSet } from '@/common/api/mine.js'
-export default {
-    data() {
-        return {
-            loading: false,
-        }
-    },
-    methods: {
-        async init() {},
-        jump(type) {
-            switch (type) {
-                case 'changePwd':
-                    uni.navigateTo({
-                        url: `/pages/user/changePwd`,
-                    })
-                    break
-                case 'changePhone':
-                    uni.navigateTo({
-                        url: `/pages/user/changePhone`,
-                    })
-                    break
-                case 'book':
-                    uni.openDocument({
-                        filePath: '/static/user_manual.docx',
-                        success: function (res) {
-                            console.log('打开文档成功')
-                        },
-                    })
-                    break
-                case 'layout':
-                    uni.showModal({
-                        title: '提示',
-                        content: '是否确认退出登录？',
-                        success: (res) => {
-                            if (res.confirm) {
-                                uni.removeStorageSync(this.$cacheKey.messageCount)
-                                // #ifdef APP-PLUS
-                                plus.runtime.setBadgeNumber(0)
-                                // #endif
-                                uni.reLaunch({
-                                    url: `/pages/user/login`,
-                                })
-                            }
-                        },
-                    })
-                    break
-                default:
-                    uni.navigateTo({
-                        url: `/pages/mine/${type}`,
-                    })
-                    break
-            }
-        },
-    },
-    onLoad() {
-        this.init()
-    },
-}
-</script>
-
-<style lang="scss">
-.mine {
-    padding-top: 20rpx;
-
-    .mine-header {
-        padding: 200rpx 34rpx 34rpx;
-        display: flex;
-        align-items: center;
-        background: $uni-theme-white;
-        margin-bottom: 20rpx;
-        box-shadow: 0 4rpx 8rpx #e7e7e74c;
-
-        .mine-header-head {
-            margin-right: 30rpx;
-            height: 128rpx;
-            width: 128rpx;
-            border-radius: $uni-theme-radius;
-            overflow: hidden;
-        }
-
-        .mine-header-name {
-            margin-right: 30rpx;
-            flex: 1;
-            font-size: 36rpx;
-            color: #111;
-            font-weight: 700;
-        }
-    }
-
-    .mine-nav {
-        padding: 34rpx;
-        display: flex;
-        align-items: center;
-        background: $uni-theme-white;
-        border-bottom: 1rpx solid #e8e8e8;
-
-        &-icon {
-            margin-right: 30rpx;
-            height: 44rpx;
-            width: 44rpx;
-            border-radius: $uni-theme-radius;
-            overflow: hidden;
-        }
-
-        &-label {
-            margin-right: 30rpx;
-            flex: 1;
-            font-size: 28rpx;
-            color: #111;
-        }
-    }
-}
-</style>
+<template>
+    <view :loading="loading">
+        <view class="mine">
+            <view class="mine-nav" @click="jump('changePhone')" style="box-shadow: 0 4rpx 8rpx #e7e7e74c">
+                <view class="mine-nav-label">更换手机号</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
+            <view class="mine-nav" @click="jump('changePwd')">
+                <view class="mine-nav-label">修改密码</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
+            <view class="mine-nav" @click="jump('deleteUser')" style="border-bottom: none">
+                <view class="mine-nav-label">账号注销</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
+            <!-- <view class="mine-nav" @click="jump('setupMessage')" style="margin-top:20rpx;border-bottom: none; ">
+                <view class="mine-nav-label">消息配置</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view> -->
+            <view class="mine-nav" @click="jump('agreement')" style="margin-top: 20rpx">
+                <view class="mine-nav-label">用户协议</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
+            <view class="mine-nav" @click="jump('policy')">
+                <view class="mine-nav-label">隐私政策</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
+            <view class="mine-nav" @click="jump('system')">
+                <view class="mine-nav-label">系统介绍</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
+            <view class="mine-nav" @click="jump('book')">
+                <view class="mine-nav-label">使用手册</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
+            <!-- <view class="mine-nav" @click="jump('database')">
+                <view class="mine-nav-label">资料库</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view> -->
+            <view class="mine-nav" @click="jump('company')">
+                <view class="mine-nav-label">公司介绍</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
+            <!-- <view class="mine-nav" @click="jump('feedback')">
+                <view class="mine-nav-label">意见反馈</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view> -->
+            <!-- @click="jump('about')" -->
+            <view class="mine-nav" style="border-bottom: none">
+                <view class="mine-nav-label">版本信息</view>
+                <view style="color: #828282; font-size: 14rpx">当前版本V1.6.6</view>
+                <!-- <uni-icons type="forward" color="#aaa" size="20"></uni-icons> -->
+            </view>
+            <view class="mine-nav" @click="jump('layout')" style="margin-top: 20rpx; border-bottom: none">
+                <view class="mine-nav-label" style="text-align: center">退出登录</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import { queryPersonSet } from '@/common/api/mine.js'
+export default {
+    data() {
+        return {
+            loading: false,
+        }
+    },
+    methods: {
+        async init() {},
+        jump(type) {
+            switch (type) {
+                case 'changePwd':
+                    uni.navigateTo({
+                        url: `/pages/user/changePwd`,
+                    })
+                    break
+                case 'changePhone':
+                    uni.navigateTo({
+                        url: `/pages/user/changePhone`,
+                    })
+                    break
+                case 'book':
+                    uni.openDocument({
+                        filePath: '/static/user_manual.docx',
+                        success: function (res) {
+                            console.log('打开文档成功')
+                        },
+                    })
+                    break
+                case 'layout':
+                    uni.showModal({
+                        title: '提示',
+                        content: '是否确认退出登录？',
+                        success: (res) => {
+                            if (res.confirm) {
+                                uni.removeStorageSync(this.$cacheKey.messageCount)
+                                // #ifdef APP-PLUS
+                                plus.runtime.setBadgeNumber(0)
+                                // #endif
+                                uni.reLaunch({
+                                    url: `/pages/user/login`,
+                                })
+                            }
+                        },
+                    })
+                    break
+                default:
+                    uni.navigateTo({
+                        url: `/pages/mine/${type}`,
+                    })
+                    break
+            }
+        },
+    },
+    onLoad() {
+        this.init()
+    },
+}
+</script>
+
+<style lang="scss">
+.mine {
+    padding-top: 20rpx;
+
+    .mine-header {
+        padding: 200rpx 34rpx 34rpx;
+        display: flex;
+        align-items: center;
+        background: $uni-theme-white;
+        margin-bottom: 20rpx;
+        box-shadow: 0 4rpx 8rpx #e7e7e74c;
+
+        .mine-header-head {
+            margin-right: 30rpx;
+            height: 128rpx;
+            width: 128rpx;
+            border-radius: $uni-theme-radius;
+            overflow: hidden;
+        }
+
+        .mine-header-name {
+            margin-right: 30rpx;
+            flex: 1;
+            font-size: 36rpx;
+            color: #111;
+            font-weight: 700;
+        }
+    }
+
+    .mine-nav {
+        padding: 34rpx;
+        display: flex;
+        align-items: center;
+        background: $uni-theme-white;
+        border-bottom: 1rpx solid #e8e8e8;
+
+        &-icon {
+            margin-right: 30rpx;
+            height: 44rpx;
+            width: 44rpx;
+            border-radius: $uni-theme-radius;
+            overflow: hidden;
+        }
+
+        &-label {
+            margin-right: 30rpx;
+            flex: 1;
+            font-size: 28rpx;
+            color: #111;
+        }
+    }
+}
+</style>