Merge branch 'feat/constructionOne' into feature/20230327_public_takeaway

* feat/constructionOne:
  feat: 去掉到店判断
  feat: 优化

src/pages/businessManage/info/data.js

@@ -112,8 +112,6 @@ export async function getInfo() {
     const dataList = await apiCategoryList(res.productBusiness);
     categoryList = dataList.data;
   }
-  // 判断是否包含到店类型
-  const storedis = res.productBusiness?.includes(3);
   this.setState({
     settlementType,
     businessInfo: res,
@@ -121,7 +119,6 @@ export async function getInfo() {
     companyNamedis,
     categoryList,
     mainCategoryId: res.mainCategoryId,
-    storedis,
   });
 }
 

src/pages/businessManage/info/index.jsx

@@ -82,7 +82,6 @@ class BusinessInfo extends Component {
     checkboxDisabled: false,
     mainCategoryId: null,
     companyNamedis: false, // 公司名称
-    storedis: true, // 到店校验
   };
 
   async componentDidMount() {
@@ -331,9 +330,7 @@ class BusinessInfo extends Component {
   }
 
   onChangeBusinessModel = e => {
-    const storedis = e.includes(3);
     this.getCategoryList(e);
-    this.setState({ storedis });
     this.props.form.setFieldsValue({
       mainCategoryId: '',
     });
@@ -350,14 +347,7 @@ class BusinessInfo extends Component {
     const {
       form: { getFieldDecorator },
     } = this.props;
-    const {
-      businessInfo,
-      type,
-      checkboxDisabled,
-      mainCategoryId,
-      companyNamedis,
-      storedis,
-    } = this.state;
+    const { businessInfo, type, checkboxDisabled, mainCategoryId, companyNamedis } = this.state;
     return (
       <div className={styles.infoBox}>
         <Form className="login-form" onSubmit={this.handleSubmit} {...formItemLayout}>
@@ -691,7 +681,7 @@ class BusinessInfo extends Component {
                   </Col>
                 </>
               )}
-              {(+mainCategoryId === carID || storedis) && (
+              {+mainCategoryId === carID && (
                 <>
                   <Col span={24}>
                     <FormItem label="授权品牌" labelCol={{ span: 4 }}>
@@ -1091,7 +1081,7 @@ class BusinessInfo extends Component {
               </Row>
             )}
           </Card>
-          {(+mainCategoryId === carID || storedis) && (
+          {+mainCategoryId === carID && (
             <Card title="其他信息">
               <Row gutter={24}>
                 <Col span={24}>

src/pages/chainStoreManage/components/storeModal.jsx

@@ -261,6 +261,7 @@ const StoreModal = props => {
       width="1000px"
       destroyOnClose
       maskClosable={false}
+      onCancel={() => handleCancel()}
       footer={
         <>
           <Button key="back" onClick={() => handleCancel()}>

src/pages/contractView/index.jsx

@@ -93,13 +93,11 @@ const ContractView = () => {
       )}
       {visible && (
         <div className={style.contract}>
-          <iframe src={url} height="600px" width="100%" title="合同"></iframe>
-          <div>
+          <iframe src={url} height="600" width="100%" title="合同"></iframe>
           <Button type="primary" onClick={() => setVisible(false)}>
             取消
           </Button>
         </div>
-        </div>
       )}
     </PageHeaderWrapper>
   );