fix: 调整三方进入参数

config/env.config.js

+import RoleType, { isPlatForm } from './role.config';
 const isProduction = process.env.NODE_ENV === 'production';
 const isPre = process.env.PRE_ENV === 'pre';
 const environment = 'sc';
 
-// 从tob进入的判断接口前缀
-const getUrlParams = name => {
-  const regArg = new RegExp(`(^|&)${name}=([^&]*)(&|$)`);
-  const r = window.location.search.substring(1).match(regArg);
-  if (r != null) return decodeURIComponent(r[2]);
-  return null;
-};
-const isPlatForm = +getUrlParams('isMaster') === 1;
-const apiPrefix = isPlatForm ? '/api/consoles' : '/api/enterprises';
-
 const envAPi = {
   api: `https://security-${environment}.liangkebang.net`, //'https://security-xyqb.liangkebang.net',
   kdspOpApi: `https://sc-merchant-api-${environment}.liangkebang.net`,
@@ -26,7 +17,6 @@ const envAPi = {
   roleApi: isPlatForm
     ? `https://sc-op-api-${environment}.liangkebang.net`
     : `https://sc-merchant-api-${environment}.liangkebang.net`,
-  apiPrefix,
 };
 
 const prodApi = {
@@ -45,7 +35,6 @@ const prodApi = {
   wsApi: 'wss://push.q-gp.com',
   msgApi: 'https://msgapi.q-gp.com',
   roleApi: isPlatForm ? 'https://sc-op-api.q-gp.com' : 'https://sc-merchant-api-pre.q-gp.com',
-  apiPrefix,
 };
 
 const preProdApi = {
@@ -60,18 +49,18 @@ const preProdApi = {
   wsApi: 'wss://push.q-gp.com',
   msgApi: 'https://msgapi.q-gp.com',
   roleApi: isPlatForm ? 'https://sc-op-api-pre.q-gp.com' : 'https://sc-merchant-api-pre.q-gp.com',
-  apiPrefix,
 };
 
-let exportApi = envAPi;
+let json = envAPi;
 if (isPre) {
-  exportApi = preProdApi;
+  json = preProdApi;
 } else if (isProduction) {
-  exportApi = prodApi;
+  json = prodApi;
 }
-module.exports = exportApi;
+const exportApi = Object.assign({}, RoleType, json);
+// module.exports = exportApi;
 
 // let exportApi;
 // isProduction ? (exportApi = prodApi) : (exportApi = envAPi);
 
-// export default exportApi;
+export default exportApi;

config/role.config.js

+/**
+ * 从别的平台进入角色判断
+ */
+// 从tob进入的判断接口前缀
+const getUrlParams = name => {
+  const regArg = new RegExp(`(^|&)${name}=([^&]*)(&|$)`);
+  const r = window.location.search.substring(1).match(regArg);
+  if (r != null) return decodeURIComponent(r[2]);
+  return null;
+};
+
+export const apiType = {
+  platform: '/api/consoles',
+  enterprise: '/api/enterprises',
+  pop: '/api/consoles',
+};
+
+// role 类型 (platform:平台, enterprise:企业, pop:pop商)
+export const RolePlatform = 'platform'; // 平台
+export const RoleEnterprise = 'enterprise'; // 企业
+export const RolePop = 'pop'; // pop商
+export const UserRole = getUrlParams('role') || '';
+export const isPlatForm = UserRole === RolePlatform;
+export const apiPrefix = apiType[UserRole];
+const RoleType = {
+  RolePlatform,
+  RoleEnterprise,
+  RolePop,
+  apiPrefix,
+  isPlatForm,
+  UserRole,
+};
+export default RoleType;

src/layouts/SecurityLayout.jsx

@@ -27,13 +27,12 @@ class SecurityLayout extends React.Component {
   /* eslint-disable no-underscore-dangle */
   render() {
     // 判断是否从tob进入
-    console.log('getUrlSearchParams -- 1 :>> ', 1111);
     const searchPrams = getUrlSearchParams();
     const isTob = searchPrams.source === 'tob';
     if (isTob) {
       localStorage.set('tobToken', searchPrams.token || '');
-      // 角色 searchPrams.isMaster (1:平台 0:pop)
-      sessionStorage.set('role', +searchPrams.isMaster === 1 ? 'platform' : 'tobMerchant');
+      // role 类型 (platform:平台, enterprise:企业, pop:pop商)
+      sessionStorage.set('role', searchPrams.role);
     }
 
     const { isReady } = this.state;

src/pages/GoodsManage/index.jsx

@@ -6,7 +6,6 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { connect } from 'dva';
 import { getToken } from '@/utils/utils';
 import styles from './style.less';
-import configApi from '../../../config/env.config';
 import UpdateStock from './UpdateStock';
 
 import {
@@ -160,15 +159,6 @@ class goodsManage extends Component {
     });
   };
 
-  audit = skuId => {
-    this.setState({
-      previewVisible: true,
-      src: `${
-        configApi.prologueDomain
-      }/goods/${skuId}?h=0&token=${getToken()}&hideReport=1&time=${Date.now()}`,
-    });
-  };
-
   setArea = async (isAll, type) => {
     // distribution配送区域  after售后地址
     if (!this.state.selectedRowKeys.length && !isAll) {

src/utils/utils.js

@@ -3,6 +3,7 @@ import { parse } from 'querystring';
 import pathRegexp from 'path-to-regexp';
 import moment from 'moment';
 import localStorage from './localStorage';
+import config from '@/../config/env.config';
 /* eslint no-useless-escape:0 import/prefer-default-export:0 */
 
 const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
@@ -218,7 +219,7 @@ export const getToUrlQuery = () => {
     return {
       source: params.source,
       token: params.token,
-      isMaster: params.isMaster,
+      role: params.role,
     };
   }
   return {};