Merge branch 'master' of www.gitinn.com:zaixianjiaoyu/sourcecode

# Conflicts:
#	front/project/www/components/Login/index.js

front/project/h5/routes/page/pay/page.js

@@ -142,7 +142,10 @@ export default class extends Page {
   }
 
   renderView() {
-    const { show, showEnd } = this.state;
+    const { show, showEnd, showContract } = this.state;
+    if (showContract) {
+      return this.renderContract();
+    }
     if (show) {
       return this.renderPay();
     }
@@ -175,13 +178,11 @@ export default class extends Page {
           商品信息
         </div>
         {content}
-        {info.refund_policy && [< div className="title">退款政策</div>,
-          <div className="desc">{info.refund_policy}</div>]}
-        {info.copyright_notes && [<div className="title">版权说明</div>,
-          <div className="desc">{info.copyright_notes}</div>]}
+        {info.refund_policy && [< div className="title">退款政策</div>, <div className="desc">{info.refund_policy}</div>]}
+        {info.copyright_notes && [<div className="title">版权说明</div>, <div className="desc">{info.copyright_notes}</div>]}
         {order.productTypes && order.productTypes.indexOf('course') > 0 && <div className="agree">
           <Checkbox checked={checked} onChange={() => this.setState({ checked: !checked })} />
-          我已阅读并同意 <a onClick={() => this.setState({ showContract: true })}>{contract.title}</a>
+          我已阅读并同意 <a onClick={() => this.setState({ showContract: true })}>《{contract.title}》</a>
         </div>}
         <div className="fixed">
           <div className="tip">*若在购买过程中遇到问题，请联系千行小助手协助解决</div>
@@ -267,4 +268,10 @@ export default class extends Page {
       </div>
     );
   }
+
+  renderContract() {
+    const { contract } = this.state;
+    // 需要一个关闭x在左上角
+    return <div dangerouslySetInnerHTML={{ __html: contract.content }} />;
+  }
 }

front/project/www/components/Login/index.js

@@ -311,6 +311,7 @@ export default class Login extends Component {
             <a href={`/contract/${privacyContract.key}`} target="_blank">
               《{privacyContract.title}》
             </a>
+            。
           </div>
         )}
         <Button
@@ -427,6 +428,7 @@ export default class Login extends Component {
             <a className="f-r" onClick={() => this.setState({ type: LOGIN_PHONE })}>
               使用手机号码登录
             </a>
+            。
           </div>
         )}
         {!needEmail && (

front/project/www/components/PayModal/index.js

@@ -267,7 +267,7 @@ export class PayMModal extends Component {
               <Checkbox className="m-r-1" checked={checked} onClick={() => {
                 this.setState({ showChecked: checked, checked: !checked });
               }} />
-              我已阅读并同意<a href={`/contract/${contract.key}`} target="_blank">{contract.title}</a>
+              我已阅读并同意<a href={`/contract/${contract.key}`} target="_blank">《{contract.title}》</a>
             </div>
           </div>
 
@@ -356,7 +356,7 @@ export class PayMutilModal extends Component {
               <Checkbox className="m-r-1" checked={checked} onClick={() => {
                 this.setState({ showChecked: checked, checked: !checked });
               }} />
-              我已阅读并同意<a href={`/contract/${contract.key}`} target="_blank">{contract.title}</a>
+              我已阅读并同意<a href={`/contract/${contract.key}`} target="_blank">《{contract.title}》</a>
             </div>
           </div>