Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

src/pages/EqSelfInspection/index.js

@@ -98,6 +98,15 @@ const EqSelfInspection = (props) => {
     );
   };
 
+  // useEffect(() => {
+  //   UnityAction.on('notiZiJian', (id) => {
+  //     handleJumpDetail(id);
+  //   });
+  //   //自检页面加载完毕
+  //   UnityAction.sendMsg('pageInited');
+  //   return () => UnityAction.off('notiZiJian');
+  // }, []);
+
   useEffect(() => {
     if (routeId) {
       dispatch({
@@ -116,15 +125,6 @@ const EqSelfInspection = (props) => {
         ProjectId: projectId * 1,
       },
     });
-    //自检页面加载完毕
-    UnityAction.sendMsg('pageInited');
-
-    UnityAction.on('notiZiJian', (id) => {
-      alert('0-00000' + id);
-      handleJumpDetail(id);
-    });
-
-    return UnityAction.off('notiZiJian');
   }, []);
 
   useEffect(() => {

src/pages/Home/index.less

@@ -23,7 +23,7 @@
   position: relative;
   display: inline-block;
   cursor: pointer;
-  border-radius: 40px 0 43px 0;
+  border-radius: 46px 6px 48px 6px;
   box-shadow: 2px 13px 18px 0 rgba(9, 64, 115, 0.49);
   > ul {
     display: flex;
@@ -61,7 +61,7 @@
   .box;
   width: 604px;
   height: 399px;
-  background: url('@/assets/home/bg2.png') no-repeat center;
+  background: url('@/assets/home/bg3.png') no-repeat center;
   background-size: 100% 100%;
 }
 .backlogMain {
@@ -75,7 +75,7 @@
   .box;
   width: 707px;
   height: 335px;
-  background: url('@/assets/home/bg3.png') no-repeat center;
+  background: url('@/assets/home/bg2.png') no-repeat center;
   background-size: 100% 100%;
 }
 .medicine {

src/pages/Projects/index.less

@@ -1,8 +1,8 @@
 .main {
   width: 100%;
   height: 100vh;
-  background: url('@/assets/projects/bg.png') no-repeat center;
-  background-size: 100% 100%;
+  // background: url('@/assets/projects/bg.png') no-repeat center;
+  // background-size: 100% 100%;
   // .titleCon {
   //   margin: 0 1.8rem;
   //   padding: 2.64rem 0 0.4rem;

src/utils/utils.js

@@ -109,6 +109,7 @@ export const UnityAction = {
       UnityAction.event[type] = [];
     }
     UnityAction.event[type].push(callback);
+    console.log(UnityAction.event);
   },
   off(type, callback) {
     if (callback) {
@@ -144,10 +145,8 @@ export const UnityAction = {
     }
   },
 };
-// alert(window.vuplex);
 if (window.vuplex) {
   window.vuplex.addEventListener('message', (e) => {
-    // alert('99999999');
     console.log(
       '============================getMessageForUnity============================',
     );