从源更新

erp_web/home.html

@@ -95,7 +95,7 @@
     </div>
     <footer class="main-footer m0">
         <div class="pull-right hidden-xs">当前版本： V2.1</div>
-        &copy; 2015-2020 华夏ERP Demo - Powered By <a href="https://www.huaxiaerp.com/" target="_blank">官方网站</a>
+        &copy; 2015-2020 华夏ERP Demo - Powered By <a href="http://home.huaxiaerp.com/" target="_blank">官方网站</a>
     </footer>
 </div>
 
@@ -106,6 +106,7 @@
 <script src="js/layer/3.1/layer.js"></script>
 <script src="js/my97/WdatePicker.js"></script>
 <script src="js/common/jsherp.js"></script>
+<script src="js/common/common.js"></script>
 <script src="js/common/i18n/jsherp_zh_CN.js"></script>
 <script>
     if ($('#switchSkin').length > 0){

erp_web/index.html

@@ -50,7 +50,11 @@
 						</a>
 					</li>
 					<li class="treeview">
-						<a target="_blank" style="color:yellow;font-weight: bold"
+						<a target="_blank" class="aliyun" style="color:yellow;font-weight: bold;display: none;"
+						   href="https://www.aliyun.com/acts/hotsale?userCode=axva2vlr">
+							<i class="fa fa-cloud"></i> 阿里云促销中
+						</a>
+						<a target="_blank" class="tencent" style="color:yellow;font-weight: bold;display: none;"
 						   href="https://cloud.tencent.com/act/cps/redirect?fromSource=gwzcw.3018172.3018172.3018172&redirect=10140&cps_key=4fb6482d716575dcb7b8fe600d93766a&from=activity">
 							<i class="fa fa-cloud"></i> 腾讯云促销中
 						</a>

erp_web/js/common/common.js

+	//baidu-tongji
+	var _hmt = _hmt || [];
+	(function() {
+		var hm = document.createElement("script");
+		hm.src = "https://hm.baidu.com/hm.js?1cd9bcbaae133f03a6eb19da6579aaba";
+		var s = document.getElementsByTagName("script")[0];
+		s.parentNode.insertBefore(hm, s);
+	})();
+
 	$.fn.serializeObject = function() {
 		var o = {};
 		var a = this.serializeArray();
@@ -48,10 +57,12 @@
 	}
     function dgResize() {
 		var searchTabHeight = $('#searchTable').height();
-        $('#tableData').datagrid('resize', {
-            width: $(window).width() - 6,
-            height: $(window).height() - searchTabHeight -46
-        });
+		if($('#tableData').length) {
+            $('#tableData').datagrid('resize', {
+                width: $(window).width() - 6,
+                height: $(window).height() - searchTabHeight -46
+            });
+		}
     }
     $(window).resize(function () {
         dgResize();

erp_web/js/modules/sys/sysIndex.js

@@ -418,8 +418,19 @@ $(function () {
         });
     })
 
-
-
-
-
+    //根据时间戳决定展示aliyun还是tencent
+    function autoChangeTip() {
+        var timestamp=new Date().getTime();
+        var checkShow = timestamp%2;
+        if(checkShow) {
+            $(".aliyun").show();
+            $(".tencent").hide();
+        } else {
+            $(".aliyun").hide();
+            $(".tencent").show();
+        }
+    }
+    setInterval(function () {
+        autoChangeTip();
+    },10*1000);
 });
\ No newline at end of file

erp_web/login.html

@@ -72,10 +72,10 @@
             </div>
             <div class="row">
                 <div class="col-xs-12">
-                    <a href="register.html" class="pull-left">[ 立即注册 ]</a>
+                    <a href="register.html" class="pull-left"><b>[ 立即注册 ]</b></a>
                     <div class="dropdown pull-right">
-                        <a href="https://www.huaxiaerp.com/" class="dropdown-toggle" target="_blank">
-                            <i class="fa icon-globe"></i> 官方网站
+                        <a href="http://home.huaxiaerp.com/" class="dropdown-toggle" target="_blank">
+                            <b><i class="fa icon-globe"></i> 官方网站</b>
                         </a>
                     </div>
                 </div>
@@ -103,5 +103,6 @@
 <script src="js/jquery-validation/1.16/jquery.validate.extend.js"></script>
 <script src="js/common/jsherp.js"></script>
 <script src="js/common/i18n/jsherp_zh_CN.js"></script>
+<script src="js/common/common.js"></script>
 <script src="js/md5/md5.js"></script>
 <script src="js/modules/sys/sysLogin.js"></script>

erp_web/register.html

@@ -89,10 +89,10 @@
             </div>
             <div class="row">
                 <div class="col-xs-12">
-                    <a href="login.html" class="pull-left">[ 立即登录 ]</a>
+                    <a href="login.html" class="pull-left"><b>[ 立即登录 ]</b></a>
                     <div class="dropdown pull-right">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
-                            <i class="fa icon-globe"></i> 官方网站
+                        <a href="http://home.huaxiaerp.com/" class="dropdown-toggle" target="_blank">
+                            <b><i class="fa icon-globe"></i> 官方网站</b>
                         </a>
                     </div>
                 </div>

src/main/bin/run-manage.sh

-FILE_PATH=/home/jshERP2.0
+FILE_PATH=
 SERVER_NAME=jshERP
 readonly APP_HOME=${FILE_PATH:-$(dirname $(cd `dirname $0`; pwd))}