From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距,和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/resources/static/js/systools/MBase.js |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/resources/static/js/systools/MBase.js b/zq-erp/src/main/resources/static/js/systools/MBase.js
index d754c18..648d3ef 100644
--- a/zq-erp/src/main/resources/static/js/systools/MBase.js
+++ b/zq-erp/src/main/resources/static/js/systools/MBase.js
@@ -5,9 +5,16 @@
  */
 function getRootPath() {
 	var curWwwPath = window.document.location.href;
-	console.log(curWwwPath);
+	let url="";
 	var pathName = window.document.location.pathname;
-	var url=curWwwPath.substring(0, curWwwPath.indexOf(pathName));
+	if(pathName&&pathName!="/"){
+		url= curWwwPath.substring(0, curWwwPath.indexOf(pathName));
+	}else{
+		url= curWwwPath;
+	}
+	console.log(url);
+	return url;
+
 //	if(url.indexOf('localhost')>0){
 //		return url++- pathName.substring(0, pathName.substr(1).indexOf('/') + 1); 
 //		console.log("1"+url);
@@ -16,7 +23,7 @@
 //		return  url+ pathName.substring(0, pathName.substr(1).indexOf('/') + 1); 
 //		console.log("2"+url);
 //	}
-	return url; 
+
 }
 /** 全局路径,代表当前网站的根URL */
 var basePath = getRootPath();

--
Gitblit v1.9.1