Merge branch 'dev4.0' of ssh://192.168.3.207:10022/qmx/jy into dev4.0

src/jfw/modules/app/src/web/staticres/jyapp/js/check-bind-phone.js

@@ -282,6 +282,8 @@
                 } catch (e) {
                     console.log('获取状态失败: ', e)
                 }
+            }).fail(function () {
+              canBindPhone = true
             })
         }
         // 初始化获取绑定状态

src/jfw/modules/bigmember/src/service/analysis/forecastwinner.go

@@ -312,19 +312,22 @@ func (this *Analysis) FWStatus() {
 				}
 			}
 			if isFFalse > 0 {
-				//预测失败 清除redis数据
-				go ClearRedisInfo(userId)
-				go func() {
-					getRes := new(util.ForecastS)
-					if redis.GetNewInterface("other", redis_forecast_status+userId, &getRes) != nil {
-						log.Println("redis 1获取预测参数有误-", userId)
-					}
-					s_nickname, _ := this.GetSession("s_nickname").(string)
-					if s_nickname == "" {
-						s_nickname, _ = this.GetSession("app_name").(string)
-					}
-					SaveFalseLogAndSendMail(userId, falseMsg, f_id, s_nickname, *getRes)
-				}()
+				if rfrExist && f_id != "" {
+					go func() {
+						//预测失败 清除redis数据
+						ClearRedisInfo(userId)
+						//发送失败邮件提醒
+						getRes := new(util.ForecastS)
+						if redis.GetNewInterface("other", redis_forecast_status+userId, &getRes) != nil {
+							log.Println("redis 1获取预测参数有误-", userId)
+						}
+						s_nickname, _ := this.GetSession("s_nickname").(string)
+						if s_nickname == "" {
+							s_nickname, _ = this.GetSession("app_name").(string)
+						}
+						SaveFalseLogAndSendMail(userId, falseMsg, f_id, s_nickname, *getRes)
+					}()
+				}
 				regMap.Data = map[string]interface{}{
 					"id":      "",
 					"success": false,

src/jfw/modules/bigmember/src/service/analysis/potential.go

@@ -82,13 +82,11 @@ func (this *Analysis) CsORRsList() {
 			json.Unmarshal(this.Body(), &getRes)
 		}
 		if getRes.PCOR != "" {
-			main_userId := userId
+			main_userId, _, _ := util.MainUserId(userId, "", 0)
 			// getRes.Searchbool -- 0：默认查询 1：条件查询
 			// log.Println(len(getRes.Area), "----", getRes.BuyerClass, "----", getRes.Business_scope, "--", getRes.Searchbool)
 			if getRes.Searchbool == 0 && (len(getRes.Area) == 0 || len(getRes.BuyerClass) == 0 || len(getRes.Business_scope) == 0) {
 				//查库获得大会员用户的信息
-				// userId = util.MainUserId(userId)
-				main_userId, _, _ = util.MainUserId(userId, "", 0)
 				o_mb, ok := db.Mgo.FindById(C_User, main_userId, `{"o_member_jy":1}`)
 				if ok && o_mb != nil && (*o_mb) != nil {
 					o_member_jy := qutil.ObjToMap((*o_mb)["o_member_jy"])

src/web/staticres/js/check-bind-phone.js

@@ -269,6 +269,8 @@
         } catch (e) {
           console.log('获取状态失败: ', e)
         }
+      }).fail(function () {
+        canBindPhone = true
       })
     }
     // 初始化获取绑定状态

src/web/templates/big-member/pc/page_index.html

@@ -949,6 +949,8 @@
         } catch (e) {
             console.log('获取状态失败: ', e)
         }
+    }).fail(function () {
+      canBindPhone = true
     })
     /* 数字动画 */
     function filpNumber () {

src/web/templates/pc/biddetail_rec.html

@@ -277,7 +277,7 @@ function isWechat() {
 						<img src="{{Msg "seo" "cdn"}}/images/guanzhued.png">
                     	<font>已关注</font>
 					</span>
-					<span class="com-guanzhu" id="unfollowedProject" style="width:90px;display: none">
+					<span class="com-guanzhu" id="unfollowedProject" style="width:90px;display: none;cursor: pointer;">
 						<img src="{{Msg "seo" "cdn"}}/images/guanzhu.png">
                     	<font>关注项目</font>
 					</span>
@@ -328,7 +328,7 @@ function isWechat() {
 										$("#unfollowedProject").css("display","none")
 										$("#followedProject").css("display","")
 									} else {
-                    EasyAlert.show(r.error_msg, null, 1500);
+                    EasyAlert.show(r.error_msg, { 'max-width': 'unset' }, 1500);
                   }
 									doReq =	false
 								 });