update wxcode

public/react/src/modules/wxcode/index.js

@@ -4,7 +4,7 @@
  * @Github:
  * @Date: 2020-01-15 09:56:34
  * @LastEditors  : tangjiang
- * @LastEditTime : 2020-01-17 21:03:15
+ * @LastEditTime : 2020-01-17 21:10:23
  */
 import './index.scss';
 import React, {useState, useEffect, useRef} from 'react';
@@ -38,14 +38,9 @@ const App = (props) => {
     updateWXCodeForInterval,
     evaluateWxCode,
     showWXCodeTextCase,
-<<<<<<< HEAD
     changeWXCodeEvaluateLoading,
     changeWXCodeEvaluateDialog
   } = props;
-=======
-    changeWXCodeEvaluateLoading
-  } = props;
->>>>>>> e0ff4d13c62ce7f92a49387eff940448ed2057f3
 
   const {identifier} = props.match.params;
   // 获取路径参数
@@ -145,7 +140,6 @@ const App = (props) => {
     evaluateWxCode(identifier, path);
   }
 
-<<<<<<< HEAD
   // 关闭弹框
   const handleCloseDialog = () => {
     changeWXCodeEvaluateDialog(false);
@@ -163,8 +157,6 @@ const App = (props) => {
     loadResult(next_game);
   }
   
-=======
->>>>>>> e0ff4d13c62ce7f92a49387eff940448ed2057f3
   const tcclasses = isShow ? `wx-code-test-case active` : 'wx-code-test-case';
   const loading = showLoading ? 'code-evaluate-loading active' : 'code-evaluate-loading';
   const dialog = showDialog ? 'pass-dialog active' : 'pass-dialog';
@@ -234,13 +226,8 @@ const App = (props) => {
                         测试集{i + 1}
                       </h2>
                       {
-<<<<<<< HEAD
                         is_public && last_compile_output
                           ? (result
-=======
-                        is_public
-                          ? (result
->>>>>>> e0ff4d13c62ce7f92a49387eff940448ed2057f3
                               ? <span className="iconfont icon-wancheng case_item_success"></span>
                               : <span className="iconfont icon-jinggao1 case_item_fail"></span>)
                           : (<span className="case-item-tips">