merge

src/components/BasicShop/BasicComponents/Form/baseForm.less

@@ -2,7 +2,7 @@
   margin-bottom: 10px;
   .radioTitle {
     padding: 6px 16px;
-    font-size: 15px;
+    // font-size: 15px;
   }
   .radioItem {
     margin-top: 10px;

src/components/BasicShop/BasicComponents/Form/index.less

@@ -7,7 +7,7 @@
   .title {
     padding-bottom: 20px;
     text-align: center;
-    font-size: 18px;
+    // font-size: 18px;
   }
   .formContent {
   }

src/components/BasicShop/BasicComponents/Header/index.less

@@ -17,7 +17,7 @@
     }
   }
   .title {
-    font-size: 20px;
+    // font-size: 20px;
     color: #fff;
   }
 }

src/components/BasicShop/BasicComponents/WhiteTpl/index.less

@@ -1,7 +1,7 @@
 .whiteTpl {
   text-align: center;
   .title {
-    font-size: 14px;
+    // font-size: 14px;
     color: #fff;
   }
 }

src/components/Calibration/index.less

@@ -5,6 +5,6 @@
   white-space: nowrap;
   pointer-events: none;
   :global(.calibrationNumber) {
-    font-size: 12px;
+    font-size: 14px;
   }
 }

src/components/CommonComponents/VisualComponents/Form/baseForm.less

@@ -2,7 +2,7 @@
   margin-bottom: 10px;
   .radioTitle {
     padding: 6px 16px;
-    font-size: 15px;
+    // font-size: 15px;
   }
   .radioItem {
     margin-top: 10px;

src/components/PanelComponents/MutiText/index.less

@@ -3,7 +3,7 @@
     margin-bottom: 12px;
     display: flex;
     .delBtn {
-      font-size: 18px;
+      // font-size: 14px;
       margin-left: 12px;
       cursor: pointer;
     }

src/components/PanelComponents/Upload/index.less

@@ -1,6 +1,6 @@
 :global(.ant-upload-select-picture-card i) {
   color: #999;
-  font-size: 32px;
+  font-size: 14px;
 }
 
 :global(.ant-upload-select-picture-card .ant-upload-text) {

src/global.css

@@ -69,4 +69,8 @@ body {
   display: flex;
   flex-wrap: wrap;
   padding-left: 12px!important;
+}
+
+.ant-form-item-label > label {
+  color: #4A4A4A !important;
 }

src/pages/editor/Container.tsx

@@ -484,32 +484,39 @@ const Container = (props: {
             canvasId={canvasId}
             allType={allType}
           />
-
+          {/* TODO 暂时隐藏 */}
-          <div className={styles.resetBall}>
+          {/* <div className={styles.resetBall}>
             <ReloadOutlined onClick={() => setDragState({ x: 0, y: 0 })} />
           </div>
-          <div className={styles.controllBall}>{render}</div>
+          <div className={styles.controllBall}>{render}</div> */}
 
           <div className={styles.sliderWrap}>
-            <span className={styles.sliderBtn} onClick={handleSlider.bind(this, 1)}>
+            <span
+              style={{ marginLeft: '13px' }}
+              className={styles.sliderBtn}
+              onClick={handleSlider.bind(this, 1)}
+            >
               +
             </span>
-            <Slider
+            {/* <Slider
-              vertical
               defaultValue={100}
               className={styles.slider}
               onChange={handleSliderChange}
               min={50}
               max={150}
               value={scaleNum * 100}
-            />
+            /> */}
+            <span>{scaleNum * 100}%</span>
             <span className={styles.sliderBtn} onClick={handleSlider.bind(this, 0)}>
               -
             </span>
+            <span className={styles.backSize}>
+              <ExpandOutlined onClick={backSize} />
+            </span>
           </div>
-          <div className={styles.backSize}>
+          {/* <div className={styles.backSize}>
             <ExpandOutlined onClick={backSize} />
-          </div>
+          </div> */}
         </div>
         {renderRight}
         <div

src/pages/editor/components/Header/index.less

@@ -17,13 +17,14 @@
       cursor: pointer;
     }
     .logo {
+      position: fixed;
       display: inline-block;
-      width: 100px;
+      width: 50px;
+      height: 50px;
       overflow: hidden;
-      border-radius: 3px;
+      background: url(../../../../assets/logo.png) no-repeat;
-      vertical-align: middle;
+      background-size: contain;
-      font-size: 20px;
+      line-height: 50px;
-      font-weight: bold;
     }
   }
   .controlArea {

src/pages/editor/components/Header/index.tsx

@@ -135,7 +135,7 @@ const HeaderComponent = memo((props: HeaderComponentProps) => {
         <div className={styles.backBtn} onClick={toBack}>
           <ArrowLeftOutlined />
         </div>
-        <div className={styles.logo}>Dooring</div>
+        <div className={styles.logo}></div>
       </div>
       <div className={styles.controlArea}>
         <Button type="primary" style={{ marginRight: '9px' }} onClick={useTemplate}>

src/pages/editor/index.less

@@ -168,29 +168,40 @@
       }
       .sliderWrap {
         position: absolute;
-        width: 30px;
+        display: inline-block;
-        right: 16px;
+        right: 30px;
         bottom: 130px;
+        height: 32px;
+        line-height: 30px;
+        background: #ffffff;
+        box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.1);
+        border-radius: 4px;
+        color: #4a4a4a;
         .slider {
-          height: 120px;
+          position: absolute;
-          display: inline-block;
+          right: 30px;
-          vertical-align: middle;
+          bottom: 95px;
+          font-size: 14px;
         }
         .sliderBtn {
           cursor: pointer;
           user-select: none;
+          display: inline;
+          font-size: 14px;
+          color: #4a4a4a;
         }
         span {
-          margin: 0 12px;
+          margin: 0 8px;
-          display: inline-block;
+        }
-          font-size: 18px;
+        .backSize {
+          cursor: pointer;
+          color: #4a4a4a;
+          &::before {
+            content: '|';
+            color: #dbdbdb;
+            margin-right: 7px;
+          }
         }
-      }
-      .backSize {
-        position: absolute;
-        right: 24px;
-        bottom: 95px;
-        cursor: pointer;
       }
     }
     .attrSetting {
@@ -204,7 +215,6 @@
       right: 0;
       .tit {
         margin-bottom: 16px;
-        font-size: 18px;
         color: #000;
       }
       .posWrap {