ldeyun/jeecgBootUniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master'

Browse Source
This commit is contained in:
yangzhq68909 2025-06-16 16:17:45 +08:00
commit 3801233bf0
5 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
env/.env vendored
View File

@ -4,6 +4,8 @@ VITE_APP_PORT = 9000
VITE_UNI_APPID = '__UNI__9F097F0' VITE_UNI_APPID = '__UNI__9F097F0'
VITE_WX_APPID = 'wx8e287639924edb51' VITE_WX_APPID = 'wx8e287639924edb51'
#发布版本号
# h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base # h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base
VITE_APP_PUBLIC_BASE=/ VITE_APP_PUBLIC_BASE=/

4
env/.env.development vendored
View File

@ -4,6 +4,6 @@ NODE_ENV = 'development'
VITE_DELETE_CONSOLE = false VITE_DELETE_CONSOLE = false
# 是否开启sourcemap # 是否开启sourcemap
VITE_SHOW_SOURCEMAP = true VITE_SHOW_SOURCEMAP = true
#VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'

32
src/pages-process/components/DynamicLink.vue
View File

@ -47,16 +47,25 @@
//动态加载页面 //动态加载页面
const comp = modules[`/src/pages-bpm/${compName.value}.vue`] const comp = modules[`/src/pages-bpm/${compName.value}.vue`]
if(!comp){ if(!comp){
console.log(newVal)
if(newVal.indexOf('index')==-1){ if(newVal.indexOf('index')==-1){
compName.value = newVal+'/index' compName.value = newVal+'/index'
comp = modules[`/src/pages-bpm/${compName.value}.vue`] console.log(compName.value)
} const comp2 = modules[`/src/pages-bpm/${compName.value}.vue`]
} comp2().then((myModule) => {
comp().then((myModule) => { asyncComponent.value = myModule.default
asyncComponent.value = myModule.default }).catch(() => {
}).catch(() => {
})
}
}else{
comp().then((myModule) => {
asyncComponent.value = myModule.default
}).catch(() => {
})
}
})
}, { }, {
deep: true, deep: true,
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
@ -65,8 +74,15 @@
}); });
const signValidator = ()=>{ const signValidator = ()=>{
console.log(comptRef.value)
//这里进行电子签章验证 //这里进行电子签章验证
return comptRef.value.signValidator() if(!comptRef.value.signValidator){
console.log(123124)
return null;
}else{
console.log(12)
return comptRef.value.signValidator()
}
} }
const getStampSuccess = (val) => { const getStampSuccess = (val) => {

9
src/pages-process/taskHandle.vue
View File

@ -165,7 +165,8 @@
flag: false, flag: false,
type: 0, type: 0,
} }
if(linkRef.value.ifEsign){ console.log(linkRef.value)
// if(linkRef.value.ifEsign){
let data = await linkRef.value.signValidator() let data = await linkRef.value.signValidator()
if(data==false||data==true){ if(data==false||data==true){
callData.flag = data; callData.flag = data;
@ -173,9 +174,9 @@
}else{ }else{
callData.flag = true; callData.flag = true;
} }
}else{ // }else{
callData.flag = true; // callData.flag = true;
} // }
callback(callData); callback(callData);
} }

4
src/pages/login/login.vue
View File

@ -105,9 +105,9 @@
let pw = Base64.encode(encodeURIComponent(password.value)) let pw = Base64.encode(encodeURIComponent(password.value))
loading.value = true loading.value = true
/*生产环境 begin */ /*生产环境 begin */
loginApi({ username: un, password: pw }) // loginApi({ username: un, password: pw })
/*开发环境 begin */ /*开发环境 begin */
// loginApi({ username: userName.value, password: password.value, captcha: 'app' }) loginApi({ username: userName.value, password: password.value, captcha: 'app' })
.then((res : any) => { .then((res : any) => {
if (res.success) { if (res.success) {
const { result } = res const { result } = res