From 3c42f80482d1756b726f312a6ba2a1145cb20375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 20 Sep 2019 12:57:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/package-lock.json            |  6 +++---
 public/react/package.json                 |  2 +-
 public/react/public/index.html            |  2 +-
 public/react/src/modules/tpm/TPMBanner.js | 15 +++------------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/public/react/package-lock.json b/public/react/package-lock.json
index 289474cd0..631da270e 100644
--- a/public/react/package-lock.json
+++ b/public/react/package-lock.json
@@ -82,9 +82,9 @@
       "integrity": "sha1-YxCgR/EtIaEDb7AxMXIZiSRAQW8="
     },
     "@icedesign/base": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npm.taobao.org/@icedesign/base/download/@icedesign/base-0.2.5.tgz",
-      "integrity": "sha1-SLoR+qYvizOjQ++mwuRqk4FWMwc=",
+      "version": "0.2.8",
+      "resolved": "https://registry.npm.taobao.org/@icedesign/base/download/@icedesign/base-0.2.8.tgz",
+      "integrity": "sha1-hmlSY+17gnKJB3sbgoy446sqzAk=",
       "requires": {
         "async-validator": "^1.6.7",
         "classnames": "^2.2.3",
diff --git a/public/react/package.json b/public/react/package.json
index e91e61f03..4d899935f 100644
--- a/public/react/package.json
+++ b/public/react/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@icedesign/base": "^0.2.5",
+    "@icedesign/base": "^0.2.8",
     "@novnc/novnc": "^1.1.0",
     "antd": "^3.23.2",
     "array-flatten": "^2.1.2",
diff --git a/public/react/public/index.html b/public/react/public/index.html
index 069e7e808..a2d09dedc 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -6,7 +6,7 @@
     <!-- <meta name="viewport" content=""> -->
     <meta name="theme-color" content="#000000">
     <!--<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">-->
-    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <!--<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">-->
 
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 997786db2..1ac81fe86 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -6,6 +6,8 @@ import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
 
 import PropTypes from 'prop-types';
 
+import { Rating ,Progress} from "@icedesign/base";
+
 import {Modal,Input,Radio,Pagination,message,Spin,Icon,Tooltip} from 'antd';
 
 import AccountProfile from"../user/AccountProfile";
@@ -16,17 +18,6 @@ import axios from 'axios'
 
 import Modals from '../modals/Modals';
 
-// import { Rating,Progress } from '@icedesign/base';
-
-import Rating from '@icedesign/base/lib/rating';
-
-import Progress from '@icedesign/base/lib/progress';
-
-// 引入业务组件样式
-import '@icedesign/base/lib/rating/style.js';
-
-import '@icedesign/base/lib/progress/style.js';
-
 import './shixuns/css/TPMBanner.css';
 
 let $ = window.$;
@@ -633,7 +624,7 @@ class TPMBanner extends Component {
                 </ul>
 
                 <div className="pr fl" id="commentsStar" onMouseOver={()=>this.showonMouseOver()} onMouseOut={()=>this.hideonMouseOut()}>
-									  <div className={"color-grey-c mb11"} style={{color: "#Fff",textAlign: "center"}}>学员评分</div>
+									  <div className={"color-grey-c mb7"} style={{color: "#Fff",textAlign: "center"}}>学员评分</div>
                     <div className="rateYo">
                         <Rating value={star_info[0]} disabled allowHalf/>
                     </div>