Merge branch 'master' of http://face3d.4dage.com:7005/shaogen1995/YFYC-H5

yfyc/src/views/Construct/index.vue

@@ -55,7 +55,7 @@
 <script>
 const unityUrlObj = {
   1: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc204",
-  2: "",
+  2: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model.html?m=yfyc214",
   3: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc215",
   4: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc211",
   5: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc213",

yfyc/src/views/Home/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="Home">
     <img class="logo" src="../../assets/img/home/logo.png" alt="" />
+    <img class="logo2" src="../../assets/img/home/logo2.png" alt="" />
     <img
       class="btn"
       @click="$router.push('/layout/list')"
@@ -55,11 +56,21 @@ export default {
       height: 100%;
     }
   }
+  .logo2{
+    width: 90%;
+    position: absolute;
+    top: 5px;
+    left: 50%;
+    transform: translateX(-50%);
+    z-index: 2;
+    pointer-events: none;
+  }
 
   .logo {
+    pointer-events: none;
     position: absolute;
     z-index: 2;
-    width: 300px;
+    width: 120px;
     top: 60px;
     left: 50%;
     transform: translateX(-50%);

yfyc/src/views/Interact/index.vue

@@ -87,7 +87,7 @@ export default {
       //此处的ID是在文档的开发-基本配置里面
       let appid = "wx3255043d1b21a4f7";
       // let url = "http://192.168.20.48:8080/#/layout/interact";
-      let url = baseURL + "/web/index.html#/layout/interact";
+      let url = "https://yifangyice.4dage.com/web/index.html#/layout/interact";
       window.location.href =
         "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" +
         appid +