123

common/config.js

@@ -32,7 +32,6 @@ const set = [
         version: '1.0.2',
         TOP_LOGO: '/static/logo2.png',
         SCAN_LOGO: '/static/me/logo.png',
-        NODE_ENV: 'pro'
     },
     // 祥粤学堂
     {
@@ -46,7 +45,6 @@ const set = [
         version: '1.0.2',
         TOP_LOGO: '/static/logo2.png',
         SCAN_LOGO: '/static/me/logo.png',
-        NODE_ENV: 'pro'
     },
     // 勘设云学堂
     {
@@ -60,7 +58,6 @@ const set = [
         version: '1.0.2',
         TOP_LOGO: '/static/logo520.png',
         SCAN_LOGO: '/static/me/logo520.png',
-        NODE_ENV: 'pro',
         tips1:
             "中山勘设云学堂是中山市工程勘察设计行业协会和广东省祥粤建设职业培训学校联合打造的网络教育平台。",
         tips2:
@@ -78,7 +75,6 @@ const set = [
         version: '1.0.2',
         TOP_LOGO: '/static/logo145.png',
         SCAN_LOGO: '/static/me/logo145.png',
-        NODE_ENV: 'pro'
     },
     // 山西云学堂
     {
@@ -92,7 +88,6 @@ const set = [
         version: '1.0.2',
         TOP_LOGO: '/static/logo962.png',
         SCAN_LOGO: '/static/me/logo962.png',
-        NODE_ENV: 'pro'
     }
 ]
 export default set[index]

common/request.js

@@ -9,7 +9,9 @@ export let tenantId = config.tenantId; // 祥粤云学堂：867735392558919680
 // #endif
 // #ifdef H5
 const host =
-  config.NODE_ENV === "pro" ? window.location.host : "120.79.166.78:19012";
+  process.env.NODE_ENV === "production"
+    ? window.location.host
+    : "120.79.166.78:19012";
 export let tenantId = uni.getStorageSync(host) || "";
 // #endif
 export const myRequest = (options) => {
@@ -23,7 +25,7 @@ export const myRequest = (options) => {
   return new Promise(async (resolve, reject) => {
     // #ifdef H5
     if (!tenantId) {
-      tenantId = await getTenantId(options);
+      tenantId = await getTenantId();
       uni.setStorageSync(host, tenantId);
     }
     // #endif
@@ -130,7 +132,7 @@ export const myRequest = (options) => {
     }
   }
 };
-function getTenantId(response) {
+function getTenantId() {
   return new Promise((resolve, reject) => {
     uni.request({
       url: config.BASE_URL + "/app/common/findTenantId",