修改登录及设备授权处理

src/main.js

@@ -1,16 +1,21 @@
 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)
 
 	return {

src/pages.json

@@ -145,14 +145,7 @@
 		"navigationBarTitleText": "718友晟",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
-		"navigationStyle": "custom",
-		// #ifdef APP-PLUS
-		"style": {
-			"app-plus": {
-				"background":"#F5F5F5"
-			}
-		}
-		// #endif
+		"navigationStyle": "custom"
 	},
 	"tabBar": {
 		"color": "#919191",

src/pages/deviceAuth/deviceAuth.vue

@@ -80,7 +80,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 +93,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"});
@@ -210,14 +211,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,//当前版本号
@@ -402,6 +408,7 @@ const handleSubmit=()=>{
     border-bottom: 1px solid #E7E7E7;
 }
 
+
 :deep(.uni-forms-item__label){
     color:#239FDF;
     font-weight: bold;

src/pages/h5-webview/h5-webview.vue

@@ -1,71 +1,71 @@
 <template>
-<view>
+<view id="test">
+    <!-- #ifdef h5 -->
     <web-view :src="url"></web-view>
+    <!-- #endif -->
 </view>
 </template>
 
 <script setup>
 import { ref,onMounted,getCurrentInstance } from 'vue';
-import { onLoad,onReady } from '@dcloudio/uni-app';
+import { onLoad,onReady,onBackPress } from '@dcloudio/uni-app';
 const { proxy } = getCurrentInstance();
 
 let windowInfo = ref(null);
 let url = ref('');
 let title = ref('');
-//将要创建的webview对象
-let wv;
 onLoad(async(opt) => {
-    // console.log(opt)
+    console.log(opt)
     url.value = opt.url;
     title.value = opt.title;
-   
+    // #ifdef APP-PLUS
+    titleNViewWebview(url.value,title.value);
+    // #endif
+    // uni.getSystemInfo({
+    //     success: (res)=> {
+    //         windowInfo.value = res;
+    //         createWvAndLoadUrl(url.value,title.value);
+    //     }
+    // });
 })
 
-onReady(()=>{
-    setTimeout(()=>{
-        uni.setNavigationBarTitle({
-            title:title.value
-        })
-    },2000)
-})
 
-onMounted(() => {
-    uni.getSystemInfo({
-        success: (res)=> {
-            windowInfo.value = res;
-            createWvAndLoadUrl(url.value);
+
+// 带标题栏控件的Webview窗口
+let webview = null;
+function titleNViewWebview(url,title) {
+    webview = plus.webview.create(url, 'test',	{
+        titleNView: {
+            backgroundColor: '#307AF5',
+            titleText: title,
+            titleColor: '#ffffff',
+            autoBackButton: true,
+            backgroundImage:'./../../static/images/bg-Blue-header.png',
+            buttons:[{onclick:clickButton}]
         }
     });
-})
-
-/*创建web-view并加载url*/
-const createWvAndLoadUrl=(url)=>{
-    // #ifdef APP-PLUS
-    wv = plus.webview.create(url,"webview",{
-        // plusrequire:"none", //禁止远程网页使用plus的API，有些使用mui制作的网页可能会监听plus.key，造成关闭页面混乱，可以通过这种方式禁止
-        top: 0,//this.windowInfo.statusBarHeight + 126, //放置在titleNView下方。如果还想在webview上方加个地址栏的什么的，可以继续降低TOP值
-        scalable: true,
-        height: windowInfo.value.windowHeight - windowInfo.value.statusBarHeight //- 126
-    })
-    wv.addEventListener('loading', () => {
+    webview.addEventListener('close', function(){
+        webview=null;
+    });
+    webview.addEventListener('titleUpdate', function(){
+        webview.show();
+    });
+    webview.addEventListener('loading', () => {
         plus.nativeUI.showWaiting("loading...",{
             width:'110px',
             padding:'10px'
         })
     }, false);
     //plus.nativeUI.showWaiting()
-    wv.addEventListener('loaded', () => {
+    webview.addEventListener('loaded', () => {
         plus.nativeUI.closeWaiting();
     }, false);
+}
 
-    //wv.loadURL(url)
-    let currentWebview = proxy.$scope.$getAppWebview();
-    currentWebview = wv;
-    // console.log(wv)
-    // setTimeout(()=> {
-    // 	console.log(wv.getStyle())
-    // }, 1000);
-    // #endif 
+// 左侧按钮返回
+function clickButton(){
+	// plus.nativeUI.alert('clicked!');
+    webview=null;
 }
 </script>
 

src/pages/login/login.vue

@@ -73,7 +73,7 @@
 </template>
 
 <script setup>
-import { ref,onMounted } from 'vue';
+import { ref,onMounted,getCurrentInstance } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 import customTabs from '@/components/customTabs.vue';
 import {isPhoneNumber} from '@/utils/validate';
@@ -83,14 +83,17 @@ import { AGREEWELCOME_KEY } from '@/enums/cacheEnums';
 import { getNavBarPaddingTop} from '@/utils/system.js'
 import { useUserStore } from '@/stores/user';
 import encryptObj from '@/utils/encrypt.js'
-import { CLIENT_ID } from '@/enums/cacheEnums';
 import {showAlert} from '@/utils/message.js'
 
 // #ifdef APP-PLUS
 // 获取 存储手机的module 
 const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
 // #endif
-const userStore = useUserStore()
+
+const { proxy } = getCurrentInstance();
+const userStore = useUserStore();
+let clientId = `${proxy.$CLIENT_ID || 2}`;
+let networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
 onLoad(async(opt) => {
     uni.setStorageSync('page_cache',true);
 })
@@ -248,13 +251,13 @@ const submitForm = () => {
         // 用户名和密码登录
         form2.value.validate().then(async param => {
             param.loginType = activeTab.value;
-            let clientId = `${CLIENT_ID || "2"}`;
             param.clientId = clientId;
             let password = encryptObj.Encrypt(param.username + clientId + "," + param.password);
             param.password = password;
+            param.runEnv = networkEnv.value;
 
             // #ifdef H5
-            param.uniqCode = '7f47cfb4-59e2-4cb9-ac46-9da5e23c4de2';//uni.getStorageSync('app_device_id');//先从缓存取之后处理 '7f47cfb4-59e2-4cb9-ac46-9da5e23c4de2'//
+            param.uniqCode = 'e5687e80-526f-4522-ba7d-41d5db197a15';//h5测试用
             let res = await login(param);
             userStore.login(res);
             uni.switchTab({ url: '/pages/home/home' })