Merge branch 'dev' into test

src/pages/lxMall/commodity/list.less

@@ -178,7 +178,7 @@
     }
 
     .goods_price {
-      color: var(--mall_main_color);
+      color: #D32F2F;
       line-height: 16px;
       display: flex;
       font-weight: bold;

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

@@ -39,8 +39,7 @@
 
         &.active {
           &>a {
-            color: #D32F2F;
-            // color: @mall_main_color;
+            color: @mall_main_color;
           }
         }
       }

src/pages/lxMall/layouts/LXShopLayout.tsx

@@ -124,7 +124,7 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
                   updateShopInfo: () => handleUpdate()
                 },
               );
-            }) : <SearchShopResult search={shopInfo.memberName} /> : null
+            }) : <SearchShopResult search={shopInfo ? shopInfo.memberName : ''} /> : null
           }
         </div>
         <Footer />

src/pages/lxMall/shopList/list.tsx

@@ -83,7 +83,7 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
             </div>
             <div className={styles.shop_list_goods}>
               {
-                item.commodityList && item.commodityList.map((commodityItem, commodityIndex) => commodityIndex < 2 && (
+                item.productList && item.productList.map((commodityItem, commodityIndex) => commodityIndex < 2 && (
                   <Link to={`/shop/commodity/detail?id=${commodityItem.id}&shopId=${btoa(JSON.stringify({ shopId: item.id, memberId: item.memberId }))}`} key={commodityItem.id} target="_blank">
                     <div className={styles.shop_list_goods_item}>
                       <div className={styles.shop_list_goods_item_imgbox}>

src/pages/payandSettle/amountAccountManage/checkWithdraw/checkDetail.tsx

@@ -41,7 +41,7 @@ const CheckDetail: React.FC<{}> = () => {
     const { code, data } = res
     setDetails(data)
     if(code === 1000) {
-      let bankRes = await PublicApi.getSettleAccountsCorporateAccountConfig({memberId: data.memberId + ''})
+      let bankRes = await PublicApi.getSettleAccountsCorporateAccountConfig({memberId: data.memberId + '', memberRoleId: data.memberRoleId + ''})
       setBankDetail(bankRes.data)
     }
   }

src/pages/payandSettle/creditApplication/quotaMenage/detail/components/IntroduceRow/index.tsx

@@ -264,6 +264,8 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
               });
               this.payRecordId = `${res.data.recordId}`;
               this.handleWxPayVisible(true);
+
+              break;
             }
 
             default: {

src/pages/trademark/addBrand.tsx

@@ -186,6 +186,7 @@ const AddBrand: React.FC<{}> = () => {
           保存
         </Button>,
       ]}
+      className={styles.brandBox}
     >
       <Space direction="vertical" style={{width:'100%'}}>
         <Card headStyle={{borderBottom:'none'}} title="流程进度">

src/pages/trademark/index.less

@@ -8,3 +8,11 @@
     padding: 18px;
   }
 }
+
+.brandBox {
+  :global {
+    .ant-form-item {
+      display: block;
+    }
+  }
+}

src/pages/transaction/components/orderPayTabs/index.less

@@ -15,3 +15,9 @@
   color: #303133;
   line-height: 24px;
 }
+
+.card-list {
+  font-size: 12px;
+  line-height: 20px;
+  margin-top: 4px;
+}

src/pages/transaction/components/orderPayTabs/index.tsx

@@ -4,6 +4,11 @@ import { Tabs, Row, Col } from 'antd'
 import { OrderDetailContext } from '../../_public/order/context'
 import MellowCard from '@/components/MellowCard'
 import StatusColors from '../StatusColors'
+import moment from 'moment'
+
+/**
+ * 展示 支付比例和简单流程的发货信息
+ */
 
 export interface OrderPayTabsProps {}
 
@@ -35,6 +40,9 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
 
   const { data, payList, ctl } = useContext(OrderDetailContext)
 
+  // 简单流程为24
+  const processEnum = data.processEnum
+
   useEffect(() => {
     // 过滤支付信息 取第一个待支付的id
     if(data?.paymentInformationResponses?.length) {
@@ -50,7 +58,10 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
   }
 
   return (
-    <MellowCard style={{marginTop: 24}} bordered={false}>
+    <Row gutter={24} style={{marginTop: 24}}>
+      <Col span={processEnum === 24 ? 12 : 24}>
+        <MellowCard bordered={false} fullHeight>
+        {/* <Row gutter={24}> */}
           <Tabs defaultActiveKey='1' onChange={onChange}>
             { data.paymentInformationResponses && data.paymentInformationResponses.map(v => <TabPane key={v.id} tab={<TabHeader dataSource={v}/>}>
                 <Row>
@@ -67,7 +78,33 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
                 </Row>
             </TabPane>) }
           </Tabs>
+        {/* </Row> */}
         </MellowCard>
+      </Col>
+      {
+        processEnum === 24 && data &&
+        <Col span={12}>
+          <MellowCard title="发货信息" fullHeight>
+            <Row className={style['card-list']}>
+              <Col span={6}><p>发货地址: </p></Col>
+              <Col><p>{data.name}</p></Col>
+            </Row>
+            <Row className={style['card-list']}>
+              <Col span={6}><p>发货时间: </p></Col>
+              <Col><p>{moment(data.deliverTime).format('YYYY-MM-DD')}</p></Col>
+            </Row>
+            <Row className={style['card-list']}>
+              <Col span={6}><p>物流单号: </p></Col>
+              <Col><p><a href={`https://www.kuaidi100.com/chaxun?nu=${data.deliverNo}`} target="_blank">{data.deliverNo}</a></p></Col>
+            </Row>
+            <Row className={style['card-list']}>
+              <Col span={6}><p>物流公司: </p></Col>
+              <Col><p>{data.logisticsCompany}</p></Col>
+            </Row>
+          </MellowCard>
+        </Col>
+      }
+    </Row>
   )
 }
 

src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts

@@ -259,6 +259,7 @@ export const useElectronicContract = (ctx: ISchemaFormActions | ISchemaFormAsync
   params['memberId'] = ctx.getFieldValue('supplyMembersId')
   params['memberRoleId'] = ctx.getFieldValue('supplyMembersRoleId')
 
+  if(params['memberId'] && params['memberRoleId']) {
     fetchOrderApi.getOrderWorkFlow(params).then(data => {
       // 简单流程并使用电子合同 强行启用电子合同
       if(data["processEnum"] === 24 && data["isElectronicContract"]) {
@@ -276,4 +277,5 @@ export const useElectronicContract = (ctx: ISchemaFormActions | ISchemaFormAsync
         })
       }
     })
+  }
 }

src/pages/transaction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx

@@ -3,8 +3,6 @@ import { PayInfoCell, EditableRow } from '../components/payInfoTableCell'
 import { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd'
 import { useEffect, useState, useRef, useContext } from 'react'
 import { PublicApi } from '@/services/api'
-import { ReadyAddOrderDetailContext } from '../../context'
-import { message } from 'antd'
 
 export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions, memberId: any, memberRoleId: any, orderProducts: any): any => {
   const paywayData = useRef<any>({})
@@ -148,7 +146,7 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
           if(options.filter(_item => _item.payType === 4).length)
             options.filter(_item => _item.payType === 4)[0].disabled = false
         }
-      } , 500)
+      } , 800)
 
       setTimeout(() => {
         if(pros.filter(item => item.deliveryType === 1).length !== pros.length) {
@@ -161,7 +159,7 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
           }
         }
       } , 800)
-
+      console.log(newColumns, 'newColumns')
       setColumns(newColumns)
     }
   }

src/pages/transaction/transactionRules/components/RuleSetting.tsx

@@ -3,7 +3,7 @@ import { usePageStatus, PageStatus } from '@/hooks/usePageStatus'
 import { useInitValue } from '@/formSchema/effects/useInitValue'
 import EyePreview from '@/components/EyePreview'
 import { findItemAndDelete } from '@/utils'
-import { ISchemaFormActions, ISchema, FormEffectHooks } from '@formily/antd'
+import { ISchemaFormActions, ISchema, FormEffectHooks, createAsyncFormActions } from '@formily/antd'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
 import { createAddContractTemplateEffect, useUnitPreview } from '../effects'
 import { PublicApi } from '@/services/api'
@@ -129,10 +129,18 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
     setVisibleChannelRroduct(false)
     setProductsLength(productRowCtl.selectRow.length);
     addSchemaAction.setFieldValue('products', productRowCtl.selectRow)
+    clearModalParams()
   }
 
   const handleCancelAddProduct = () => {
     setVisibleChannelRroduct(false)
+    clearModalParams()
+  }
+
+  const clearModalParams = () => {
+    let currentState = JSON.parse(sessionStorage.getItem("currentState"))
+    let result = {...currentState, queryParams: { currentPage: 1}}
+    sessionStorage.setItem("currentState", JSON.stringify(result))
   }
 
   const columnsSetProduct: any[] = [
@@ -321,9 +329,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
         visible={visibleChannelRroduct}
         columns={columnsSetProduct}
         rowSelection={productRowSelection}
-        resetModal={{
-          destroyOnClose: true
-        }}
+        resetModal={{destroyOnClose: true}}
         fetchTableData={params => fetchProductList(params)}
         formilyProps={
           {

src/theme/science/styles/colors.less

@@ -2,7 +2,7 @@
 // 企业商城科技模板
 .theme-mall-science {
   font-size: 14px;
-  --mall_main_color: #D32F2F;
+  --mall_main_color: #00B37A;
   --mall_main_color_opacity_2: rgba(211, 47, 47, .2);
   --mall_sub_color: rgba(211, 47, 47, 0.1);