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 @@
- 设备授权
+ {{networkEnv==1?'内网':''}}设备授权
-
+
+
+
+
+
+
+
+
+
+
{
- 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 0000000..8c8e479
Binary files /dev/null and b/src/static/images/login-biaoshi.png differ