ui问题

src/components/blessingPreheat/recordPopup/index.js

@@ -41,12 +41,8 @@ export default class RecordPopup extends Component {
           </div>
           <div className="table__body">
           {
-<<<<<<< HEAD
             recordList.length>0?
             recordList.map((item, index) => {
-=======
-            recordList.length > 0 && recordList.map((item, index) => {
->>>>>>> 34c558626cde36bc53ef82ea62da8a8d7e3881ab
               return (<div className="tr__container" key={index}>
               <span className="tr">{item.submit_time}</span>
               <span className="tr">{item.score}</span>
@@ -62,13 +58,6 @@ export default class RecordPopup extends Component {
             }):
                 <div className={'notdata'}>暂无测试记录</div>
           }
-          {
-            recordList.length === 0 && (
-              <div className="tr__container">
-                <p>暂无测试记录</p>
-              </div>
-            )
-          }
           </div>
         </div>
       </div>