Merge branch 'dev4.0' of http://192.168.3.207:10080/qmx/jy into dev4.0

src/jfw/front/frontRouter.go

@@ -6,6 +6,7 @@ import (
 	"jfw/config"
 	"jfw/public"
 	"qfw/util/jy"
+	"regexp"
 	"strings"
 )
 
@@ -145,6 +146,9 @@ func (this *CommonRouter) BigpcIndex() error {
 func (this *CommonRouter) BigpcPage(htmlPage string) error {
 	return this.doPcBigPage(htmlPage)
 }
+
+var bigVipFreePageReg = regexp.MustCompile(`set_*|free_*`)
+
 func (this *CommonRouter) doPcBigPage(pageSign string) error {
 	userid, _ := this.GetSession("userId").(string)
 	//没有登录跳转登录页面
@@ -161,8 +165,10 @@ func (this *CommonRouter) doPcBigPage(pageSign string) error {
 		if array := strings.Split(pageSign, "/"); len(array) > 0 {
 			pageSign = array[0]
 		}
-		if !bigBaseMsg.CheckBigVipFrontPower(pageSign) {
-			return this.Redirect("/big/page/index")
+		if !bigVipFreePageReg.MatchString(pageSign) {
+			if !bigBaseMsg.CheckBigVipFrontPower(pageSign) {
+				return this.Redirect("/big/page/index")
+			}
 		}
 	}
 	return this.Render(fmt.Sprintf("/frontRouter/pc/page_big_pc/sess/index.html"))

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

@@ -168,7 +168,7 @@ func (this *Analysis) FWData() {
 							go SaveFalseLogAndSendMail(userId, "rpc 接口调用出错", "", s_nickname, *getRes)
 						}
 						//保存中标预测记录
-						SaveFWHistorys(status, userId, main_userId, base64Key, phone, currentCount, this.Request, getRes, ai)
+						go SaveFWHistorys(status, userId, main_userId, base64Key, phone, currentCount, this.Request, getRes, ai)
 					} else {
 						if member_status == 4 {
 							status = -3 //是否是试用用户

src/jfw/modules/bigmember/src/service/use/use.go

@@ -148,10 +148,11 @@ func (u *Use) Info() {
 		if userid == "" {
 			return Result{Data: M{"status": -1}, Error_msg: "未登录"}
 		}
+		mainid, _, _ := util.MainUserId(userid, "", 0)
 		d := map[string]interface{}{
 			"i_member_status": 0,
 		}
-		data, _ := db.Mgo.FindById("user", userid, `{"i_member_starttime":1,"i_member_endtime":1,"i_member_status":1,"o_member_jy":1}`)
+		data, _ := db.Mgo.FindById("user", mainid, `{"i_member_starttime":1,"i_member_endtime":1,"i_member_status":1,"o_member_jy":1}`)
 		if (*data)["i_member_status"] != nil {
 			d["member_status"] = qu.IntAll((*data)["i_member_status"])
 			d["member_starttime"] = qu.IntAll((*data)["i_member_starttime"])

src/web/templates/frontRouter/pc/page_big_pc/sess/index.html

@@ -54,6 +54,7 @@
     <link rel="preload" href="//cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" as="script" crossorigin="anonymous" />
     <link rel="preload" href="//cdn.jsdelivr.net/npm/moment@2.29.1/moment.min.js" as="script" crossorigin="anonymous" />
      <!-- E 预加载库资源 -->
+     <!-- S 注入 -->
     <script src="https://cdn.jsdelivr.net/npm/import-map-overrides@2.2.0/dist/import-map-overrides.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/systemjs@6.8.3/dist/system.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/systemjs@6.8.3/dist/extras/amd.min.js"></script>
@@ -92,8 +93,7 @@
       System.import('vuex'),
       System.import('axios'),
       System.import('moment'),
-      System.import('lodash'),
-      System.import('echarts')
+      System.import('lodash')
     ]).then(function (modules) {
       var singleSpa = modules[0];
       var Vue = modules[1];

src/web/templates/pc/biddetail_rec.html

@@ -319,7 +319,7 @@ function isWechat() {
 							 }
 							 function addFollow() {
 							 	 if (doReq){
-							 	 	retrun
+							 	 	return
 								 }
 								 doReq = true
 								 $.post("/bigmember/follow/project/add",{sid:{{.T.obj._id}}},function(r){
@@ -327,7 +327,9 @@ function isWechat() {
 										followProjectId = r.data
 										$("#unfollowedProject").css("display","none")
 										$("#followedProject").css("display","")
-									}
+									} else {
+                    EasyAlert.show(r.error_msg, null, 1500);
+                  }
 									doReq =	false
 								 });
 							 }