Merge branch 'wangtao' of uskycloud/usky-web-mobile into master

src/pages/common/appMessage/index.vue

@@ -121,9 +121,7 @@ function goContentDetails(e) {
   }else if(e.infoType == 1){
     proxy.$tab.navigateTo(`/pages/common/appMessage/nociteDetails?moduleId=${e.moduleId}`).then(() => {});
   }else if(e.infoType == 3){//OA消息
-    console.log(e)
     if(e.infoContent){
-      console.log(e.infoContent.includes("新的审批任务"))
       if(e.infoContent){
         if(e.infoContent.includes("新的审批任务")){
           proxy.$common.toPage(2,"todo")
@@ -158,7 +156,6 @@ function noticeDelete(e) {
  * @api接口调用
  */
 function init(obj) {
-  console.log(obj)
   uni.setNavigationBarTitle({
     title: obj.typeName ? obj.typeName : "消息列表",
   });
@@ -166,7 +163,6 @@ function init(obj) {
   state.loading = true;
   if(obj.id){
     if(obj.type == 3){
-      console.log(4444)
       if(obj?.oaType){
         proxy.$common.toPage(2,obj.oaType)
       }

src/plugins/common.plugins.js

@@ -323,7 +323,6 @@ export default {
     var name = uni.getStorageSync("storage_data").name
     let form = "https://manager.usky.cn/mobile/#/"
     let path = "https://oa.usky.cn/mobile/#/login?token"
-    console.log("跳转页面",type,to,item,name)
     if(name){
       var params = { 
           user:name,
@@ -336,7 +335,7 @@ export default {
           window.open(`${item.path}=${encodeURIComponent(jm)}?form=${form}`)
         }
         if(type == "2"){
-          window.open(`${path}=${encodeURIComponent(jm)}?form=${form}?toPage=${to}`)
+          location.href = `${path}=${encodeURIComponent(jm)}?form=${form}?toPage=${to}`
         }
       //#endif
       //#ifdef APP-PLUS || MP-WEIXIN 
@@ -352,13 +351,9 @@ export default {
         }
       //#endif
     }else{
-      if(item){
-        uni.navigateTo({
-          url: "/pages/common/webview/index?url=" + item.path,
-        });
-      }
+      uni.navigateTo({
+        url: "/pages/index",
+      });
     }
   },
-
-
 };