panhui 6 年 前
コミット
3570a6efd2
29 ファイル変更32 行追加18 行削除
  1. 2 2
      src/main/webapp/WEB-INF/html/yimishijie.html
  2. 0 0
      src/main/webapp/yimishijie/yimishijie/css/app.13bc5923c4936e6b60916a40e43fe396.css
  3. 0 0
      src/main/webapp/yimishijie/yimishijie/css/app.13bc5923c4936e6b60916a40e43fe396.css.map
  4. 0 0
      src/main/webapp/yimishijie/yimishijie/css/app.5635568331ff5d635c1c9f071646dd3f.css
  5. 0 0
      src/main/webapp/yimishijie/yimishijie/css/app.5635568331ff5d635c1c9f071646dd3f.css.map
  6. BIN
      src/main/webapp/yimishijie/yimishijie/img/02banner.5109347.jpg
  7. BIN
      src/main/webapp/yimishijie/yimishijie/img/02banner.705f722.jpg
  8. BIN
      src/main/webapp/yimishijie/yimishijie/img/03banner.4c147db.jpg
  9. BIN
      src/main/webapp/yimishijie/yimishijie/img/03banner.822b27d.jpg
  10. BIN
      src/main/webapp/yimishijie/yimishijie/img/solute1.5ad8ddd.jpg
  11. BIN
      src/main/webapp/yimishijie/yimishijie/img/solute2.64529d6.jpg
  12. BIN
      src/main/webapp/yimishijie/yimishijie/img/solute3.bce8df0.jpg
  13. BIN
      src/main/webapp/yimishijie/yimishijie/img/solute4.c3e09a2.jpg
  14. BIN
      src/main/webapp/yimishijie/yimishijie/img/solute5.8d5e4b3.jpg
  15. BIN
      src/main/webapp/yimishijie/yimishijie/img/solute5.bcf10e4.png
  16. 0 0
      src/main/webapp/yimishijie/yimishijie/js/0.1ffc16853041b97b93f2.js
  17. 0 0
      src/main/webapp/yimishijie/yimishijie/js/0.1ffc16853041b97b93f2.js.map
  18. 0 0
      src/main/webapp/yimishijie/yimishijie/js/0.c5aea46bb7dc66670dbd.js
  19. 0 0
      src/main/webapp/yimishijie/yimishijie/js/0.c5aea46bb7dc66670dbd.js.map
  20. 2 2
      src/main/webapp/yimishijie/yimishijie/js/manifest.28c3141dbdc7029ca945.js
  21. 0 0
      src/main/webapp/yimishijie/yimishijie/js/manifest.28c3141dbdc7029ca945.js.map
  22. BIN
      src/main/yimishijie/src/assets/02banner.jpg
  23. BIN
      src/main/yimishijie/src/assets/03banner.jpg
  24. BIN
      src/main/yimishijie/src/assets/solute1.jpg
  25. BIN
      src/main/yimishijie/src/assets/solute2.jpg
  26. BIN
      src/main/yimishijie/src/assets/solute3.jpg
  27. BIN
      src/main/yimishijie/src/assets/solute4.jpg
  28. BIN
      src/main/yimishijie/src/assets/solute5.png
  29. 28 14
      src/main/yimishijie/src/pages/Home.vue

+ 2 - 2
src/main/webapp/WEB-INF/html/yimishijie.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>一米世界</title><link href=./yimishijie/yimishijie/css/app.13bc5923c4936e6b60916a40e43fe396.css rel=stylesheet></head><body><div id=app></div><script>(function(doc, win) {
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>一米世界</title><link href=./yimishijie/yimishijie/css/app.5635568331ff5d635c1c9f071646dd3f.css rel=stylesheet></head><body><div id=app></div><script>(function(doc, win) {
             var docEl = doc.documentElement,
                 resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
                 recalc = function() {
@@ -16,4 +16,4 @@
             if (!doc.addEventListener) return;
             win.addEventListener(resizeEvt, recalc, false);
             doc.addEventListener('DOMContentLoaded', recalc, false);
-        })(document, window);</script><script type=text/javascript src=./yimishijie/yimishijie/js/manifest.84ae2841704fc2192333.js></script><script type=text/javascript src=./yimishijie/yimishijie/js/vendor.5890bb0ea67d72d3baa6.js></script><script type=text/javascript src=./yimishijie/yimishijie/js/app.504556ad9879d1001eef.js></script></body></html>
+        })(document, window);</script><script type=text/javascript src=./yimishijie/yimishijie/js/manifest.28c3141dbdc7029ca945.js></script><script type=text/javascript src=./yimishijie/yimishijie/js/vendor.5890bb0ea67d72d3baa6.js></script><script type=text/javascript src=./yimishijie/yimishijie/js/app.504556ad9879d1001eef.js></script></body></html>

ファイルの差分が大きいため隠しています
+ 0 - 0
src/main/webapp/yimishijie/yimishijie/css/app.13bc5923c4936e6b60916a40e43fe396.css


ファイルの差分が大きいため隠しています
+ 0 - 0
src/main/webapp/yimishijie/yimishijie/css/app.13bc5923c4936e6b60916a40e43fe396.css.map


ファイルの差分が大きいため隠しています
+ 0 - 0
src/main/webapp/yimishijie/yimishijie/css/app.5635568331ff5d635c1c9f071646dd3f.css


ファイルの差分が大きいため隠しています
+ 0 - 0
src/main/webapp/yimishijie/yimishijie/css/app.5635568331ff5d635c1c9f071646dd3f.css.map


BIN
src/main/webapp/yimishijie/yimishijie/img/02banner.5109347.jpg


BIN
src/main/webapp/yimishijie/yimishijie/img/02banner.705f722.jpg


BIN
src/main/webapp/yimishijie/yimishijie/img/03banner.4c147db.jpg


BIN
src/main/webapp/yimishijie/yimishijie/img/03banner.822b27d.jpg


BIN
src/main/webapp/yimishijie/yimishijie/img/solute1.e516d93.jpg → src/main/webapp/yimishijie/yimishijie/img/solute1.5ad8ddd.jpg


BIN
src/main/webapp/yimishijie/yimishijie/img/solute2.9f43cbb.jpg → src/main/webapp/yimishijie/yimishijie/img/solute2.64529d6.jpg


BIN
src/main/webapp/yimishijie/yimishijie/img/solute3.21ca50c.jpg → src/main/webapp/yimishijie/yimishijie/img/solute3.bce8df0.jpg


BIN
src/main/webapp/yimishijie/yimishijie/img/solute4.c7cb3bb.jpg → src/main/webapp/yimishijie/yimishijie/img/solute4.c3e09a2.jpg


BIN
src/main/webapp/yimishijie/yimishijie/img/solute5.8d5e4b3.jpg


BIN
src/main/webapp/yimishijie/yimishijie/img/solute5.bcf10e4.png


ファイルの差分が大きいため隠しています
+ 0 - 0
src/main/webapp/yimishijie/yimishijie/js/0.1ffc16853041b97b93f2.js


ファイルの差分が大きいため隠しています
+ 0 - 0
src/main/webapp/yimishijie/yimishijie/js/0.1ffc16853041b97b93f2.js.map


ファイルの差分が大きいため隠しています
+ 0 - 0
src/main/webapp/yimishijie/yimishijie/js/0.c5aea46bb7dc66670dbd.js


ファイルの差分が大きいため隠しています
+ 0 - 0
src/main/webapp/yimishijie/yimishijie/js/0.c5aea46bb7dc66670dbd.js.map


+ 2 - 2
src/main/webapp/yimishijie/yimishijie/js/manifest.84ae2841704fc2192333.js → src/main/webapp/yimishijie/yimishijie/js/manifest.28c3141dbdc7029ca945.js

@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,i,c){for(var a,u,s,f=0,l=[];f<r.length;f++)u=r[f],t[u]&&l.push(t[u][0]),t[u]=0;for(a in i)Object.prototype.hasOwnProperty.call(i,a)&&(e[a]=i[a]);for(n&&n(r,i,c);l.length;)l.shift()();if(c)for(f=0;f<c.length;f++)s=o(o.s=c[f]);return s};var r={},t={3:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var i=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"yimishijie/js/"+e+"."+{0:"c5aea46bb7dc66670dbd"}[e]+".js";var a=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,i.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./yimishijie/",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.84ae2841704fc2192333.js.map
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,i,c){for(var u,a,f,s=0,l=[];s<r.length;s++)a=r[s],t[a]&&l.push(t[a][0]),t[a]=0;for(u in i)Object.prototype.hasOwnProperty.call(i,u)&&(e[u]=i[u]);for(n&&n(r,i,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var r={},t={3:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var i=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"yimishijie/js/"+e+"."+{0:"1ffc16853041b97b93f2"}[e]+".js";var u=setTimeout(a,12e4);function a(){c.onerror=c.onload=null,clearTimeout(u);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=a,i.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./yimishijie/",o.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.28c3141dbdc7029ca945.js.map

ファイルの差分が大きいため隠しています
+ 0 - 0
src/main/webapp/yimishijie/yimishijie/js/manifest.28c3141dbdc7029ca945.js.map


BIN
src/main/yimishijie/src/assets/02banner.jpg


BIN
src/main/yimishijie/src/assets/03banner.jpg


BIN
src/main/yimishijie/src/assets/solute1.jpg


BIN
src/main/yimishijie/src/assets/solute2.jpg


BIN
src/main/yimishijie/src/assets/solute3.jpg


BIN
src/main/yimishijie/src/assets/solute4.jpg


BIN
src/main/yimishijie/src/assets/solute5.png


+ 28 - 14
src/main/yimishijie/src/pages/Home.vue

@@ -196,7 +196,7 @@
             <p>无论您身在何处,用户都可以使用“一米世界”通过手机摄像头,实时浏览和查看购物中心、商店、景点、博物馆、商品和交通设施的各种信息。</p>
             </div>-->
 
-            <div class="rightColor bg" :style="{backgroundImage:'url('+require('../assets/solute5.jpg')+')'}"></div>
+            <div class="rightColor bg" :style="{backgroundImage:'url('+require('../assets/solute5.png')+')'}"></div>
           </div>
         </div>
 
@@ -223,6 +223,7 @@
             <div class="title">联系我们</div>
             <div class="btn">7*24小时竭诚为您服务</div>
           </div>
+          <div class="hideLeft"></div>
 
           <div class="center">
             <div class="title">联系方式</div>
@@ -286,6 +287,7 @@ export default {
   mounted() {
     setTimeout(() => {
       var mySwiper = new Swiper('.swiper-container', {
+        autoplay: true,
         pagination: {
           el: '.swiper-pagination',//自动隐藏
           clickable: true,
@@ -436,18 +438,18 @@ export default {
       this.autoData = Date.parse(new Date())
     },
     chooseVideo(src) {
-      if (!this.send) {
-        this.$confirm('想要查看视频,请先留言哦!', '提示', {
-          confirmButtonText: '去留言',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.goConnect()
-        }).catch(() => {
-
-        });
-        return;
-      }
+      // if (!this.send) {
+      //   this.$confirm('想要查看视频,请先留言哦!', '提示', {
+      //     confirmButtonText: '去留言',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }).then(() => {
+      //     this.goConnect()
+      //   }).catch(() => {
+
+      //   });
+      //   return;
+      // }
       this.showVideo = true
       this.video = src
     },
@@ -865,8 +867,13 @@ export default {
     background-position: left center;
     width: 100%;
     background-size: contain;
+    position: relative;
     .left {
-      margin-left: 2.01rem;
+      // margin-left: 2.01rem;
+      position: absolute;
+      left: 2.01rem;
+      top: 50%;
+      transform: translateY(-50%);
       .title {
         font-size: 0.61rem;
         color: #fff;
@@ -886,6 +893,12 @@ export default {
       }
     }
 
+    .hideLeft{
+margin-left: 2.01rem;
+  width: 3.14rem;
+   height: 0.94rem;
+    }
+
     .center {
       width: 3.6rem;
       height: 4.16rem;
@@ -917,6 +930,7 @@ export default {
       border-radius: 0.1rem;
       background-color: #fdfdfd;
       margin-left: 0.21rem;
+      margin-right: 0.3rem;
       .title {
         font-size: 0.28rem;
         font-weight: bold;

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません