Merge branch 'hotfix/v4.10.16.1' of qmx/jy into hotfix/v4.10.16.2

src/jfw/modules/app/src/web/staticres/jyapp/me/js/account.js

@@ -35,12 +35,11 @@ var account = {
                           // 判断APP版本
                           // 如果app版本号大于等于3.1.2则展示
                           var currentVersion = ''
-                          var targetVersion = '3.1.2'
+                          var targetVersion = '3.1.1'
                           try {
                             currentVersion = JyObj.getVersion()
                             if (currentVersion) {
-                              var c = compareVersion(currentVersion, targetVersion)
-                              this.fastButtonShow(!c)
+                              var c = compareVersion(targetVersion, currentVersion)
                               if (c) {
                                 $('#bindWX').show();
                               }

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

@@ -297,12 +297,11 @@
         // 判断APP版本
         // 如果app版本号大于等于3.1.2则展示
         var currentVersion = ''
-        var targetVersion = '3.1.2'
+        var targetVersion = '3.1.1'
         try {
           currentVersion = JyObj.getVersion()
           if (currentVersion) {
-            var c = compareVersion(currentVersion, targetVersion)
-            this.fastButtonShow(!c)
+            var c = compareVersion(targetVersion, currentVersion)
             if (c) {
               $('.wx').show()
               $('.fast-login-open-link').removeClass('no-right-line')
@@ -320,7 +319,10 @@
     // s-- h5状态下隐藏微信登录 --s
     if (platform.inH5) {
       showWxLoginIcon(false)
+    } else if (platform.inApp ){
+      showWxLoginIcon(true)
     }
+
     // e-- h5状态下隐藏微信登录 -- e
     // s-- 删除注册页缓存 -- s
     sessionStorage.removeItem('comname')
@@ -750,12 +752,6 @@
 				JyObj.clearPushMessage("");
 				JyObj.hiddenBottom(0);
 			}catch(e){}
-			try{
-				//是否安装了微信
-				if(JyObj.isInstallWeixin()==0){
-					showWxLoginIcon(false)
-				}
-			}catch(e){}
 			if(getUrlParam("flag")=="kicked" || getUrlParam("flag")=="quit"){
 				try{
 					//禁止后退