Merge branch 'minJeecg' into 'master'

1.修改模块

See merge request cxcxt/jeecguniapp!14

env/.env

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

env/.env.development

@@ -4,6 +4,6 @@ NODE_ENV = 'development'
 VITE_DELETE_CONSOLE = false
 # 是否开启sourcemap
 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://szcx.zyyt.sinopec.com/jeecg-boot'
+#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'

src/pages-process/components/DynamicLink.vue

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

src/pages-process/taskHandle.vue

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

src/pages/login/login.vue

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