Merge branch 'test'

www/webapp/scg/src/api/index.js

@@ -28,7 +28,7 @@ function errorState(response) {
     title: '提示',
     content: '网络异常',
   })
-    .show();
+  .show();
 }
 
 const httpServer = (opts, data) => {
@@ -40,7 +40,7 @@ const httpServer = (opts, data) => {
   const httpDefaultOpts = { // http默认配置
     method: opts.method,
     // baseURL,
-    url: apiPath + opts.url,
+    url: opts.url.indexOf('https://') > -1 ? opts.url : apiPath + opts.url,
     timeout: 10000,
     params: Object.assign(Public, data),
     data: qs.stringify(Object.assign(Public, data)),
@@ -57,30 +57,30 @@ const httpServer = (opts, data) => {
   };
   if (opts.method === 'get') {
     Object.keys(httpDefaultOpts.params)
-      .forEach(key => {
-        httpDefaultOpts.url += `&${key}=${httpDefaultOpts.params[key]}`;
-      });
+    .forEach(key => {
+      httpDefaultOpts.url += `&${key}=${httpDefaultOpts.params[key]}`;
+    });
     delete httpDefaultOpts.data;
   }
   delete httpDefaultOpts.params;
   const promise = new Promise((resolve, reject) => {
     // console.log(httpDefaultOpts);
     axios(httpDefaultOpts)
-      .then(
-        (res) => {
-          if (httpDefaultOpts.url.indexOf('baidu') > 0) {
-            resolve(res.data);
-          } else {
-            resolve(res.data.data);
-          }
+    .then(
+      (res) => {
+        if (httpDefaultOpts.url.indexOf('baidu') > 0) {
+          resolve(res.data);
+        } else {
+          resolve(res.data.data);
         }
-      )
-      .catch(
-        (response) => {
-          errorState(response);
-          reject(response);
-        }
-      );
+      }
+    )
+    .catch(
+      (response) => {
+        errorState(response);
+        reject(response);
+      }
+    );
   });
   return promise;
 };