@@ -1,10 +1,5 @@ | |||||
<template> | <template> | ||||
<view class="boox"> | <view class="boox"> | ||||
<<<<<<< HEAD | |||||
<!-- <digital-human :width="400" rootStyle="position: fixed; left: 50%; top: 100rpx; transform: translateX(-50%);"></digital-human> --> | |||||
======= | |||||
>>>>>>> yunzhu | |||||
<view class="booximg"> | <view class="booximg"> | ||||
<image v-if="domainObj.domain == 'zh.aihxz.com'" class="img" | <image v-if="domainObj.domain == 'zh.aihxz.com'" class="img" | ||||
src="https://autoiot.oss-cn-beijing.aliyuncs.com/static/wabIndexs.png" mode=""></image> | src="https://autoiot.oss-cn-beijing.aliyuncs.com/static/wabIndexs.png" mode=""></image> | ||||
@@ -52,12 +47,7 @@ | |||||
var app = getApp(); | var app = getApp(); | ||||
var config = require("../../config"); | var config = require("../../config"); | ||||
const domainObj = require('@/utils/domain.js'); | const domainObj = require('@/utils/domain.js'); | ||||
<<<<<<< HEAD | |||||
// import human from './mathManIndex.js' | |||||
======= | |||||
>>>>>>> yunzhu | |||||
export default { | export default { | ||||
// mixins: [human], | |||||
data() { | data() { | ||||
return { | return { | ||||
domainObj: domainObj, // 域名 | domainObj: domainObj, // 域名 | ||||
@@ -1,14 +1,8 @@ | |||||
import Vue from 'vue'; | import Vue from 'vue'; | ||||
/** | /** | ||||
* env文件里配置自定义运行菜单每一个js代表一个域名 | * env文件里配置自定义运行菜单每一个js代表一个域名 | ||||
<<<<<<< HEAD | |||||
*/ | */ | ||||
const obj = process.env.ENV_PATH == undefined ? require('../env/dev.js') : require(process.env.ENV_PATH) | |||||
======= | |||||
*/ | |||||
import Vue from 'vue'; | |||||
const obj = process.env.ENV_PATH == undefined ? require('../env/dev.js') : require(process.env.ENV_PATH) | const obj = process.env.ENV_PATH == undefined ? require('../env/dev.js') : require(process.env.ENV_PATH) | ||||
>>>>>>> yunzhu | |||||
const base = obj.baseUrl | const base = obj.baseUrl | ||||
// http.js使用 | // http.js使用 | ||||
const baseUrl = `${base}/autoSR/api`; | const baseUrl = `${base}/autoSR/api`; | ||||
@@ -21,10 +15,6 @@ const domain = obj.domain || ''; | |||||
const iMServiceHost = 'https://im.quhouse.com/'; //IM的后端地址正式 | const iMServiceHost = 'https://im.quhouse.com/'; //IM的后端地址正式 | ||||
Vue.prototype.$domain = obj.domain || ''; | Vue.prototype.$domain = obj.domain || ''; | ||||
<<<<<<< HEAD | |||||
======= | |||||
>>>>>>> yunzhu | |||||
export { | export { | ||||
domain, | domain, | ||||
baseUrl, | baseUrl, | ||||