Merge branch 'dev4.6.3' of http://192.168.3.207:8080/qmx/jy into dev4.6.3

src/jfw/modules/app/src/web/templates/me/login.html

@@ -201,7 +201,7 @@
 					return
 				}
 				var phone = $.trim($("#tel").val());
-				if((!Verification.isPhone(phone))||(!CreatePhone.isPhone(phone))){
+				if((!Verification.isPhone(phone))&&(!CreatePhone.isPhone(phone))){
 					EasyAlert.show("手机号格式错误");
 					return
 				}

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -824,7 +824,7 @@ console.log('Hello world');
               if(vm.entinfo.admin_department || vm.entinfo.admin_system) {
                 location.href = '/page_entniche_new/page/sub_management/sub_management_system.html'
               } else {
-                location.href = '/page_entniche/page/subsetting/sub_entrance.html'
+                location.href = '/page_entniche_new/page/subsetting/sub_entrance.html'
               }
               return
             }
@@ -879,8 +879,10 @@ console.log('Hello world');
         if (!r.haskey) {
             if(historyVt == 'm' && vm.rootInfo.isSubCount) {
                 $(".set_keyword").hide();
+            } else if(historyVt == 's'){
+                $(".set_keyword").hide();
             } else {
-                $(".set_keyword").show();
+              $(".set_keyword").show();
             }
               if (r.isPassCount && (localStorage.isPassCount == null || localStorage.isPassCount != date.split("-")[2])) {
                 localStorage.isPassCount = date.split("-")[2]
@@ -1782,8 +1784,10 @@ function hasNoData() {
               if(!data.haskey) {
                 if(historyVt == 'm' && vm.rootInfo.isSubCount) {
                     $(".set_keyword").hide();
+                } else if(historyVt == 's') {
+                    $(".set_keyword").hide();
                 } else {
-                    $(".set_keyword").show();
+                  $(".set_keyword").show();
                 }
               } else {
                 $(".set_keyword").hide();
@@ -1857,7 +1861,7 @@ function hasNoData() {
         if(switchProduct == 'bigmember') {
             window.location.href = '/jyapp/vipsubscribe/toSetKeyWordPage?vSwitch=m';
         } else if(switchProduct == 'entniche') {
-          window.location.href = '/page_entniche/page/subsetting/keyWord.html'
+          window.location.href = '/page_entniche_new/page/subsetting/keyWord.html'
         } else {
             if (isInTSguide) {
                 window.location.href = '/jyapp/wxkeyset/keyset/index';
@@ -1905,7 +1909,7 @@ function hasNoData() {
   //我的企业列表
   function toEntNichePage() {
       setSessionStorage();
-      window.location.href = "/page_entniche/home";
+      window.location.href = "/page_entniche_new/home";
   }
 
   //vip设置