采购订单

demo.js

@@ -2,11 +2,8 @@ const mockData = {
   message: '',
   code: 1000,
   data: {
-    global: {
-      siteId: 352,
-      siteUrl: 'http://10.0.0.25:4396',
-      logo: 'http://10.0.0.28:88/group1/M00/00/0A/CgAAHF9fF0WAcD-hAAAcbWJWu6M407.png',
-      countryList: [
+    publicSelect: {
+      siteList: [
         {
           name: '简体中文-ZH',
           key: 'zh-CN',
@@ -27,7 +24,7 @@ const mockData = {
           key: 'ko',
           icon: 'http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/koren.png'
         }
-      ],
+      ]
     }
   }
 }

package.json

@@ -9,7 +9,7 @@
     "start:analyze": "ANALYZE=1 umi dev",
     "clean": "rimraf node_modules",
     "start": "yarn api && yarn scripts:build && umi dev",
-    "build": "yarn api && yarn scripts:build && umi build",
+    "build": "yarn api && yarn scripts:build && yarn build:clean",
     "build:yxc": "yarn api && yarn scripts:build-yxc && umi build",
     "build:analyze": "ANALYZE=1 umi build",
     "build:dev": "pm2 start scripts/devServer.js",
@@ -17,7 +17,8 @@
     "postinstall": "umi generate tmp",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
+    "test:coverage": "umi-test --coverage",
+    "start:cross": "cross-env SITE_ID=352 yarn start"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [
@@ -70,6 +71,7 @@
     "chalk": "^4.1.0",
     "clone": "^2.1.2",
     "connect-history-api-fallback": "^1.6.0",
+    "cross-env": "^7.0.2",
     "express": "^4.17.1",
     "fs-extra": "^9.0.1",
     "god-yapi2ts": "^1.6.0",

scripts/services/index.js

@@ -18,6 +18,8 @@ const demoFetch = require('../../demo').fetchConfig
 
 const isDemo = true
 
+const SITE_ID = Number(process.env.SITE_ID)
+
 const remoteUrl = process.argv[2] || 'http://10.0.0.25:8100'
 
 const axios = Axios.create({
@@ -25,6 +27,12 @@ const axios = Axios.create({
   responseType: 'json',
 })
 
+if (!SITE_ID) {
+  console.log('\n构建失败!!!!!!')
+  console.log('\n缺少站点ID')
+  process.exit(1)
+}
+
 const serviceConfig = {
   // 用于注册页
   userRegister: {
@@ -37,23 +45,23 @@ const serviceConfig = {
     shopInfo: {
       url: '/manage/shop/findShopsBySiteId',
       params: {
-        siteId: 352
+        siteId: SITE_ID
       },
       method: 'get'
     },
     orderMode: {
       url: '/order/rule/configuration/all',
       method: 'get'
+    }
   },
-    // site: {
-    //   url: '/manage/paas/site/all',
-    //   method: 'get',
-    //   // params: linkage => {
-    //   //   return {
-    //   //     id: linkage.id
-    //   //   }
-    //   // }
-    // }
+  global: {
+    siteInfo: {
+      url: '/manage/paas/site/details',
+      params: {
+        id: SITE_ID
+      },
+      method: 'get'
+    }
   }
 
 }

src/app.tsx

@@ -172,6 +172,7 @@ export function onRouteChange({ routes, matchedRoutes, location, action }) {
       history.replace('/memberCenter/home')
       return;
     }
+    console.log(query)
     // 固定配置， 出现此参数说明需携带参数校验权限路由
     if (query.page_type && routeAuthUrls.find(authPath => {
       const parseUrl = queryString.parseUrl(authPath)

src/layouts/UserLayouts.tsx

@@ -13,7 +13,7 @@ import Logo from '../../mockStatic/logo.png'
 const UserLayouts:React.FC = (props) => {
   return (
     <div className={styles.lingxiBusinessUserLayout}>
-      <UserHeader logo={GlobalConfig.global.logo}/>
+      <UserHeader logo={GlobalConfig.global.siteInfo.logo}/>
       <div className={styles.lingxiBusinessUserBg}>
         { props.children }
         <BaseFooter/>

src/layouts/components/HeaderDropdown.tsx

@@ -25,7 +25,7 @@ const HeaderDropdown: React.FC = () => {
   const menuHeaderDropdown = (
     <Menu selectedKeys={[]}>
       {
-        GlobalConfig.global.countryList.map(v => <Menu.Item key={v.key} onClick={() => setSelect(v)}>
+        GlobalConfig.publicSelect.siteList.map(v => <Menu.Item key={v.key} onClick={() => setSelect(v)}>
           <Space>
             {select.key === v.key ? <img src={gou} style={{width: 20, height: 20}}/> : <div style={{width: 20, height: 20}}></div> }
             <img src={v.icon} style={{width: 24, height: 17}}/>

src/layouts/components/SelectLang.tsx

@@ -30,7 +30,7 @@ const SelectLang: React.FC = () => {
   const menuHeaderDropdown = (
     <Menu selectedKeys={[]}>
       {
-        GlobalConfig.global.countryList.map(v => <Menu.Item key={v.key} onClick={() => setLang(v)}>
+        GlobalConfig.publicSelect.siteList.map(v => <Menu.Item key={v.key} onClick={() => setLang(v)}>
           <Space>
             {currentLangKey === v.key ? <img src={gou} style={{ width: 20, height: 20 }} /> : <div style={{ width: 20, height: 20 }}></div>}
             <img src={v.icon} style={{ width: 24, height: 17 }} />
@@ -43,7 +43,7 @@ const SelectLang: React.FC = () => {
 
   const renderCurrentLang = () => {
     let currentLang: countryItem
-    GlobalConfig.global.countryList.map(item => {
+    GlobalConfig.publicSelect.siteList.map(item => {
       if (item.key === currentLangKey) {
         currentLang = item
       }

src/pages/404.tsx

@@ -14,7 +14,7 @@ const NoFoundPage: React.FC<{}> = () => {
   
   return (
     <div className={styles.wrapper}>
-      <UserHeader logo={GlobalConfig.global.logo}/>
+      <UserHeader logo={GlobalConfig.global.siteInfo.logo}/>
       <div className={styles.errorBox}>
         <Row>        
           <Col span={12}>

src/pages/500.tsx

@@ -14,7 +14,7 @@ const InternetError: React.FC<{}> = () => {
   
   return (
     <div className={styles.wrapper}>
-      <UserHeader logo={GlobalConfig.global.logo}/>
+      <UserHeader logo={GlobalConfig.global.siteInfo.logo}/>
       <div className={styles.errorBox}>
         <Row>        
           <Col span={12}>

src/pages/transaction/purchaseOrder/orderDetail/index.tsx

@@ -150,7 +150,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
             deliveryAddresId: value.deliveryAddresId.id,
             ...omit(value.deliveryAddresId, ['id'])
           }
-          fnResult = id ? await PublicApi.postOrderProcurementOrderUpdate({...params, id}) : await PublicApi.postOrderProcurementOrderAdd(params)
+          fnResult = id ? await PublicApi.postOrderProcurementOrderUpdate({...params, id}) : await PublicApi.postOrderProcurementOrderAddReinsurancePolicy(params)
           break;
         }
         case '1': {

src/pages/transaction/purchaseOrder/orderPreview/index.tsx

@@ -156,7 +156,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
     { label: '对应报价单号', name: 'quotationNo', span: 8, render: text => <Link to={'/'}>{text}</Link> },
     { label: '订单摘要', name: 'orderThe', span: 8 },
     { label: '供应会员', name: 'supplyMembersName', span: 8, render: text => <Link to={'/'}>{text}</Link> },
-    { label: '下单模式', name: 'orderModel', span: 8, render: text => GlobalConfig.web.orderMode[text].label },
+    { label: '下单模式', name: 'orderModel', span: 8, render: text => GlobalConfig.web.orderMode.find(v => v.value === text)?.label || '' },
     { label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] },
     { label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(text) },
     { label: '外部状态', name: 'externalState', span: 8, render: text => <StatusColors type='out' status={text}/> },
@@ -190,16 +190,16 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
             ></AuditProcess> }
 
             {/* 商品列表 */}
-            <OrderProductTable editable={editableProductTable}/>
+            {/* <OrderProductTable editable={editableProductTable}/> */}
 
             {/* 支付信息 todo */}
             <OrderPayTabs/>
 
             {/* 杂项 */}
-            <OrderMergeInfo/>
+            {/* <OrderMergeInfo/> */}
 
             {/* 订单流转记录 */}
-            <OrderTransformRecord/>
+            {/* <OrderTransformRecord/> */}
           </div>
         </OrderDetailWrapper>
 

src/store/site/index.ts

@@ -5,8 +5,8 @@ import { PublicApi } from '@/services/api'
 
 class SiteStore implements ISiteModule {
   // 可在根目录下的demo.js修改数据
-  @observable public siteId: number = GlobalConfig.global.siteId; // 站点id
-  @observable public siteUrl: string = GlobalConfig.global.siteUrl; // 站点域名
+  @observable public siteId: number = GlobalConfig.global.siteInfo.id; // 站点id
+  @observable public siteUrl: string = GlobalConfig.global.siteInfo.siteUrl; // 站点域名
   @observable public mallTemplateId: number = null; // 企业商城模板id
   @observable public mallTemplateInfo: any = {}; // 企业商城模板id
   @observable public shopTemplateId: number = null; // 店铺模板id

src/utils/request.ts

@@ -56,7 +56,7 @@ const defaultHeaders = {
   'Content-Type': 'Application/json',
   'source': '1',
   'environment': '1',
-  'site': GlobalConfig.global.siteId.toString()
+  'site': GlobalConfig.global.siteInfo.id.toString()
 }
 
 /**