소스 검색

正式环境配置

zhangle 5 달 전
부모
커밋
3ea1818cd8

+ 2 - 2
crmeb_src/mer_mer_admin/.env.production

@@ -3,6 +3,6 @@ ENV = 'production'
 
 # base api
 # VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'https://play.nanodreamtech.com'
-VUE_BASE_URL = '/mer/'
+VUE_APP_BASE_API = 'https://api.lgns.shop'
+VUE_BASE_URL = '/'
 

+ 2 - 2
crmeb_src/mer_plat_admin/.env.production

@@ -4,6 +4,6 @@ ENV = 'production'
 
 # base api
 # VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'https://play.nanodreamtech.com'
-VUE_BASE_URL = '/admin/'
+VUE_APP_BASE_API = 'https://api.lgns.shop'
+VUE_BASE_URL = '/'
 

+ 1 - 1
crmeb_src/mer_uniapp/App.vue

@@ -260,7 +260,7 @@
 				if (e.size.windowWidth > 430 && !isPhone) {
 					// window.location.pathname = 'https://java.crmeb.net/';
 					/* 若你的项目未设置根目录(默认为 / 时),则使用下方代码 */
-					window.location.pathname = '/h5/static/html/pc.html';
+					window.location.pathname = '/static/html/pc.html';
 				}
 			},
 			

+ 3 - 2
crmeb_src/mer_uniapp/config/app.js

@@ -8,15 +8,16 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 //移动端商城API 网络接口修改此配置,小程序域名要求https 例如:https://xxx
-let domain = 'http://127.0.0.1:20810'
+// let domain = 'http://127.0.0.1:20810'
 // let domain = 'https://play.nanodreamtech.com'
+let domain = 'https://api.lgns.shop'
 
 module.exports = {
 	// 请求域名 格式: https://您的域名
 	HTTP_REQUEST_URL: domain,
 	// #ifdef MP || APP-PLUS
 	// H5商城地址
-	HTTP_H5_URL: 'https://play.nanodreamtech.com/h5',
+	HTTP_H5_URL: 'https://www.lgns.shop',
 	// #endif
 	HEADER: {
 		'content-type': 'application/json'

+ 2 - 2
crmeb_src/mer_uniapp/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "crmeb",
-    "appid" : "__UNI__FF3411F",
+    "appid" : "__UNI__1EF9677",
     "description" : "crmeb商城",
     "versionName" : "2.1.2",
     "versionCode" : 2,
@@ -234,7 +234,7 @@
         },
         "router" : {
             "mode" : "history",
-            "base" : "/h5/"
+            "base" : "/"
         },
         "domain" : "",
         "sdkConfigs" : {

+ 1 - 1
crmeb_src/mer_uniapp/pages/admin/components/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue

@@ -1311,7 +1311,7 @@ export default {
         // #ifdef H5
         const rooturl = window.location.origin
         const directory = instance.getDataset().directory
-        script.src = rooturl + directory + 'uni_modules/qiun-data-charts/static/h5/echarts.min.js'
+        script.src = rooturl + directory + 'uni_modules/qiun-data-charts/static/echarts.min.js'
         // #endif
         script.onload = this.newEChart
         document.head.appendChild(script)

+ 1 - 1
crmeb_src/mer_uniapp/static/html/pc.html

@@ -49,7 +49,7 @@
     </head>
     <body>
        <!--若你的项目未设置根目录(默认为 / 时),则使用下方代码-->
-		<iframe src="/h5/" id="iframe"></iframe>
+		<iframe src="/" id="iframe"></iframe>
 		<!-- <script src="https://pv.sohu.com/cityjson?ie=utf-8"></script> -->
 		<script type="text/javascript">
 		      // var Ip=returnCitySN['cip']