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

houtai/src/utils/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 const service = axios.create({
   // baseURL: 'http://192.168.20.55:8032', // 本地调试
-  baseURL: process.env.NODE_ENV === 'development' ? 'http://192.168.20.55:8037/api/' : '/api/',
-  // baseURL: process.env.NODE_ENV === 'development' ? 'https://hnbwg.4dage.com' : '',
+  // baseURL: process.env.NODE_ENV === 'development' ? 'http://192.168.20.55:8037/api/' : '/api/',
+  baseURL: process.env.NODE_ENV === 'development' ? 'https://yifangyice.4dage.com/api/' : '/api/',
   timeout: 5000
 })
 // 请求拦截器

yfyc/src/views/Construct/index.vue

@@ -3,7 +3,7 @@
     <!-- 模型的嵌套盒子 -->
     <div class="ifrBox">
       <iframe
-        src="http://4dscene.4dage.com/culturalrelics/YFYCModel/index.html#/"
+        src="https://4dscene.4dage.com/culturalrelics/YFYCModel/index.html#/"
         frameborder="0"
       ></iframe>
     </div>

yfyc/src/views/Goods/components/GoodsVr.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='GoodsVr'>
-    <iframe src="http://zzbbh.4dage.com/SWKK/show.html?id=WK1592095910366638080" frameborder="0"></iframe>
+    <iframe src="https://zzbbh.4dage.com/SWKK/show.html?id=WK1592095910366638080" frameborder="0"></iframe>
   </div>
 </template>
 

yfyc/src/views/Home/index.vue

@@ -9,7 +9,7 @@
     />
     <div class="ifrBox">
       <iframe
-        src="http://zzbbh.4dage.com/SWKK/show.html?id=WK1592095910366638080"
+        src="https://zzbbh.4dage.com/SWKK/show.html?id=WK1592095910366638080"
         frameborder="0"
       ></iframe>
     </div>

yfyc/vue.config.js

@@ -3,7 +3,7 @@ const webpack = require('webpack')
 process.env.VUE_APP_VERSION = require('./package.json').version
 
 module.exports = {
-  publicPath: process.env.NODE_ENV === 'development' ? '/' : '/',
+  publicPath: process.env.NODE_ENV === 'development' ? '/' : './',
   // productionSourceMap: process.env.CLI_MODE === 'prod' ? false : true,
   configureWebpack: {
     // module: {