From bf772e586c29b4858366dbad143b1eaeca3c46ed Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 17 四月 2020 10:18:09 +0800
Subject: [PATCH] 2020-04-17

---
 src/tabviews/zshare/actionList/index.jsx |   67 +++++++++++++--------------------
 1 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/src/tabviews/zshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
index 533eb25..494a553 100644
--- a/src/tabviews/zshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -570,9 +570,9 @@
           res.rduri = btn.interface
         }
       } else {
-        if (btn.sysInterface === 'true') {
-          res.rduri = window.GLOB.mainSystemApi || window.GLOB.subSystemApi
-        } else {
+        if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
+          res.rduri = window.GLOB.mainSystemApi
+        } else if (btn.sysInterface !== 'true') {
           res.rduri = btn.interface
         }
       }
@@ -1027,9 +1027,11 @@
 
     let param = {
       BID: this.props.BID,
-      func: 'webapi_ChangeUser',
-      appkey: window.GLOB.appkey || '',
-      rduri: window.GLOB.mainSystemApi || window.GLOB.subSystemApi
+      func: 'webapi_ChangeUser'
+    }
+
+    if (window.GLOB.mainSystemApi) {
+      param.rduri = window.GLOB.mainSystemApi
     }
 
     param[setting.primaryKey] = data[0][setting.primaryKey]
@@ -1439,19 +1441,16 @@
           res.rduri = btn.interface
         }
       } else {
-        if (btn.sysInterface === 'true') {
-          res.rduri = window.GLOB.mainSystemApi || window.GLOB.subSystemApi
-        } else {
+        if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
+          res.rduri = window.GLOB.mainSystemApi
+        } else if (btn.sysInterface !== 'true') {
           res.rduri = btn.interface
         }
       }
 
-      // res.method = btn.method
       if (btn.outerFunc) {
         res.func = btn.outerFunc
       }
-
-      res.appkey = window.GLOB.appkey || '' // 澶栭儴璇锋眰鏃讹紝缁熶竴娣诲姞appkey
 
       return Api.genericInterface(res)
     }).then(response => {
@@ -1916,9 +1915,9 @@
             param.rduri = btn.interface
           }
         } else {
-          if (btn.sysInterface === 'true') {
-            param.rduri = window.GLOB.mainSystemApi || window.GLOB.subSystemApi
-          } else {
+          if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
+            param.rduri = window.GLOB.mainSystemApi
+          } else if (btn.sysInterface !== 'true') {
             param.rduri = btn.interface
           }
         }
@@ -1926,8 +1925,6 @@
         if (btn.outerFunc) {
           res.func = btn.outerFunc
         }
-
-        res.appkey = window.GLOB.appkey || '' // 澶栭儴璇锋眰鏃讹紝缁熶竴娣诲姞appkey
 
         return Api.genericInterface(res)
       }).then(response => {
@@ -2008,14 +2005,12 @@
             param.rduri = btn.interface
           }
         } else {
-          if (btn.sysInterface === 'true') {
-            param.rduri = window.GLOB.mainSystemApi || window.GLOB.subSystemApi
-          } else {
+          if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
+            param.rduri = window.GLOB.mainSystemApi
+          } else if (btn.sysInterface !== 'true') {
             param.rduri = btn.interface
           }
         }
-  
-        param.appkey = window.GLOB.appkey || ''
   
         if (btn.outerFunc) {
           param.func = btn.outerFunc
@@ -2039,17 +2034,15 @@
             delete res.message
             delete res.status
 
-            if (btn.sysInterface === 'true') {
-              res.rduri = window.GLOB.mainSystemApi || window.GLOB.subSystemApi
-            } else {
+            if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
+              res.rduri = window.GLOB.mainSystemApi
+            } else if (btn.sysInterface !== 'true') {
               res.rduri = btn.interface
             }
   
             if (btn.outerFunc) {
               res.func = btn.outerFunc
             }
-      
-            res.appkey = window.GLOB.appkey || '' // 澶栭儴璇锋眰鏃讹紝缁熶竴娣诲姞appkey
       
             Api.genericInterface(res).then(result => {
               if (result.status) {
@@ -2093,9 +2086,9 @@
             param.rduri = btn.interface
           }
         } else {
-          if (btn.sysInterface === 'true') {
-            param.rduri = window.GLOB.mainSystemApi || window.GLOB.subSystemApi
-          } else {
+          if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
+            param.rduri = window.GLOB.mainSystemApi
+          } else if (btn.sysInterface !== 'true') {
             param.rduri = btn.interface
           }
         }
@@ -2103,8 +2096,6 @@
         if (btn.outerFunc) {
           res.func = btn.outerFunc
         }
-  
-        res.appkey = window.GLOB.appkey || '' // 澶栭儴璇锋眰鏃讹紝缁熶竴娣诲姞appkey
   
         Api.genericInterface(res).then(result => {
           if (result.status) {
@@ -2156,16 +2147,13 @@
           param.rduri = btn.interface
         }
       } else {
-        if (btn.sysInterface === 'true') {
-          param.rduri = window.GLOB.mainSystemApi || window.GLOB.subSystemApi
-        } else {
+        if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
+          param.rduri = window.GLOB.mainSystemApi
+        } else if (btn.sysInterface !== 'true') {
           param.rduri = btn.interface
         }
       }
       
-
-      param.appkey = window.GLOB.appkey || ''
-
       if (btn.outerFunc) {
         param.func = btn.outerFunc
       }
@@ -2327,8 +2315,7 @@
     let param = {
       func: 'sPC_Get_TableData',
       obj_name: 'data',
-      arr_field: arr_field,
-      appkey: window.GLOB.appkey || ''
+      arr_field: arr_field
     }
 
     if (this.props.BID) {

--
Gitblit v1.8.0