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

src/config.json

@@ -279,7 +279,6 @@
     "PCS_time":24,
     "detail_element":["table","div"],
 	"termValidity":3600,
-    "entnichePcUser": [442,1686,1685,1711],
     "uploadPath": "./web/staticres/upload/res/",
     "redisSessionLockSize":20,
     "accountMergeOnline":"2010-03-30 00:00:00",

src/entnichePc.json

@@ -0,0 +1,4 @@
+{
+	"entnichePcUser": [442,1686,1685,1711],
+	"hideEntnicheMenu": [1711,442]
+}

src/jfw/config/config.go

@@ -17,6 +17,13 @@ var Wxoauth, Wxoauthinfo string
 
 var GmailAuth []*mail.GmailAuth
 
+type entnichePcConf struct {
+	EntnichePcUser   []int `json:"entnichePcUser"`
+	HideEntnicheMenu []int `json:"hideEntnicheMenu"`
+}
+
+var EntnichePcConf *entnichePcConf
+
 func init() {
 	util.ReadConfig(&Sysconfig)
 	WeixinConfig, _ = Sysconfig["wxJianyu"].(map[string]interface{})
@@ -35,4 +42,7 @@ func init() {
 		}
 		GmailAuth = append(GmailAuth, mail)
 	}
+
+	//PC端商机管理配置
+	util.ReadConfig("./entnichePc.json", &EntnichePcConf)
 }

src/jfw/front/dataExport.go

@@ -918,16 +918,24 @@ func (this *DataExport) GetPcEntAuth() {
 	myEntMenu := false
 	entnicheMenu := false
 	pcUsers := map[int]bool{}
-	for _, v := range config.Sysconfig["entnichePcUser"].([]interface{}) {
-		pcUsers[util.IntAll(v)] = true
+	hideUsers := map[int]bool{}
+	for _, v := range config.EntnichePcConf.EntnichePcUser {
+		pcUsers[v] = true
+	}
+	for _, v := range config.EntnichePcConf.HideEntnicheMenu {
+		hideUsers[v] = true
 	}
 	if phone != "" {
 		ent := public.Mysql.SelectBySql("select id,phone from entniche_info where phone=? and status=1", phone)
-		if len(*ent) != 0 {
+		if ent != nil && len(*ent) != 0 {
 			for _, val := range *ent {
-				if pcUsers[util.IntAll((val)["id"])] {
-					entnicheMenu = true
+				if pcUsers[util.IntAll(val["id"])] {
 					myEntMenu = true
+					if hideUsers[util.IntAll(val["id"])] {
+						entnicheMenu = false
+					} else {
+						entnicheMenu = true
+					}
 					break
 				}
 			}
@@ -937,19 +945,22 @@ func (this *DataExport) GetPcEntAuth() {
 			if user != nil && len(*user) > 0 {
 				for _, v := range *user {
 					if pcUsers[util.IntAll(v["ent_id"])] {
-						ents := public.Mysql.SelectBySql("select status from entniche_info where id=?", util.IntAll(v["ent_id"]))
-						if len(*ents) != 0 {
+						ents := public.Mysql.SelectBySql("select status,id from entniche_info where id=?", util.IntAll(v["ent_id"]))
+						if ents != nil && len(*ents) != 0 {
 							for _, vv := range *ents {
 								if util.IntAll(vv["status"]) == 1 {
 									myEntMenu = true
-									break
+								}
+								if util.IntAll(v["power"]) == 1 {
+									if hideUsers[util.IntAll(vv["id"])] {
+										entnicheMenu = false
+									} else {
+										entnicheMenu = true
+									}
 								}
 							}
 						}
-						if util.IntAll(v["power"]) == 1 {
-							entnicheMenu = true
-							break
-						}
+						break
 					}
 				}
 			}

src/jfw/modules/app/src/app/tag/ad.go

@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"jfw/public"
 	"log"
-	"strconv"
+	"strings"
 	"time"
 
 	"qfw/util/redis"
@@ -69,10 +69,10 @@ func Ad(s_code string, n int) []adInfo {
 }
 
 type adInfo struct {
-	s_link   string `json:"s_link"`   //广告位跳转链接
-	s_pic    string `json:"s_pic"`    //广告位弹窗
-	s_remark string `json:"s_remark"` //备注
-	o_extend struct {
+	S_link   string `json:"s_link"`   //广告位跳转链接
+	S_pic    string `json:"s_pic"`    //广告位弹窗
+	S_remark string `json:"s_remark"` //备注
+	O_extend struct {
 		Linktype  string `json:"linktype"`  //是否外部链接
 		Height    string `json:"height"`    //高度
 		Width     string `json:"width"`     //宽度
@@ -94,28 +94,25 @@ func adHandle(data []interface{}, s_code string) []adInfo {
 		if len(adInfo_Arr) > 0 {
 			now := time.Now()
 			for _, v := range adInfo_Arr {
-				if v.O_extend.StartTime != "" {
-					if thisTime, err := strconv.ParseInt(v.O_extend.StartTime, 10, 64); err == nil {
+				if v.O_extend.StartTime != "" && len(strings.Split(v.O_extend.StartTime, "-")) == 6 {
+					if thisTime, err := time.ParseInLocation("2006-01-02-15-04-05", v.O_extend.StartTime, time.Local); err == nil {
 						//广告还未开始
-						if thisTime > now.Unix() {
-							break
+						if thisTime.Unix() > now.Unix() {
+							continue
 						}
 					}
 				}
-				if v.O_extend.EndTime != "" {
-					if thisTime, err := strconv.ParseInt(v.O_extend.EndTime, 10, 64); err == nil {
+				if v.O_extend.EndTime != "" && len(strings.Split(v.O_extend.EndTime, "-")) == 6 {
+					if thisTime, err := time.ParseInLocation("2006-01-02-15-04-05", v.O_extend.EndTime, time.Local); err == nil {
 						//广告已经结束
-						if thisTime < now.Unix() {
-							break
+						if thisTime.Unix() < now.Unix() {
+							continue
 						}
 					}
 				}
 				res = append(res, v)
 			}
 		}
-		// if len(data) != len(res) && len(res) > 0 {
-		// 	redis.PutCKV("other", "ad_"+s_code, res)
-		// }
 	}
 	return res
 }

src/jfw/modules/subscribepay/src/service/ad.go

@@ -7,7 +7,7 @@ import (
 	"github.com/go-xweb/xweb"
 	"log"
 	"qfw/util/redis"
-	"strconv"
+	"strings"
 	"time"
 	"util"
 )
@@ -74,23 +74,22 @@ func adHandle(data []interface{}) []adInfo {
 			return res
 		}
 		json.Unmarshal(bytes, &adInfo_Arr)
-		log.Println(adInfo_Arr)
 		if len(adInfo_Arr) > 0 {
 			now := time.Now()
 			for _, v := range adInfo_Arr {
-				if v.O_extend.StartTime != "" {
-					if thisTime, err := strconv.ParseInt(v.O_extend.StartTime, 10, 64); err == nil {
+				if v.O_extend.StartTime != "" && len(strings.Split(v.O_extend.StartTime, "-")) == 6 {
+					if thisTime, err := time.ParseInLocation("2006-01-02-15-04-05", v.O_extend.StartTime, time.Local); err == nil {
 						//广告还未开始
-						if thisTime > now.Unix() {
-							break
+						if thisTime.Unix() > now.Unix() {
+							continue
 						}
 					}
 				}
-				if v.O_extend.EndTime != "" {
-					if thisTime, err := strconv.ParseInt(v.O_extend.EndTime, 10, 64); err == nil {
+				if v.O_extend.EndTime != "" && len(strings.Split(v.O_extend.EndTime, "-")) == 6 {
+					if thisTime, err := time.ParseInLocation("2006-01-02-15-04-05", v.O_extend.EndTime, time.Local); err == nil {
 						//广告已经结束
-						if thisTime < now.Unix() {
-							break
+						if thisTime.Unix() < now.Unix() {
+							continue
 						}
 					}
 				}

src/jfw/tag/ad.go

@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"jfw/public"
 	"log"
-	"strconv"
+	"strings"
 	"time"
 
 	"qfw/util/redis"
@@ -91,32 +91,28 @@ func adHandle(data []interface{}, s_code string) []adInfo {
 			return res
 		}
 		json.Unmarshal(bytes, &adInfo_Arr)
-		log.Println(adInfo_Arr)
 		if len(adInfo_Arr) > 0 {
 			now := time.Now()
 			for _, v := range adInfo_Arr {
-				if v.O_extend.StartTime != "" {
-					if thisTime, err := strconv.ParseInt(v.O_extend.StartTime, 10, 64); err == nil {
+				if v.O_extend.StartTime != "" && len(strings.Split(v.O_extend.StartTime, "-")) == 6 {
+					if thisTime, err := time.ParseInLocation("2006-01-02-15-04-05", v.O_extend.StartTime, time.Local); err == nil {
 						//广告还未开始
-						if thisTime > now.Unix() {
-							break
+						if thisTime.Unix() > now.Unix() {
+							continue
 						}
 					}
 				}
-				if v.O_extend.EndTime != "" {
-					if thisTime, err := strconv.ParseInt(v.O_extend.EndTime, 10, 64); err == nil {
+				if v.O_extend.EndTime != "" && len(strings.Split(v.O_extend.EndTime, "-")) == 6 {
+					if thisTime, err := time.ParseInLocation("2006-01-02-15-04-05", v.O_extend.EndTime, time.Local); err == nil {
 						//广告已经结束
-						if thisTime < now.Unix() {
-							break
+						if thisTime.Unix() < now.Unix() {
+							continue
 						}
 					}
 				}
 				res = append(res, v)
 			}
 		}
-		// if len(data) != len(res) && len(res) > 0 {
-		// 	redis.PutCKV("other", "ad_"+s_code, res)
-		// }
 	}
 	return res
 }

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

@@ -34,7 +34,7 @@
     <script type="systemjs-importmap" crossorigin="anonymous">
       {
         "imports": {
-          "entpc": "/page_entpc/js/app.js",
+          "entpc": "/page_entpc/js/app.js?v={{Msg "seo" "version"}}",
           "single-spa": "https://cdn.jsdelivr.net/npm/single-spa@4.3.7/lib/system/single-spa.min.js",
           "vue": "https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.js",
           "vue-router": "https://cdn.jsdelivr.net/npm/vue-router@3.0.7/dist/vue-router.min.js"

src/web/templates/pc/biddetail_bd.html

@@ -184,47 +184,133 @@ $(function(){
 		<script>
 			{{$s:=(Ad "jy-pccontent-right" -1)}}
 			var ADList={{$s}};
-			if(ADList){
-				var random=Math.floor(Math.random()*ADList.length);
-				var AD=ADList[random];
-				var ADHtml = "";
-				if(AD.s_pic!=undefined&&AD.s_pic){
-					if(AD.s_link){
-						ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
-					}
-					ADHtml += "<img id='pc-article-content-right' src='"+AD.s_pic+"'>";
-					if(AD.s_link){
-						ADHtml += "</a>";
-					}
-				}else {
-					ADHtml += AD.s_script;
-				}
-				$("#B1").html(ADHtml);
-			}
+      var ExcludeList = ""
+      if (ADList.length>0){
+        for (var i=0;i<ADList.length;i++ ){
+          if (ExcludeList!=""&&ExcludeList.split("-").length==ADList.length){
+            break;
+          }
+          var random=Math.floor(Math.random()*ADList.length);
+          if (ExcludeList.indexOf(random)>-1){
+            continue;
+          }
+          var AD=ADList[random];
+          if (AD.o_extend != undefined) {
+            var nowTime = new Date().getTime();
+            if (AD.o_extend.startTime!=undefined){
+              var stArr = AD.o_extend.startTime.split("-");
+              if (stArr.length==6){
+                var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
+                var stTime = new Date(stStr).getTime();
+                //未开始
+                if (stTime>nowTime){
+                  if (ExcludeList!=""){
+                    ExcludeList +="-"
+                  }
+                  ExcludeList = ExcludeList+ random 
+                  continue
+                }
+              }
+            }
+            if (AD.o_extend.endTime!=undefined){
+              var etArr = AD.o_extend.endTime.split("-");
+              if (etArr.length==6){
+                var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
+                var etTime = new Date(etStr).getTime();
+                //已结束
+                if (etTime<nowTime){
+                  if (ExcludeList!=""){
+                    ExcludeList +="-"
+                  }
+                  ExcludeList = ExcludeList+ random 
+                  continue
+                }
+              }
+            }
+          }
+          var ADHtml = "";
+          if(AD.s_pic){
+              if(AD.s_link){
+                  ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
+              }
+              ADHtml += "<img id='pc-article-content-right' src='"+AD.s_pic+"'>";
+              if(AD.s_link){
+                  ADHtml += "</a>";
+              }
+          }else {
+              ADHtml += AD.s_script;
+          }
+          $("#B1").html(ADHtml);
+          break;
+        }
+      }
 		</script>
 	</div>
 </div>
 <div  onclick="adv_statistics(this)" adv_name="PC快照页-底部"  class="adv-pccontent-bottom" id="B2" style="cursor:default;">
 	<script>
 		{{$s:=(Ad "jy-pccontent-bottom" -1)}}
-		var ADList={{$s}};
-        if(ADList){
-			var random=Math.floor(Math.random()*ADList.length);
-            var AD=ADList[random];
-            var ADHtml = "";
-            if(AD.s_pic!=undefined&&AD.s_pic){
-                if(AD.s_link){
-                    ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
+		var ADList={{$s}}; 
+    var ExcludeList = ""
+    if (ADList.length>0){
+      for (var i=0;i<ADList.length;i++ ){
+        if (ExcludeList!=""&&ExcludeList.split("-").length==ADList.length){
+          break;
+        }
+        var random=Math.floor(Math.random()*ADList.length);
+        if (ExcludeList.indexOf(random)>-1){
+          continue;
+        }
+        var AD=ADList[random];
+        if (AD.o_extend != undefined) {
+          var nowTime = new Date().getTime();
+          if (AD.o_extend.startTime!=undefined){
+            var stArr = AD.o_extend.startTime.split("-");
+            if (stArr.length==6){
+              var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
+              var stTime = new Date(stStr).getTime();
+              //未开始
+              if (stTime>nowTime){
+                if (ExcludeList!=""){
+                  ExcludeList +="-"
                 }
-                ADHtml += "<img id='pc-article-content-bottom' src='"+AD.s_pic+"'>";
-                if(AD.s_link){
-                    ADHtml += "</a>";
+                ExcludeList = ExcludeList+ random 
+                continue
+              }
+            }
+          }
+          if (AD.o_extend.endTime!=undefined){
+            var etArr = AD.o_extend.endTime.split("-");
+            if (etArr.length==6){
+              var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
+              var etTime = new Date(etStr).getTime();
+              //已结束
+              if (etTime<nowTime){
+                if (ExcludeList!=""){
+                  ExcludeList +="-"
                 }
-            }else {
-                ADHtml += AD.s_script;
+                ExcludeList = ExcludeList+ random 
+                continue
+              }
+            }
+          }
+        }
+        var ADHtml = "";
+        if(AD.s_pic){
+            if(AD.s_link){
+                ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
+            }
+            ADHtml += "<img id='pc-article-content-bottom' src='"+AD.s_pic+"'>";
+            if(AD.s_link){
+                ADHtml += "</a>";
             }
-            $("#B2").html(ADHtml);
+        }else {
+            ADHtml += AD.s_script;
         }
+        $("#B2").html(ADHtml);
+        break;
+      }
+    }
 	</script>
 </div>
 </div>

src/web/templates/pc/biddetail_rec.html

@@ -634,9 +634,50 @@ function isWechat() {
         <script>
 			{{$s:=(Ad "jy-pccontent-right" -1)}}
             var ADList={{$s}};
-            if(ADList){
+            var ExcludeList = ""
+            if (ADList.length>0){
+              for (var i=0;i<ADList.length;i++ ){
+                if (ExcludeList!=""&&ExcludeList.split("-").length==ADList.length){
+                  break;
+                }
                 var random=Math.floor(Math.random()*ADList.length);
+                if (ExcludeList.indexOf(random)>-1){
+                  continue;
+                }
                 var AD=ADList[random];
+                if (AD.o_extend != undefined) {
+                  var nowTime = new Date().getTime();
+                  if (AD.o_extend.startTime!=undefined){
+                    var stArr = AD.o_extend.startTime.split("-");
+                    if (stArr.length==6){
+                      var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
+                      var stTime = new Date(stStr).getTime();
+                      //未开始
+                      if (stTime>nowTime){
+                        if (ExcludeList!=""){
+                          ExcludeList +="-"
+                        }
+                        ExcludeList = ExcludeList+ random 
+                        continue
+                      }
+                    }
+                  }
+                  if (AD.o_extend.endTime!=undefined){
+                    var etArr = AD.o_extend.endTime.split("-");
+                    if (etArr.length==6){
+                      var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
+                      var etTime = new Date(etStr).getTime();
+                      //已结束
+                      if (etTime<nowTime){
+                        if (ExcludeList!=""){
+                          ExcludeList +="-"
+                        }
+                        ExcludeList = ExcludeList+ random 
+                        continue
+                      }
+                    }
+                  }
+                }
                 var ADHtml = "";
                 if(AD.s_pic){
                     if(AD.s_link){
@@ -650,6 +691,8 @@ function isWechat() {
                     ADHtml += AD.s_script;
                 }
                 $("#B1").html(ADHtml);
+                break;
+              }
             }
         </script>
 	</div>
@@ -732,23 +775,67 @@ function isWechat() {
 <div   onclick="adv_statistics(this)" adv_name="PC快照页-底部"  class="adv-pccontent-bottom" id="B2" style="cursor:default;">
 	<script>
 		{{$s:=(Ad "jy-pccontent-bottom" -1)}}
-		var ADList={{$s}};
-        if(ADList){
-            var AD=ADList[random];
-            var ADHtml = "";
-            if(AD.s_pic){
-                if(AD.s_link){
-                    ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
+		var ADList={{$s}}; 
+    var ExcludeList = ""
+    if (ADList.length>0){
+      for (var i=0;i<ADList.length;i++ ){
+        if (ExcludeList!=""&&ExcludeList.split("-").length==ADList.length){
+          break;
+        }
+        var random=Math.floor(Math.random()*ADList.length);
+        if (ExcludeList.indexOf(random)>-1){
+          continue;
+        }
+        var AD=ADList[random];
+        if (AD.o_extend != undefined) {
+          var nowTime = new Date().getTime();
+          if (AD.o_extend.startTime!=undefined){
+            var stArr = AD.o_extend.startTime.split("-");
+            if (stArr.length==6){
+              var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
+              var stTime = new Date(stStr).getTime();
+              //未开始
+              if (stTime>nowTime){
+                if (ExcludeList!=""){
+                  ExcludeList +="-"
                 }
-                ADHtml += "<img id='pc-article-content-bottom' src='"+AD.s_pic+"'>";
-                if(AD.s_link){
-                    ADHtml += "</a>";
+                ExcludeList = ExcludeList+ random 
+                continue
+              }
+            }
+          }
+          if (AD.o_extend.endTime!=undefined){
+            var etArr = AD.o_extend.endTime.split("-");
+            if (etArr.length==6){
+              var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
+              var etTime = new Date(etStr).getTime();
+              //已结束
+              if (etTime<nowTime){
+                if (ExcludeList!=""){
+                  ExcludeList +="-"
                 }
-            }else {
-                ADHtml += AD.s_script;
+                ExcludeList = ExcludeList+ random 
+                continue
+              }
             }
-            $("#B2").html(ADHtml);
+          }
         }
+        var ADHtml = "";
+        if(AD.s_pic){
+            if(AD.s_link){
+                ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
+            }
+            ADHtml += "<img id='pc-article-content-bottom' src='"+AD.s_pic+"'>";
+            if(AD.s_link){
+                ADHtml += "</a>";
+            }
+        }else {
+            ADHtml += AD.s_script;
+        }
+        $("#B2").html(ADHtml);
+        break;
+      }
+    }
 	</script>
 </div>
 </div>

src/web/templates/pc/index.html

@@ -280,7 +280,8 @@ var adv_background_opacity = 0.6;
 {{if $s}}
 var ADList={{$s}}
 if (ADList.length>0){
-	  var AD=ADList[0]
+  for (var i=0;i<ADList.length;i++ ){
+	  var AD=ADList[i]
 		if(AD.s_link){
       adv_url = AD.s_link
     }
@@ -288,6 +289,29 @@ if (ADList.length>0){
       adv_img = AD.s_pic+"?v="+ new Date().getTime()
     }
     if (AD.o_extend != undefined) {
+      var nowTime = new Date().getTime();
+      if (AD.o_extend.startTime!=undefined){
+        var stArr = AD.o_extend.startTime.split("-");
+        if (stArr.length==6){
+          var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
+          var stTime = new Date(stStr).getTime();
+          //未开始
+          if (stTime>nowTime){
+            continue
+          }
+        }
+      }
+      if (AD.o_extend.endTime!=undefined){
+        var etArr = AD.o_extend.endTime.split("-");
+        if (etArr.length==6){
+          var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
+          var etTime = new Date(etStr).getTime();
+          //已结束
+          if (etTime<nowTime){
+            continue
+          }
+        }
+      }
       if (AD.o_extend.width!=undefined){
         adv_width = AD.o_extend.width;
         adv_margin_left = parseInt(adv_width)/2;
@@ -305,8 +329,10 @@ if (ADList.length>0){
       $("#pc-index-alert").removeClass("pc_tc").addClass("pc_tc_master").css({"margin-top":"-"+adv_margin_top+"px","margin-left":"-"+adv_margin_left+"px"});
       $("#index_tc").removeClass("tc").addClass("tc_master").css({"width":adv_width+"px","height":adv_height+"px","background":"url('"+adv_img+"')","background-size":"cover"}).attr("dataurl",adv_url);
       $(".tans").css({"opacity":adv_background_opacity});//遮罩层透明度
+      break;
     }
   }
+}
 {{end}}
 
 var showDay = localStorage.tc;