Merge branch 'master' of https://g.civnet.cn:8443/test/maintenance

src/pages/mobileConfig/SiteConfig.jsx

@@ -21,8 +21,8 @@ const SiteConfig = props => {
   const [form] = Form.useForm();
   const layout = {
     layout: 'horizontal',
-    labelCol: { span: 3 },
-    wrapperCol: { span: 14 },
+    labelCol: { span: 7 },
+    wrapperCol: { span: 6 },
   };
   useEffect(() => {
     console.log(miniTitle, 'miniTitle');
@@ -88,6 +88,7 @@ const SiteConfig = props => {
   };
   return (
     <Spin spinning={loading} tip="loading...">
+      <div style={{ minHeight: 'calc(100vh  - 172px)', marginTop: '20px' }}>
         <Form form={form} {...layout}>
           <Item
             label="应用名称："
@@ -181,12 +182,13 @@ const SiteConfig = props => {
               <Radio value={false}>否</Radio>
             </Radio.Group>
           </Item>
-        <Item style={{ textAlign: 'center' }}>
+          <Item wrapperCol={{ span: 6, offset: 7 }}>
             <Button type="primary" onClick={submit}>
               提交
             </Button>
           </Item>
         </Form>
+      </div>
     </Spin>
   );
 };

src/pages/mobileConfig/menuconfig/LeftPart.less

 .contentContainer{
-  max-height: calc(100vh - 300px);
+    // min-height: calc(100vh - 48px);
     overflow-x: auto;
     display: flex;
     .menuContainer{
         min-width: 300px;
-      border:1px solid #abaeb1;
-      // min-height:calc(100vh - 300px);
+        border:2px solid #eee;
+        min-height:calc(100vh - 172px);
         overflow-y:auto;
         .ant-tree-list{
             padding: 10px;
@@ -26,7 +26,7 @@
         padding: 16px;
         float: left;
         min-width: 500px;
-      border:1px solid #abaeb1;
+        border:2px solid #eee;
         .ant-table-pagination-right{
             padding-right: 12px;
         }
@@ -35,8 +35,8 @@
         margin-left: 12px;
         // flex: 1;
         float: left;
-      min-width: 400px;
-      border:1px solid #abaeb1;
+        min-width: 700px;
+        border:2px solid #eee;
         .ant-table-pagination-right{
             padding-right: 12px;
         }

src/pages/mobileConfig/menuconfig/MenuConfig.jsx

@@ -6,10 +6,10 @@ import LeftPart from './LeftPart';
 const MenuConfig = props => {
   const [flag, setFlag] = useState(1);
   return (
-    <ProCard split="vertical">
+    <div split="vertical">
       <LeftPart />
       {/* <ProCard><AddForm /></ProCard> */}
-    </ProCard>
+    </div>
   );
 };
 export default MenuConfig;

src/pages/userCenter/siteManage/SiteManage.jsx

@@ -130,6 +130,7 @@ const SiteManage = () => {
     let arr = list.map(item => {
       item.id = item.OUID * 10000;
       item.text = item.OUName;
+      item.isChecked = false;
       item.type = 'widgetGroup';
       item.children = item.userList.map(u => ({
         ...u,

src/services/mobileConfig/api.js

@@ -37,3 +37,7 @@ export const editWebsite = (params, options) => {
     options,
   );
 };
+
+/**
+ * @获取菜单配置
+ */