Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-13 17:56:29"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-13 17:56:29"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-13 18:36:29"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-13 18:36:29"}},"marketisstart":true,"marketrate":300}

core/src/web/staticres/wxswordfish/main.js

@@ -128,22 +128,39 @@ function ScopeDialog(type,clickLi){
 		commonAjaxReq(thisClass,type);
 	});
 }
+//取积分
+function getCredit(){
+	
+}
+
 function commonAjaxReq(object,module){
+	//是关的不用处理
+	var dataObj = {
+		reqType: "other",
+		snopshot:false
+	};
 	if($("#"+module+"-on-off").hasClass("open")){
 		//开服务要校验
 		if(module=="tender"){
 			if(!Tender.status){
 				//提示扣积分
+				//先取积分，规则然后提示
 				$(".creditTip-dialog").show()
 				$("html,body").addClass("overflow-hidden")
-				
+				//生成快照
+				dataObj["snopshot"]=true
+			}
+		}else if(module=="bid"){
+			if(!Bid.status){
+				//提示扣积分
+				$(".creditTip-dialog").show()
+				$("html,body").addClass("overflow-hidden")
+				//生成快照
+				dataObj["snopshot"]=true
 			}
 		}
 	}
-	//是关的不用处理
-	var dataObj = {
-		reqType: "other"
-	};
+
 	var keysString = "",scopeString = "";
 	var thisClass = this;
 	this.afterCommit = function(){

core/src/web/staticres/wxswordfish/style.css

@@ -527,4 +527,19 @@ img{
 	background-color:#FAF5DF;
 	height:130px;
 	border:1px solid #F5DC9A;
+}
+.tip-button{
+	float: right;
+ 	margin-right: 50px;
+}
+.tip-button span{
+	border-radius:5px;
+	display:inline-block;
+	padding:3px 10px;
+	margin-right:5px;
+	border:1px solid #689AFF;
+	cursor:pointer;
+}
+.tip-button span:nth-child(1){
+	background-color:#24C0D7;
 }

core/src/web/templates/swordfish/wxtoolbar.html

@@ -44,9 +44,9 @@
 <div class="dialog creditTip-dialog">
 	<div class="tip">
 		<div>您添加了1个信息栏目（招标公告），确认后系统将每月扣除1000积分，您目前的积分余额是1500积分，扣除后将剩余500积分。</div>
-		<div class="float:right">
-		<button>提交</button>
-		<button>取消</button>
+		<div class="tip-button">
+		<span id="credit_yes">提交</span>
+		<span id="credit_no">取消</span>
 		</div>
 	</div>
 </div>
@@ -90,7 +90,8 @@ $(function(){
 	});
 	//弹出框消失
 	$(".dialog").click(function(e){
-		if($(e.target).hasClass("dialog")){
+		var et=$(e.target)
+		if(et.hasClass("dialog")&&!et.hasClass("creditTip-dialog")){
 			$(this).hide();
 			$("html,body").removeClass("overflow-hidden");
 		}