From a0f2fab6bfe19884ce7c134c0fb5e1c9d3859b35 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Tue, 19 Aug 2025 09:34:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=86=85=E7=BD=91=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/cacheEnums.js             |   2 +-
 src/main.js                         |   7 +++-
 src/pages/deviceAuth/deviceAuth.vue |  54 +++++++++++++++++++++++-----
 src/static/images/login-biaoshi.png | Bin 0 -> 860 bytes
 4 files changed, 53 insertions(+), 10 deletions(-)
 create mode 100644 src/static/images/login-biaoshi.png

diff --git a/src/enums/cacheEnums.js b/src/enums/cacheEnums.js
index a67dd81..264ff92 100644
--- a/src/enums/cacheEnums.js
+++ b/src/enums/cacheEnums.js
@@ -4,5 +4,5 @@ export const AGREEWELCOME_KEY="agreewelcome";
 // clientId 默认写2 
 export const CLIENT_ID="2";
 // #区分内外网 //1-内网，2-外网
-export const NETWORK_ENV=2;
+export const NETWORK_ENV=1;
 
diff --git a/src/main.js b/src/main.js
index c1db60c..cfb180d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,15 +1,20 @@
 import { createSSRApp } from "vue";
 import App from "./App.vue";
-
+import { CLIENT_ID,NETWORK_ENV } from '@/enums/cacheEnums';
 import '@/static/font/iconfont.css'
 
 // pinia
 import { createPinia } from 'pinia'
 const pinia = createPinia()
 
+
+
 export function createApp() {
 
 	const app = createSSRApp(App);
+
+	app.config.globalProperties.$CLIENT_ID = CLIENT_ID;
+	app.config.globalProperties.$NETWORK_ENV = NETWORK_ENV;
 	
 	app.use(pinia)
 
diff --git a/src/pages/deviceAuth/deviceAuth.vue b/src/pages/deviceAuth/deviceAuth.vue
index 34116cd..4d60f9e 100644
--- a/src/pages/deviceAuth/deviceAuth.vue
+++ b/src/pages/deviceAuth/deviceAuth.vue
@@ -6,13 +6,26 @@
             <view :style="{height: navBarPaddingTop + 'px'}"></view>
             <view class="auth-title">
                 <image src="@/static/images/icon-lock@2x.png"/>
-                <text>设备授权</text>
+                <text>{{networkEnv==1?'内网':''}}设备授权</text>
             </view>
             <view class="login-con">
                 <!-- 登录 -->
                 <block v-if="!bindStatus">
-                    <view class="login-form">
+                    <view class="login-form" :class="{network1:networkEnv==1}">
                         <uni-forms ref="form2" :model="formData2" :rules="rules2" label-position="top">
+                            <!-- networkEnv -->
+                            <uni-forms-item label="设备标识" required name="uniqCode" v-if="networkEnv==1">
+                                <view class="code-con">
+                                    <uni-easyinput :inputBorder="false" 
+                                        v-model="formData2.uniqCode" placeholder="请输入设备标识" 
+                                    >
+                                        <!-- <template #prefixIcon>
+                                            <image src="/static/images/login-biaoshi.png" style="width: 20px; height: 20px;" />
+                                        </template> -->
+                                        
+                                    </uni-easyinput>
+                                </view>
+                            </uni-forms-item>
                             <uni-forms-item label="用户名" required name="username">
                                 <view class="code-con">
                                     <uni-easyinput prefixIcon="person" :inputBorder="false" 
@@ -80,7 +93,6 @@ import { v4 as uuidv4 } from 'uuid'
 import { getNavBarPaddingTop} from '@/utils/system.js';
 import { getBindStatus,authDeviceApply,authInputCode } from '@/api/auth.js';
 import {showToast,showAlert} from '@/utils/message.js'
-import { CLIENT_ID,NETWORK_ENV } from '@/enums/cacheEnums';
 import encryptObj from '@/utils/encrypt.js'
 import { requestAndroidPermissionAsync } from '@/utils/common.js'
 
@@ -94,8 +106,10 @@ const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
 // #endif
 let systemInfo = {};
 let deviceId = ref(undefined);
+let clientId = `${proxy.$CLIENT_ID || 2}`;
+let networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
 onLoad(async(opt) => {
-    console.log("deviceAuth=>onLoad");
+    console.log("deviceAuth=>onLoad",clientId,networkEnv);
     uni.setStorageSync('page_cache',true);
     // uni.preloadPage({url: "/pages/login/login"});
     // uni.preloadPage({url: "/pages/home/home"});
@@ -191,6 +205,11 @@ const formData2 = ref({
 });
 
 const rules2 = {
+    uniqCode:{
+        rules: [
+            { required: true, errorMessage: '请输入设备标识' },
+        ]
+    },
     username: {
         rules: [
             { required: true, errorMessage: '请输入用户名' },
@@ -210,14 +229,19 @@ const submitForm = async() => {
     // 用户名和密码登录
     form2.value.validate().then(async param => {
         btnLoading.value = true;
-        deviceId.value = uuidv4();
-        let clientId = `${CLIENT_ID || 2}`;
+        //1-内网，2-外网
+        if(networkEnv==1){
+            deviceId.value = form2.value.uniqCode;
+        }else{
+            deviceId.value = uuidv4(); //2-外网 生成的设备唯一标识
+        }
+        
         let password = encryptObj.Encrypt(param.username + clientId + "," + param.password);
         let params = {
             username:param.username,
             password,
-            networkEnv:NETWORK_ENV,//1-内网，2-外网
-            uniqCode:deviceId.value,//生成的设备唯一标识
+            networkEnv:networkEnv.value,//1-内网，2-外网
+            uniqCode:deviceId.value,
             ...systemInfo,//设备信息
             // #ifdef APP-PLUS
             verId:systemInfo.appWgtVersion,//当前版本号
@@ -443,6 +467,20 @@ const handleSubmit=()=>{
     content: "\e66c" !important;
 }
 
+/* 加设备ID样式 */
+.container .login-form.network1{
+    padding-bottom:50rpx;
+}
+.container .login-form.network1 .code-con{
+    padding:0 0 3rpx;
+}
+.container .login-form.network1 :deep(.uni-forms-item){
+    margin-bottom:10px !important
+}
+.container .login-form.network1 :deep(.uni-easyinput__content-input){
+    height: 30px !important;
+}
+
 .btn-submit{
     width:496rpx;
     height:88rpx;
diff --git a/src/static/images/login-biaoshi.png b/src/static/images/login-biaoshi.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c8e479773201e47ed34667b5fc2812479df96b7
GIT binary patch
literal 860
zcmV-i1Ec(jP)<h;3K|Lk000e1NJLTq000&M000{Z1^@s6cq)J80009KNkl<Zcmb@G
z&rcIU6vyA&E#MEL+)Sk{@mKVqCZ>teghY%8q*1$&NNkImAn`AdGaO7jNTL@-1I7ci
zC1ApWKdN{zob;k_F)^qJT_JM8#DhpFGrqT_wQaU*15D;S^Y;Dt?C$K&D2)Siek~IJ
zp+yY28S+PrxeF1aL6Jgq1K=*$q=o>yNxcg3oFo8r?9qd6+=!M1x`7&jD;Z2CfF5wp
zn8pT%Sc~g>x;z6;I||LUgI{<0!qZiS;`#of!P}E1O{G{G%m);@E*gxW5LA+&s8$rX
zzHi0}AWswVF#SqLY5s4w1Z&}0uNH~l@kiqK{1KyPtExtcq>@09(4&Rpy`=kE*tmNx
zYSgelUzT7!RP|nh@(BQ2>DOrkfK#MYM>r0M*GSh%3(qdO##4dZ(GtulBSF_gl%ksK
zX;My?AQyzhvwF~Vi{LURxOPzx%yE8lM7+&*wou}O(U9v+wlCkd1#_~L;NzK;013Zo
z=AQPkZ7ExD&Es!dq?Bjq)jtYUPGB-|Od`Ca*Y`G=e~Km3blQS<lsRf>DY_FCZtrNI
za$@-EzNu2xRV}3G5Q?MLBor8I!DS8@rw?=^=ELQ5{ZKQmj)pup7fR%lw9jg`1rIg5
zm#m7|_tqxHaa%AatXD;W{r$!f+JP}sWEXQYTQGllg7u&R6SM;xOp)D4+ni%|H?Rbs
ze>%TSiy9q5Ri_BnMga4ipqaZ$Tdj>_oWr^7%vTQh;^3g#7>&28zmi`-LMH%}ljvZB
zNf5FgL8&AEB&1q7*`1urHC&r=r^XCe8<?+4Bu{>j5+Bh9pktB~aF)i)`e&C{Z}E%`
z2P<E*%{~A#MiV-@hHL%dcs;DO3>d`fD|+qpS-U7vwl7yK9n^#Fe&|F2=|(pDI7Yj&
zo!pBg;95j{$u{dBn67B;{!nt)iWK`t0-mmz??7f_P&lV^Y$W6{bGe3VvlCKa2?7xN
zR^-YdN^XB1s`{CoWM^|O*KjQ}Xx#<pD`boTpjQvLuDl5C<u!%%G_GX^5Q~|A0RRC1
m|Gtv}0RR9121!IgR09BV9cFsq-Dg<<0000<MNUMnLSTZL=!>ra

literal 0
HcmV?d00001