Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5

public/index.html

@@ -14,7 +14,6 @@
     -->
   <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
   <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/goods_new_v3.js?v3"></script>
-  <!-- <script src="./goods_new_v4.js"></script> -->
   <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

src/icons/iconfont.css

@@ -0,0 +1,71 @@
+@font-face {
+  font-family: "marketing"; /* Project id 2908384 */
+  src: url('./iconfont.woff2?t=1661913208504') format('woff2'),
+       url('./iconfont.woff?t=1661913208504') format('woff'),
+       url('./iconfont.ttf?t=1661913208504') format('truetype');
+}
+
+.marketing {
+  font-family: "marketing" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.marketing-list:before {
+  content: "\e626";
+}
+
+.marketing-beijingtupian:before {
+  content: "\e833";
+}
+
+.marketing-tupian:before {
+  content: "\e889";
+}
+
+.marketing-fuwenbenkuang:before {
+  content: "\e66f";
+}
+
+.marketing-sousuolan-:before {
+  content: "\e606";
+}
+
+.marketing-lunbotuguanli:before {
+  content: "\e642";
+}
+
+.marketing-sousuo:before {
+  content: "\e62f";
+}
+
+.marketing-yanjing:before {
+  content: "\e611";
+}
+
+.marketing-yanjing-biyan:before {
+  content: "\e63a";
+}
+
+.marketing-duigoux:before {
+  content: "\ec9e";
+}
+
+.marketing-changjianwentixiangguanwenti:before {
+  content: "\e689";
+}
+
+.marketing-wenti:before {
+  content: "\e639";
+}
+
+.marketing-quxiao:before {
+  content: "\e61d";
+}
+
+.marketing-jiantou_xiangzuo:before {
+  content: "\eb09";
+}
+

src/index.js

@@ -4,6 +4,7 @@ import './index.css';
 import App from './App';
 import reportWebVitals from './reportWebVitals';
 import 'zent/css/index.css';
+import './icons/iconfont.css'
 ReactDOM.render(
   // <React.StrictMode>
     <App />

src/pages/exchangepage/couponTemplate/goodsPage/componentLib/main.js

@@ -20,9 +20,12 @@ export default class componentLib extends React.Component {
     return (
       <div className='componentLib'>
           <h4>基础组件</h4>
+          <div className="marketing marketing-tupian">&#x33;</div>
+
          <ul>
              <li>
-                 轮播图
+               <i className='marketing marketing-tupian'/>
+                <span>轮播图</span>
              </li>
              <li>
                  背景图

src/pages/exchangepage/couponTemplate/goodsPage/componentLib/main.less

@@ -1,3 +1,4 @@
+
 .componentLib {
     width: 180px;
     height: 100%;
@@ -7,13 +8,16 @@
     right: -190px;
     padding: 15px;
     box-sizing: border-box;
+
     h4 {
         padding: 15px 0;
     }
+
     ul {
         display: flex;
         flex-wrap: wrap;
         justify-content: space-between;
+
         li {
             margin: 0 0 15px 0;
             border-radius: 2px;
@@ -21,11 +25,23 @@
             height: 72px;
             font-size: 12px;
             color: #666;
-            background: #f99;
+            background: #fff;
             display: flex;
+            flex-direction: column;
             align-items: center;
             justify-content: center;
             cursor: pointer;
+            transition: all .3s;
+
+            &:hover {
+                background: #007aff;
+                color: #fff;
             }
         }
     }
+
+    span,
+    i {
+        color: #f00;
+    }
+}