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

config_formal/sword_172.17.145.167/entnichePc.json

@@ -1,4 +1,5 @@
 {
 	"entnichePcUser": [18624,12724,10256,14002,14004,14576,14577,1416,1421,2546,9522,10500,10511,10617,12469,7426,12814,12815,12816,12817,12818,12819,12820,12823,12822,12920,14128,14796],
-	"hideEntnicheMenu": [10256,14002,14004,14577,1416]
+	"hideEntnicheMenu": [10256,14002,14004,14577,1416],
+	"privateDataPhone": "18530014520,13525530909,13938299083,15225181827,18537851805,15830500028"
 }

config_formal/sword_172.17.145.167/time.txt

@@ -1,2 +1,2 @@
-#上次修改时间,比当前修改时间小就行
-2022-1-18 9:00:00
+#上次修改时间,比当前修改时间小就行
+2022-1-21 00:00:00

config_formal/sword_172.17.148.50/entnichePc.json

@@ -1,4 +1,5 @@
 {
 	"entnichePcUser": [18624,12724,10256,14002,14004,14576,14577,1416,1421,2546,9522,10500,10511,10617,12469,7426,12814,12815,12816,12817,12818,12819,12820,12823,12822,12920,14128,14796],
-	"hideEntnicheMenu": [10256,14002,14004,14577,1416]
+	"hideEntnicheMenu": [10256,14002,14004,14577,1416],
+	"privateDataPhone": "18530014520,13525530909,13938299083,15225181827,18537851805,15830500028"
 }

config_formal/sword_172.17.148.50/time.txt

@@ -1,2 +1,2 @@
-#上次修改时间,比当前修改时间小就行
-2022-1-18 9:00:00
+#上次修改时间,比当前修改时间小就行
+2022-1-21 00:00:00

src/entnichePc.json

@@ -1,4 +1,5 @@
 {
 	"entnichePcUser": [14595,442,1686,1685,1711,674],
-	"hideEntnicheMenu": [1711,442]
+	"hideEntnicheMenu": [1711,442],
+	"privateDataPhone": "18530014520,13525530909,13938299083"
 }

src/jfw/config/config.go

@@ -18,8 +18,9 @@ var Wxoauth, Wxoauthinfo string
 var GmailAuth []*mail.GmailAuth
 
 type entnichePcConf struct {
-	EntnichePcUser   []int `json:"entnichePcUser"`
-	HideEntnicheMenu []int `json:"hideEntnicheMenu"`
+	EntnichePcUser   []int  `json:"entnichePcUser"`
+	HideEntnicheMenu []int  `json:"hideEntnicheMenu"`
+	PrivateDataPhone string `json:"privateDataPhone"`
 }
 
 var EntnichePcConf *entnichePcConf

src/jfw/front/dataExport.go

@@ -840,6 +840,7 @@ func (this *DataExport) GetPcEntAuth() {
 	//phone = "15136225931"
 	myEntMenu := false
 	entnicheMenu := false
+	privatedata := false
 	pcUsers := map[int]bool{}
 	hideUsers := map[int]bool{}
 	for _, v := range config.EntnichePcConf.EntnichePcUser {
@@ -899,12 +900,16 @@ func (this *DataExport) GetPcEntAuth() {
 				}
 			}
 		}
+		if strings.Contains(config.EntnichePcConf.PrivateDataPhone, phone) {
+			privatedata = true
+		}
 	}
 
 	data := map[string]interface{}{
 		"myEntMenu":    myEntMenu,
 		"entnicheMenu": entnicheMenu,
 		"isNew":        isNew,
+		"privatedata":  privatedata,
 	}
 	this.ServeJson(data)
 }

src/web/staticres/common-module/yearEndReport/js/index.js

@@ -298,11 +298,11 @@ var vPage = new Vue({
                             initSwiper.bind(_this)()
                         })
                     } else {
-                        location.replace('/swordfish/about')
+                        location.replace('/swordfish/about?from=yearEndReportnew')
                     }
                 },
                 error: function () {
-                    location.replace('/swordfish/about')
+                    location.replace('/swordfish/about?from=yearEndReportnew')
                 }
             })
         },

src/web/staticres/js/login.js

@@ -345,23 +345,29 @@ function checkMenuForEnt () {
                 type: 'get',
                 url: '/front/entExportAuth/getAuth?t=' + new Date().getTime(),
                 success: function (r) {
-                    var tempHtml = ''
+					$(".myorderDiv[data-ent-menu]").remove()
+					var tempHtml = ''
                     if(r.myEntMenu){
-                        tempHtml += "<div class=\"myorderDiv\" onclick=\"window.location.href='/entpc/myent'\">"
+                        tempHtml += "<div data-ent-menu class=\"myorderDiv\" onclick=\"window.location.href='/entpc/myent'\">"
                         +"<span>我的企业</span>"
                         +"</div>"
                     }
                     if(r.entnicheMenu){
                         if (r.isNew) {
-                            tempHtml+= "<div class=\"myorderDiv\" onclick=\"window.location.href='/entpc/newBus'\">"
+                            tempHtml+= "<div data-ent-menu class=\"myorderDiv\" onclick=\"window.location.href='/entpc/newBus'\">"
                                 +"<span>商机管理</span>"
                                 +"</div>"
                         } else {
-                            tempHtml+= "<div class=\"myorderDiv\" onclick=\"window.location.href='/entpc/bus'\">"
+                            tempHtml+= "<div data-ent-menu class=\"myorderDiv\" onclick=\"window.location.href='/entpc/bus'\">"
                                 +"<span>商机管理</span>"
                                 +"</div>"
                         }
                     }
+                    if(r.privatedata){
+                      tempHtml+= "<div data-ent-menu class=\"myorderDiv\" onclick=\"window.location.href='/swordfish/page_big_pc/free/custom_search'\">"
+                          +"<span>画像分析系统</span>"
+                          +"</div>"
+                    }
                     $(".infoList .lastBox").before(tempHtml)
                 }
             })
@@ -753,13 +759,14 @@ var haslogin = function(num,kyorpn,url){
 				+"</div>"
 			$("#login").html(hhtml);
 			try{
-        checkBigStatus()
-        checkMenuForEnt()
+				checkBigStatus()
+				checkMenuForEnt()
 				infoListCss();
 				commonMouseEvent();
                 message.init()
 			}catch(e){}
-		}else{
+		}
+		else{
 			$("#login").html("<button class='loginBtn' data-toggle='modal' onclick='openLoginDig()'>登录</button>");
 			loginBtnType();
 			//pc限制登陆