Merge branch 'feature/zhangleyuan/20200119/style-optimize' into 'master'

Feature/zhangleyuan/20200119/style optimize

See merge request !4

src/modules/root/Header.jsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2019-09-10 18:26:03
  * @Date: 2019-09-10 18:26:03
  * @LastEditors: wufan
  * @LastEditors: wufan
- * @LastEditTime: 2021-01-12 17:25:20
+ * @LastEditTime: 2021-01-25 20:40:53
  * @Description:
  * @Description:
  */
  */
 import React, { useContext, useEffect, useState } from "react";
 import React, { useContext, useEffect, useState } from "react";
@@ -163,9 +163,7 @@ function Header(props) {
                 </div>
                 </div>
               </div>
               </div>
               <div className="share" onClick={handleCopy}>
               <div className="share" onClick={handleCopy}>
-                <Tooltip title="分享店铺" placement="bottom">
-                  <span className="icon iconfont tool-tip-right">&#xe85e;</span>
-                </Tooltip>
+                <span className="icon iconfont tool-tip-right">&#xe85e;</span>
                 <div className="text">分享店铺</div>
                 <div className="text">分享店铺</div>
               </div>
               </div>
 
 

src/modules/store-manage/EmployeeAddOrEditModal.less

 .employee-add-modal {
 .employee-add-modal {
+  .mt-4 {
+    margin-bottom:-6px !important
+  }
+  .mt-10 {
+    margin-bottom:-10px !important
+  }
+  .mt-26 {
+    margin-bottom:-26px !important
+  }
+  .mb10 {
+    margin-top: 5px !important;
+  }
   .radio-tip {
   .radio-tip {
     padding-left: 24px;
     padding-left: 24px;
     font-size: 14px;
     font-size: 14px;

src/modules/store-manage/EmployeeAddOrEditModal.tsx

@@ -2,7 +2,7 @@
  * @Author: wufan
  * @Author: wufan
  * @Date: 2020-11-27 16:21:49
  * @Date: 2020-11-27 16:21:49
  * @LastEditors: wufan
  * @LastEditors: wufan
- * @LastEditTime: 2021-01-09 16:32:41
+ * @LastEditTime: 2021-01-25 21:14:48
  * @Description: Description
  * @Description: Description
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -223,6 +223,8 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
               rules={[{ required: true }]}
               rules={[{ required: true }]}
               validateStatus={nameStatus}
               validateStatus={nameStatus}
               help={nameErrorMsg}
               help={nameErrorMsg}
+              style={{marginBottom:'-2px !important'}}
+             className="mt-4"
             >
             >
               <Input
               <Input
                 style={{ width: 200 }}
                 style={{ width: 200 }}
@@ -236,6 +238,8 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
               <Form.Item
               <Form.Item
                 label="企业微信账号"
                 label="企业微信账号"
                 name="weChatAccount"
                 name="weChatAccount"
+                style={{marginBottom:'-2px !important'}}
+                className="mt-10"
               >
               >
                 <div>{props.choosedItem.weChatAccount}</div>
                 <div>{props.choosedItem.weChatAccount}</div>
               </Form.Item>
               </Form.Item>
@@ -246,6 +250,8 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
                 rules={[{ required: true }]}
                 rules={[{ required: true }]}
                 validateStatus={phoneStatus}
                 validateStatus={phoneStatus}
                 help={phoneErrorMessage}
                 help={phoneErrorMessage}
+                style={{marginBottom:'-2px !important'}}
+                className="mt-10"
               >
               >
                 <Input
                 <Input
                   style={{ width: 200 }}
                   style={{ width: 200 }}
@@ -268,13 +274,17 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
               label="员工身份"
               label="员工身份"
               name="role"
               name="role"
               rules={[{ required: false }]}
               rules={[{ required: false }]}
+              style={{marginBottom:'-2px !important'}}
+              className="mt-26"
             >
             >
               <RadioGroup
               <RadioGroup
                 onChange={(e) => {
                 onChange={(e) => {
                   handleChangeValues("role", e.target.value);
                   handleChangeValues("role", e.target.value);
                 }}
                 }}
+                className="mt5"
               >
               >
-                <Radio value={"CloudLecturer"}>
+                <Radio value={"CloudLecturer"} className="mt-4"
+>
                   <span style={{ color: "#333" }}>普通讲师</span>
                   <span style={{ color: "#333" }}>普通讲师</span>
                   <p className="radio-tip">
                   <p className="radio-tip">
                     仅可查看/使用与自己相关的文件和课表，并进行上课
                     仅可查看/使用与自己相关的文件和课表，并进行上课