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/pages/deviceAuth/deviceAuth.vue b/src/pages/deviceAuth/deviceAuth.vue
index 2a14911..fbab04d 100644
--- a/src/pages/deviceAuth/deviceAuth.vue
+++ b/src/pages/deviceAuth/deviceAuth.vue
@@ -296,6 +296,7 @@ const inputRefs = ref([]);
const activeIndex = ref(0);//初始化焦点
let authCode = ref('')
const handleInput = (index, event) => {
+ activeIndex.value = index;
// 只允许数字输入
const value = event.detail.value.replace(/\D/g, '')
codes.value[index] = value
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index d779879..d0e9cc1 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -21,7 +21,7 @@
-
+
{{ backBlogObj.count1 }}
待办
@@ -136,7 +136,7 @@
-
+
@@ -326,10 +326,14 @@ const getCommonServices = async ()=>{
let data = await getUserFavorite({});
commonServiceList.value = data || []
}
-// 跳转
-let handleJump=(url)=>{
+// 跳转 type:1-tabbar
+let handleJump=(url,type)=>{
if(url){
+ if(type==1){
+ uni.switchTab({url});
+ }else{
uni.navigateTo({ url })
+ }
}
}
diff --git a/src/pages/loading/loading.vue b/src/pages/loading/loading.vue
index a177ab7..0b0475c 100644
--- a/src/pages/loading/loading.vue
+++ b/src/pages/loading/loading.vue
@@ -1,6 +1,8 @@
-
+
+ 企业内网
+
Version {{ appVersion }}
@@ -29,6 +31,7 @@ import {showAlert} from '@/utils/message.js'
import { useUserStore } from '@/stores/user';
const userStore = useUserStore();
const { proxy } = getCurrentInstance();
+const networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
// #ifdef APP-PLUS
// 获取 存储手机的module
@@ -58,13 +61,13 @@ onLoad(async(opt) => {
if(!versionVisible.value){
try {
// 授权设备存储
- let granted = requestAndroidPermission(systemInfo);
- if(granted){
+ // let granted = requestAndroidPermission(systemInfo);
+ // if(granted){
// showAlert("22授权成功！")
- setTimeout(()=>{
+ // setTimeout(()=>{
selectDeviceId();
- },500)
- }
+ // },500)
+ // }
} catch (error) {
console.error('权限请求出错:', error);
// showAlert(JSON.stringify(error))
@@ -100,12 +103,7 @@ const getOSVesion = async()=>{
// #ifdef H5
verNumber : systemInfo.appVersion,
// #endif
- // deviceType:systemInfo.model,//型号
os: formatIOS(systemInfo.osName),//操作系统 Android IOS
- // osVersion:systemInfo.osVersion,//操作系统版本
- // resolution:systemInfo.windowWidth+"*"+systemInfo.windowHeight,//分辨率
- // trademark:systemInfo.deviceBrand,//设备品牌
- // uniqueCode:systemInfo.deviceId//设备ID
}
// 当前手机版本
appVersion.value = param.verNumber;
@@ -137,40 +135,44 @@ const selectDeviceId = async()=>{
// let deviceId = uni.getStorageSync('app_device_id');// 本地设备ID
try {
safeSave.getSafeFile({ "key": "app_device_id" }, res2 => {
+ // showAlert(JSON.stringify(res2));
if (res2.code == 1) {
let deviceId = res2.data;
- console.log("读取成功=>",deviceId)
// showAlert("读取成功=>"+deviceId);
- getBindStatus({uniqCode:deviceId}).then(res=>{
- let bindStatus = res.bindStatus
- // setTimeout(()=>{
- // 绑定状态（1=已提交、2=等待审核、3=审核通过、4=绑定成功、5=审核拒绝）
- if(bindStatus == 4){
- // 检查是否已登录 并 获取用户信息
- if (userStore.isLogin) {
- uni.reLaunch({
- url: '/pages/home/home',
- });
-
+ if(deviceId!=""){
+ getBindStatus({uniqCode:deviceId}).then(res=>{
+ let bindStatus = res.bindStatus
+ // setTimeout(()=>{
+ // 绑定状态（1=已提交、2=等待审核、3=审核通过、4=绑定成功、5=审核拒绝）
+ if(bindStatus == 4){
+ // 检查是否已登录 并 获取用户信息
+ if (userStore.isLogin) {
+ uni.reLaunch({
+ url: '/pages/home/home',
+ });
+
+ }else{
+ uni.reLaunch({
+ url: '/pages/login/login',
+ });
+ }
}else{
uni.reLaunch({
- url: '/pages/login/login',
+ url: '/pages/deviceAuth/deviceAuth',
});
}
- }else{
- uni.reLaunch({
- url: '/pages/deviceAuth/deviceAuth',
- });
- }
- // },1000)
- });
- } else {
- // showAlert('读取失败:'+res2.msg)
- // setTimeout(()=>{
+ // },1000)
+ });
+ }else{
uni.reLaunch({
url: '/pages/deviceAuth/deviceAuth',
});
- // },1000)
+ }
+
+ } else {
+ uni.reLaunch({
+ url: '/pages/deviceAuth/deviceAuth',
+ });
}
})
} catch (error) {
@@ -206,12 +208,22 @@ const handleClose=()=>{
position: relative;
padding-top:100px;
}
+
.container .bg{
background:url('@/static/images/loading-logo.png') no-repeat;
background-size:700rpx 800rpx;
width: 700rpx;
height: 800rpx;
margin:0 auto;
+ position: relative;
+}
+.container .bg .env-txt{
+ position: absolute;
+ right: 35rpx;
+ top:10rpx;
+ color:#fff;
+ font-size: 36rpx;
+ font-weight: bold;
}
.container .version{
color:#A8D4FF;
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index c28b951..5764cae 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -3,7 +3,8 @@
- 欢迎来到718友晟
+ 718友晟企业内网
+ 欢迎来到718友晟
@@ -257,7 +258,7 @@ const submitForm = () => {
param.runEnv = networkEnv.value;
// #ifdef H5
- param.uniqCode = '7666ac20-827a-4c23-8e2e-fbbf24564fc0';//h5测试用 内网-sn123456 外网-7666ac20-827a-4c23-8e2e-fbbf24564fc0
+ param.uniqCode = 'b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9';//h5测试用 内网-sn123456 外网-b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9
let res = await login(param);
userStore.login(res);
uni.switchTab({ url: '/pages/home/home' })
@@ -329,6 +330,12 @@ const submitForm = () => {
margin: 0 0 35rpx 70rpx;
}
+.login-con .login-title text:not(:last-child)::after {
+ content: "·";
+ margin: 0 10px;
+ color: #fff;
+}
+
:deep(.login-tab .tabs-header) {
background: none !important;
border-bottom: none !important;
diff --git a/src/pages/userinfo/userinfo.vue b/src/pages/userinfo/userinfo.vue
index 7122dbd..30b34a6 100644
--- a/src/pages/userinfo/userinfo.vue
+++ b/src/pages/userinfo/userinfo.vue
@@ -2,14 +2,18 @@
+
+
+
+
+
-
-
-
![]()
@@ -91,9 +95,8 @@
-
+
-