beauty-erp.git - Gitblit

parent: 5f9e3447 | patch | commit | ignore whitespace

Helius

2021-11-09 74fe9216adea035899299e839c02070819bcb340

fix

10 files modified

	zq-erp/src/main/resources/static/js/plugin/kindeditor/plugins/baidumap/index.html	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/js/plugin/kindeditor/plugins/baidumap/map.html	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/plugin/beditor/dialogs/map/map.html	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/plugin/beditor/dialogs/map/show.html	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/plugin/kindeditor/plugins/baidumap/index.html	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/plugin/kindeditor/plugins/baidumap/map.html	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/shop/shopInfo-form.html	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/orgment/shopInfo-form.html	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/common/login.html	4 ●●●●● patch \| view \| raw \| blame \| history

 zq-erp/src/main/resources/static/js/plugin/kindeditor/plugins/baidumap/index.html

@@ -11,7 +11,7 @@
    .iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
    .iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
</style>
<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
</head>

<body onload="initMap();">

 zq-erp/src/main/resources/static/js/plugin/kindeditor/plugins/baidumap/map.html

@@ -7,7 +7,7 @@
            html { height: 100% }
            body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
        </style>
        <script charset="utf-8" src="http://api.map.baidu.com/api?v=1.3"></script>
        <script charset="utf-8" src="https://api.map.baidu.com/api?v=1.3"></script>
        <script>
            var map, geocoder;
            function initialize() {

 zq-erp/src/main/resources/static/plugin/beditor/dialogs/map/map.html

@@ -4,7 +4,7 @@
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title></title>
    <script type="text/javascript" src="../internal.js"></script>
    <script type="text/javascript" src="http://api.map.baidu.com/api?v=1.1&services=true"></script>
    <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.1&services=true"></script>
    <style type="text/css">
        .content{width:530px; height: 350px;margin: 10px auto;}
        .content table{width: 100%}

 zq-erp/src/main/resources/static/plugin/beditor/dialogs/map/show.html

@@ -14,7 +14,7 @@
            overflow: hidden;
        }
    </style>
    <script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
    <script type="text/javascript" src="https://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
</head>

<body onload="initMap();">

 zq-erp/src/main/resources/static/plugin/kindeditor/plugins/baidumap/index.html

@@ -12,7 +12,7 @@
    .iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
    .iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
</style>
<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
</head>

<body onload="initMap();">

 zq-erp/src/main/resources/static/plugin/kindeditor/plugins/baidumap/map.html

@@ -7,7 +7,7 @@
            html { height: 100% }
            body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
        </style>
        <script charset="utf-8" src="http://api.map.baidu.com/api?v=1.3"></script>
        <script charset="utf-8" src="https://api.map.baidu.com/api?v=1.3"></script>
        <script>
            var map, geocoder;
            function initialize() {

 zq-erp/src/main/resources/templates/views/admin/hive-erp/shop/shopInfo-form.html

@@ -13,7 +13,7 @@
    th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
<script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script>

    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=Oego4OzlvPRPNyjCPTctXtuVNsSissOX"></script>
    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=Oego4OzlvPRPNyjCPTctXtuVNsSissOX"></script>


</head>

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html

@@ -911,7 +911,7 @@
                        this.achieveList.push({
                            orderItem: item,
                            staff: this.loginUser,
                            saleId: this.loginUser.suId,
                            saleId: _this.loginUser.suUserType === 'admin' ? '' : this.loginUser.suId,
                            goodsCash: item.payMoney,
                            achieveType : _this.achieveTypeList[0].value,
                            commission: 0,

 zq-erp/src/main/resources/templates/views/admin/hive/orgment/shopInfo-form.html

@@ -13,7 +13,7 @@
    th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
<script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script>

    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=Oego4OzlvPRPNyjCPTctXtuVNsSissOX"></script>
    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=Oego4OzlvPRPNyjCPTctXtuVNsSissOX"></script>


</head>

 zq-erp/src/main/resources/templates/views/common/login.html

@@ -271,9 +271,9 @@
                    href="https://pubstorage-bucket.oss-cn-shenzhen.aliyuncs.com/tools/xp/49.0.2623.112_chrome_installer.exe "
                    target="_blank">谷歌浏览器（推荐）</a><span>|</span><strong>打印控件：</strong><a
                    href="https://pubstorage-bucket.oss-cn-shenzhen.aliyuncs.com/tools/CLodop_Setup_for_Win32NT_https_3.056Extend.exe"
                    target="_blank">下载控件</a><span>|</span><strong>APP：</strong><a
                    target="_blank">下载控件</a><span>|</span><!--<strong>APP：</strong><a
                    href="http://testfile.hive.jyymatrix.cc/mobile/download.html"
                    target="_blank">下载APP客户端</a>
                    target="_blank">下载APP客户端</a>-->
            </p>
        </div>
    </div>

			@@ -11,7 +11,7 @@
			.iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
			.iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
			</style>
			<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
			<script type="text/javascript" src="https://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
			</head>

			<body onload="initMap();">

			@@ -7,7 +7,7 @@
			html { height: 100% }
			body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
			</style>
			<script charset="utf-8" src="http://api.map.baidu.com/api?v=1.3"></script>
			<script charset="utf-8" src="https://api.map.baidu.com/api?v=1.3"></script>
			<script>
			var map, geocoder;
			function initialize() {

			@@ -4,7 +4,7 @@
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title></title>
			<script type="text/javascript" src="../internal.js"></script>
			<script type="text/javascript" src="http://api.map.baidu.com/api?v=1.1&services=true"></script>
			<script type="text/javascript" src="https://api.map.baidu.com/api?v=1.1&services=true"></script>
			<style type="text/css">
			.content{width:530px; height: 350px;margin: 10px auto;}
			.content table{width: 100%}

			@@ -14,7 +14,7 @@
			overflow: hidden;
			}
			</style>
			<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
			<script type="text/javascript" src="https://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
			</head>

			<body onload="initMap();">

			@@ -12,7 +12,7 @@
			.iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
			.iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
			</style>
			<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
			<script type="text/javascript" src="https://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
			</head>

			<body onload="initMap();">

			@@ -13,7 +13,7 @@
			th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
			<script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script>

			<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=Oego4OzlvPRPNyjCPTctXtuVNsSissOX"></script>
			<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=Oego4OzlvPRPNyjCPTctXtuVNsSissOX"></script>


			</head>

			@@ -911,7 +911,7 @@
			this.achieveList.push({
			orderItem: item,
			staff: this.loginUser,
			saleId: this.loginUser.suId,
			saleId: _this.loginUser.suUserType === 'admin' ? '' : this.loginUser.suId,
			goodsCash: item.payMoney,
			achieveType : _this.achieveTypeList[0].value,
			commission: 0,

			@@ -271,9 +271,9 @@
			href="https://pubstorage-bucket.oss-cn-shenzhen.aliyuncs.com/tools/xp/49.0.2623.112_chrome_installer.exe "
			target="_blank">谷歌浏览器（推荐）</a><span>\|</span><strong>打印控件：</strong><a
			href="https://pubstorage-bucket.oss-cn-shenzhen.aliyuncs.com/tools/CLodop_Setup_for_Win32NT_https_3.056Extend.exe"
			target="_blank">下载控件</a><span>\|</span><strong>APP：</strong><a
			target="_blank">下载控件</a><span>\|</span><!--<strong>APP：</strong><a
			href="http://testfile.hive.jyymatrix.cc/mobile/download.html"
			target="_blank">下载APP客户端</a>
			target="_blank">下载APP客户端</a>-->
			</p>
			</div>
			</div>