Merge branch 'develop/deploy' of...

Merge branch 'develop/deploy' of https://gitlab.kis-v.com/congmt_kis/aqbits-trace-code into develop/change-ui

src/data/index.json

@@ -48,12 +48,12 @@
           ],
           "product_certification": [
             {
-              "certification_information": "Chứng nhận certificate",
+              "certification_information": "Chứng nhận certificate 1",
               "image": "/image/certificate/certificate.jpg",
               "date": 1624870109921
             },
             {
-              "certification_information": "Chứng nhận certificate",
+              "certification_information": "Chứng nhận certificate 2",
               "image": "/image/certificate/certificate.jpg",
               "date": 1624870109921
             }

src/views/examples/Tracecode.js

@@ -99,7 +99,7 @@ const Tracecode = () => {
                 </Col>
                 <Col md="6">
                   <div className="pl-md-5">
-                    <h3>{product.name}</h3>
+                    <div className="h3 font-weight-bold m3">{product.name}</div>
                     <div className="h5 mb-3">Mã sản phẩm <span className="font-weight-bold">{product.trace_code}</span></div>
                     <div className="h5 mb-3">Xuất xứ <span className="font-weight-bold">{product.origin}</span></div>
                     <div className="h5 mb-3" style={{ color: '#33CC66' }}>Giá: {product.cost}</div>
@@ -170,7 +170,7 @@ const Tracecode = () => {
                   <TabContent activeTab={"plainTabs" + plainTabs}>
                     <TabPane tabId="plainTabs1">
                       <div className="description">
-                        <div className="h5 font-weight-bold mb-3">{product.name}</div>
+                        <div className="h3 font-weight-bold mb-3">{product.name}</div>
                         <div className="h5 mb-3">Mã sản phẩm <span className="font-weight-bold">{product.trace_code}</span></div>
                         <div className="h5 mb-3">Xuất xứ <span className="font-weight-bold">{product.origin}</span></div>
                         <div className="h5 mb-3" style={{ color: '#33CC66' }}>Giá: {product.cost}</div>
@@ -182,8 +182,9 @@ const Tracecode = () => {
                           <div>
                             <div className="h5 font-weight-bold mt-3">{diary.company}</div>
                             <Row className="h6 mb-3">
-                              <Col>{formatDateTime(diary.date)}</Col>
-                              <Col>{diary.description}</Col>
+                              <Col xs={4}>{formatDateTime(diary.date)}</Col>
+                              <Col xs={6}>{diary.description}</Col>
+                              <Col></Col>
                             </Row>
                           </div>
                         ))}
@@ -194,8 +195,8 @@ const Tracecode = () => {
                         {product.product_certification.map((certificate) => (
                           <Row>
                             <Col xs={4}>
-                              <div className="h6 mt-3 mb-3">{certificate.certification_information}</div>
                               <img src={window.location.origin + certificate.image} alt="certificate" height="250px" />
+                              <div className="h5 mt-3 mb-3 font-weight-bold">{certificate.certification_information}</div>
                             </Col>
                           </Row>
                         ))}