Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

package.json

@@ -55,7 +55,7 @@
     "god": "^0.2.4",
     "immutability-helper": "^3.1.1",
     "lingxi-design": "^1.0.8",
-    "lingxi-design-ui": "^1.1.16",
+    "lingxi-design-ui": "^1.1.17",
     "lingxi-editor-core": "^1.0.6",
     "lingxi-web": "^1.0.6",
     "lint-staged": "^10.0.7",

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

@@ -121,7 +121,7 @@ const Header: React.FC<HeaderPropsType> = (props) => {
       <div id="floatSearch" className={cx(styles.header, styles.float)}>
         <div className={styles.header_container}>
           <div className={styles.logo}>
-            <img src={logo} />
+            <ImageBox  width={145} height={50} imgUrl={logo} />
           </div>
           <div className={styles.mall_search}>
             <div className={styles.mall_search_box}>

src/theme/science/styles/colors.less

@@ -3,8 +3,11 @@
 .theme-mall-science {
   font-size: 14px;
   --mall_main_color: #00B37A;
-  --mall_main_color_opacity_2: rgba(211, 47, 47, .2);
-  --mall_sub_color: rgba(211, 47, 47, 0.1);
+  --mall_main_color_opacity_2: #daf2e7;
+  --mall_sub_color: #daf2e7;
+  // --mall_main_color: #D32F2F;
+  // --mall_main_color_opacity_2: rgba(211, 47, 47, .2);
+  // --mall_sub_color: rgba(211, 47, 47, 0.1);
 
   --category_content_bg: #FFFFFF;
   --category_content_title_text: #303133;