shish 6 лет назад
Родитель
Сommit
7a4a0b3a3d

+ 10 - 10
mall/src/constant/index.js

@@ -25,8 +25,8 @@ const envVal = {
 // 项目配置
 if (ProjectName == 'mobile') {
 	// #ifdef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://m.huaml.com' : `${window.location.protocol}//${window.location.host}`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.m.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
+	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://mall.huaml.com' : `${window.location.protocol}//${window.location.host}`
+	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.mall.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
 	// #endif
 	// #ifdef MP-WEIXIN
 	envVal.formal = process.env.NODE_ENV == 'development' ? extConfig.mHost : extConfig.mHost
@@ -36,23 +36,23 @@ if (ProjectName == 'mobile') {
 	// uni.setStorageSync('source', 'mobile')
 } else if (ProjectName == 'business') {
 	// #ifdef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://b.huaml.com' : `${window.location.protocol}//${window.location.host}`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.b.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
+	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://shop.huaml.com' : `${window.location.protocol}//${window.location.host}`
+	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.shop.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
 	// #endif
 	// #ifndef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://b.huaml.com' : `https://b.huaml.com`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.b.huaml.com` : `https://api.b.huaml.com`
+	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://shop.huaml.com' : `https://shop.huaml.com`
+	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.shop.huaml.com` : `https://api.shop.huaml.com`
 	// #endif
 
 	// uni.setStorageSync('source', 'business')
 } else {
 	// #ifdef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://w.huaml.com' : `${window.location.protocol}//${window.location.host}`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.w.huaml.com` : `${window.location.protocol}//api.w.${getFirstHost()}.com`
+	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://www.huaml.com' : `${window.location.protocol}//${window.location.host}`
+	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.www.huaml.com` : `${window.location.protocol}//api.w.${getFirstHost()}.com`
 	// #endif
 	// #ifndef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://w.huaml.com' : `https://w.huaml.com`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.w.huaml.com` : `https://api.w.huaml.com`
+	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://www.huaml.com' : `https://www.huaml.com`
+	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.www.huaml.com` : `https://api.www.huaml.com`
 	// #endif
 
 	// uni.setStorageSync('source', 'www')

+ 1 - 1
saas/src/sass/shop/shop.vue

@@ -106,7 +106,7 @@
 
             gotoPage(type,data) {
                 console.log(data)
-                let host = `http://api.s.${getFirstHost()}.com`;
+                let host = `http://api.saas.${getFirstHost()}.com`;
                 let url=null
                 switch (type) {
                     case 1:

+ 3 - 3
saas/vue.config.js

@@ -77,19 +77,19 @@ module.exports = {
 
 		proxy: {
 			'/dev': {
-				target: 'http://api.b.huaml.com',
+				target: 'http://api.shop.huaml.com',
 
 				changeOrigin: true,
 				pathRewrite: { '^/dev': '' }
 			},
 			'/s-dev': {
-				target: 'http://api.s.huaml.com',
+				target: 'http://api.saas.huaml.com',
 
 				changeOrigin: true,
 				pathRewrite: { '^/s-dev': '' }
 			},
 			'/pro': {
-				target: 'http://api.b.huaml.com',
+				target: 'http://api.shop.huaml.com',
 
 				changeOrigin: true,
 				pathRewrite: { '^/pro': '/api' }

+ 10 - 10
store/src/constant/index.js

@@ -25,8 +25,8 @@ const envVal = {
 // 项目配置
 if (ProjectName == 'mobile') {
 	// #ifdef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://m.huaml.com' : `${window.location.protocol}//${window.location.host}`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.m.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
+	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://mall.huaml.com' : `${window.location.protocol}//${window.location.host}`
+	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.mall.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
 	// #endif
 	// #ifdef MP-WEIXIN
 	envVal.formal = process.env.NODE_ENV == 'development' ? extConfig.mHost : extConfig.mHost
@@ -36,23 +36,23 @@ if (ProjectName == 'mobile') {
 	// uni.setStorageSync('source', 'mobile')
 } else if (ProjectName == 'business') {
 	// #ifdef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://b.huaml.com' : `${window.location.protocol}//${window.location.host}`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.b.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
+	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://store.huaml.com' : `${window.location.protocol}//${window.location.host}`
+	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.shop.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
 	// #endif
 	// #ifndef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://b.huaml.com' : `https://b.huaml.com`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.b.huaml.com` : `https://api.b.huaml.com`
+	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://store.huaml.com' : `https://store.huaml.com`
+	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.shop.huaml.com` : `https://api.shop.huaml.com`
 	// #endif
 
 	// uni.setStorageSync('source', 'business')
 } else {
 	// #ifdef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://w.huaml.com' : `${window.location.protocol}//${window.location.host}`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.w.huaml.com` : `${window.location.protocol}//api.w.${getFirstHost()}.com`
+	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://www.huaml.com' : `${window.location.protocol}//${window.location.host}`
+	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.www.huaml.com` : `${window.location.protocol}//api.w.${getFirstHost()}.com`
 	// #endif
 	// #ifndef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://w.huaml.com' : `https://w.huaml.com`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.w.huaml.com` : `https://api.w.huaml.com`
+	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://www.huaml.com' : `https://www.huaml.com`
+	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.www.huaml.com` : `https://api.www.huaml.com`
 	// #endif
 
 	// uni.setStorageSync('source', 'www')

+ 2 - 2
store/src/ext.json

@@ -4,8 +4,8 @@
     "directCommit": false,
     "ext": {
       "account": 12362,
-      "mHost": "https://api.m.huaml.com",
+      "mHost": "https://api.mall.huaml.com",
       "imgHost": "https://img.huaml.com",
-      "merchantName":"花美灵商"
+      "merchantName":"花美灵商"
     }
   }

+ 1 - 1
store/src/utils/chat.js

@@ -1,5 +1,5 @@
 // import { url } from '@src/utils/axios'
-const DEFAULT_ADDRESS = process.env.NODE_ENV === 'production' ? 'ws://m.huaml.com:8282' : 'ws://m.huaml.com:8282'
+const DEFAULT_ADDRESS = process.env.NODE_ENV === 'production' ? 'ws://mall.huaml.com:8282' : 'ws://mall.huaml.com:8282'
 
 const TYPE = {
 	CART: 1