isoftstone/jnpf_app
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 端点登录

Browse Source
This commit is contained in:
caijun
2026-01-25 20:22:58 +08:00
parent f9e1a0cc18
commit f43f2ff3c2
12 changed files with 551 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/common.js
View File

@@ -90,6 +90,15 @@ export function getAdapterUserList(data, options) {
} }
}) })
} }
// 社交授权的跳转
export function socialAuthRedirect(type, redirectUri) {
return request({
url: '/admin-api/system/auth/social-auth-redirect?type=' + type + '&redirectUri=' + redirectUri,
method: 'GET'
})
}
// 获取人员角色 // 获取人员角色
export function getAdapterRoleList() { export function getAdapterRoleList() {
return request({ return request({
@@ -239,13 +248,18 @@ export function getPermissionInfo() {
} }
// 获取token // 获取token
export function socialLogin(token) { export function socialLogin(type, code, state) {
console.log(type,code,state,'data数据---')
return request({ return request({
url: '/admin-api/system/auth/social-login', url: '/admin-api/system/auth/social-login',
method: 'post', method: 'post',
token, data: {
type,
code,
state
},
header: { header: {
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/json',
} }
}) })
} }

469
manifest.json
View File

@@ -1,237 +1,238 @@
{ {
"name": "jnpf java vue3版", "name" : "jnpf java vue3版",
"appid": "__UNI__663111E", "appid" : "__UNI__55507A7",
"description": "专注信息化平台、软件开发、app开发", "description" : "专注信息化平台、软件开发、app开发",
"versionName": "1.0.0", "versionName" : "1.0.0",
"versionCode": "100", "versionCode" : "100",
"transformPx": false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus": { "app-plus" : {
"usingComponents": true, "usingComponents" : true,
"nvueStyleCompiler": "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion": 3, "compilerVersion" : 3,
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": false, "alwaysShowBeforeRender" : false,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules": { "modules" : {
"Barcode": {}, "Barcode" : {},
"Camera": {}, "Camera" : {},
"Maps": {}, "Maps" : {},
"OAuth": {}, "OAuth" : {},
"Push": {}, "Push" : {},
"Record": {}, "Record" : {},
"VideoPlayer": {} "VideoPlayer" : {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute": { "distribute" : {
/* android打包配置 */ /* android打包配置 */
"android": { "android" : {
"permissions": [ "permissions" : [
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>", "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>", "<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>", "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>", "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"schemes": "jnpf", "schemes" : "jnpf",
"minSdkVersion": 22, "minSdkVersion" : 22,
"targetSdkVersion": 26, "targetSdkVersion" : 26,
"abiFilters": ["armeabi-v7a", "arm64-v8a"] "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios": { "ios" : {
"privacyDescription": { "privacyDescription" : {
"NSPhotoLibraryUsageDescription": "以便于修改头像等功能图片上传", "NSPhotoLibraryUsageDescription" : "以便于修改头像等功能图片上传",
"NSPhotoLibraryAddUsageDescription": "以便于修改头像等功能图片上传", "NSPhotoLibraryAddUsageDescription" : "以便于修改头像等功能图片上传",
"NSCameraUsageDescription": "以便于修改头像等功能图片上传", "NSCameraUsageDescription" : "以便于修改头像等功能图片上传",
"NSMicrophoneUsageDescription": "以便于使用语音、录制音频等功能", "NSMicrophoneUsageDescription" : "以便于使用语音、录制音频等功能",
"NSLocationWhenInUseUsageDescription": "以便于定位当前位置等功能", "NSLocationWhenInUseUsageDescription" : "以便于定位当前位置等功能",
"NSLocationAlwaysUsageDescription": "以便于定位当前位置等功能", "NSLocationAlwaysUsageDescription" : "以便于定位当前位置等功能",
"NSLocationAlwaysAndWhenInUseUsageDescription": "以便于定位当前位置等功能", "NSLocationAlwaysAndWhenInUseUsageDescription" : "以便于定位当前位置等功能",
"NSCalendarsUsageDescription": "以便于更好的办公", "NSCalendarsUsageDescription" : "以便于更好的办公",
"NSContactsUsageDescription": "以便于更好的沟通", "NSContactsUsageDescription" : "以便于更好的沟通",
"NSAppleMusicUsageDescription": "以便于修改头像等功能媒体资料上传", "NSAppleMusicUsageDescription" : "以便于修改头像等功能媒体资料上传",
"NSFaceIDUsageDescription": "以便于使用快捷登录等功能" "NSFaceIDUsageDescription" : "以便于使用快捷登录等功能"
}, },
"urltypes": "jnpf", "urltypes" : "jnpf",
"capabilities": { "capabilities" : {
"entitlements": { "entitlements" : {
"com.apple.developer.associated-domains": ["applinks:unlink.java.jnpfsoft.com"] "com.apple.developer.associated-domains" : [ "applinks:unlink.java.jnpfsoft.com" ]
} }
}, },
"idfa": false "idfa" : false
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs": { "sdkConfigs" : {
"maps": { "maps" : {
"amap": { "amap" : {
"name": "amapOdpt2hGy", "name" : "amapOdpt2hGy",
"appkey_ios": "", "appkey_ios" : "",
"appkey_android": "" "appkey_android" : ""
} }
}, },
"oauth": { "oauth" : {
"weixin": { "weixin" : {
"appid": "wx8f5cb90d8ff960a3", "appid" : "wx8f5cb90d8ff960a3",
"UniversalLinks": "" "UniversalLinks" : ""
} }
}, },
"push": { "push" : {
"unipush": { "unipush" : {
"version": "2", "version" : "2",
"offline": false "offline" : false
} }
} }
}, },
"splashscreen": { "splashscreen" : {
"androidStyle": "default", "androidStyle" : "default",
"android": { "android" : {
"hdpi": "unpackage/res/startup/480x762.png", "hdpi" : "unpackage/res/startup/480x762.png",
"xhdpi": "unpackage/res/startup/720x1242.png", "xhdpi" : "unpackage/res/startup/720x1242.png",
"xxhdpi": "unpackage/res/startup/1080x1882.png" "xxhdpi" : "unpackage/res/startup/1080x1882.png"
}, },
"iosStyle": "default", "iosStyle" : "default",
"ios": { "ios" : {
"iphone": { "iphone" : {
"portrait-896h@3x": "unpackage/res/startup/1242x2688.png", "portrait-896h@3x" : "unpackage/res/startup/1242x2688.png",
"landscape-896h@3x": "unpackage/res/startup/1242x2688.png", "landscape-896h@3x" : "unpackage/res/startup/1242x2688.png",
"portrait-896h@2x": "unpackage/res/startup/1242x2688.png", "portrait-896h@2x" : "unpackage/res/startup/1242x2688.png",
"landscape-896h@2x": "unpackage/res/startup/1242x2688.png", "landscape-896h@2x" : "unpackage/res/startup/1242x2688.png",
"iphonex": "unpackage/res/startup/startup.png", "iphonex" : "unpackage/res/startup/startup.png",
"iphonexl": "unpackage/res/startup/1242x2688.png", "iphonexl" : "unpackage/res/startup/1242x2688.png",
"retina55": "unpackage/res/startup/1242x2688.png", "retina55" : "unpackage/res/startup/1242x2688.png",
"retina55l": "unpackage/res/startup/1242x2688.png", "retina55l" : "unpackage/res/startup/1242x2688.png",
"retina47": "unpackage/res/startup/1242x2688.png", "retina47" : "unpackage/res/startup/1242x2688.png",
"retina47l": "unpackage/res/startup/1242x2688.png", "retina47l" : "unpackage/res/startup/1242x2688.png",
"retina40": "unpackage/res/startup/1242x2688.png", "retina40" : "unpackage/res/startup/1242x2688.png",
"retina40l": "unpackage/res/startup/1242x2688.png", "retina40l" : "unpackage/res/startup/1242x2688.png",
"retina35": "unpackage/res/startup/1242x2688.png" "retina35" : "unpackage/res/startup/1242x2688.png"
}, },
"ipad": { "ipad" : {
"portrait-1366h@2x": "", "portrait-1366h@2x" : "",
"landscape-1366h@2x": "" "landscape-1366h@2x" : ""
} }
} }
}, },
"icons": { "icons" : {
"android": { "android" : {
"hdpi": "unpackage/res/icons/72x72.png", "hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png", "xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png", "xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png" "xxxhdpi" : "unpackage/res/icons/192x192.png"
}, },
"ios": { "ios" : {
"appstore": "unpackage/res/icons/1024x1024.png", "appstore" : "unpackage/res/icons/1024x1024.png",
"ipad": { "ipad" : {
"app": "unpackage/res/icons/76x76.png", "app" : "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png", "app@2x" : "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png", "notification" : "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png", "proapp@2x" : "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png", "settings" : "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png", "spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png" "spotlight@2x" : "unpackage/res/icons/80x80.png"
}, },
"iphone": { "iphone" : {
"app@2x": "unpackage/res/icons/120x120.png", "app@2x" : "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png", "app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png", "notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png", "settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png", "spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png" "spotlight@3x" : "unpackage/res/icons/120x120.png"
} }
} }
} }
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp": {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin": { "mp-weixin" : {
"appid": "wx8f5cb90d8ff960a3", "appid" : "wx8f5cb90d8ff960a3",
"setting": { "setting" : {
"urlCheck": true, "urlCheck" : true,
"es6": true, "es6" : true,
"postcss": true, "postcss" : true,
"minified": true "minified" : true
}, },
"usingComponents": true, "usingComponents" : true,
"permission": { "permission" : {
"scope.userLocation": { "scope.userLocation" : {
"desc": "你的位置信息将用于小程序位置接口的效果展示" "desc" : "你的位置信息将用于小程序位置接口的效果展示"
} }
}, },
"requiredPrivateInfos": ["getLocation", "chooseLocation"] "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
}, },
"mp-alipay": { "mp-alipay" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-baidu": { "mp-baidu" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-toutiao": { "mp-toutiao" : {
"usingComponents": true "usingComponents" : true
}, },
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
}, },
"vueVersion": "3", "vueVersion" : "3",
"h5": { "h5" : {
"devServer": { "devServer" : {
"port": 5001 "port" : 5001
}, },
"title": "jnpf java vue3版", "title" : "jnpf java vue3版",
"router": { "router" : {
"mode": "history" "mode" : "history"
}, },
"optimization": { "optimization" : {
"treeShaking": { "treeShaking" : {
"enable": true "enable" : true
} }
}, },
"sdkConfigs": { "sdkConfigs" : {
"maps": { "maps" : {
"amap": { "amap" : {
"key": "", "key" : "",
"securityJsCode": "", "securityJsCode" : "",
"serviceHost": "" "serviceHost" : ""
} }
} }
} }
}, },
"locale": "zh-Hans", "locale" : "zh-Hans",
"fallbackLocale": "zh-Hans", "fallbackLocale" : "zh-Hans",
"app-harmony": { "app-harmony" : {
"distribute": { "distribute" : {
"bundleName": "com.jnpf.java", "bundleName" : "com.jnpf.java",
"modules": { "modules" : {
"uni-push": {} "uni-push" : {}
} }
} }
} }
} }
/* 5+App特有相关 */ /* 5+App特有相关 */

33
pages/apply/dynamicModelList/form.vue
View File

@@ -56,13 +56,16 @@
</view> </view>
<!-- 底部操作按钮区域 --> <!-- 底部操作按钮区域 -->
<view v-if="!loading && (!(dataForm.approveStatus == 1 || dataForm.approveStatus == 2 || dataForm.approveStatus == 4) || !dataForm.id || config.current && config.current == 2)" class="buttom-actions"> <view v-if="!loading && (dataForm.approveStatus != 4 || !dataForm.id || config.current && config.current == 2) && !isProcess" class="buttom-actions">
<u-button v-if="(!dataForm.approveStatus && dataForm.id) || dataForm.approveStatus == 3" class="buttom-btn launch-flow-btn" type="primary" @click.stop="handleLaunchFlow" :disabled="idDsabled" :loading="btnLoading"> <u-button v-if="(!dataForm.approveStatus && dataForm.id) || dataForm.approveStatus == 3" class="buttom-btn launch-flow-btn" type="primary" @click.stop="handleLaunchFlow" :disabled="idDsabled" :loading="btnLoading">
发起流程 发起流程
</u-button> </u-button>
<u-button v-if="!config.current" class="buttom-btn" type="primary" @click.stop="submit" :disabled="idDsabled" :loading="btnLoading"> <u-button v-if="!config.current && !dataForm.approveStatus" class="buttom-btn" type="primary" @click.stop="submit" :disabled="idDsabled" :loading="btnLoading">
保存 保存
</u-button> </u-button>
<u-button v-if="!config.current && (dataForm.approveStatus == 1 || dataForm.approveStatus == 2)" class="buttom-btn" type="primary" @click.stop="goProcess">
查看流程
</u-button>
<u-button v-if="config.current == 2" class="buttom-btn" type="error" @click.stop="handleFail" :disabled="idDsabled" :loading="btnLoading"> <u-button v-if="config.current == 2" class="buttom-btn" type="error" @click.stop="handleFail" :disabled="idDsabled" :loading="btnLoading">
不通过 不通过
</u-button> </u-button>
@@ -344,6 +347,7 @@
currentProcessId: '', currentProcessId: '',
selectedCandidates: {}, selectedCandidates: {},
approvalData: [], // 存储审批记录 approvalData: [], // 存储审批记录
isProcess: false, // 点击查看流程
//审批意见弹窗相关数据 //审批意见弹窗相关数据
showApprovalReasonDialog: false, // 弹窗显示状态 showApprovalReasonDialog: false, // 弹窗显示状态
@@ -381,7 +385,7 @@
}, },
isApproval(){ isApproval(){
const {current} = this.config const {current} = this.config
return !!current return !!current || this.isProcess
} }
}, },
onLoad(option) { onLoad(option) {
@@ -426,7 +430,7 @@
const getNavigationTitle = () =>{ const getNavigationTitle = () =>{
let titleName = '' let titleName = ''
if(this.config.current){ if(this.config.current || this.isProcess){
titleName = this.config.name + '详情' titleName = this.config.name + '详情'
}else { }else {
const name = this.dataForm.id ? this.$t('common.editText') : this.$t('common.addText') const name = this.dataForm.id ? this.$t('common.editText') : this.$t('common.addText')
@@ -483,8 +487,19 @@
getListCreateData(params){ getListCreateData(params){
getListCreate(params,this.modelId).then(res=>{ getListCreate(params,this.modelId).then(res=>{
if(res.code == 0) { if(res.code == 0) {
// const name = this.approvalType == 'through' ? '申请通过成功' '发起成功'
let name = '发起成功'
switch(this.approvalType){
case 'through':
name = '审批通过成功'
break;
case 'fail':
name = '审批不通过成功'
break;
}
uni.showToast({ uni.showToast({
title: '发起成功', title: name,
icon: 'success' icon: 'success'
}) })
setTimeout(() => { setTimeout(() => {
@@ -743,6 +758,14 @@
this.approvalReason = '' // 清空之前的意见 this.approvalReason = '' // 清空之前的意见
this.showApprovalReasonDialog = true this.showApprovalReasonDialog = true
}, },
// 查看流程
goProcess(){
this.isProcess = true
console.log(this.config,'config-')
uni.setNavigationBarTitle({
title: `${this.config.name}流程详情`
})
},
// 提交审批结果（通过/不通过） // 提交审批结果（通过/不通过）
async submitApprovalResult() { async submitApprovalResult() {

18
pages/index/indexWork.vue
View File

@@ -94,6 +94,10 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="todoList.length > 2" class="todo-more" @click="openToDoPage">
更多
<u-icon name="arrow-down" class="u-p-r-10"color="#666"></u-icon>
</view>
</scroll-view> </scroll-view>
<view class="empty-container" v-else> <view class="empty-container" v-else>
<view> <view>
@@ -398,7 +402,7 @@
getDonePage() { getDonePage() {
const params = { const params = {
pageNo:1, pageNo:1,
pageSize: 3 pageSize: 2000
} }
getDonePage(params).then(res=>{ getDonePage(params).then(res=>{
const {code,data} = res const {code,data} = res
@@ -408,7 +412,7 @@
index: 1, // 待办任务的tab索引 index: 1, // 待办任务的tab索引
text: res.data.total.toString() // 角标数字 text: res.data.total.toString() // 角标数字
}); });
this.todoList = data.list || [] this.todoList = data.list.slice(0,3) || []
} }
}) })
}, },
@@ -585,7 +589,7 @@
/* 滚动容器样式 */ /* 滚动容器样式 */
.todo-scroll-container { .todo-scroll-container {
width: 100%; width: 100%;
max-height: 680rpx !important; max-height: 780rpx !important;
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 4rpx; width: 4rpx;
} }
@@ -594,6 +598,12 @@
border-radius: 2rpx; border-radius: 2rpx;
} }
} }
.todo-more {
text-align: center;
color: #666;
font-size: 28rpx;
margin-top: 5rpx;
}
.todo-item { .todo-item {
// display: flex; // display: flex;
align-items: flex-start; align-items: flex-start;
@@ -652,7 +662,7 @@
} }
.title-right { .title-right {
align-items: center; align-items: center;
font-size: 24rpx; font-size: 28rpx;
color: #666; color: #666;
} }
/* 滚动容器 */ /* 滚动容器 */

2
pages/index/my.vue
View File

@@ -267,7 +267,7 @@
userStore.logout().then(() => { userStore.logout().then(() => {
uni.closeSocket() uni.closeSocket()
uni.reLaunch({ uni.reLaunch({
url: '/pages/login/index' url: '/pages/login/index?socialLogin=true'
}) })
}) })
this.removeAccount() this.removeAccount()

164
pages/login/index.vue
View File

@@ -17,7 +17,7 @@
</view> </view>
<view class="logo-hd u-flex-col"> <view class="logo-hd u-flex-col">
<view class="loginSwitch u-flex-col"> <view class="loginSwitch u-flex-col">
<view class="loginInputBox u-flex-col" v-show="!isSso && !ssoLoading"> <view class="loginInputBox u-flex-col" v-show=" true || !isSso && !ssoLoading">
<u-form :model="formData" :rules="rules" ref="dataForm" :errorType="['toast']" label-position="left" <u-form :model="formData" :rules="rules" ref="dataForm" :errorType="['toast']" label-position="left"
label-width="150" label-align="left"> label-width="150" label-align="left">
<u-form-item v-show="false" prop="account" :borderBottom="false"> <u-form-item v-show="false" prop="account" :borderBottom="false">
@@ -49,9 +49,9 @@
<view class="remember-wrap"> <view class="remember-wrap">
<u-checkbox v-model="remember"><span class="remember-text">记住账号密码</span></u-checkbox> <u-checkbox v-model="remember"><span class="remember-text">记住账号密码</span></u-checkbox>
</view> </view>
<view class="remember-wrap"> <!-- <view class="remember-wrap">
<u-checkbox v-model="isCertify"><span class="remember-text">是否认证</span></u-checkbox> <u-checkbox v-model="isCertify"><span class="remember-text">是否认证</span></u-checkbox>
</view> </view> -->
<view class="loginBtnBox"> <view class="loginBtnBox">
<u-button @click="login" type="primary" :loading="loading">{{ loading ? "登录中...":"登录"}} <u-button @click="login" type="primary" :loading="loading">{{ loading ? "登录中...":"登录"}}
</u-button> </u-button>
@@ -130,7 +130,8 @@
getLoginConfig, getLoginConfig,
getSocialsUserList, getSocialsUserList,
socialsLogin, socialsLogin,
getTicket getTicket,
socialAuthRedirect
} from '@/api/common.js' } from '@/api/common.js'
import md5Libs from "@/uni_modules/vk-uview-ui/libs/function/md5"; import md5Libs from "@/uni_modules/vk-uview-ui/libs/function/md5";
import resources from '@/libs/resources' import resources from '@/libs/resources'
@@ -171,7 +172,7 @@
}, },
sysConfigInfo: {}, sysConfigInfo: {},
appIcon: '', appIcon: '',
sysName: '', sysName: '综合监控系统',
copyright: '综合监控系统', copyright: '综合监控系统',
socialsList: [], socialsList: [],
show: false, show: false,
@@ -183,7 +184,8 @@
preUrl: '', preUrl: '',
ticketParams: "", ticketParams: "",
loginCode: '', loginCode: '',
isKeyUp: true isKeyUp: true,
ssoOptions: {} // 端点登录参数
} }
}, },
watch: { watch: {
@@ -209,43 +211,59 @@
this.$refs.dataForm.setRules(this.rules); this.$refs.dataForm.setRules(this.rules);
}, },
onLoad(options) { onLoad(options) {
if (options?.JNPF_TICKET) { this.ssoOptions = options
this.ssoTicket = options.JNPF_TICKET if(options.code){
uni.navigateTo({ this.exchangeToken(options)
url: `/pages/login/otherLogin?ssoTicket=${this.ssoTicket}` }else if(options.socialLogin){
}) this.getLogin()
} }
this.ssoTicket = uni.getStorageSync('ssoTicket') else{
this.sysConfigInfo = uni.getStorageSync('sysConfigInfo') this.certifyLogin()
console.log(this.define,'define-------------') }
this.appIcon = !!this.sysConfigInfo.appIcon ? this.baseURL + this.sysConfigInfo.appIcon :
logoImg // if(JSON.stringify(options) == '{}'){
this.sysName = !!this.sysConfigInfo.companyName ? this.sysConfigInfo.sysName : // // 端点登录
'JNPF快速开发平台' // this.certifyLogin()
// this.copyright = !!this.sysConfigInfo.copyright ? this.sysConfigInfo.copyright : // }else {
// this.define.copyright // this.getLogin()
// this.copyright = !!this.sysConfigInfo.copyright && this.sysConfigInfo.copyright // }
// if (options?.JNPF_TICKET) {
// this.ssoTicket = options.JNPF_TICKET
// uni.navigateTo({
// url: `/pages/login/otherLogin?ssoTicket=${this.ssoTicket}`
// })
// }
// this.ssoTicket = uni.getStorageSync('ssoTicket')
// this.sysConfigInfo = uni.getStorageSync('sysConfigInfo')
// console.log(this.define,'define-------------')
// this.appIcon = !!this.sysConfigInfo.appIcon ? this.baseURL + this.sysConfigInfo.appIcon :
// logoImg
// this.sysName = !!this.sysConfigInfo.companyName ? this.sysConfigInfo.sysName :
// '综合监控系统'
// // this.copyright = !!this.sysConfigInfo.copyright ? this.sysConfigInfo.copyright :
// // this.define.copyright
// // this.copyright = !!this.sysConfigInfo.copyright && this.sysConfigInfo.copyright
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.sysName title: this.sysName
}) })
let needCode = uni.getStorageSync('app_loginNeedCode') // let needCode = uni.getStorageSync('app_loginNeedCode')
this.isCode = needCode // this.isCode = needCode
this.changeCode() // this.changeCode()
// this.getLoginConfig() // this.getLoginConfig()
this.formData.password = ''; // this.formData.password = '';
if (options.data) { // if (options.data) {
this.tenantUserInfo = JSON.parse(options.data) // this.tenantUserInfo = JSON.parse(options.data)
// if (this.tenantUserInfo) this.show = true // // if (this.tenantUserInfo) this.show = true
} // }
this.initAccount() // this.initAccount()
// #ifndef H5 // // #ifndef H5
uni.onKeyboardHeightChange(res => { // uni.onKeyboardHeightChange(res => {
this.isKeyUp = res.height == 0 ? true : false // this.isKeyUp = res.height == 0 ? true : false
return this.isKeyUp // return this.isKeyUp
}) // })
// #endif // // #endif
this.initLoginConfig() // this.initLoginConfig()
}, },
methods: { methods: {
initAccount() { initAccount() {
@@ -499,30 +517,18 @@
this.imgUrl = `/api/oauth/ImageCode/${this.codeLength || 4}/${timestamp}` this.imgUrl = `/api/oauth/ImageCode/${this.codeLength || 4}/${timestamp}`
}, },
login() { login() {
if(this.ssoOptions.socialLogin){
this.$refs.dataForm.validate(valid => { this.$refs.dataForm.validate(valid => {
if (valid) { if (valid) {
this.loading = true this.loading = true
const password = md5Libs.md5(this.formData.password); const password = md5Libs.md5(this.formData.password);
const encryptPassword = this.jnpf.aesEncryption.encrypt(password); const encryptPassword = this.jnpf.aesEncryption.encrypt(password);
// let query = {
// account: this.formData.account,
// password: encryptPassword,
// timestamp: this.timestamp,
// code: this.formData.code,
// origin: this.formData.origin,
// jnpf_ticket: this.ssoTicket,
// grant_type: 'password',
// }
if(this.isCertify){
// 认证登录
this.certifyLogin()
}else {
this.getLogin() this.getLogin()
} }
});
} return
}); }
this.certifyLogin()
}, },
// 普通登录 // 普通登录
getLogin(){ getLogin(){
@@ -540,8 +546,9 @@
// query.Client_Id = uni.getStorageSync('cid') // query.Client_Id = uni.getStorageSync('cid')
// #endif // #endif
login(query).then(res => { login(query).then(res => {
let token = res.data.accessToken const {accessToken,refreshToken} = res.data
userStore.setToken(token) userStore.setToken(accessToken)
userStore.setRefreshToken(refreshToken)
this.rememberAccount() this.rememberAccount()
if(res.code == 0){ if(res.code == 0){
getPermissionInfo().then(res=>{ getPermissionInfo().then(res=>{
@@ -576,33 +583,24 @@
}) })
}, },
// 认证登录 // 认证登录
certifyLogin(){ async certifyLogin(){
lx.biz.getAuthCode({ let type = '100'
appId: "8889088-16130048", // AppID let redirectUri = location.origin + '/pages/login/index?' + encodeURIComponent(`type=${type}&redirect=/`)
success: (res) => { const res = await socialAuthRedirect(type,encodeURIComponent(redirectUri))
console.log('免登授权码：', res.authCode) console.log(res,'res-------')
this.exchangeToken(res.authCode) window.location.href = res.data
},
fail: (err) => {
console.error('获取免登授权码失败：', err)
uni.showToast({
title: '免登失败，请重试',
icon: 'none'
})
this.loading = false
}
})
}, },
async exchangeToken(authCode) { async exchangeToken(options) {
try { try {
const type = '110' const type = '100'
const code = authCode const code = '1222' || options?.code
const state = this.uuid() const state = this.uuid() || options?.state
const res = await socialLogin(type, code, state) const res = await socialLogin(type, code, state)
const {accessToken,refreshToken} = res.data
const userStore = useUserStore() const userStore = useUserStore()
// 存储Token和用户信息 // 存储Token和用户信息
userStore.setToken(res) userStore.setToken(accessToken)
userStore.setRefreshToken(refreshToken)
uni.switchTab({ uni.switchTab({
url: '/pages/index/indexWork' url: '/pages/index/indexWork'
}); });

4
pages/my/abouts/index.vue
View File

@@ -10,9 +10,7 @@
</view> </view>
<view class="content u-p-l-32 u-p-r-32 u-p-t-30 u-font-28"> <view class="content u-p-l-32 u-p-r-32 u-p-t-30 u-font-28">
<text>引迈信息技术有限公司是一家做快速开发平台的企业，针对软件传统开发遇到招人难、留人难、用人成本高、技术更新换代快等一系列问题，只需要一套JNPF平台、您遇到的一系列问题就依然而解。 <text>软通动力！</text>
JNPF采用主流的两大技术Java/.Net开发，是一套低代码开发平台，可视化开发环境，有拖拽式的代码生成器，灵活的权限配置、SaaS服务，强大的接口对接，随心可变的工作流引擎，一站式开发多端使用Web、Android、IOS、微信小程序，并且有以构建业务流程、逻辑和数据模型等所需的功能；为企业项目节省80%的重回工作，让开发者将重心放在业务逻辑，不必烦恼底层架构设计，可短时间开发出如ERP、OA、CRM、HR、MIS以及电信、银行、政府、企业等各行业的企业应用系统。
引迈信息技术有限公司以诚信为根本、服务为基础理念，通过持续不断地研发技术创新、强化平台质量和颜值，为企业保驾护航！</text>
</view> </view>
<view class="copyright">{{copyright}}</view> <view class="copyright">{{copyright}}</view>
</view> </view>

BIN
static/image/logoT.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 192 KiB

BIN
static/image/logoT.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 835 KiB

5
store/modules/user.js
View File

@@ -12,6 +12,7 @@ export const useUserStore = defineStore({
id: 'user', id: 'user',
state: () => ({ state: () => ({
token: "", token: "",
refreshToken: "",
userInfo: {}, userInfo: {},
menuList: [], menuList: [],
tenantId: '', tenantId: '',
@@ -38,6 +39,10 @@ export const useUserStore = defineStore({
this.token = token this.token = token
uni.setStorageSync('token', token) uni.setStorageSync('token', token)
}, },
setRefreshToken(refreshToken) {
this.refreshToken = refreshToken
uni.setStorageSync('refreshToken', refreshToken)
},
setCid(cid) { setCid(cid) {
this.cid = cid this.cid = cid
uni.setStorageSync('cid', cid) uni.setStorageSync('cid', cid)

10
utils/define.js
View File

@@ -1,10 +1,10 @@
/* process.env.NODE_ENV设置生产环境模式 */ /* process.env.NODE_ENV设置生产环境模式 */
// #ifndef MP // #ifndef MP
const baseURL = process.env.NODE_ENV === "production" ? "http://10.0.64.25:48080" : "http://10.28.117.48:48080" const baseURL = process.env.NODE_ENV === "production" ? "http://10.0.64.25:48080" : "http://10.0.64.25:48080"
const webSocketUrl = process.env.NODE_ENV === "production" ? "http://10.0.64.25:48080" : const webSocketUrl = process.env.NODE_ENV === "production" ? "http://10.0.64.25:48080" :
"ws://10.28.117.183:30000/api/message/websocket" "ws://10.0.64.25:48080/api/message/websocket"
const report = process.env.NODE_ENV === 'production' ? 'http://10.0.64.25:48080' : 'http://10.28.117.183:8200' const report = process.env.NODE_ENV === 'production' ? 'http://10.0.64.25:48080' : 'http://10.0.64.25:48080'
const pcURL = process.env.NODE_ENV === 'production' ? 'http://10.0.64.25:48080' : 'http://10.28.117.183:3000' const pcURL = process.env.NODE_ENV === 'production' ? 'http://10.0.64.25:48080' : 'http://10.0.64.25:48080'
// #endif // #endif
// #ifdef MP // #ifdef MP
@@ -15,7 +15,7 @@ const pcURL = process.env.NODE_ENV === 'production' ? 'http://10.0.64.25:48080'
// #endif // #endif
console.log(process.env.NODE_ENV === "production",'判断环境----------') console.log(process.env.NODE_ENV === "production",'判断环境----------')
const define = { const define = {
copyright: "Copyright @ 2025 引迈信息技术有限公司版权所有", copyright: "Copyright @ 2026 软通动力",
sysVersion: "V6.0", sysVersion: "V6.0",
baseURL, // 接口前缀 baseURL, // 接口前缀
report, report,

266
utils/request.js
View File

@@ -1,119 +1,177 @@
import define from './define' import define from './define'
import { import { useLocale } from '@/locale/useLocale';
useLocale
} from '@/locale/useLocale';
const { const { getBackLocale } = useLocale();
getBackLocale
} = useLocale();
let host = define.baseURL let host = define.baseURL
const defaultOpt = { const defaultOpt = { load: true }
load: true
}
// 示例 // ------------- token刷新核心配置 -------------
// async xxxx(code) { const whiteList = ['/login', '/system/auth/refresh-token']
// var res = await this.request({ let requestQueue = []
// url: '/api/System/DictionaryData/All', let isRefreshingToken = false
// method: 'GET', const isRelogin = { show: false }
// data,
// options: {
// load: false
// }
// })
// if (!res) return
// console.log(res)
// }
// ------------- 核心request方法 -------------
function request(config) { function request(config) {
config.options = Object.assign(defaultOpt, config.options) config.options = Object.assign(defaultOpt, config.options)
const token = uni.getStorageSync('token') || '' const token = uni.getStorageSync('token') || ''
const tenantId = uni.getStorageSync('tenantId') || '' const refreshToken = uni.getStorageSync('refreshToken') || ''
const systemCode = uni.getStorageSync('systemCode') || '' const tenantId = '1' || uni.getStorageSync('tenantId')
const locale = getBackLocale() const systemCode = uni.getStorageSync('systemCode') || ''
let header = { const locale = getBackLocale()
"accept" : 'application/json, text/plain, */*',
"App-Code": systemCode,
"Content-Type": "application/json;charset=UTF-8",
"Jnpf-Origin": "app",
"Vue-Version": "3",
"Accept-Language": locale,
"tenant-id": tenantId,
...config.header
}
header['App-Code'] = encodeURIComponent(header['App-Code'])
if (token) header['Authorization'] = token
// 测试 todo
console.log(config.url,config.url.includes('admin-api'),'config.url.includes---')
if(config.url.includes('admin-api')){
host = 'http://10.28.117.48:48080'
}else {
host = define.baseURL
}
let url = config.url.indexOf('http') > -1 ? config.url : host + config.url
// 构建请求头
let header = {
"accept": 'application/json, text/plain, */*',
"App-Code": systemCode,
"Content-Type": "application/json;charset=UTF-8",
"Jnpf-Origin": "app",
"Vue-Version": "3",
"Accept-Language": locale,
"tenant-id": tenantId,
...config.header
}
header['App-Code'] = encodeURIComponent(header['App-Code'])
if (token) header['Authorization'] = token
// let url = config.url.indexOf('http') > -1 ? config.url : host + config.url
let url = host + config.url
console.log(url,'url---')
// 3. 显示加载中
if (config.options.load) {
uni.showLoading({ title: config.options.loadText || '正在加载' })
}
if (config.options.load) { // 4. 返回Promise，核心改造逻辑
uni.showLoading({ return new Promise((resolve, reject) => {
title: config.options.loadText || '正在加载' // 封装核心请求逻辑
}) const coreRequest = () => {
} uni.request({
url: url,
data: config.data || {},
method: config.method || 'GET',
header: header,
timeout: define.timeout,
success: async (res) => {
uni.hideLoading();
if (res.statusCode === 200) {
if (res.data.code == 200 || res.data.code == 0) {
resolve(res.data)
} else if ([401, 600, 601, 602].includes(res.data.code)) {
// 白名单接口不处理
const isWhiteList = whiteList.some(v => config.url.includes(v))
if (isWhiteList) {
ajaxError(res.data)
reject(res.data.msg)
return
}
return new Promise((resolve, reject) => { // ------------- 核心调整：刷新token请求改为问号拼接参数 -------------
uni.request({ if (!refreshToken) {
url: url, await handleAuthorized()
data: config.data || {}, reject(res.data.msg)
method: config.method || 'GET', return
header: header, }
timeout: define.timeout,
success: res => { if (isRefreshingToken) {
if (res.statusCode === 200) { requestQueue.push(() => coreRequest())
if (res.data.code == 200 || res.data.code == 0) { return
resolve(res.data) }
} else {
ajaxError(res.data) isRefreshingToken = true
reject(res.data.msg) try {
} // 拼接URL参数：和PC端一致，POST方法 + ?refreshToken=xxx
} else { const refreshUrl = `${host}/admin-api/system/auth/refresh-token?refreshToken=${encodeURIComponent(refreshToken)}`
ajaxError(res.data) // 调用刷新token接口（POST方法 + URL参数，无请求体）
reject(res.errMsg) const refreshRes = await uni.request({
} url: refreshUrl, // 带参数的URL
uni.hideLoading(); method: 'POST', // 保持POST方法
}, header: {
fail: err => { 'tenant-id': tenantId, // 携带租户ID
uni.showToast({ 'Content-Type': 'application/json'
title: '连接服务器失败', },
icon: 'none', data: {} // 无请求体，参数全在URL上
}) })
setTimeout(function () {
uni.hideLoading(); // 刷新成功处理
}, 2000); if (refreshRes.statusCode === 200 && refreshRes.data.code === 200) {
reject(err) const newTokenData = refreshRes.data.data
} // 存储新token（建议用项目封装的setToken方法）
}) uni.setStorageSync('token', newTokenData.token)
}) uni.setStorageSync('refreshToken', newTokenData.refreshToken)
// 更新请求头
header['Authorization'] = newTokenData.token
// 重试当前请求
coreRequest()
// 执行队列请求
requestQueue.forEach(cb => cb())
requestQueue = []
} else {
await handleAuthorized()
reject('刷新token失败：' + (refreshRes.data?.msg || '接口返回异常'))
}
} catch (err) {
await handleAuthorized()
reject('刷新token异常：' + err.errMsg)
} finally {
isRefreshingToken = false
requestQueue = []
}
} else {
ajaxError(res.data)
reject(res.data.msg)
}
} else {
ajaxError(res.data)
reject(res.errMsg)
}
},
fail: (err) => {
uni.hideLoading();
uni.showToast({ title: '连接服务器失败', icon: 'none' })
reject(err)
}
})
}
coreRequest()
})
} }
// ------------- 辅助函数 -------------
function ajaxError(data) { function ajaxError(data) {
uni.showToast({ uni.showToast({
title: data.msg || '请求出错，请重试', title: data.msg || '请求出错，请重试',
icon: 'none', icon: 'none',
complete() { complete() {
if (data.code === 600 || data.code === 601 || data.code === 602 || data.code === 401) { if ([600, 601, 602, 401].includes(data.code) && !isRefreshingToken) {
setTimeout(() => { setTimeout(() => handleAuthorized(), 1500)
uni.removeStorageSync('token') }
uni.removeStorageSync('cid') }
uni.removeStorageSync('userInfo') })
uni.removeStorageSync('permissionList') }
uni.removeStorageSync('sysVersion')
uni.removeStorageSync('dynamicModelExtra') async function handleAuthorized() {
uni.reLaunch({ if (!isRelogin.show) {
url: '/pages/login/index' isRelogin.show = true
}) const res = await uni.showModal({
}, 1500) title: '登录过期',
} content: '您的登录已过期，请重新登录',
} showCancelButton: false,
}) confirmText: '重新登录'
})
if (res.confirm) {
// 清除缓存（建议用项目封装的removeToken方法）
uni.removeStorageSync('token')
uni.removeStorageSync('refreshToken')
uni.removeStorageSync('cid')
uni.removeStorageSync('userInfo')
uni.removeStorageSync('permissionList')
uni.removeStorageSync('sysVersion')
uni.removeStorageSync('dynamicModelExtra')
uni.reLaunch({ url: '/pages/login/index' })
}
isRelogin.show = false
}
} }
export default request export default request