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

yfyc/src/utils/request.js

@@ -3,10 +3,10 @@ import {
   Toast
 } from "vant";
 // export const baseURL = process.env.NODE_ENV === 'development' ? 'http://192.168.20.55:8037' : ''             //线下地址
-export const baseURL = process.env.NODE_ENV === 'development' ? 'https://yifangyice.4dage.com' : ''             //线上地址
+export const baseURL = process.env.NODE_ENV === 'development' ? 'https://yifangyice.4dage.com' : '' //线上地址
 let axajInd = 0
 const service = axios.create({
-  baseURL: baseURL+'/api/',
+  baseURL: baseURL + '/api/',
   timeout: 50000
 })
 // 请求拦截器
@@ -42,6 +42,8 @@ service.interceptors.response.use(function (response) {
   return response.data
 }, function (error) {
   Toast.fail(error.message);
+  axajInd = 0
+  document.querySelector('.loadingApp').style.display = 'none'
   // 对响应错误做点什么
   return Promise.reject(error)
 })

yfyc/src/views/Construct/components/HomeList.vue

@@ -91,18 +91,18 @@ export default {
   watch: {
     videoShow(val) {
       if (val) {
-        let dom = document.querySelector("#myVideo");
         setTimeout(() => {
+          let dom = document.querySelector("#myVideo");
           dom.play();
+          dom.addEventListener(
+            "ended",
+            () => {
+              //结束
+              this.$router.push(`/layout/construct/${myId}`);
+            },
+            false
+          );
         }, 500);
-        dom.addEventListener(
-          "ended",
-          () => {
-            //结束
-            this.$router.push(`/layout/construct/${myId}`);
-          },
-          false
-        );
         setTimeout(() => {
           this.videoBtnShow = true;
         }, 1000);

yfyc/src/views/Goods/data.js

@@ -174,19 +174,19 @@ export const audioInfo = {
 
 export const kankanInfo = {
   1: 'https://www.4dkankan.com/spc.html?m=KJ-6yx95uCkTj',
-  2: 'http://www.4dmodel.com/SuperTwo/index.html?m=KJ-EXncYQLnri',
-  3: 'http://www.4dmodel.com/SuperTwo/index.html?m=KJ-zGY6Q9ybvk',
-  4: 'http://www.4dmodel.com/SuperTwo/index.html?m=KJ-cvX1r17d3W',
+  2: 'https://www.4dmodel.com/SuperTwo/index.html?m=KJ-EXncYQLnri',
+  3: 'https://www.4dmodel.com/SuperTwo/index.html?m=KJ-zGY6Q9ybvk',
+  4: 'https://www.4dmodel.com/SuperTwo/index.html?m=KJ-cvX1r17d3W',
   5: '',
-  6: 'http://www.4dmodel.com/SuperTwo/index.html?m=1234',
+  6: 'https://www.4dmodel.com/SuperTwo/index.html?m=1234',
   7: '',
   8: '',
   9: '',
   10: '',
-  11: 'http://www.4dmodel.com/SuperTwo/index.html?m=KJ-JoFOVTJ9ON',
-  12: 'http://www.4dmodel.com/SuperTwo/index.html?m=1252',
-  13: 'http://www.4dmodel.com/SuperTwo/index.html?m=1251',
-  14: 'http://www.4dmodel.com/SuperTwo/index.html?m=1250',
+  11: 'https://www.4dmodel.com/SuperTwo/index.html?m=KJ-JoFOVTJ9ON',
+  12: 'https://www.4dmodel.com/SuperTwo/index.html?m=1252',
+  13: 'https://www.4dmodel.com/SuperTwo/index.html?m=1251',
+  14: 'https://www.4dmodel.com/SuperTwo/index.html?m=1250',
   15: '',
 }
 

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 = "https://yifangyice.4dage.com/web/index.html#/layout/interact";
+      let url = baseURL + "/web/index.html#/layout/interact";
       window.location.href =
         "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" +
         appid +