Browse Source

fix style

KaysonCui 5 years ago
parent
commit
880936bf58

+ 42 - 0
front/project/h5/routes/product/dataDetail/index.less

@@ -57,6 +57,48 @@
     border-top: 1px solid #eee;
     background: #fff;
 
+    .action {
+      display: inline-block;
+      margin-right: 10px;
+
+      .minus {
+        display: inline-block;
+        width: 20px;
+        height: 20px;
+        border: 1px solid #dfdfdf;
+        border-radius: 50%;
+        text-align: center;
+        line-height: 20px;
+        font-size: 10px;
+
+        i {
+          vertical-align: none;
+        }
+      }
+
+      .num {
+        display: inline-block;
+        color: #686872;
+        margin: 0 15px;
+      }
+
+      .add {
+        display: inline-block;
+        width: 20px;
+        height: 20px;
+        background: #41a6f3;
+        border-radius: 50%;
+        color: #fff;
+        text-align: center;
+        line-height: 20px;
+        font-size: 10px;
+
+        i {
+          vertical-align: none;
+        }
+      }
+    }
+
     .fee {
       display: inline-block;
     }

+ 24 - 2
front/project/h5/routes/product/dataDetail/page.js

@@ -11,6 +11,7 @@ import { Course } from '../../../stores/course';
 import { Order } from '../../../stores/order';
 import { DataType } from '../../../../Constant';
 import { FAQItem, CommentItem } from '../../../components/Item';
+import Icon from '../../../components/Icon';
 
 const DataTypeMap = getMap(DataType, 'value', 'label');
 
@@ -40,10 +41,22 @@ export default class extends Page {
         content = <div dangerouslySetInnerHTML={{ __html: data[tab] }} />;
         break;
       case 'faq':
-        content = <div>{(data.faqs || []).map(row => <FAQItem data={row} />)}</div>;
+        content = (
+          <div>
+            {(data.faqs || []).map(row => (
+              <FAQItem data={row} />
+            ))}
+          </div>
+        );
         break;
       case 'comment':
-        content = <div>{(data.comments || []).map(row => <CommentItem data={row} />)}</div>;
+        content = (
+          <div>
+            {(data.comments || []).map(row => (
+              <CommentItem data={row} />
+            ))}
+          </div>
+        );
         break;
       default:
         break;
@@ -85,6 +98,15 @@ export default class extends Page {
         />
         {this.renderText()}
         <div className="fixed">
+          <div className="action">
+            <div className="minus">
+              <Icon type="minus" />
+            </div>
+            <div className="num">10</div>
+            <div className="add">
+              <Icon type="plus" />
+            </div>
+          </div>
           <div className="fee">
             总额: <Money value={data.price} size="lager" />
           </div>

+ 2 - 0
front/project/www/components/Modal/index.js

@@ -20,6 +20,7 @@ export default class extends Component {
       close = true,
       maskClosable = false,
       body = true,
+      center,
     } = this.props;
     return (
       <Modal
@@ -30,6 +31,7 @@ export default class extends Component {
         footer={false}
         width={width}
         onCancel={onClose}
+        centered={center}
       >
         <div className="g-modal-wrapper">
           {close && onClose && <Icon className="close" type="close-circle" theme="filled" onClick={() => onClose()} />}

+ 64 - 1
front/project/www/routes/my/collect/index.less

@@ -1,3 +1,66 @@
 @charset "utf-8";
 
-#my-sollect {}
+#my-collect {
+  .user-action {
+    .tip {
+      font-size: 12px;
+      color: #A7A7B7;
+
+      span {
+        color: #4299FF;
+        cursor: pointer;
+        margin: 0 5px;
+      }
+
+      i {
+        font-size: 14px;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .table-layout {
+    padding: 20px 30px;
+
+    .user-table {
+      font-size: 12px;
+    }
+
+    .article-item {
+      .detail {
+        max-height: 140px;
+        overflow: hidden;
+        background: linear-gradient(360deg, rgba(161, 161, 171, 0) 0%, rgba(104, 104, 114, 1) 100%);
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+      }
+    }
+  }
+}
+
+.g-modal.article-detail-modal {
+  .ant-modal-body {
+    .detail {
+      height: 600px;
+      overflow-y: auto;
+    }
+
+    .prev {
+      position: absolute;
+      left: -100px;
+      top: 300px;
+      color: #fff;
+      font-size: 37px;
+      cursor: pointer;
+    }
+
+    .next {
+      position: absolute;
+      right: -100px;
+      top: 300px;
+      color: #fff;
+      font-size: 37px;
+      cursor: pointer;
+    }
+  }
+}

File diff suppressed because it is too large
+ 98 - 60
front/project/www/routes/my/collect/page.js


+ 4 - 0
front/project/www/routes/my/error/index.less

@@ -21,5 +21,9 @@
 
   .table-layout {
     padding: 20px 30px;
+
+    .user-table {
+      font-size: 12px;
+    }
   }
 }