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

src/jfw/front/follow.go

@@ -288,7 +288,7 @@ func (m *Follow) PcEntAllNotice() error {
 	data := map[string]interface{}{}
 	if entname!="" {
 		fields := `{"projectname":1,"bidamount":1,"title":1,"publishtime":1,"subtype":1,"toptype":1,"href":1}`
-		res, ok := tools.MQFW.Find("bidding", `{"winner":"`+entname+`"}`, nil, fields, false, -1, -1)
+		res, ok := tools.MQFW.Find("bidding", `{"winner":"`+entname+`"}`, `{"publishtime":-1}`, fields, false, -1, -1)
 		if ok && len(*res) != 0 && res != nil && *res != nil {
 			for _, v := range *res {
 				v["_id"] = util.EncodeArticleId2ByCheck(util.BsonIdToSId(v["_id"]))

src/jfw/modules/followent/src/followent/followent.go

@@ -104,7 +104,7 @@ func (f *FollowEnt) NewInfo(winnerid string) error {
 	var a_visited interface{}
 	_id := ""
 	fields := `{"projectname":1,"bidamount":1,"title":1,"publishtime":1,"subtype":1,"toptype":1,"href":1}`
-	data, ok := mongodb.Find("bidding", `{"winner":"`+winner+`"}`, nil, fields, false, -1, -1)
+	data, ok := mongodb.Find("bidding", `{"winner":"`+winner+`"}`, `{"publishtime":-1}`, fields, false, -1, -1)
 	if !ok {
 		return f.Render("_error.html")
 	}

src/jfw/modules/push/src/qfw/push/dopush/dopush.go

@@ -297,7 +297,10 @@ func SendFmail(email, subject, html string, dataexport int, fmdatas []map[string
 	}
 	log.Println(email, dataexport)
 	b := mail.GSendMail("剑鱼-招标订阅", email, "", "", subject, html, fname, GmailMap)
-	if b && fname != "" {
+	if !b {
+		log.Println(email, "邮件发送失败")
+	}
+	if fname != "" {
 		os.Remove(fname)
 	}
 }

src/jfw/modules/push/src/qfw/push/dopush/excel.go

@@ -31,26 +31,18 @@ func GetBidInfoXlsx(data []map[string]interface{}) string {
 	//信息
 	for _, v := range data {
 		row := sheet.AddRow()
-		pt := v["publishtime"]
-		publishtime := qu.FormatDateWithObj(&pt, qu.Date_Short_Layout)
-		cell := row.AddCell()
-		cell.SetValue(publishtime)
-
-		cell = row.AddCell()
-		cell.SetValue(v["subtype"])
-
-		cell = row.AddCell()
-		cell.SetValue(v["buyer"])
-		cell.SetStyle(style)
 
 		projectname := qu.ObjToString(v["projectname"])
 		if projectname == "" {
 			projectname = qu.ObjToString(v["title"])
 		}
-		cell = row.AddCell()
+		cell := row.AddCell()
 		cell.SetValue(projectname)
 		cell.SetStyle(style)
 
+		cell = row.AddCell()
+		cell.SetValue(v["subtype"])
+
 		budget := qu.Float64All(v["budget"]) / float64(10000)
 		cell = row.AddCell()
 		if budget != 0 {
@@ -59,6 +51,10 @@ func GetBidInfoXlsx(data []map[string]interface{}) string {
 			cell.SetValue("")
 		}
 
+		cell = row.AddCell()
+		cell.SetValue(v["buyer"])
+		cell.SetStyle(style)
+
 		bpt := v["bidopentime"]
 		bidopentime := qu.FormatDateWithObj(&bpt, "2006-01-02 15:04")
 		cell = row.AddCell()
@@ -75,6 +71,11 @@ func GetBidInfoXlsx(data []map[string]interface{}) string {
 		} else {
 			cell.SetValue("")
 		}
+
+		pt := v["publishtime"]
+		publishtime := qu.FormatDateWithObj(&pt, qu.Date_Short_Layout)
+		cell = row.AddCell()
+		cell.SetValue(publishtime)
 	}
 	fx.AppendSheet(sheet, "剑鱼")
 	fname := time.Now().Format("20060102150405")

src/web/templates/weixin/search/mainSearch.html

@@ -18,7 +18,7 @@
 				<!--搜索-->
 				<div class="search-tontrol">
 					<div>
-						<input class="inp-search" type="text" name="searchvalue"  value="" maxlength="50" placeholder="示例：税务局 软件" />
+						<input class="inp-search" type="text" name="searchvalue"  value="" maxlength="50" placeholder="示例：税务局 软件" readonly/>
 						<input class="search-submit" type="submit" value="" />
 					</div>
 					<!--点击关闭-->
@@ -54,32 +54,39 @@
                 $(".rightHref").click(function(){
                     window.open("http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=2&sn=379fc869080a36d9d0798a3d4fb9a63a#wechat_redirect");
                 });
+                /*
 				$(".inp-search").click(function(){
 					window.open("/jylab/superSearch");
-				});
-                //超级和中标企业搜索跳转跳转
-				$(".content ul li a:eq(0)").click(function(){
-                    if(open_supersearch){
-                        window.location.href='/jylab/superSearch';
-                    }else{
-                        window.location.href='/jylab/laboratory/cjss';
-                    }
-				});
-                $(".content ul li a:eq(1)").click(function(){
-                    if(open_entsesearch){
-                        window.location.href='/jylab/entsesearch/search';
-                    }else{
-                        window.location.href='/jylab/laboratory/zbqy';
-                    }
+				});*/
+                $(".inp-search").on("touchstart",function (e) {
+                    e.preventDefault();
                 });
-			});
-            //查询是否开通超级搜索和中标企业搜索
-            function flush_isOpenSupersearch() {
-                $.post("/jylab/supsearch/getstatus",function(result){
-                    open_supersearch=result.supstatus;
-                    open_entsesearch=result.entstatus;
+                $(".inp-search").on("touchend",function () {
+                    window.open("/jylab/superSearch");
                 });
-            }
-		</script>
+            //超级和中标企业搜索跳转跳转
+            $(".content ul li a:eq(0)").click(function(){
+                if(open_supersearch){
+                    window.location.href='/jylab/superSearch';
+                }else{
+                    window.location.href='/jylab/laboratory/cjss';
+                }
+            });
+            $(".content ul li a:eq(1)").click(function(){
+                if(open_entsesearch){
+                    window.location.href='/jylab/entsesearch/search';
+                }else{
+                    window.location.href='/jylab/laboratory/zbqy';
+                }
+            });
+        });
+        //查询是否开通超级搜索和中标企业搜索
+        function flush_isOpenSupersearch() {
+            $.post("/jylab/supsearch/getstatus",function(result){
+                open_supersearch=result.supstatus;
+                open_entsesearch=result.entstatus;
+            });
+        }
+</script>
 	</body>
 </html>