shaogen1995 3 lat temu
rodzic
commit
dcb772194b

BIN
houtai/public/favicon.ico


+ 2 - 2
houtai/src/utils/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 const service = axios.create({
   // baseURL: 'http://192.168.0.135:8011/', // 本地调试
-  baseURL: 'http://8.135.106.227:8011/', // 显示调试
-  // baseURL: '', // build
+  // baseURL: 'http://8.135.106.227:8011', // 线上调试
+  baseURL: '', // build
   timeout: 5000
 })
 // 请求拦截器

+ 11 - 3
houtai/src/views/Home.vue

@@ -2,9 +2,10 @@
   <div class="home">
     <div class="top">
       <div class="left">珠海高新区中共党史学习教育园地线上展厅</div>
-      <div class="right" @click="cut = !cut">
-        <img src="../assets/user.jpg" alt="" />
-        <p>{{ userName }}</p>
+      <div class="right">
+        <p class="sceneEdit" @click="sceneEdit">场景编辑</p>
+        <img src="../assets/user.jpg" alt="" @click="cut = !cut" />
+        <p @click="cut = !cut">{{ userName }}</p>
         <!-- 下箭头 -->
         <div class="pull_down" v-if="cut"></div>
         <div class="pull_up" v-else></div>
@@ -196,6 +197,10 @@ export default {
   },
   //方法集合
   methods: {
+    // 点击场景编辑
+    sceneEdit(){
+      window.open('/edit-backstage/edit.html?m=1151_2')
+    },
     //点击删除
     delLiuYan(id) {
       this.$confirm("确定删除吗?", "提示", {
@@ -373,6 +378,9 @@ export default {
       position: relative;
       display: flex;
       align-items: center;
+      .sceneEdit{
+        margin-right: 50px;
+      }
       img {
         margin-right: 10px;
         width: 40px;

BIN
web/public/favicon.ico


+ 3 - 2
web/public/static/js/Hot.js

@@ -39,8 +39,9 @@ window.initHot = function(model){
         var r = link.substring(link.indexOf("html") + 4)
           , o = "en" == manage.number("lang") ? "&lang=" + manage.number("lang") : "";
         -1 == r.indexOf("?") ? src = link + "?time=" + randomTime().getTime() + "&id=" + window.number + o : src = link + "&time=" + randomTime().getTime() + "&id=" + window.number + o 
-            
-        return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1/', 'http://www.4dmodel.com/SuperTwo/hot_online1/')    
+        // return 'http://8.135.106.227:8011' + src  // 线上测试
+        return src 
+        // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1/', 'http://www.4dmodel.com/SuperTwo/hot_online1/')    
     }
     var removeSrcPostMark = function(url){//去除texture.load时自动加上的'?'
         var index = url.indexOf('?')

+ 3 - 1
web/public/static/js/manage.js

@@ -1,6 +1,8 @@
   
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-var g_Prefix="https://super.4dage.com/";
+// var g_Prefix="https://super.4dage.com/";
+// var g_Prefix="http://project.4dage.com:8011/";//有自己的大场景编辑后台的 - 线上场景调试
+var g_Prefix=window.origin+'/';//有自己的大场景编辑后台的 - 打包
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
 var s = window.location.href.split('/');
     s.pop();

BIN
web/public/tab5Ma.png


BIN
web/src/assets/images/icon/dollhouse.png


BIN
web/src/assets/images/icon/dollhouse_active.png


BIN
web/src/assets/images/icon/floor.png


BIN
web/src/assets/images/icon/floor_active.png


+ 18 - 6
web/src/components/welcome/index.vue

@@ -9,7 +9,7 @@
     />
     <div
       class="btn"
-      @click.stop="$emit('close')"
+      @click.stop="clickBtn"
       :style="{
         backgroundImage: `url(${require('@/assets/images/project/btn.png')})`,
       }"
@@ -20,7 +20,9 @@
     </div>
     <div class="shouji" v-if="isMobile">
       <span>主办方:</span>
-      珠海高新技术产业开发区党群工作部、珠海高新区(唐家湾镇)<i>文化中心、珠海四维时代科技有限公司、中国移动通信集团有限公司</i> 
+      珠海高新技术产业开发区党群工作部、珠海高新区(唐家湾镇)<i
+        >文化中心、珠海四维时代科技有限公司、中国移动通信集团有限公司</i
+      >
     </div>
 
     <!-- <div class="btn" v-else @click.stop="$emit('close')" :style="{backgroundImage:`url(${require('@/assets/images/project/btnMo.png')})`}">
@@ -37,7 +39,17 @@ export default {
       loading: true,
     };
   },
-  methods: {},
+  methods: {
+    clickBtn() {
+      // fetch("http://8.135.106.227:8011/show/addVisit")
+        fetch("/show/addVisit")
+        .then((response) => response.json())
+        .then((data) => {
+          console.log("------------", data);
+        });
+      this.$emit("close");
+    },
+  },
   mounted() {},
 };
 </script>
@@ -145,12 +157,12 @@ export default {
       bottom: 10px;
       left: 0;
       width: 100%;
-      color: #EDD3B0;
-      &>span{
+      color: #edd3b0;
+      & > span {
         display: block;
         font-weight: 700;
       }
-      &>i{
+      & > i {
         display: block;
       }
     }

+ 32 - 22
web/src/views/gui/menu.vue

@@ -390,7 +390,7 @@
                 <!-- 选中了之后的显示 -->
                 <div v-show="caseInd === index"></div>
               </div>
-              <span :class="{ active: caseInd === index }">{{
+              <span @touchstart="select(index, item.id)" :class="{ active: caseInd === index }">{{
                 item.id + "、" + item.txt
               }}</span>
             </li>
@@ -551,9 +551,9 @@
         <p class="biaoti">珠海高新区"红色云展厅"</p>
         <!-- <p class="biaoti">虚拟展厅</p> -->
         <div class="Motab5ER">
-          <img src="@/assets/tab/tab5Ma.png" alt="" />
+          <img src="/tab5Ma.png" alt="" />
           <p>请使用手机扫描二维码</p>
-          <a href="../../assets/tab/tab5Ma.png" download class="tab5Box"
+          <a href="/tab5Ma.png" download class="tab5Box"
             >下 载 二 维 码</a
           >
         </div>
@@ -601,7 +601,7 @@
           </div>
           <div>
             <a href="javascript:;"></a>
-            <a href="javascript:;"></a>
+            <a target="_blank" href="http://www.4dmodel.com/SuperTwo/index.html?m=1034" title="望慈山房"></a>
             <a target="_blank" href="https://www.4dkankan.com/spc.html?m=9ZqmhsI1Iq&lang=zh" title="廉洁文化园内苏兆征雕像广场"></a>
           </div>
           <div>
@@ -647,7 +647,7 @@
                 <!-- 选中了之后的显示 -->
                 <div v-show="caseInd === index"></div>
               </div>
-              <span :class="{ active: caseInd === index }">{{
+              <span  @click="select(index, item.id)" :class="{ active: caseInd === index }">{{
                 item.id + "、" + item.txt
               }}</span>
             </li>
@@ -819,9 +819,9 @@
         </div>
         <!-- 二维码图片+按钮盒子 -->
         <div class="tab5Ma">
-          <img src="@/assets/tab/tab5Ma.png" alt="" />
+          <img src="/tab5Ma.png" alt="" />
           <p>请用手机扫描二维码</p>
-          <a href="assets/tab/tab5Ma.png" download class="tab5Box"
+          <a href="/tab5Ma.png" download class="tab5Box"
             >下 载 二 维 码</a
           >
           <div class="tab5Box" @click="copyPcTxt">复 制 链 接</div>
@@ -840,6 +840,8 @@ export default {
   components: { Iframe },
   data() {
     return {
+      baseUrl:'http://8.135.106.227:8011',//线上调试
+      // baseUrl:'',//打包
       isGuide: true,
       //--------------手机端数据------------------
       iframeUrl: "",
@@ -918,7 +920,7 @@ export default {
     //点击复制链接
     copyPcTxt() {
       // 存储传递过来的数据
-      let OrderNumber = "9999999999";
+      let OrderNumber = window.location.href;
       // 创建一个input 元素
       // createElement() 方法通过指定名称创建一个元素
       let newInput = document.createElement("input");
@@ -969,8 +971,9 @@ export default {
           let fd = new FormData();
           fd.append("file", blob, Date.now() + ".jpg");
           //Ajax上传FormData对象
+          // eslint-disable-next-line no-undef
           $.ajax({
-            url: "http://8.135.106.227:8011/web/upload",
+            url: this.baseUrl+"/show/upload",
             type: "POST",
             cache: false,
             data: fd,
@@ -980,8 +983,8 @@ export default {
             .done((res) => {
               console.log("上传图片成功", res);
               if (res.code === 0) {
-                this.$message.success("生成二维码成功");
-                this.qrCodeUrl = "http://8.135.106.227:8011/" + res.data;
+                this.$message.success("生成图片成功");
+                this.qrCodeUrl = this.baseUrl+ res.data;
                 this.topicXShow = true;
               }
             })
@@ -1012,8 +1015,9 @@ export default {
         data.userName = this.myName;
       }
       //发送请求
+      // eslint-disable-next-line no-undef
       $.ajax({
-        url: "http://8.135.106.227:8011/web/comment/save",
+        url: this.baseUrl+"/show/comment/save",
         type: "POST",
         data: JSON.stringify(data),
         dataType: "json",
@@ -1114,8 +1118,9 @@ export default {
           let fd = new FormData();
           fd.append("file", blob, Date.now() + ".jpg");
           //Ajax上传FormData对象
+          // eslint-disable-next-line no-undef
           $.ajax({
-            url: "http://8.135.106.227:8011/web/upload",
+            url: this.baseUrl+"/show/upload",
             type: "POST",
             cache: false,
             data: fd,
@@ -1125,8 +1130,8 @@ export default {
             .done((res) => {
               console.log("上传图片成功", res);
               if (res.code === 0) {
-                this.$message.success("生成二维码成功");
-                this.qrCodeUrl = "http://8.135.106.227:8011/" + res.data;
+                this.$message.success("生成图片成功");
+                this.qrCodeUrl = this.baseUrl + res.data;
                 this.topicXShow = true;
                 if (myBoo) this.toPictureShow = false;
               }
@@ -1236,9 +1241,10 @@ export default {
 
     //封装获取留言信息方法
     getList(data) {
+      // eslint-disable-next-line no-undef
       $.ajax({
         type: "POST",
-        url: "http://8.135.106.227:8011/web/comment/list",
+        url:  this.baseUrl+"/show/comment/list",
         data: JSON.stringify(data),
         dataType: "json",
         contentType: "application/json;charset=UTF-8",
@@ -1258,11 +1264,11 @@ export default {
     },
 
     switchBGM() {
-      if ($("#volume img")[0].src.indexOf("on.png") > -1) {
-        window.manage.switchBgmState(true);
-      } else if ($("#volume img")[0].src.indexOf("off.png") > -1) {
-        window.manage.switchBgmState(false);
-      }
+      // if ($("#volume img")[0].src.indexOf("on.png") > -1) {
+      //   window.manage.switchBgmState(true);
+      // } else if ($("#volume img")[0].src.indexOf("off.png") > -1) {
+      //   window.manage.switchBgmState(false);
+      // }
     },
   },
 };
@@ -1463,6 +1469,7 @@ export default {
           }
         }
         & > span {
+          cursor: pointer;
           font-size: 22px;
         }
         .active {
@@ -2644,7 +2651,10 @@ export default {
 }
 @media only screen and (max-width: 487px) {
   #myMoMu {
-    display: block !important;
+    display: none !important;
+  }
+  #gui-modes-floorplan{
+    margin-bottom: 0 !important;
   }
   #myMoMu img {
     margin-left: 12px;