Merge branch 'dev' into test

config/routes/logisticsRoutes.ts

@@ -127,6 +127,13 @@ const LogisticsRoute: RouterChild = {
       path: '/memberCenter/logisticsAbility/logisticsSubmit',
       name: 'logisticsSubmit',
       routes: [
+        // 新增
+        {
+          path: '/memberCenter/logisticsAbility/logisticsSubmit/addLogistics',
+          name: 'addToOrderSubmit',
+          component: '@/pages/logistics/addLogistics',
+          hideInMenu: true
+        },
         // 快递单查询
         {
           path: '/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList',

src/components/ModalTable/index.tsx

@@ -3,7 +3,7 @@ import {StandardTable} from 'god';
 import NestTable from '@/components/NestTable';
 import { IStandardTableProps } from 'god/dist/src/standard-table';
 import { Row, Col, Modal } from 'antd';
-import { productModalSchema, productModalByMemberSchema, memberModalSchema, inquirySchema, demandSchema, enquirySchema, mergeOrderSchema, goodsModalSchema, demandNumberSchema, logisticsDeliverySearchSchema, addOrderModalSchema } from './schema';
+import { productModalSchema, productModalByMemberSchema, memberModalSchema, inquirySchema, demandSchema, enquirySchema, mergeOrderSchema, goodsModalSchema, demandNumberSchema, logisticsDeliverySearchSchema, addOrderModalSchema , logisticsSelectGoodsSearchSchema} from './schema';
 import Search from '../NiceForm/components/Search';
 import SearchSelect from '../NiceForm/components/SearchSelect';
 import Submit from '../NiceForm/components/Submit';
@@ -18,7 +18,7 @@ export interface ModalTableProps extends IStandardTableProps<any> {
   cancel?(),
   visible?: boolean,
   resetModal?: object,
-  modalType?: 'productByDefault' | 'productByMember' | 'memberByDefault' | 'inquiryByDefault' | 'demandByDefault' | 'enquiryModel' | 'MergeOrderByDefault' | 'goodsModalSchema' | 'demandNumberSchema' | 'logisticsDelivery' | 'addOrderModalSchema' | 'none' ,
+  modalType?: 'productByDefault' | 'productByMember' | 'memberByDefault' | 'inquiryByDefault' | 'demandByDefault' | 'enquiryModel' | 'MergeOrderByDefault' | 'goodsModalSchema' | 'demandNumberSchema' | 'logisticsDelivery' | 'addOrderModalSchema' | 'selectGoodsSchema' | 'none' ,
   useNestTable?: boolean, // 是否使用嵌套表格
   nestColumns?: any[],
   nestTableProps?: any,
@@ -82,6 +82,9 @@ const ModalTable:React.FC<ModalTableProps> = (props) => {
       case 'addOrderModalSchema': {
         return addOrderModalSchema
       }
+      case 'selectGoodsSchema': {
+        return logisticsSelectGoodsSearchSchema
+      }
       case 'none': {
         return {}
       }

src/components/ModalTable/schema/index.ts

@@ -673,3 +673,64 @@ export const logisticsDeliverySearchSchema: ISchema = {
     }
   }
 }
+
+
+export const logisticsSelectGoodsSearchSchema: ISchema = {
+  type: 'object',
+  properties: {
+    productName: {
+      type: 'string',
+      'x-component': 'ModalSearch',
+      'x-component-props': {
+        placeholder: '商品名称',
+        align: 'flex-left',
+      },
+    },
+    [FORM_FILTER_PATH]: {
+      type: 'object',
+      'x-component': 'flex-layout',
+      'x-component-props': {
+        rowStyle: {
+          flexWrap: 'nowrap',
+          style: {
+            marginRight: 0
+          }
+        },
+        colStyle: {
+          marginTop: 20,
+        },
+      },
+      properties: {
+        brand: {
+          type: 'string',
+          "x-component-props": {
+            placeholder: '商品品牌',
+            style: {
+              width: 160
+            }
+          }
+        },
+        category: {
+          type: 'string',
+          "x-component": 'SearchSelect',
+          'x-component-props': {
+            placeholder: '商品品类',
+            fetchSearch: PublicApi.getWarehouseInvoicesTypeAll,
+            style: {
+              width: 160
+            }
+          },
+        },
+        submit: {
+          "x-component": 'Submit',
+          "x-mega-props": {
+            span: 1
+          },
+          "x-component-props": {
+            children: '查询'
+          }
+        }
+      }
+    }
+  }
+}

src/pages/logistics/addLogistics/columns.ts

+import { ColumnType } from 'antd/lib/table/interface';
+
+export const SelectGoodsColumns: ColumnType<any>[] = [
+  {
+    title: '商品ID',
+    key: 'productId',
+    dataIndex: 'productId',
+  },
+  {
+    title: '商品名称',
+    key: 'productName',
+    dataIndex: 'productName',
+  },
+  {
+    title: '品类',
+    key: 'category',
+    dataIndex: 'category',
+  },
+  {
+    title: '品牌',
+    key: 'brand',
+    dataIndex: 'brand',
+  }
+]

src/pages/logistics/addLogistics/index.less

+.revise_style {
+  :global {
+    .ant-form-item-label {
+      width: 174px;
+      label {
+        color:#6B778C
+      }
+    }
+    .ant-form-item-control {
+      width: 500px;
+      .ant-form-item-control-input-content {
+        position: relative;
+        .ant-btn-link {
+          position: absolute;
+          right: -120px;
+        }
+        .ant-picker {
+          width: 100%;
+        }
+      }
+      .ant-input-group-addon {
+        .ant-input-search-button {
+          background-color: #6B778C;
+          border-color: #6B778C;
+        }
+      }
+    }
+    .ant-radio-group-solid {
+      .ant-radio-button-wrapper-checked {
+        background: #6B778C;
+        border-color: #6B778C;
+        &:hover {
+          background: #6B778C;
+          border-color: #6B778C;
+        }
+      }
+    }
+  }
+  .upload_item {
+    padding: 5px 8px;
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background-color: #FAFBFC;
+
+    .upload_left {
+      display: flex;
+      align-items: center;
+      color: #303133;
+
+      :global {
+        .anticon-file-word {
+          color: #4279df; 
+          font-size: 20px;
+          margin-right: 8px;
+        }
+      }
+    }
+
+    .upload_right {
+      color: #00B37A;
+      cursor: pointer;
+
+      :global {
+        .anticon-delete {
+          margin-left: 19px;
+          color: #C0C4CC;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

src/pages/lxMall/components/Category/index.tsx

@@ -25,13 +25,13 @@ const Category: React.FC<CategoryPropsType> = (props) => {
 
   useEffect(() => {
     let getCategoryFn
-    let params: any = {}
+    const params: any = {}
     let headers = {}
     switch (type) {
       case LAYOUT_TYPE.mall:
         if (mallTemplateId) {
           params.templateId = mallTemplateId
-          getCategoryFn = PublicApi.getTemplatePlatformFindAllCategoryTree
+          getCategoryFn = PublicApi.getTemplateWebCategoryWebFindEnterpriseCategoryTree
           fetchCategoryList(getCategoryFn, params, type)
         }
         break

src/pages/lxMall/components/FloorAnchor/index.less

@@ -4,8 +4,10 @@
   margin: 0 auto;
   z-index: 9;
 
+
   .anchor {
     position: absolute;
+    overflow: hidden;
     top: 20px;
     width: 88px;
     left: -128px;
@@ -82,4 +84,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file

src/pages/transaction/inquiryQuote/components/details.tsx

@@ -434,7 +434,7 @@ const Details: React.FC<parmas> = (props) => {
           {
             Object.keys(data).length > 0 &&
             <>
-              {type !== 'quote' ?
+              {type === 'rfq' ?
                 <TabPane tab="外部流转" key="1">
                   <Steps
                     style={{ padding: '20px 0' }}
@@ -578,7 +578,7 @@ const Details: React.FC<parmas> = (props) => {
       </div>
       <div className={style.item_wrap}>
         {
-          type !== 'quote' ?
+          type === 'rfq' ?
             <>
               <div className={style.mainCol_title}>外部流转记录</div>
               <Table columns={flowRecord.external} rowKey='id' pagination={false} dataSource={data.externalInquiryListLogResponses} />

src/store/site/index.ts

@@ -28,7 +28,7 @@ class SiteStore implements ISiteModule {
       siteId: this.siteId
     }
 
-    const res = await PublicApi.getTemplatePlatformFindUseTemplateBySite(param)
+    const res = await PublicApi.getTemplateWebPageTemplateWebFindEnterpriseTemplate(param)
     runInAction(() => {
       this.mallTemplateInfo = res.data || {}
       this.mallTemplateId = this.mallTemplateInfo.id