Fix 微信端时间选择器

src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -31,6 +31,62 @@ $(function () {
 		}
 	}
 })
+/*
+* money unit for zyh @date 2020/6/5
+* */
+var MoneyUnit = {
+	levelArr: ['元', '万元', '亿元', '万亿元'],
+	test: function (num, type, lv) {
+	if (type === void 0) {
+		type = 'string';
+	}
+
+	if (lv === void 0) {
+		lv = 0;
+	}
+
+	if (num === 0) {
+		if (type === 'string') {
+			return '0';
+		}
+
+		if (type === 'lv') {
+			return this.levelArr[lv];
+		}
+
+		if (type === 'number') {
+			return 0;
+		}
+
+		if (type === 'index') {
+			return lv;
+		}
+	}
+
+	var result = num / Math.pow(10000, lv);
+
+	if (result > 10000 && lv < 2) {
+		return this.test(num, type, lv + 1);
+	} else {
+		if (type === 'string') {
+			return result.toFixed(2).replace('.00', '') + this.levelArr[lv];
+		}
+
+		if (type === 'lv') {
+			return this.levelArr[lv];
+		}
+
+		if (type === 'index') {
+			return lv;
+		}
+
+		if (type === 'number') {
+			return result.toFixed(2).replace('.00', '');
+		}
+	}
+}
+}
+
 var SuperSearch = {
 	secondFlag:"",
 	secondList:"",
@@ -1311,6 +1367,14 @@ var SuperSearch = {
 					}
 				}
 			}
+			// 金额标签
+			var moneyTag = '';
+			if(typeof(list[i].budget) != "undefined" && list[i].budget != null && list[i].budget != ""){
+				moneyTag = '<span class="industry">'+MoneyUnit.test(list[i].budget)+'</span>';
+			}
+			if(typeof(list[i].bidamount) != "undefined" && list[i].bidamount != null && list[i].bidamount != ""){
+				moneyTag = '<span class="industry">'+MoneyUnit.test(list[i].bidamount)+'</span>';
+			}
 			if(i==3&&pageNum==1){
 				ListHtml += '<div class="tslist" style="border-bottom-width:0px;">'
 			}else{
@@ -1326,7 +1390,7 @@ var SuperSearch = {
 						+'</div>'
 						+'<div style="clear:both;"></div>'
 						+'<div class="restime time-diff">'
-						+area+industry+datatype+tdf
+						+area+industry+datatype+moneyTag+tdf
 						+'</div>'
 						+'<div style="clear:both;"></div>'
 						+detail
@@ -2212,12 +2276,21 @@ var SuperSearch = {
 				if(subtype==undefined){
 					subtype = ""
 				}
+				if(subtype!=""){
+					homeListHtml +='<div class="course">'+subtype+'</div>'
+				}
 				if (industry!=""){
 					homeListHtml +='<div class="industry">'+industry+'</div>'
 				}
-				if(subtype!=""){
-					homeListHtml +='<div class="course">'+subtype+'</div>'
+				var moneyTag = ''
+				// 金额标签
+				if(typeof(_list.budget) != "undefined" && _list.budget != null && _list.budget != ""){
+					moneyTag = '<div class="industry">'+MoneyUnit.test(_list.budget)+'</div>';
 				}
+				if(typeof(_list.bidamount) != "undefined" && _list.bidamount != null && _list.bidamount != ""){
+					moneyTag = '<div class="industry">'+MoneyUnit.test(_list.bidamount)+'</div>';
+				}
+				homeListHtml += moneyTag
 				//时间
 				var publishtime = _list["publishtime"];
 				if(publishtime&&Number(publishtime)>=1000000){
@@ -3478,4 +3551,4 @@ function formatDate(date,hms) {
 	}else{
 		return YY + MM + DD
 	}
-}
+}

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -11,6 +11,61 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
     <script>
+        /*
+        * money unit for zyh @date 2020/6/5
+        * */
+        var MoneyUnit = {
+            levelArr: ['元', '万元', '亿元', '万亿元'],
+            test: function (num, type, lv) {
+                if (type === void 0) {
+                    type = 'string';
+                }
+
+                if (lv === void 0) {
+                    lv = 0;
+                }
+
+                if (num === 0) {
+                    if (type === 'string') {
+                        return '0';
+                    }
+
+                    if (type === 'lv') {
+                        return this.levelArr[lv];
+                    }
+
+                    if (type === 'number') {
+                        return 0;
+                    }
+
+                    if (type === 'index') {
+                        return lv;
+                    }
+                }
+
+                var result = num / Math.pow(10000, lv);
+
+                if (result > 10000 && lv < 2) {
+                    return this.test(num, type, lv + 1);
+                } else {
+                    if (type === 'string') {
+                        return result.toFixed(2).replace('.00', '') + this.levelArr[lv];
+                    }
+
+                    if (type === 'lv') {
+                        return this.levelArr[lv];
+                    }
+
+                    if (type === 'index') {
+                        return lv;
+                    }
+
+                    if (type === 'number') {
+                        return result.toFixed(2).replace('.00', '');
+                    }
+                }
+            }
+        }
         var isExaminePhone={{session "s_phone"}}=="18613717801";
     		function afterReceivePushMessage(type,url){
           if(type=="bid" || type=="vipreport"){
@@ -514,10 +569,10 @@
                 // 预算：budget；中标：bidamount
                 var moneyList = "";
                 if (obj.budget != null && obj.budget != "") {
-                    moneyList = '<span class="industry money">' + obj.budget + '</span>';
+                    moneyList = '<span class="industry money">' + MoneyUnit.test(obj.budget) + '</span>';
                 }
                 if (obj.bidamount != null && obj.bidamount != "") {
-                    moneyList = '<span class="industry money">' + obj.bidamount + '</span>';
+                    moneyList = '<span class="industry money">' + MoneyUnit.test(obj.bidamount) + '</span>';
                 }
                 //时间
                 var showdateList = ""

src/web/staticres/js/wxSupersearch.js

@@ -1,3 +1,58 @@
+/*
+* money unit for zyh @date 2020/6/5
+* */
+var MoneyUnit = {
+	levelArr: ['元', '万元', '亿元', '万亿元'],
+	test: function (num, type, lv) {
+	if (type === void 0) {
+		type = 'string';
+	}
+
+	if (lv === void 0) {
+		lv = 0;
+	}
+
+	if (num === 0) {
+		if (type === 'string') {
+			return '0';
+		}
+
+		if (type === 'lv') {
+			return this.levelArr[lv];
+		}
+
+		if (type === 'number') {
+			return 0;
+		}
+
+		if (type === 'index') {
+			return lv;
+		}
+	}
+
+	var result = num / Math.pow(10000, lv);
+
+	if (result > 10000 && lv < 2) {
+		return this.test(num, type, lv + 1);
+	} else {
+		if (type === 'string') {
+			return result.toFixed(2).replace('.00', '') + this.levelArr[lv];
+		}
+
+		if (type === 'lv') {
+			return this.levelArr[lv];
+		}
+
+		if (type === 'index') {
+			return lv;
+		}
+
+		if (type === 'number') {
+			return result.toFixed(2).replace('.00', '');
+		}
+	}
+}
+}
 var SuperSearch = {
 	secondFlag:"",
 	secondList:"",
@@ -118,7 +173,7 @@ var SuperSearch = {
 				}
 				if(SuperSearch.showNull){
 					$("#supersearchPage #selLable").removeClass("hidden");
-					$("#supersearchPage .nullcontent").removeClass("hidden");	
+					$("#supersearchPage .nullcontent").removeClass("hidden");
 				}else{
 					if(SuperSearch.showNull == null){
 						$("#supersearchPage #selLable").addClass("hidden");
@@ -134,11 +189,11 @@ var SuperSearch = {
 				$("#supersearchPage #wrapper").addClass("hidden");
 			}
 		});
-		
+
 		$("#supersearchPage input[name=super_searchinput]").on("input",function(){
 			SuperSearch.canSearch();
 		});
-		
+
 		//是否显示提示搜索框
 		$("#supersearchPage input[name=super_searchinput]").focus(function(){
 			hideTab();
@@ -148,7 +203,7 @@ var SuperSearch = {
 				$("#supersearchPage .inputDiv").addClass("hidden");
 			},300);
 		});
-		
+
 		//清除输入框功能
 		$("#supersearchPage .clearInpt").on("tap",function(){
 			$("#supersearchPage input[name=super_searchinput]").val("");
@@ -178,7 +233,7 @@ var SuperSearch = {
 			SuperSearch.showToOrder(false)
 			SuperSearch.dyDiv=true;
 		});
-		
+
 		//订阅
 		$("#supersearchPage #zjdy").on("tap",function(){
 			var rFlag = false;
@@ -243,7 +298,7 @@ var SuperSearch = {
 				});
 			}
 		});
-		
+
 		////
 		SuperSearch.njTipEasyPopup = new EasyPopup("nijianTip");
 		$("#supersearchPage .q-mark").on("tap",function(){
@@ -258,7 +313,7 @@ var SuperSearch = {
             $(this).addClass("active");
             $("#supersearchPage .money-dialog .btn").removeClass("active");
 		});
-	
+
 	    var reg = /^[\u4e00-\u9fa5]+$/;
 	    var maxnum = "";
 	    $("#supersearchPage .maxMrice").on("input propertychange",function(){
@@ -318,7 +373,7 @@ var SuperSearch = {
 	            maxnum = min;
 			}
 		});
-	
+
 	    var minnum = "";
 	    $("#supersearchPage .minMrice").on("input propertychange",function(){
 	    	/*
@@ -377,7 +432,7 @@ var SuperSearch = {
 	            maxnum = min;
 	        }
 	    });
-	
+
 	    $("#supersearchPage .shaixIndustry").on("tap",function(){
 	            $(this).addClass("shaixcl");
 	            $(this).siblings().removeClass("shaixcl");
@@ -410,7 +465,7 @@ var SuperSearch = {
 	        $(this).addClass("shaixcl");
 	        $(this).siblings().removeClass("shaixcl");
 		});
-			
+
 		var dialogObj = $("#supersearchPage .contentone");
 		dialogObj.find(".btn").on("tap",function(){
 			if($(this).parent().index() == 0){
@@ -423,7 +478,7 @@ var SuperSearch = {
 				dialogObj.find("ul:first li:first .btn").addClass("active");
 			};
 		});
-		
+
 		var dialogObjtwo = $("#supersearchPage .contenttwo");
 	    dialogObjtwo.find(".btn").on("tap",function(){
 	        if($(this).parent().index() == 0){
@@ -444,7 +499,7 @@ var SuperSearch = {
 	            dialogObjtwo.find("ul:first li:first .btn").addClass("active");
 	        };
 	    });
-	
+
 	    dialogObjtwo.find('div[id="dqbtn"]').on("tap",function(){
 	        $(this).toggleClass("active");
 	        if ($(this).attr("class") != "active"){
@@ -457,7 +512,7 @@ var SuperSearch = {
 	            dialogObjtwo.find("ul:first li:first .btn").addClass("active");
 	        };
 	    });
-	
+
 		//获取输入时间
 		$("#supersearchPage .jypt-pt button").on("tap",function(){
 			var thisIndex = $("#supersearchPage .jypt-pt .jypt-active").index();
@@ -479,13 +534,151 @@ var SuperSearch = {
 				$("#supersearchPage .jypt-pt>button:first").addClass("jypt-active");
 			}
 		});
+		//获取当前时间
+		var date = (function () {
+			var date = new Date();
+			var year = date.getFullYear();
+			var month = date.getMonth() + 1;
+			var day = date.getDate();
+			month = month < 10 ? '0' + month : month;
+			day = day < 10 ? '0' + day : day;
+			return year + '-' + month + '-' + day;
+		})();
+		// 显示记录值
+		var nowStartTime, nowEndTime;
+		function resetDefaultTime () {
+			var stime = localStorage.search_starttime;
+			var etime = localStorage.search_endtime;
+			var regTime = new RegExp(/\d{4}年\d{2}月\d{2}日/)
+			if (stime && regTime.test(stime)) {
+				nowStartTime = stime.replace('日', '').split(/[年|月]/)
+				$("#supersearchPage #starttime").val(stime).attr('data-value', new Date(nowStartTime.join('/')).getTime());
+			} else {
+				$("#supersearchPage #starttime").val('').attr('data-value', '');
+				localStorage.removeItem('search_starttime')
+			}
+			if (etime && regTime.test(etime)) {
+				nowEndTime = etime.replace('日', '').split(/[年|月]/)
+				$("#supersearchPage #endtime").val(etime).attr('data-value', new Date(nowEndTime.join('/')).getTime());
+			} else {
+				$("#supersearchPage #endtime").val('').attr('data-value', '');
+				localStorage.removeItem('search_endtime')
+			}
+		}
+		resetDefaultTime()
+		// 点击事件绑定datepicker
 		$("#supersearchPage #starttime").on("click",function(){
-	        $("#supersearchPage #starttime").mobiscroll('show');
+			if(typeof(isWxsearchlist) != "undefined"){
+				$("#supersearchPage .sl-jyshxbottom").addClass("hide");
+			}
+			weui.datePicker({
+				id: 'start' + new Date().getTime(),
+				start: 2000,
+				title: '选择开始时间',
+				end: nowEndTime ? nowEndTime.join('-') : new Date(),
+				defaultValue: nowStartTime ? nowStartTime : date.split('-'),
+				className: 'jymobile-datePicker start',
+				onChange: function (result) {
+					var nowTArr = result.map(function (v) {
+						return v.label
+					})
+					$(".jymobile-datePicker.start .weui-picker__item").each(function(){
+						var nowT = $(this).text()
+						$(this).removeClass('is-now-select')
+						if (nowTArr.indexOf(nowT) !== -1) {
+							$(this).addClass('is-now-select')
+						}
+					})
+				},
+				onClose: function () {
+					if(typeof(isWxsearchlist) != "undefined"){
+						$("#supersearchPage .sl-jyshxbottom").removeClass("hide");
+					}
+				},
+				onConfirm: function (result) {
+					var year = result[0].value;
+					var month = result[1].value < 10 ? '0' + result[1].value : result[1].value;
+					var day = result[2].value < 10 ? '0' + result[2].value : result[2].value;
+					var time_result = year + '年' + month + '月' + day + '日';
+					var timeSec = year + '/' + month + '/' + day
+					nowStartTime = [year, month, day]
+					if(localStorage){
+						localStorage.search_starttime = time_result;
+					}
+					$("#supersearchPage #starttime").val(time_result).attr('data-value', new Date(timeSec).getTime());
+					SuperSearch.afterSelect();
+				}
+			});
+			$(".jymobile-datePicker.start #weui-picker-confirm").text('确认')
+			if (!nowStartTime) {return}
+			$(".jymobile-datePicker.start .weui-half-screen-dialog__ft").prepend(`<a href="javascript:;" class="weui-btn weui-btn_disabled weui-picker__btn" id="resetTime" data-action="select" style="text-decoration: none;">重置</a>`)
+			$(".jymobile-datePicker.start #resetTime").on('click',function () {
+				$('.jymobile-datePicker.start .weui-mask.weui-animate-fade-in').trigger('click');
+				$('.jymobile-datePicker.start .weui-mask.weui-animate-fade-in').click();
+				$("#supersearchPage #starttime").attr("data-value","").val('');
+				nowStartTime = null
+				if(localStorage){
+					localStorage.removeItem("search_starttime");
+				}
+				SuperSearch.afterOnClear();
+			})
 		});
 		$("#supersearchPage #endtime").on("click",function(){
-	        $("#supersearchPage #endtime").mobiscroll('show');
+			if(typeof(isWxsearchlist) != "undefined"){
+				$("#supersearchPage .sl-jyshxbottom").addClass("hide");
+			}
+			weui.datePicker({
+				id: 'end' + new Date().getTime(),
+				start: nowStartTime ? nowStartTime.join('-') : 2000,
+				title: '选择结束时间',
+				end: new Date(),
+				defaultValue: nowEndTime ? nowEndTime : date.split('-'),
+				className: 'jymobile-datePicker end',
+				onChange: function (result) {
+					var nowTArr = result.map(function (v) {
+						return v.label
+					})
+					$(".jymobile-datePicker.end .weui-picker__item").each(function(){
+						var nowT = $(this).text()
+						$(this).removeClass('is-now-select')
+						if (nowTArr.indexOf(nowT) !== -1) {
+							$(this).addClass('is-now-select')
+						}
+					})
+				},
+				onClose: function () {
+					if(typeof(isWxsearchlist) != "undefined"){
+						$("#supersearchPage .sl-jyshxbottom").removeClass("hide");
+					}
+				},
+				onConfirm: function (result) {
+					var year = result[0].value;
+					var month = result[1].value < 10 ? '0' + result[1].value : result[1].value;
+					var day = result[2].value < 10 ? '0' + result[2].value : result[2].value;
+					var time_result = year + '年' + month + '月' + day + '日';
+					var timeSec = year + '/' + month + '/' + day
+					nowEndTime = [year, month, day]
+					if(localStorage){
+						localStorage.search_endtime = time_result;
+					}
+					$("#supersearchPage #endtime").val(time_result).attr('data-value', new Date(timeSec).getTime());
+					SuperSearch.afterSelect();
+				}
+			});
+			$(".jymobile-datePicker.end #weui-picker-confirm").text('确认')
+			if (!nowEndTime) {return}
+			$(".jymobile-datePicker.end .weui-half-screen-dialog__ft").prepend(`<a href="javascript:;" class="weui-btn weui-btn_disabled weui-picker__btn" id="resetTime" data-action="select" style="text-decoration: none;">重置</a>`)
+			$(".jymobile-datePicker.end #resetTime").on('click',function () {
+				$('.jymobile-datePicker.end .weui-mask.weui-animate-fade-in').trigger('click');
+				$('.jymobile-datePicker.end .weui-mask.weui-animate-fade-in').click();
+				$("#supersearchPage #endtime").attr("data-value","").val('');
+				nowEndTime = null
+				if(localStorage){
+					localStorage.removeItem("search_endtime");
+				}
+				SuperSearch.afterOnClear();
+			})
 		});
-		SuperSearch.initMobiscroll();
 		//返回时 是否显示table的查看更多
 		if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
 			SuperSearch.isTable(false);
@@ -614,7 +807,7 @@ var SuperSearch = {
 					SuperSearch.noMoreData();
 					return;
 				}
-				
+
 				$.ajax({
 					type: 'post',
 					url: '/swordfish/searchlist/paging',
@@ -652,7 +845,7 @@ var SuperSearch = {
 				SuperSearch.isTable(true);
 			}
 		}
-		
+
 		if(!hasNextPage){
 			SuperSearch.noMoreData();
 			return;
@@ -727,7 +920,7 @@ var SuperSearch = {
 			}
 		});
 		SuperSearch.reqParam.scope=scope.join(",");
-	
+
 		//行业类型
 		var industrySelect="";
 		if($("#supersearchPage .contentthree .active").hasClass("btn")){
@@ -736,7 +929,7 @@ var SuperSearch = {
 			}else{
 				industrySelect= $("#supersearchPage .contentthree .active").attr("data-value");
 			}
-		
+
 		}else{
 			$("#supersearchPage .contentthree .active").parent("li").find(".btn").each(function(){
 				industrySelect+= $(this).attr("data-value")+",";
@@ -744,7 +937,7 @@ var SuperSearch = {
 			industrySelect=industrySelect.substring(0,industrySelect.length-1);
 		}
 		SuperSearch.reqParam.industry=industrySelect;
-	
+
 		//信息类型
 		var selectToptypes = "";
 		$("#supersearchPage .contenttwo #dqbtn.active").each(function(){
@@ -754,7 +947,7 @@ var SuperSearch = {
 		}
 			selectToptypes += thisText;
 		});
-	
+
 		var selectSubTypes = "";
 		$("#supersearchPage .contenttwo  .btn.active").each(function(){
 			if($(this).parent().index() == 0){
@@ -767,7 +960,7 @@ var SuperSearch = {
 			selectSubTypes += thisText;
 		});
 		SuperSearch.reqParam.subtype=selectSubTypes;
-	
+
 		//金额
 		var moneyRange=$("#supersearchPage .money-dialog .active").attr("data-value");
 		if(moneyRange!="all"){
@@ -778,12 +971,12 @@ var SuperSearch = {
 			SuperSearch.reqParam.minprice="";
 			SuperSearch.reqParam.maxprice="";
 		}
-	
+
 		//SuperSearch.reqParam.money=moneyRange;
-	
+
 		//日期
 		SuperSearch.reqParam.publishtime=SuperSearch.setPublishtime();
-	
+
 		//全文or标题
 		if($(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal')=="searchtitle"){
 			SuperSearch.reqParam.selectType="title";
@@ -798,7 +991,7 @@ var SuperSearch = {
 			var model = "lab_search";
 			var s_url = "/jylab/mainSearch/";
 			var s_model = "搜索";
-		
+
 			var s_industry = "";//行业-单选
 			var s_key = "";//关键词
 			var i_amount = 0;//中标金额 1-含 0-不含
@@ -837,9 +1030,9 @@ var SuperSearch = {
 			}else{
 				i_infotable = 1;
 			}
-		
+
 			var content = '{"encode":"' + encode + '","model":"' + model + '","s_url":"' + s_url + '","s_model":"' + s_model + '","s_openid":"' + s_openid + '","s_industry":"' + s_industry + '","s_key":"'+s_key+'","i_amount":'+i_amount+',"i_area":'+i_area+',"i_industry":'+i_industry+',"i_infotable":'+i_infotable+',"i_infotype":'+i_infotype+',"i_time":'+i_time+'}';
-		
+
 			$.post('/accesslog/byajax',{json:content},function(r){});
 		}
 	},
@@ -887,7 +1080,7 @@ var SuperSearch = {
 			$(".newdialog .sub-search-title").find("li").removeClass("active");
 			$(".selected-export .options .search-title").find("em").text("标题搜索");
 			$(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");
-			
+
 			$(".newdialog .sub-show-list").find("li").removeClass("active");
 			$(".selected-export .show-list").find("em").text("列表显示");
 			$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
@@ -914,7 +1107,7 @@ var SuperSearch = {
 				$("#supersearchPage .selLable").removeClass("hidden");
 				//铺查询信息
 				$("#supersearchPage #wrapper .dropload-down").remove();
-				
+
 				if(data["list"] == null || data["list"].length == 0){
 					$("#supersearchPage #hasNoData_tiptext>font").hide();
 					if(data.status==-1){
@@ -1031,7 +1224,7 @@ var SuperSearch = {
 			if(industry!=""){
 				industry='<span class="industry">'+industry+'</span>';
 			}
-		
+
 			//时间
 			var tdf = list[i].publishtime;
 			var fullTime="";
@@ -1047,7 +1240,7 @@ var SuperSearch = {
 			}else{
 				tdf = '';
 			}
-		
+
 			var datatype = "";
 			if(list[i].subtype){
 				datatype='<span class="type">'+list[i].subtype+'</span>'
@@ -1087,6 +1280,14 @@ var SuperSearch = {
 					}
 				}
 			}
+			// 金额标签
+			var moneyTag = '';
+			if(typeof(list[i].budget) != "undefined" && list[i].budget != null && list[i].budget != ""){
+				moneyTag = '<span class="industry">'+MoneyUnit.test(list[i].budget)+'</span>';
+			}
+			if(typeof(list[i].bidamount) != "undefined" && list[i].bidamount != null && list[i].bidamount != ""){
+				moneyTag = '<span class="industry">'+MoneyUnit.test(list[i].bidamount)+'</span>';
+			}
 			if(i==3&&pageNum==1){
 				ListHtml += '<div class="tslist" style="border-bottom-width:0px;">'
 			}else{
@@ -1102,14 +1303,14 @@ var SuperSearch = {
 						+'</div>'
 						+'<div style="clear:both;"></div>'
 						+'<div class="restime time-diff">'
-						+area+datatype+industry+tdf
+						+area+industry+datatype+moneyTag+tdf
 						+'</div>'
 						+'<div style="clear:both;"></div>'
 						+detail
 						+'</div>';
 			if(i>=20||pageNum!=1){
 				continue
-			}			
+			}
 			//拟建项目
 			if(SuperSearch.subtype_proposed==SuperSearch.reqParam.subtype){
 				var projectinfo = list[i].projectinfo;
@@ -1243,7 +1444,7 @@ var SuperSearch = {
 	       SuperSearch.myredirect(h,sid,sds,industry);
 	   	});
 	   	$('#supersearchPage #list').html(ListHtmlObj);
-	
+
 	   	TableHtmlobj.on("tap",function(event){
 	       	var h =  $(this).attr("s");
 	       	var sid = $(this).attr("sid");
@@ -1257,7 +1458,7 @@ var SuperSearch = {
 	  	    $("#supersearchPage #table .content").html("<tr><td><div>序号</div></td><td><div>项目名称</div></td><td><div>公告类型</div></td><td><div>预算<br>（万元）</div></td><td><div>招标单位</div></td><td><div>开标时间</div></td><td><div>中标单位</div></td><td>中标金额<br>（万元）</td><td><div>发布时间</div></td></tr>");
 	   	}
 	   	$("#supersearchPage #table .content").append(TableHtmlobj);
-		
+
 		$(".loading_").hide();
 	},
 	myredirect: function (link,sid,sds,industry){  //跳转三级页
@@ -1349,7 +1550,7 @@ var SuperSearch = {
 //		}else{
 //			$("#supersearchPage .inputDiv").css("border-top-width","1px");
 		}
-		//		
+		//
 		var len=$("#supersearchPage .inputDiv ul li").length;
 		$("#supersearchPage .inputDiv ul li:eq("+(len-1)+")").css("border-bottom-right-radius","5px").css("border-bottom-left-radius","5px");
 		//点击提示框内容 进行搜索
@@ -1418,7 +1619,7 @@ var SuperSearch = {
 					if(document.all){
 						window.event.cancelBubble = true;
 				 	}else{
-						event.stopPropagation(); 
+						event.stopPropagation();
 					}
 				}
 			},1000);
@@ -1436,7 +1637,7 @@ var SuperSearch = {
 		if(flag){ //table
 			if(SuperSearch.dropload){//表格只展示20条数据
 				SuperSearch.dropload.lock();
-			} 
+			}
 			if($("#table .content tr").length>20){
 				$(".dropload-down").css("display","none");
 				$("#wrapper .shade_table").css("display","");
@@ -1559,7 +1760,7 @@ var SuperSearch = {
 		}
 	    $("body").scrollTop(sessionStorage.superSearch_yScroll);
 	    $("#supersearchPage #table .data").scrollLeft(sessionStorage.superSearch_xScroll);
-	
+
 	    //筛选时间
 	    var ptime= sessionStorage.superSearch_publishtime;
 	    if(typeof(ptime) != "undefined" && ptime != ""){
@@ -1594,7 +1795,7 @@ var SuperSearch = {
 			    });
 			}
 	    }
-	
+
 	    //地区
 	    var scopes=sessionStorage.superSearch_scope;
 	    if(typeof(scopes) != "undefined" && scopes != "A"&&scopes != ""){
@@ -1616,8 +1817,8 @@ var SuperSearch = {
 	    /*if(industry != "A"&&industry != ""){
 		$("#supersearchPage .contentthree").find("ul:first li:first .btn").removeClass("active");
 		industry = industry.split(",");
-	
-	
+
+
 		if(industry.length>1){
 		  //  alert(1)
 		    $("#supersearchPage [data-value='"+industry[0]+"']").parent("li").find("#dqbtn").addClass("active");
@@ -1751,119 +1952,6 @@ var SuperSearch = {
 		    }
 	    });
 	},
-	initMobiscroll: function(){
-		var starttime = null;
-		var endtime = null;
-		if(localStorage){
-			var stime = localStorage.search_starttime;
-			var etime = localStorage.search_endtime;
-			if(stime){
-				$("#supersearchPage #starttime").attr("data-value",stime);
-				starttime = new Date(Number(stime));
-				$('#supersearchPage #starttime').val(starttime.Format("yyyy年MM月dd日"));
-			}else{
-				$("#supersearchPage #starttime").attr("data-value","");
-				$('#supersearchPage #starttime').val("");
-			}
-			if(etime){
-				$("#supersearchPage #endtime").attr("data-value",etime);
-				endtime = new Date(Number(etime));
-				$('#supersearchPage #endtime').val(endtime.Format("yyyy年MM月dd日"));
-			}else{
-				$("#supersearchPage #endtime").attr("data-value","");
-				$('#supersearchPage #endtime').val("");
-			}
-		}
-		$.mobiscroll.setDefaults({
-			theme: "ios",
-			lang: "zh",
-			setText: "确定",
-			clearText: "清空",
-			buttons: [ 
-			    'set',
-			    { 
-					text: '选择时间',
-					cssClass: 'dwb title',
-					handler: function(event,inst){ 
-					    
-					}
-			    },
-				'clear'
-			],
-			dateFormat: "yyyy年mm月dd日",
-			dateOrder: "yyyymd",
-			timeWheels: "H",
-			timeFormat: "HH时 周DD",
-			dayNames: ["日","一","二","三","四","五","六"],
-			headerText: false,
-			yearSuffix: "年",
-			monthSuffix: "月",
-			daySuffix: "日",
-			showOnTap: false,
-			onBeforeShow: function(inst){
-				if(typeof(isWxsearchlist) != "undefined"){
-					$("#supersearchPage .sl-jyshxbottom").addClass("hide");
-				}
-			},
-			onClosed: function(valueText, inst){
-				if(typeof(isWxsearchlist) != "undefined"){
-					$("#supersearchPage .sl-jyshxbottom").removeClass("hide");
-				}
-			}
-		});
-		$("#supersearchPage #starttime").mobiscroll().date({
-			maxDate: endtime,
-			onInit: function(inst){
-				if(starttime){
-					inst.setVal(new Date(Number(starttime)));
-				}
-			},
-			onSelect: function(valueText,inst){
-				var arrayVal = inst.getArrayVal();
-				var date = new Date(arrayVal[0],arrayVal[1],arrayVal[2]);
-				var inst = $("#supersearchPage #endtime").mobiscroll('getInst');
-				inst.option({minDate: date});
-				if(localStorage){
-					localStorage.search_starttime = date.getTime();
-				}
-				$("#supersearchPage #starttime").attr("data-value",date.getTime());
-				SuperSearch.afterSelect();
-			},
-			onClear: function (event, inst){
-				$("#supersearchPage #starttime").attr("data-value","");
-				if(localStorage){
-					localStorage.removeItem("search_starttime");
-				}
-				SuperSearch.afterOnClear();
-			}
-	    });
-		$("#supersearchPage #endtime").mobiscroll().date({
-			minDate: starttime,
-			onInit: function(inst){
-				if(endtime){
-					inst.setVal(new Date(Number(endtime)));
-				}
-			},
-			onSelect: function(valueText,inst){
-				var arrayVal = inst.getArrayVal();
-				var date = new Date(arrayVal[0],arrayVal[1],arrayVal[2]);
-				var inst = $("#supersearchPage #starttime").mobiscroll('getInst');
-				inst.option({maxDate: date});
-				if(localStorage){
-					localStorage.search_endtime = date.getTime();
-				}
-				$("#supersearchPage #endtime").attr("data-value",date.getTime());
-				SuperSearch.afterSelect();
-			},
-			onClear: function (event, inst){
-				$("#supersearchPage #endtime").attr("data-value","");
-				if(localStorage){
-					localStorage.removeItem("search_endtime");
-				}
-				SuperSearch.afterOnClear();
-			}
-	    });
-	},
 	afterSelect: function(){
 		$("#supersearchPage .jypt-timeinputs").addClass("jypt-timeinputs-active");
 		$("#supersearchPage .jypt-pt .jypt-active").removeClass("jypt-active");
@@ -1886,7 +1974,7 @@ var SuperSearch = {
 			}
 			publishtime = SuperSearch.getInputTime().join("_");
 			if(publishtime != "_"){
-				return publishtime;	
+				return publishtime;
 			}else{
 				return "";
 			}
@@ -1916,7 +2004,7 @@ var SuperSearch = {
 		if(SuperSearch.dropload != null){
 			SuperSearch.dropload.resetload();
 		}
-		//再html内点击都会存缓存 关闭广告后再刷新 会取缓存 
+		//再html内点击都会存缓存 关闭广告后再刷新 会取缓存
 		SuperSearch.clearSessionStorage();
 	},
 	appendInterceptWord: function(word){
@@ -2034,12 +2122,21 @@ var SuperSearch = {
 				if(subtype==undefined){
 					subtype = ""
 				}
+				if(subtype!=""){
+					homeListHtml +='<div class="course">'+subtype+'</div>'
+				}
 				if (industry!=""){
 					homeListHtml +='<div class="industry">'+industry+'</div>'
 				}
-				if(subtype!=""){
-					homeListHtml +='<div class="course">'+subtype+'</div>'
+				var moneyTag = ''
+				// 金额标签
+				if(typeof(_list.budget) != "undefined" && _list.budget != null && _list.budget != ""){
+					moneyTag = '<div class="industry">'+MoneyUnit.test(_list.budget)+'</div>';
+				}
+				if(typeof(_list.bidamount) != "undefined" && _list.bidamount != null && _list.bidamount != ""){
+					moneyTag = '<div class="industry">'+MoneyUnit.test(_list.bidamount)+'</div>';
 				}
+				homeListHtml += moneyTag
 				//时间
 				var publishtime = _list["publishtime"];
 				if(publishtime){
@@ -2124,4 +2221,4 @@ var SuperSearch = {
 			$(".no_data").show();
 		}
 	}
-};
+};

src/web/templates/weixin/dataExport/dataExport.html

@@ -10,16 +10,19 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}14">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
+<!--    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">-->
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}1">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
     <script src="/js/jquery.js"></script>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css?v={{Msg "seo" "version"}}">
-    <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js?v={{Msg "seo" "version"}}"></script>
+<!--    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css?v={{Msg "seo" "version"}}">-->
+<!--    <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js?v={{Msg "seo" "version"}}"></script>-->
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
+    <!--2.10.4-->
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css"/>
+    <script type="text/javascript" src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js"></script>
 </head>
 <style>
 	.confirm{
@@ -118,24 +121,24 @@
         color: #fff;
         float: left;
     }
-	
+
 	.elseChooseList .list-item a {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
 	}
-	
+
 	.elseChooseList .list-item a .label {
 		width: auto;
 	}
-	
+
 	.elseChooseList .list-item a .content {
 		margin-right: .2rem;
 		flex: 1;
 		text-align: right;
 	}
 </style>
-<body>
+<body class="p13">
     <div class="page">
         <div class="main">
         <div class="progress">
@@ -146,7 +149,7 @@
         		<span class="active">条件筛选</span>
         		<div class="line"></div>
         	</div>
-        
+
         	<div class="p-item">
         		<p class="p-item-icon">
         			<i class="icon iconfont">&#xe617;</i>
@@ -154,7 +157,7 @@
         		<span>支付订单</span>
         		<div class="line"></div>
         	</div>
-        
+
         	<div class="p-item">
         		<p class="p-item-icon icon-gray">
         			<i class="icon iconfont">&#xe616;</i>
@@ -187,7 +190,7 @@
                    <ul>
                        	<li class="list-item">
 							<a href="/front/wx_dataExport/area">
-	                           <strong class="label">区域</strong>   
+	                           <strong class="label">区域</strong>
 	                           <span id="area" class="content"></span>
 	                           <i class="iconfont icon-arrow"></i>
                         	</a>
@@ -211,7 +214,7 @@
                            <span class="match content">按标题匹配</span>
                            <i class="iconfont icon-arrow"></i>
                        </a></li>
-                        
+
                         <li class="list-item"><a href="/front/wx_dataExport/price">
                             <strong class="label">金额</strong>
                             <span id="price" class="content"></span>
@@ -286,11 +289,11 @@
 
 <script>
     initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
-    $(function(){		
+    $(function(){
     	//清除我已阅读缓存
 		sessionStorage.removeItem("readClause");
 		sessionStorage.removeItem("index");
-		
+
 		sessionStorage.removeItem("ischecked");
 
         //
@@ -376,157 +379,6 @@
             $(".chooseTime ul li span").eq(3).attr("data-value", autoDate3+"_toNow");
         }
 
-        //日期选择器
-        $("#starttime").mobiscroll().date({
-            theme: "ios",
-            lang: "zh",
-            setText: "确定",
-            clearText: "清空",
-
-            buttons: [
-                'set',
-                {
-                    text: '开始日期',
-                    cssClass: 'dwb title',
-                    handler: function(event,inst){
-
-                    }
-                },
-                'clear'
-            ],
-            dateFormat: "yyyy年mm月dd日",
-            dateOrder: "yyyymd",
-            timeWheels: "H",
-            timeFormat: "HH时 周DD",
-            dayNames: ["日","一","二","三","四","五","六"],
-            headerText: false,
-            yearSuffix: "年",
-            monthSuffix: "月",
-            daySuffix: "日",
-            showOnTap: false,
-            maxDate:new Date(),
-            onSelect: function (valueText, inst) {//选择时事件（点击确定后），valueText 为选择的时间，
-                var startFlag = true;
-                // 转化时间戳
-                var tval = valueText.replace("年","-").replace("月","-").replace("日","");
-                var val = new Date(tval).getTime();
-                var vals = Number(val.toString().slice(0,-3));
-                localStorage.export_starttime = vals;
-                // 判空
-                if ($("#endtime").val()!=""){
-                    var ete = $("#endtime").val().replace("年","-").replace("月","-").replace("日","");
-                    var enddate =  new Date(ete).getTime();
-                    if(val >  enddate){
-                        $("#starttime").val("");
-                        EasyAlert.show("开始日期不能大于截止日期","",3000);
-                    }
-                    startFlag =false;
-                }
-                // if (startFlag){
-                    $("#starttime").addClass("timeSelect");
-                    $("#endtime").addClass("timeSelect");
-                    $(".dateMake").css({"color":"#24C0D7"});
-                    $(".chooseTime ul li").removeClass('active');
-                // }
-                //
-                $(".confirm").hide();
-                $(".resetOne").css('display','flex');
-                localStorage.removeItem("date");
-                localStorage.removeItem("index");
-            },
-            onClear: function (inst) {
-                localStorage.removeItem("export_starttime");
-                if ($("#endtime").val()==""){
-                    $("#endtime").removeClass("timeSelect");
-                    $("#starttime").removeClass("timeSelect");
-                    $(".dateMake").css({"color":"#000"});
-                    $(".chooseTime > i").css("color","#888");
-                    $(".chooseTime ul li").removeClass('active');
-                    $(".chooseTime ul li:eq(0)").addClass('active');
-                }
-            }
-        });
-
-        $("#endtime").mobiscroll().date({
-            theme: "ios",
-            lang: "zh",
-            setText: "确定",
-            clearText: "清空",
-            buttons: [
-                'set',
-                {
-                    text: '截止日期',
-                    cssClass: 'dwb title',
-                    handler: function(event,inst){
-                    }
-                },
-                'clear'
-            ],
-            dateFormat: "yyyy年mm月dd日",
-            dateOrder: "yyyymd",
-            timeWheels: "H",
-            timeFormat: "HH时 周DD",
-            dayNames: ["日","一","二","三","四","五","六"],
-            headerText: false,
-            yearSuffix: "年",
-            monthSuffix: "月",
-            daySuffix: "日",
-            showOnTap: false,
-            maxDate:new Date(),
-            onInit: function(inst){
-
-            },
-            onSelect: function (valueText, inst) {//选择时事件（点击确定后），valueText 为选择的时间，
-                //$("#endtime").text("");
-                //$("#endtime").append("<i class=\"iconfont icon-rili\"></i>"+valueText);
-                var endFlag = true;
-                // 转化时间戳
-                var tval = valueText.replace("年","-").replace("月","-").replace("日","");
-                var val = new Date(tval).getTime();
-                var vals = Number(val.toString().slice(0,-3));
-                localStorage.export_endtime = vals;
-                // 判空
-                if ($("#starttime").val()!=""){
-                    var ste = $("#starttime").val().replace("年","-").replace("月","-").replace("日","");
-                    var startdate =  new Date(ste).getTime();
-                    if(val <  startdate){
-                        $("#endtime").val("");
-                        EasyAlert.show("截止日期不能小于开始日期","",3000);
-                    }
-                    endFlag =false;
-                }
-                // if (endFlag){
-                    $("#starttime").addClass("timeSelect");
-                    $("#endtime").addClass("timeSelect");
-                    $(".dateMake").css({"color":"#24C0D7"});
-                    $(".chooseTime ul li").removeClass('active');
-                // }
-                //
-                $(".confirm").hide();
-                $(".resetOne").css('display','flex');
-                localStorage.removeItem("date");
-                localStorage.removeItem("index");
-            },
-            onClear: function (inst) {
-                localStorage.removeItem("export_endtime");
-                if ($("#starttime").val()==""){
-                    $("#endtime").removeClass("timeSelect");
-                    $("#starttime").removeClass("timeSelect");
-                    $(".dateMake").css({"color":"#000"});
-                    $(".chooseTime > i").css("color","#888");
-                    $(".chooseTime ul li").removeClass('active');
-                    $(".chooseTime ul li:eq(0)").addClass('active');
-                }
-            }
-        });
-
-        $("#starttime").on("click",function(){
-            $("#starttime").mobiscroll('show');
-        });
-
-        $("#endtime").on("click",function(){
-            $("#endtime").mobiscroll('show');
-        });
 		var onceDetail = {{.T.orderDetail}}
 		var pay_way = ""
 		var data_spec = ""
@@ -566,10 +418,10 @@
 			}
 	        //行业
 			if(filter["industry"]!=null&&filter["industry"]!=""){
-				localStorage.industry = filter["industry"].join(',').replace(/,/g," ");	 
+				localStorage.industry = filter["industry"].join(',').replace(/,/g," ");
 			}else{
 				localStorage.industry = "";
-			}  
+			}
 	        //关键词
 			var keywords = JSON.stringify(filter["keywords"]);
 	        if(keywords!==""){
@@ -730,6 +582,155 @@
             $(".confirm").hide();
             $(".resetOne").css('display','flex');
         }
+        //获取当前时间
+        var nowDate = (function () {
+            var date = new Date();
+            var year = date.getFullYear();
+            var month = date.getMonth() + 1;
+            var day = date.getDate();
+            month = month < 10 ? '0' + month : month;
+            day = day < 10 ? '0' + day : day;
+            return year + '-' + month + '-' + day;
+        })();
+        // 显示记录值
+        var nowStartTime, nowEndTime;
+        function getDefaultTime () {
+            var stime = $("#starttime").val();
+            var etime = $("#endtime").val();
+            var regTime = new RegExp(/\d{4}年\d{2}月\d{2}日/)
+            if (stime && regTime.test(stime)) {
+                nowStartTime = stime.replace('日', '').split(/[年|月]/)
+            }
+            if (etime && regTime.test(etime)) {
+                nowEndTime = etime.replace('日', '').split(/[年|月]/)
+            }
+        }
+        // 点击事件绑定datepicker
+        $("#starttime").on("click",function(){
+            getDefaultTime()
+            weui.datePicker({
+                id: 'start' + new Date().getTime(),
+                start: 2000,
+                title: '选择开始时间',
+                end: nowEndTime ? nowEndTime.join('-') : new Date(),
+                defaultValue: nowStartTime ? nowStartTime : nowDate.split('-'),
+                className: 'jymobile-datePicker start',
+                onChange: function (result) {
+                    var nowTArr = result.map(function (v) {
+                        return v.label
+                    })
+                    $(".jymobile-datePicker.start .weui-picker__item").each(function(){
+                        var nowT = $(this).text()
+                        $(this).removeClass('is-now-select')
+                        if (nowTArr.indexOf(nowT) !== -1) {
+                            $(this).addClass('is-now-select')
+                        }
+                    })
+                },
+                onClose: function () {},
+                onConfirm: function (result) {
+                    var year = result[0].value;
+                    var month = result[1].value < 10 ? '0' + result[1].value : result[1].value;
+                    var day = result[2].value < 10 ? '0' + result[2].value : result[2].value;
+                    var time_result = year + '年' + month + '月' + day + '日';
+                    var timeSec = year + '/' + month + '/' + day
+                    nowStartTime = [year, month, day]
+                    $("#starttime").val(time_result).attr('value', time_result);
+
+                    localStorage.export_starttime = new Date(timeSec).getTime() / 1000;
+                    $("#starttime").addClass("timeSelect");
+                    $("#endtime").addClass("timeSelect");
+                    $(".dateMake").css({"color":"#24C0D7"});
+                    $(".chooseTime ul li").removeClass('active');
+
+                    $(".confirm").hide();
+                    $(".resetOne").show();
+                    localStorage.removeItem("date");
+                    localStorage.removeItem("index");
+                }
+            });
+            $(".jymobile-datePicker.start #weui-picker-confirm").text('确认')
+            if (!nowStartTime) {return}
+            $(".jymobile-datePicker.start .weui-half-screen-dialog__ft").prepend(`<a href="javascript:;" class="weui-btn weui-btn_disabled weui-picker__btn" id="resetTime" data-action="select" style="text-decoration: none;">重置</a>`)
+            $(".jymobile-datePicker.start #resetTime").on('click',function () {
+                $('.jymobile-datePicker.start .weui-mask.weui-animate-fade-in').trigger('click');
+                $('.jymobile-datePicker.start .weui-mask.weui-animate-fade-in').click();
+                $("#starttime").attr("value","").val('');
+                nowStartTime = null
+                localStorage.removeItem("export_starttime");
+                if ($("#endtime").val()==""){
+                    $("#endtime").removeClass("timeSelect");
+                    $("#starttime").removeClass("timeSelect");
+                    $(".dateMake").css({"color":"#000"});
+                    $(".chooseTime > i").css("color","#888");
+                    $(".chooseTime ul li").removeClass('active');
+                    $(".chooseTime ul li:eq(0)").addClass('active');
+                }
+            })
+        });
+        $("#endtime").on("click",function(){
+            getDefaultTime()
+            weui.datePicker({
+                id: 'end' + new Date().getTime(),
+                start: nowStartTime ? nowStartTime.join('-') : 2000,
+                title: '选择截止时间',
+                end: new Date(),
+                defaultValue: nowEndTime ? nowEndTime : nowDate.split('-'),
+                className: 'jymobile-datePicker end',
+                onChange: function (result) {
+                    var nowTArr = result.map(function (v) {
+                        return v.label
+                    })
+                    $(".jymobile-datePicker.end .weui-picker__item").each(function(){
+                        var nowT = $(this).text()
+                        $(this).removeClass('is-now-select')
+                        if (nowTArr.indexOf(nowT) !== -1) {
+                            $(this).addClass('is-now-select')
+                        }
+                    })
+                },
+                onClose: function () {},
+                onConfirm: function (result) {
+                    var year = result[0].value;
+                    var month = result[1].value < 10 ? '0' + result[1].value : result[1].value;
+                    var day = result[2].value < 10 ? '0' + result[2].value : result[2].value;
+                    var time_result = year + '年' + month + '月' + day + '日';
+                    var timeSec = year + '/' + month + '/' + day
+                    nowStartTime = [year, month, day]
+                    $("#endtime").val(time_result).attr('value', time_result);
+
+                    localStorage.export_endtime = new Date(timeSec).getTime() / 1000;
+                    $("#starttime").addClass("timeSelect");
+                    $("#endtime").addClass("timeSelect");
+                    $(".dateMake").css({"color":"#24C0D7"});
+                    $(".chooseTime ul li").removeClass('active');
+
+                    $(".confirm").hide();
+                    $(".resetOne").show();
+                    localStorage.removeItem("date");
+                    localStorage.removeItem("index");
+                }
+            });
+            $(".jymobile-datePicker.end #weui-picker-confirm").text('确认')
+            if (!nowEndTime) {return}
+            $(".jymobile-datePicker.end .weui-half-screen-dialog__ft").prepend(`<a href="javascript:;" class="weui-btn weui-btn_disabled weui-picker__btn" id="resetTime" data-action="select" style="text-decoration: none;">重置</a>`)
+            $(".jymobile-datePicker.end #resetTime").on('click',function () {
+                $('.jymobile-datePicker.end .weui-mask.weui-animate-fade-in').trigger('click');
+                $('.jymobile-datePicker.end .weui-mask.weui-animate-fade-in').click();
+                $("#endtime").attr("value","").val('');
+                nowEndTime = null
+                localStorage.removeItem("export_endtime");
+                if ($("#starttime").val()==""){
+                    $("#endtime").removeClass("timeSelect");
+                    $("#starttime").removeClass("timeSelect");
+                    $(".dateMake").css({"color":"#000"});
+                    $(".chooseTime > i").css("color","#888");
+                    $(".chooseTime ul li").removeClass('active');
+                    $(".chooseTime ul li:eq(0)").addClass('active');
+                }
+            })
+        });
+        getDefaultTime()
         //时间
         if(localStorage.export_starttime!==undefined && localStorage.export_starttime!==""){
             let start = new Date(Number(localStorage.export_starttime));
@@ -1018,4 +1019,4 @@
 	{{include "/common/baiducc.html"}}
 </body>
 
-</html>
+</html>

src/web/templates/weixin/follow/set.html

@@ -2,17 +2,21 @@
 <head>
 <title>项目信息</title>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<link href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css" rel="stylesheet">
+<!--<link href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css" rel="stylesheet">-->
 <link href="{{Msg "seo" "cdn"}}/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/follow.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
 <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
-<script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
+<!--<script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>-->
 {{include "/common/weixin.html"}}
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/jy.js?v={{Msg "seo" "version"}}"></script>
+<!--2.10.4-->
+<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css"/>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js"></script>
 <script>
 	var hasReload = false;
 	if(sessionStorage){
@@ -23,7 +27,304 @@
 			window.location.reload(true);
 		}
 	}
-	initShare({{.T.signature}},{{.T.openid}},"","jy_extend",{{.T.nickname}});
+    initShare({{.T.signature}},{{.T.openid}},"","jy_extend",{{.T.nickname}});
+</script>
+<script>
+	/***
+	 * weui datepicker for hour @zyh @date:2020/6/1
+	 * */
+	function weuiCron () {
+		var regex = /^(\d+)(?:-(\d+))?(?:\/(\d+))?$/g;
+		var constraints = [[1, 31], [1, 12], [0, 6]];
+		/**
+		 * Schedule
+		 */
+
+		var Schedule = /*#__PURE__*/function () {
+			"use strict";
+
+			function Schedule(fields, start, end) {
+				/**
+				 * dayOfMonth
+				 * @type {Array}
+				 */
+				this._dates = fields[0];
+				/**
+				 * month
+				 * @type {Array}
+				 */
+
+				this._months = fields[1];
+				/**
+				 * dayOfWeek
+				 * @type {Array}
+				 */
+
+				this._days = fields[2];
+				/**
+				 * start
+				 * @type {Date}
+				 */
+
+				this._start = start;
+				/**
+				 * end
+				 * @type {Date}
+				 */
+
+				this._end = end;
+				/**
+				 * cursor
+				 * @type {Date}
+				 * @private
+				 */
+
+				this._pointer = start;
+			}
+
+			var _proto = Schedule.prototype;
+
+			_proto._findNext = function _findNext() {
+				var next;
+
+				while (true) {
+					if (this._end.getTime() - this._pointer.getTime() < 0) {
+						throw new Error("out of range, end is " + this._end + ", current is " + this._pointer);
+					}
+
+					var month = this._pointer.getMonth();
+
+					var date = this._pointer.getDate();
+
+					var day = this._pointer.getDay();
+
+					if (this._months.indexOf(month + 1) === -1) {
+						this._pointer.setMonth(month + 1);
+
+						this._pointer.setDate(1);
+
+						continue;
+					}
+
+					if (this._dates.indexOf(date) === -1) {
+						this._pointer.setDate(date + 1);
+
+						continue;
+					}
+
+					if (this._days.indexOf(day) === -1) {
+						this._pointer.setDate(date + 1);
+
+						continue;
+					}
+
+					next = new Date(this._pointer);
+					break;
+				}
+
+				return next;
+			}
+			/**
+			 * fetch next data
+			 */
+			;
+
+			_proto.next = function next() {
+				var value = this._findNext(); // move next date
+
+
+				this._pointer.setDate(this._pointer.getDate() + 1);
+
+				return {
+					value: value,
+					done: !this.hasNext()
+				};
+			}
+			/**
+			 * has next
+			 * @returns {boolean}
+			 */
+			;
+
+			_proto.hasNext = function hasNext() {
+				try {
+					this._findNext();
+
+					return true;
+				} catch (e) {
+					return false;
+				}
+			};
+
+			return Schedule;
+		}();
+
+		function parseField(field, constraints) {
+			var low = constraints[0];
+			var high = constraints[1];
+			var result = [];
+			var pointer; // * 号等于最低到最高
+
+			field = field.replace(/\*/g, low + '-' + high); // 处理 1,2,5-9 这种情况
+
+			var fields = field.split(',');
+
+			for (var i = 0, len = fields.length; i < len; i++) {
+				var f = fields[i];
+
+				if (f.match(regex)) {
+					f.replace(regex, function ($0, lower, upper, step) {
+						// ref to `cron-parser`
+						step = parseInt(step) || 1; // Positive integer higher than constraints[0]
+
+						lower = Math.min(Math.max(low, ~~Math.abs(lower)), high); // Positive integer lower than constraints[1]
+
+						upper = upper ? Math.min(high, ~~Math.abs(upper)) : lower; // Count from the lower barrier to the upper
+
+						pointer = lower;
+
+						do {
+							result.push(pointer);
+							pointer += step;
+						} while (pointer <= upper);
+					});
+				}
+			}
+
+			return result;
+		}
+		/**
+		 *
+		 * @param expr
+		 * @param start
+		 * @param end
+		 * @returns {*}
+		 */
+
+
+		function parse(expr, start, end) {
+			var atoms = expr.replace(/^\s\s*|\s\s*$/g, '').split(/\s+/);
+			var fields = [];
+			atoms.forEach(function (atom, index) {
+				var constraint = constraints[index];
+				fields.push(parseField(atom, constraint));
+			});
+			return new Schedule(fields, start, end);
+		}
+		return { parse: parse }
+	}
+
+
+	// 扩展weui datepicker来支持选择小时
+	//自定义日期:月时分秒
+	function costomDatePicker(years, startTime, endTime, str) {
+		for (var j = startTime; j < endTime; j++) {
+			years.push({
+				label: ('' + j).length === 1 ? '0' + j + str : '' + j + str,
+				value: ('' + j).length === 1 ? '0' + j : '' + j
+			});
+		}
+
+		return years;
+	}
+
+	var Fixhours = costomDatePicker([], 0, 24, "时");
+
+	function datePickerForHour(options) {
+		var nowDate = new Date();
+		var defaults = options; // 兼容原来的 start、end 传 Number 的用法
+
+		if (typeof defaults.start === 'number') {
+			defaults.start = new Date(defaults.start + "/01/01");
+		} else if (typeof defaults.start === 'string') {
+			defaults.start = new Date(defaults.start.replace(/-/g, '/'));
+		}
+
+		if (typeof defaults.end === 'number') {
+			defaults.end = new Date(defaults.end + "/12/31");
+		} else if (typeof defaults.end === 'string') {
+			defaults.end = new Date(defaults.end.replace(/-/g, '/'));
+		}
+
+			var findBy = function findBy(array, key, value) {
+			for (var i = 0, len = array.length; i < len; i++) {
+				var _obj = array[i];
+
+				if (_obj[key] == value) {
+					return _obj;
+				}
+			}
+		};
+
+		var date = [];
+		var tempS = new Date(defaults.start.getTime())
+		var tempE = new Date(defaults.end.getTime())
+		var tempDefaultE = new Date(defaults.end.getTime())
+		// console.log('fix before', defaults.end.toLocaleString())
+		tempDefaultE.setHours(0)
+		tempDefaultE.setMinutes(0)
+		tempDefaultE.setSeconds(0)
+		defaults.end = new Date(tempDefaultE.getTime() + 60 * 60 * 24 * 1000)
+		// console.log('fix', defaults.end.toLocaleString(), tempDefaultE.toLocaleString())
+		// if (tempE.getFullYear() == tempS.getFullYear() && (tempE.getMonth() + 1) == (tempS.getMonth() + 1) && tempE.getDate() != tempS.getDate()) {
+		// 	defaults.end.setDate(defaults.end.getDate() + 1)
+		// }
+		var interval = weuiCron().parse(defaults.cron, defaults.start, defaults.end);
+		// console.log(tempS.toLocaleString(), tempE.toLocaleString())
+		var obj;
+
+		do {
+			obj = interval.next();
+			var year = obj.value.getFullYear();
+			var month = obj.value.getMonth() + 1;
+			var day = obj.value.getDate();
+			var Y = findBy(date, 'value', year);
+
+			if (!Y) {
+				Y = {
+					label: year + '年',
+					value: year,
+					children: []
+				};
+				date.push(Y);
+			}
+
+			var M = findBy(Y.children, 'value', month);
+
+			if (!M) {
+				M = {
+					label: month + '月',
+					value: month,
+					children: []
+				};
+				Y.children.push(M);
+			}
+			var cc = Fixhours
+			var isS = year == tempS.getFullYear() && month == (tempS.getMonth() + 1) && day == tempS.getDate()
+			var isE = year == tempE.getFullYear() && month == (tempE.getMonth() + 1) && day == tempE.getDate()
+			// console.log(isS, isE, obj.value.toLocaleString())
+			// console.log(tempS.getHours(), tempE.getHours())
+			if (isS) {
+				cc = costomDatePicker([], tempS.getHours(), 24, '时')
+			}
+			if (isE) {
+				var maxT = tempE.getHours() + 1
+				cc = costomDatePicker([], 0, maxT > 24 ? 24 : maxT, '时')
+			}
+			if (isS && isE) {
+				var maxT = tempE.getHours() + 1
+				cc = costomDatePicker([], tempS.getHours(), maxT > 24 ? 24 : maxT, '时')
+			}
+
+			M.children.push({
+				label: day + '日',
+				value: day,
+				children: cc
+			});
+		} while (!obj.done);
+
+		return weui.picker(date, defaults);
+	}
 </script>
 <script type="text/javascript">
 var _id = "";
@@ -357,64 +658,6 @@ $(function(){
 	var minDate = new Date();
 	minDate.setHours(minDate.getHours() + 1);
 	var setRemindTimeFlag = false;
-	$.mobiscroll.setDefaults({
-	   	theme: "ios",
-	   	lang: "zh",
-		setText: "确定",
-		buttons: [
-		    'set',
-		    {
-		        text: '选择时间',
-				cssClass: 'dwb title',
-		        handler: function(event,inst){
-
-		        }
-		    }
-		],
-		dateFormat: "yyyy年mm月dd日",
-		dateOrder: "yyyymd",
-		timeWheels: "H",
-		timeFormat: "HH时 周DD",
-		dayNames: ["日","一","二","三","四","五","六"],
-		headerText: false,
-		startYear: new Date().getFullYear(),
-		endYear: new Date().getFullYear()+5,
-		yearSuffix: "年",
-		monthSuffix: "月",
-		daySuffix: "日",
-		hourSuffix: "时",
-		showOnTap: false
-	});
-	$("#bidopentime>.time").mobiscroll().datetime({
-		minDate: l_remindtime==""?minDate:new Date(Number(l_remindtime+"000")),
-		onInit: function(inst){
-			if(l_bidopentime != ""){
-				inst.setVal(new Date(Number(l_bidopentime+"000")));
-			}
-		},
-		onSelect: function(valueText,inst){
-			var arrayVal = inst.getArrayVal();
-			var date = new Date(arrayVal[0],arrayVal[1],arrayVal[2],arrayVal[3]);
-			var now = new Date();
-			var defaultValue = null;
-			if(!(now.getFullYear() == date.getFullYear() && now.getMonth() == date.getMonth() && now.getDate() == date.getDate())){
-				defaultValue = new Date(date.getTime());
-				defaultValue.setDate(defaultValue.getDate() - 1);
-			}else{
-				defaultValue = new Date(now.getFullYear(),now.getMonth(),now.getDate(),now.getHours());
-				defaultValue.setHours(defaultValue.getHours() + 1);
-			}
-			var inst = $("#remindtime>.time").mobiscroll('getInst');
-			inst.option({maxDate: date});
-			if(!setRemindTimeFlag){
-				inst.setArrayVal([defaultValue.getFullYear(),defaultValue.getMonth(),defaultValue.getDate(),defaultValue.getHours()],true);
-				afterRemindtimeSelect(defaultValue);
-			}
-			l_bidopentime = date.getTime()+"";
-			l_bidopentime = l_bidopentime.substring(0,l_bidopentime.length - 3);
-			opation();
-		}
-    });
 	var remindtimeMinDate = null;
 	if(l_remindtime == ""){
 		remindtimeMinDate = minDate;
@@ -430,35 +673,166 @@ $(function(){
 	if(l_bidopentime != ""){
 		remindtimeMaxDate = new Date(Number(l_bidopentime+"000"));
 	}
-	$("#remindtime>.time").mobiscroll().datetime({
-		minDate: remindtimeMinDate,
-		maxDate: remindtimeMaxDate,
-		onInit: function(inst){
-			if(l_remindtime != ""){
-				inst.setVal(new Date(Number(l_remindtime+"000")));
+	//获取当前时间
+	var nowDate = (function () {
+		var date = new Date();
+		var year = date.getFullYear();
+		var month = date.getMonth() + 1;
+		var day = date.getDate();
+		month = month < 10 ? '0' + month : month;
+		day = day < 10 ? '0' + day : day;
+		return year + '/' + month + '/' + day;
+	})();
+	function nowDateForHour (msec) {
+		var date = new Date(msec);
+		var year = date.getFullYear();
+		var month = date.getMonth() + 1;
+		var day = date.getDate();
+		var hour = date.getHours();
+		month = month < 10 ? '0' + month : month;
+		day = day < 10 ? '0' + day : day;
+		hour = hour < 10 ? '0' + hour : hour;
+		return [year, month, day, hour]
+	}
+	var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
+	// 显示记录值
+	var nowStartTime, nowEndTime;
+	var minSTime, minETime;
+	function getDefaultNowTime () {
+		// 获取默认值 开标
+		if (l_bidopentime != '') {
+			minSTime = new Date(Number(l_bidopentime + '000'))
+			// 默认值低，需使用最小值
+			if (minSTime.getTime() < minDate.getTime()) {
+				minSTime = new Date(minDate.getTime())
 			}
-		},
-		onSelect: function(valueText,inst){
-			setRemindTimeFlag = true;
-			var arrayVal = inst.getArrayVal();
-			var date = new Date(arrayVal[0],arrayVal[1],arrayVal[2],arrayVal[3]);
-			afterRemindtimeSelect(date);
-			opation();
+		} else {
+			minSTime = new Date(minDate.getTime())
 		}
-    });
+		nowStartTime = nowDateForHour(minSTime.getTime())
+
+		// 获取默认值 提醒
+		minETime = new Date(minDate.getTime())
+		if (l_remindtime != '') {
+			var tempNowDate = new Date(Number(l_remindtime + '000'))
+			nowEndTime = nowDateForHour(tempNowDate.getTime())
+			// 默认值低
+			if (minETime.getTime() > tempNowDate.getTime()) {
+				nowEndTime = nowDateForHour(minETime.getTime())
+			}
+		} else {
+			nowEndTime = nowDateForHour(minETime.getTime())
+		}
+	}
+	getDefaultNowTime()
 	$("#bidopentime").click(function(){
 		if(!remind){
 			return false;
 		}
-        $('#bidopentime>.time').mobiscroll('show');
-        return false;
+		datePickerForHour({
+			id: 'start' + new Date().getTime(),
+			start: new Date(minSTime.getTime()),
+			title: '选择开标时间',
+			cron: '* * *',
+			end: new Date().getFullYear()+5,
+			defaultValue: nowStartTime ? nowStartTime : nowDate.split('/'),
+			className: 'jymobile-datePicker start',
+			onChange: function (result) {
+				var nowTArr = result.map(function (v) {
+					return v.label
+				})
+				$(".jymobile-datePicker.start .weui-picker__item").each(function(){
+					var nowT = $(this).text()
+					$(this).removeClass('is-now-select')
+					if (nowTArr.indexOf(nowT) !== -1) {
+						$(this).addClass('is-now-select')
+					}
+				})
+			},
+			onClose: function () {},
+			onConfirm: function (result) {
+				var year = result[0].value;
+				var month = result[1].value < 10 ? '0' + result[1].value : result[1].value;
+				var day = result[2].value < 10 ? '0' + result[2].value : result[2].value;
+				var hour = result[3].value;
+				var timeSec = year + '/' + month + '/' + day + ' ' + hour + ':00:00'
+				nowStartTime = [year, month, day, hour]
+
+				var date = new Date(timeSec);
+				var time_result = year + '年' + month + '月' + day + '日 ' + hour + '时 ' + weekDay[date.getDay()];
+				$("#bidopentime input").val(time_result).attr('value', time_result)
+				var now = new Date();
+				var defaultValue = null;
+				if(!(now.getFullYear() == date.getFullYear() && now.getMonth() == date.getMonth() && now.getDate() == date.getDate())){
+					defaultValue = new Date(date.getTime());
+					defaultValue.setDate(defaultValue.getDate() - 1);
+				}else{
+					defaultValue = new Date(now.getFullYear(),now.getMonth(),now.getDate(),now.getHours());
+					defaultValue.setHours(defaultValue.getHours() + 1);
+				}
+
+				if(!setRemindTimeFlag){
+					l_remindtime = defaultValue.getTime()+"";
+					l_remindtime = l_remindtime.substring(0,l_remindtime.length - 3);
+					var tl_remindtime = Number(l_remindtime + '000')
+					nowEndTime = nowDateForHour(Number(tl_remindtime))
+					var time_result_end = nowEndTime[0] + '年' + nowEndTime[1] + '月' + nowEndTime[2] + '日 ' + nowEndTime[3] + '时 ' + weekDay[new Date(Number(tl_remindtime)).getDay()];
+					$("#remindtime input").val(time_result_end).attr('value', time_result_end)
+				}
+				l_bidopentime = date.getTime()+"";
+				l_bidopentime = l_bidopentime.substring(0,l_bidopentime.length - 3);
+				opation();
+			}
+		});
+		$(".jymobile-datePicker.start #weui-picker-confirm").text('确认')
+		return false;
 	});
 	$("#remindtime").click(function(){
 		if(!remind){
 			return false;
 		}
-        $('#remindtime>.time').mobiscroll('show');
-        return false;
+		datePickerForHour({
+			id: 'end' + new Date().getTime(),
+			start: new Date(minETime.getTime()),
+			title: '选择提醒时间',
+			cron: '* * *',
+			end: new Date(nowStartTime[0] + '/' + nowStartTime[1] + '/' + nowStartTime[2] + ' ' + nowStartTime[3] + ':00:00'),
+			defaultValue: nowEndTime ? nowEndTime : nowDate.split('/'),
+			className: 'jymobile-datePicker end',
+			onChange: function (result) {
+				var nowTArr = result.map(function (v) {
+					return v.label
+				})
+				$(".jymobile-datePicker.end .weui-picker__item").each(function(){
+					var nowT = $(this).text()
+					$(this).removeClass('is-now-select')
+					if (nowTArr.indexOf(nowT) !== -1) {
+						$(this).addClass('is-now-select')
+					}
+				})
+			},
+			onClose: function () {},
+			onConfirm: function (result) {
+				var year = result[0].value;
+				var month = result[1].value < 10 ? '0' + result[1].value : result[1].value;
+				var day = result[2].value < 10 ? '0' + result[2].value : result[2].value;
+				var hour = result[3].value;
+				var timeSec = year + '/' + month + '/' + day + ' ' + hour + ':00:00'
+				nowEndTime = [year, month, day, hour]
+
+				var date = new Date(timeSec);
+				minSTime = new Date(timeSec)
+				var time_result = year + '年' + month + '月' + day + '日 ' + hour + '时 ' + weekDay[date.getDay()];
+				$("#remindtime input").val(time_result).attr('value', time_result)
+
+				setRemindTimeFlag = true;
+				l_remindtime = date.getTime()+"";
+				l_remindtime = l_remindtime.substring(0,l_remindtime.length - 3);
+				opation();
+			}
+		});
+		$(".jymobile-datePicker.end #weui-picker-confirm").text('确认')
+		return false;
 	});
 	$("#hasNoFollow-sure").click(function(){
 		followSave(1);
@@ -596,8 +970,16 @@ function isFollow(){
 	return true;
 }
 </script>
+<style>
+	.setpage .noticehead {
+		font-size: 17px;
+	}
+	.setpage li {
+		font-size: 16px;
+	}
+</style>
 </head>
-<body class="setpage">
+<body class="setpage p13">
 	<div class="noticehead">
 		{{if .T.projectname}}
 			{{.T.projectname}}

src/web/templates/weixin/historypush.html

@@ -20,8 +20,8 @@
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v=0{{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css">
-    <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
+    // <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css">
+    <!--<script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>-->
     <!-- 2.8.5 -->
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js"></script>
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
@@ -32,6 +32,61 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/subscribe_list.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/vipreport_dialog.css?v={{Msg "seo" "version"}}">
     <script>
+    /*
+        * money unit for zyh @date 2020/6/5
+        * */
+        var MoneyUnit = {
+            levelArr: ['元', '万元', '亿元', '万亿元'],
+            test: function (num, type, lv) {
+                if (type === void 0) {
+                    type = 'string';
+                }
+
+                if (lv === void 0) {
+                    lv = 0;
+                }
+
+                if (num === 0) {
+                    if (type === 'string') {
+                        return '0';
+                    }
+
+                    if (type === 'lv') {
+                        return this.levelArr[lv];
+                    }
+
+                    if (type === 'number') {
+                        return 0;
+                    }
+
+                    if (type === 'index') {
+                        return lv;
+                    }
+                }
+
+                var result = num / Math.pow(10000, lv);
+
+                if (result > 10000 && lv < 2) {
+                    return this.test(num, type, lv + 1);
+                } else {
+                    if (type === 'string') {
+                        return result.toFixed(2).replace('.00', '') + this.levelArr[lv];
+                    }
+
+                    if (type === 'lv') {
+                        return this.levelArr[lv];
+                    }
+
+                    if (type === 'index') {
+                        return lv;
+                    }
+
+                    if (type === 'number') {
+                        return result.toFixed(2).replace('.00', '');
+                    }
+                }
+            }
+        }
         var zbadd = {{Msg "seo" "ZBADDRESS"}};
         var firstPage = null;
         var scrollTop = 0;
@@ -79,7 +134,7 @@
             $(window).scroll(function () {
                 scrollTop = $(this).scrollTop();
             });
-            
+
         });
 
         var isInTSguide = false;//订阅向导
@@ -157,7 +212,7 @@
                     dataType: 'json',
                     success: function (data) {
                         if (data.otherFlag){
-                          localStorage.setItem({{.T.userId}}+"_otherFlag",data.otherFlag) 
+                          localStorage.setItem({{.T.userId}}+"_otherFlag",data.otherFlag)
                         }
                         pageIndex = 2;
                         isInTSguide = data.isInTSguide;
@@ -441,6 +496,14 @@
                         industryListname = '<span class="industry">' + industryname + '</span>';
                     }
                 }
+                // 预算：budget；中标：bidamount
+                var moneyList = "";
+                if (obj.budget != null && obj.budget != "") {
+                    moneyList = '<span class="industry money">' + MoneyUnit.test(obj.budget) + '</span>';
+                }
+                if (obj.bidamount != null && obj.bidamount != "") {
+                    moneyList = '<span class="industry money">' + MoneyUnit.test(obj.bidamount) + '</span>';
+                }
                 //时间
                 var showdateList = ""
                 var showdateTable = ""
@@ -457,7 +520,7 @@
                 if (projectM == 1) {
                     projectMList = '<span class="projectM">项目匹配</span>'
                 } else {
-                    projectMList = areaList + datatypeList + industryListname
+                    projectMList = areaList + industryListname + datatypeList + moneyList
                 }
                 //序号位置
                 var paddingLeft = 20
@@ -1095,7 +1158,7 @@
             margin-left: -50%;
         }
         .close{
-            position: absolute;                                                                                                                                                                                                                                                                                 
+            position: absolute;
             width: .56rem;
             height: .56rem;
             top: -.38rem;
@@ -1181,7 +1244,7 @@
         }
     </style>
 </head>
-<body>
+<body class="p13">
 <div class="_header">
     <div class="wx_header">
         <div class="wx_header_left">
@@ -1351,7 +1414,7 @@
 <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/mapArea.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" charset="UTF-8">
-    function mapData() {       
+    function mapData() {
         var _citySessionData = null
         var _provinceArr = {}//选择的省份对应的城市
         var allCityNum = 0;//选择全部省份的个数
@@ -1564,7 +1627,7 @@
       $.post("/jypay/usermerge/query",{"notice":"1"},function(r){
         if(r.message=="success"&&r.data.needMerge==false){
           localStorage.canshowother=true //用于记录和“其他”弹窗先后顺序
-        } 
+        }
         if(r.message=="success"&&r.data.needMerge==true){
           var showText='<em style="color:#2ABED1">手机号：'+r.data.phone+'、微信号：'+r.data.nickname+'</em><br> 为保证您的正常使用，您可以根据自身情况进行设置。'
           if(r.data.vip.length==2){
@@ -1582,7 +1645,7 @@
         localStorage.tipUserMerge=tipTime
       },"json")
     }
-    
+
     //关闭 其他采购单位行业 弹窗
     function close_other(){
       $(".jy-alert-other").hide();
@@ -1600,62 +1663,100 @@
         // 点击选择时间
         $('#showDatePicker').on('click', function () {
             var that = this
-            $(that).find('.time_result').addClass('current')
-            weui.datePicker({
-                id: '1',
-                start: 2000,
-                end: new Date(),
-                defaultValue: date.split('-'),
-                className: 'jymobile-datePicker',
-                onChange: function (result) {
-                },
-                onConfirm: function (result) {
-                    var year = result[0].value;
-                    var month = result[1].value < 10 ? '0' + result[1].value : result[1].value;
-                    var day = result[2].value < 10 ? '0' + result[2].value : result[2].value;
-                    var time_result = year + '.' + month + '.' + day;
-                    FTAGData(year + '-' + month + '-' + day)
-                    $('.time_result').html(time_result)
-                }
-            });
-
-            // 日期选择器样式修改--start---------------------
-            // 修改标题
-            // $('.jymobile-datePicker .weui-picker__hd a[data-action=cancel]')
-            $('.jymobile-datePicker .weui-picker__hd a:first').removeClass('weui-picker__action').addClass('jymobile-picker__action').text('选择时间')
-            $("#weui-picker-confirm").css("text-decoration", "none");
-            // 如果没有选择，不会出现 '查看全部时间'
-            var timeResultBox = $(that).find('.time_result')
-            var timeResult = timeResultBox.text()
-            if (timeResult !== '时间') {
-                // 给日期选择器添加footer
-                var footerHTML = '<div class="weui-picker__ft"><div class="reset-time weui-picker__action" data-action="cancel">查看全部时间</div></div>'
-                $('.jymobile-datePicker .weui-picker').append(footerHTML)
-                // 日期选择器样式添加--end---------------------
-                $('.jymobile-datePicker .weui-picker__ft').on('click', function () {
-                    FTAGData();
-                    $('.weui-mask.weui-animate-fade-in').trigger('click');
-                    $(that).find('.time_result').removeClass('current').text('时间')
-                })
-            }
-
             // 给取遮罩绑定点击事件
-            $('.weui-mask.weui-animate-fade-in').on('click', function () {
+            function closeTimePicker () {
                 var timeResultBox = $(that).find('.time_result')
                 var timeResult = timeResultBox.text()
                 // 点击取消或者空白处，时间选择器消失。判断#showDatePicker是否高亮
                 if (timeResult === '时间') {
-                    $(that).find('.time_result').toggleClass('current')
+                    $(that).find('.time_result').removeClass('current').text('时间')
                 }
-            })
+            }
+            $('.jymobile-datePicker .weui-mask').on('click', closeTimePicker)
+            // 关闭地区选择
+            if ($('.screen').css("display") !== "none") {
+                if (sessionStorage.getItem(userId + "_selectCityName") == "" || sessionStorage.getItem(userId + "_selectCityName") == undefined) {
+                    $('#showArea').find("span").toggleClass("current");
+                }
+                $('.area_container').slideUp();
+                $('.screen').hide();
+            }
+
+            // weui 时间选择器
+            if (Boolean($(".jymobile-datePicker").html())) {
+                $(".jymobile-datePicker .weui-mask").click()
+                $(".jymobile-datePicker .weui-mask").trigger('click')
+            } else {
+                var computedTop = $("._header").offset().top + $("._header").height() - 1
+                $("._header").addClass('fix-top')
+                $(".filter_tab").addClass('is-hide-border')
+                weui.datePicker({
+                    id: 'up',
+                    start: 2000,
+                    title: '选择时间',
+                    end: new Date(),
+                    defaultValue: date.split('-'),
+                    className: 'jymobile-datePicker up',
+                    onChange: function (result) {
+                        var nowTArr = result.map(function (v) {
+                            return v.label
+                        })
+                        $(".jymobile-datePicker.up .weui-picker__item").each(function(){
+                            var nowT = $(this).text()
+                            $(this).removeClass('is-now-select')
+                            if (nowTArr.indexOf(nowT) !== -1) {
+                                $(this).addClass('is-now-select')
+                            }
+                        })
+                    },
+                    onClose: function () {
+                        $("._header").removeClass('fix-top')
+                        $(".filter_tab").removeClass('is-hide-border')
+                        closeTimePicker()
+                    },
+                    onConfirm: function (result) {
+                        let year = result[0].value;
+                        let month = result[1].value < 10 ? '0' + result[1].value : result[1].value;
+                        let day = result[2].value < 10 ? '0' + result[2].value : result[2].value;
+                        let time_result = year + '.' + month + '.' + day;
+                        FTAGData(year + '-' + month + '-' + day)
+                        $('.time_result').html(time_result)
+                    }
+                });
+                $(".jymobile-datePicker.up #weui-picker-confirm").text('确认')
+                $(that).find('.time_result').addClass('current')
+
+                $(".jymobile-datePicker.up .weui-half-screen-dialog__ft").prepend(`<a href="javascript:;" class="weui-btn weui-btn_disabled weui-picker__btn" id="resetTime" data-action="select" style="text-decoration: none;">重置</a>`)
+                $(".jymobile-datePicker.up #resetTime").on('click',function () {
+                    FTAGData();
+                    $('.jymobile-datePicker.up .weui-mask.weui-animate-fade-in').trigger('click');
+                    $('.jymobile-datePicker.up .weui-mask.weui-animate-fade-in').click();
+                    $(that).find('.time_result').removeClass('current').text('时间')
+                })
+            }
+            // 日期选择器样式修改--start---------------------
+            // 修改标题
+            // $('.jymobile-datePicker .weui-picker__hd a[data-action=cancel]')
+            // $('.jymobile-datePicker .weui-picker__hd a:first').removeClass('weui-picker__action').addClass('jymobile-picker__action').text('选择时间')
+            // $("#weui-picker-confirm").css("text-decoration", "none");
         });
         // 选择地区
         $('#showArea').on('click', function () {
-            if (_scrollTop == 0) {
-                _scrollTop = scrollTop;
+            // 关闭时间选择
+            if (Boolean($(".jymobile-datePicker").html())) {
+                $(".jymobile-datePicker .weui-mask").click()
+                $(".jymobile-datePicker .weui-mask").trigger('click')
+                var timeResult = $('#showDatePicker').find('.time_result').text()
+                // 点击取消或者空白处，时间选择器消失。判断#showDatePicker是否高亮
+                if (timeResult === '时间') {
+                    $('#showDatePicker').find('.time_result').removeClass('current').text('时间')
+                }
             }
-            $(".subscribe").toggleClass('overClass');
-            scrollHtml();
+            //if(_scrollTop==0){
+            //	_scrollTop = scrollTop;
+            //}
+            //$(".subscribe").toggleClass('overClass');
+            //scrollHtml();
             if (sessionStorage.getItem(userId + "_selectCityName") == "" || sessionStorage.getItem(userId + "_selectCityName") == undefined) {
                 $(this).find("span").toggleClass("current");
             }
@@ -1669,8 +1770,8 @@
         })
         //
         $('.screen').click(function () {
-            $(".subscribe").toggleClass('overClass');
-            scrollHtml();
+            //$(".subscribe").toggleClass('overClass');
+            //scrollHtml();
             if (sessionStorage.getItem(userId + "_selectCityName") == "" || sessionStorage.getItem(userId + "_selectCityName") == undefined) {
                 $('#showArea').find("span").toggleClass("current");
             }
@@ -1679,7 +1780,7 @@
         })
         // 地区选择确认按钮
         $('.enter_btn').click(function () {
-            $(".subscribe").toggleClass('overClass');
+            //$(".subscribe").toggleClass('overClass');
             var cityCount = $('.area_wrap .city input:checked').length - $('.area_wrap .city .cityAll input:checked').length;
             $('.area_container').slideUp();
             $('.screen').hide()
@@ -1730,9 +1831,13 @@
 
         })
         $('.reset_btn').click(function () {
-            $('#showArea .jymobile-tab-triangle').text("地区");
+            selectCity = ''
+            $('#showArea .jymobile-tab-triangle').removeClass('current').text("地区");
+            ajaxFun(firstTime, selectCity);
             $('.area_wrap .province .city-count').hide().text('')
             $('.c_item input[type="checkbox"]').prop('checked', false)
+            $('.screen').trigger('click')
+            $('.screen').click()
         })
         // 关闭设置弹窗
         $('#close_set').on('click', function () {
@@ -1781,4 +1886,4 @@
 </body>
 <!--百度统计-->
 {{include "/common/baiducc.html"}}
-</html>
+</html>

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

@@ -10,14 +10,14 @@
 <link href="{{Msg "seo" "cdn"}}/css/jy.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/wxsearch.css?v={{Msg "seo" "version"}}1" rel="stylesheet" type="text/css" >
-<link href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css" rel="stylesheet">
+<!--<link href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css" rel="stylesheet">-->
 <link href="{{Msg "seo" "cdn"}}/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}12" rel="stylesheet">
 <script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/jy.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-<script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
+<!--<script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>-->
 {{include "/common/weixin.html"}}
 <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=DD279b2a90afdf0ae7a3796787a0742e"></script>
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}9"></script>
@@ -28,7 +28,7 @@
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/search_tab.css?v={{Msg "seo" "version"}}5">
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
+<!--<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">-->
 <!--2.8.5-->
 <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/css/wx/base.css?v={{Msg "seo" "version"}}" />
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/swiper/swiper.min.css?v={{Msg "seo" "version"}}">
@@ -36,6 +36,9 @@
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css//wxbutton.css?v={{Msg "seo" "version"}}">
 <script src="{{Msg "seo" "cdn"}}/swiper/swiper.min.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>
+<!--2.10.4-->
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css"/>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js"></script>
 <title>搜索</title>
 <script type="text/javascript">
 	var s_openid = {{session "s_m_openid"}};
@@ -95,7 +98,7 @@
                 $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
                     if ($(dom).attr('index') === index) {
                         $(dom).show().siblings().hide()
-                        
+
                         // 切换上下三角
                         $this.find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-shouqi')
                         $this.siblings().find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
@@ -119,7 +122,7 @@
                 if ($(dom).attr('index') === index) {
                     // $(dom).show().siblings().hide()
                     $(dom).slideDown('fast').siblings().hide()
-                    
+
                     // 切换上下三角
                     $this.find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-shouqi')
                     $this.siblings().find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
@@ -215,7 +218,7 @@
 	<style>
 		body{
 			height: auto;
-			overflow: auto;	
+			overflow: auto;
 		}
 		#searchIndex .content li:nth-of-type(1) a {
 			background: url("{{Msg "seo" "cdn"}}/applysub/img/enterprise.png") 0.3rem 0.32rem no-repeat;
@@ -271,7 +274,7 @@
 		  0% {
 		    transform: rotate(0deg); }
 		  100% {
-		    transform: rotate(360deg); } 
+		    transform: rotate(360deg); }
 		}
 	#dqbtn{
 		width: 5.5em !important;
@@ -283,8 +286,8 @@
   .modal-content {
       position: relative;
       background-color: #fff;
-       border: 0px solid #999 !important; 
-       border: 0px solid rgba(0,0,0,.2) !important; 
+       border: 0px solid #999 !important;
+       border: 0px solid rgba(0,0,0,.2) !important;
       border-radius: 6px;
       -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5);
       box-shadow: none;
@@ -294,7 +297,7 @@
   }
 	</style>
 </head>
-<body  style="min-height:100vh;">
+<body  style="min-height:100vh;" class="p13">
 
 <div class="modal fade" data-backdrop="static"  id="homePageTap" tabindex="-1" role="dialog">
   <div class="modal-dialog" role="document">
@@ -305,7 +308,7 @@
       <div style="border-radius: 10px;position: relative;width:5.7rem;height: 7.5rem;">
 			<img onclick="tapClose(0)" src="/vipsubscribe/image/close.png" style="position: absolute;right: 0px;top: -1rem;width: .6rem;" >
 <!--			<img src="/images/wx/frame.png" >-->
-        <img src ="/vipsubscribe/image/vip_home.png" onclick="gotoIntroducePage()"> 
+        <img src ="/vipsubscribe/image/vip_home.png" onclick="gotoIntroducePage()">
 <!--			<div onclick="tapClose(1)" class="tap_div_btn" style="position: absolute;background: #2ABED1;border-radius: 41px;width: 5rem;height: .9rem;text-align: center;line-height: .9rem;color: #fff;left: 50%;margin-left: -2.5rem;bottom: .5rem;">查看详情</div>-->
 		</div>
       </div>
@@ -395,7 +398,7 @@
                 <a class="tab_item">
                     <img src="/images/search/home_tab_4.png" alt="">
                     <span>APP下载</span>
-                </a> 
+                </a>
             </div>
         </div>
         <!-- 最新标讯 -->
@@ -550,7 +553,7 @@
 				<div class="showlist on">列表</div>
 				<div class="showtable">表格</div>
 			</div>
-		</div>		
+		</div>
 		<div id="intercept" class="hidden">
 			<img src="{{Msg "seo" "cdn"}}/images/tip.png"><font>“的方式”</font>及其后面的字词均被忽略，因为剑鱼标讯的查询限制在20个汉字以内。
 		</div>
@@ -809,7 +812,7 @@
 	<form class="wxhead" action="">
 		<div class="entsearch_head searchhead">
 			<input class="form-control searchinput" id="ent_searchinput" maxlength ="50" value="" placeholder="中标企业名称"/>
-	
+
 			<input type="hidden" name="money" value="">
 			<input type="hidden" name="money_from" value="">
 			<input type="hidden" name="money_to" value="">
@@ -849,7 +852,7 @@
 						</li>
 					</ul>
 				</div>
-	
+
 				<div class="jydq-dialog hidden">
 					<div class="dialog-content contentone">
 						<ul>
@@ -945,7 +948,7 @@
 				<li class="jydqreset j-button-cancel reset">重置</li>
 				<li class="jydqsure j-button-confirm sure">确定</li>
 			</ul>
-		</div>	
+		</div>
 	</div>
 	<!--数据列表-->
 	<div id="wrapper" style="margin-top:.2rem;border-top: 1px solid #E0E0E0;" class="hidden">
@@ -992,7 +995,7 @@
 			ADHtml+="<div onclick='adv_statistics(this)' adv_name='微信搜索列表页-中部' ><a dataHref='"+AD.s_link+"'><img src='"+AD.s_pic+"'/></a></div>"
 		}else{
 			ADHtml+="<img src='"+AD.s_pic+"'/>"
-		}	
+		}
 	}else{
 		ADHtml+=AD.s_script
 	}
@@ -1005,7 +1008,7 @@
 	sessionStorage.removeItem("remind"); //开标提醒标识
 	sessionStorage.removeItem("ischecked");//数据导出 是否点击“我已阅”
  	sessionStorage.removeItem("readClause");
-	
+
 
 	//
 	var onceFlag_tablepro=false;
@@ -1020,7 +1023,7 @@
 			onceFlag_popstate = false;
 		}
 		if(onceFlag_popstate && !popstateFlag){
-			backThisPage();	
+			backThisPage();
 		}
 		//pageshow先执行，popstate后执行，popstate执行完之后，重置
 		onceFlag_popstate = false;
@@ -1135,7 +1138,7 @@
 		    $(".tab_container a:eq(0)").on("tap",function(){
 				EntSearch.clearSessionStorage();
 				EntSearch.init(true,true,true);
-		    });	  
+		    });
     	});
 	}
 	function backThisPage(){
@@ -1177,4 +1180,4 @@
 <!--百度统计-->
 {{include "/common/baiducc.html"}}
 </body>
-</html>
+</html>