Merge branch 'feature/merchant-info-edit' of...

Merge branch 'feature/merchant-info-edit' of git.quantgroup.cn:ui/merchant-manage-ui into feature/merchant-info-alter

src/pages/businessManage/info/data.js

@@ -266,8 +266,8 @@ export function renderServiceTags() {
         that.state.businessInfo.customList.map(tag => {
           const isLongTag = tag.length > 20;
           const tagElem = (
-            // closable 二期放开
-            <Tag key={tag} onClose={() => handleClose.call(that, tag)}>
+            // 二期放开
+            <Tag key={tag} closable onClose={() => handleClose.call(that, tag)}>
               {isLongTag ? `${tag.slice(0, 20)}...` : tag}
             </Tag>
           );
@@ -293,14 +293,14 @@ export function renderServiceTags() {
         />
       )}
       {/* 二期放开 */}
-      {/* {!that.state.tagVisible && (
+      {!that.state.tagVisible && (
         <Tag
           onClick={() => showInput.call(that)}
           style={{ background: '#fff', borderStyle: 'dashed' }}
         >
           <PlusOutlined /> 新增
         </Tag>
-      )} */}
+      )}
     </div>
   );
 }

src/pages/businessManage/info/index.jsx

@@ -70,7 +70,7 @@ class BusinessInfo extends Component {
     mainCategoryId: null,
     companyNamedis: false, // 公司名称
     companyType: null, // 企业类型
-    disabled: true, // 二期放开
+    disabled: false, // 二期放开
   };
 
   async componentDidMount() {
@@ -203,7 +203,11 @@ class BusinessInfo extends Component {
           '';
         obj.householdRegisterImage =
           (imgs?.householdRegisterImage?.length && imgs?.householdRegisterImage[0]?.url) || '';
+        if (!this.state.companyNamedis) {
           obj.icbProofImage = (imgs?.icbProofImage?.length && imgs?.icbProofImage[0]?.url) || '';
+        } else {
+          delete obj.icbProofImage;
+        }
 
         obj.applySource = 1;
         obj.signDateType = 1;
@@ -582,9 +586,11 @@ class BusinessInfo extends Component {
                     <Row>
                       <Col span={4} style={{ marginTop: '4px' }}>
                         {/* 二期放开 */}
-                        {/* {businessInfo.companyName && (
-                          <Button onClick={this.setCompanyName}>修改</Button>
-                        )} */}
+                        {businessInfo.companyName && (
+                          <Button onClick={this.setCompanyName}>
+                            {this.state.companyNamedis ? '修改' : '取消'}
+                          </Button>
+                        )}
                       </Col>
                       <Col span={12}>
                         <FormItem label="公司名称" labelCol={{ span: 8 }}>
@@ -1194,14 +1200,14 @@ class BusinessInfo extends Component {
             </Card>
           )}
           {/* 临时注释二期放开 */}
-          {/* <div className={styles.formBtns}>
+          <div className={styles.formBtns}>
             <Button type="primary" size="large" htmlType="submit" loading={this.state.loading}>
               修改并提交
             </Button>
             <Button size="large" onClick={this.onCancel}>
               取消
             </Button>
-          </div> */}
+          </div>
         </Form>
         {this.state.visibleLoading && (
           <div className={styles.spinBox}>

src/pages/businessManage/service.js

@@ -50,7 +50,7 @@ export const apiRecognize = params =>
 
 // 编辑商户信息
 export const apiEditStoreInfo = params =>
-  request.post('/api/merchants/suppliers/edit', { prefix: kdspApi, data: params });
+  request.post('/api/merchants/suppliers/info/edit', { prefix: kdspApi, data: params });
 
 // 查询商户详情
 export const apiBusinessDetail = businessId =>

src/pages/orderManage/pendingDeliveryOrder/index.less

@@ -48,13 +48,13 @@
   }
 }
 .btnWarning {
-  background-color: rgb(247, 143, 74);
-  border-color: rgb(247, 143, 74);
+  background-color: rgb(247, 143, 74) !important;
+  border-color: rgb(247, 143, 74) !important;
 }
 .btnWarning:hover,
 .btnWarning:focus {
-  background-color: rgb(253, 168, 111);
-  border-color: rgb(253, 168, 111);
+  background-color: rgb(253, 168, 111) !important;
+  border-color: rgb(253, 168, 111) !important;
 }
 
 .tableList {