Merge branch 'master' into feature/v4.10.9

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{
 					//禁止后退

src/jfw/modules/publicapply/src/activityday/dao/exchange.go

@@ -232,9 +232,10 @@ func (e *Ex) GetRecords() (ex *entity.ExchangeData) {
 		}
 		for _, rv := range *records {
 			urlMap := common.ObjToMap(rv["url"])
-			if ex.Address == "" && urlMap != nil && len(*urlMap) > 0 {
+			var address string
+			if urlMap != nil && len(*urlMap) > 0 {
 				if urlMap != nil {
-					ex.Address = common.InterfaceToStr((*urlMap)[e.Platform])
+					address = common.InterfaceToStr((*urlMap)[e.Platform])
 				}
 			}
 			productId := encrypt.SE.EncodeString(common.InterfaceToStr(rv["product_info_id"]))
@@ -264,6 +265,7 @@ func (e *Ex) GetRecords() (ex *entity.ExchangeData) {
 					ExCode:     exCode,
 					PartyName:  partyName,
 					EXDate:     exDate,
+					Address:    address,
 				})
 			} else { //未兑换
 				//判断是否已经过期
@@ -320,9 +322,10 @@ WHERE lua.position_id  =  ? AND pbi.attribute > 0 AND  lua.active_id  != 6 ORDER
 		}
 		for _, rv := range *records {
 			urlMap := common.ObjToMap(rv["url"])
-			if ex.Address == "" && urlMap != nil && len(*urlMap) > 0 {
+			var address string
+			if urlMap != nil && len(*urlMap) > 0 {
 				if urlMap != nil {
-					ex.Address = common.InterfaceToStr((*urlMap)[e.Platform])
+					address = common.InterfaceToStr((*urlMap)[e.Platform])
 				}
 			}
 			activeId := encrypt.SE.EncodeString(common.InterfaceToStr(rv["active_id"]))
@@ -341,6 +344,7 @@ WHERE lua.position_id  =  ? AND pbi.attribute > 0 AND  lua.active_id  != 6 ORDER
 					ExCode:     exCode,
 					PartyName:  partyName,
 					EXDate:     exDate,
+					Address:    address,
 				})
 			} else { //未兑换
 				//判断是否已经过期

src/jfw/modules/publicapply/src/activityday/entity/exchange.go

@@ -12,6 +12,7 @@ type ExchangeList struct {
 	EXDate     string `json:"ex_date"` //兑换时间
 	ActiveId   string `json:"active_id"`
 	PrizeId    string `json:"prize_id"` //
+	Address    string `json:"address"`  //
 }
 
 // 兑换列表返回结构体