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

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-20 09:32:14"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-20 09:32:14"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-20 11:42:49"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-20 11:42:49"}},"marketisstart":true,"marketrate":300}

core/src/web/templates/member/credit/mycredit.html

@@ -3,6 +3,7 @@
 <title>我的积分</title>
 {{include "/common/inc.html"}}
 <script charset="utf-8" src="/js/paging.js"></script>
+<script src="/js/validform-min.js"></script>
 <style>
 .credit-explain {
     background-color: #FCF8E3;
@@ -281,7 +282,7 @@
 							<tr class="rowtwo">
 								<td width="60%" style="text-indent: 7em;">邀请一个新用户（微信剑鱼分享邀请新用户），得150积分</td>
 								<td width="10%" align="center"></td>
-								<td width="30%" style="padding:110px"></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="$('#yaoqingModal').modal('show')">邀请</span></td>
 							</tr>
 						</table>
 						</div>
@@ -308,11 +309,54 @@
 		</div>
 	</div>
 </div>
+
+<!-- 邮箱邀请Modal -->
+<div class="modal fade b-modal" id="yaoqingModal" tabindex="-1" role="dialog" aria-labelledby="yaoqingModalLabel">
+  	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+		  	<div class="modal-header">
+				<span data-dismiss="modal" aria-label="Close" class="close glyphicon guanbi1"></span>
+				<span class="modal-title" id="yaoqingModalLabel">邀请</span>
+			</div>
+			<div class="modal-body">
+				<form class="validForm form-horizontal" role="form" method="post">
+				<div class="form-group">
+					<span id="col-sm-3" class="col-sm-3 control-label" for="name"><span>*</span>邀请人邮箱　</span>
+					<div class="col-sm-6">
+						<input type="text" name="s_email" class="form-control" maxlength="50"  datatype="*"  nullmsg="请输入邮箱地址" errormsg="请输入邮箱地址" >
+					</div>
+					<div class="col-sm-3">
+					   <span class="Validform_checktip checkCodeIdValid Validform_error"></span>
+					</div>
+				</div> 
+				<div class="form-group">
+					<span class="col-sm-3 control-label"><span>*</span>验证码　</span>
+					<div class="input-group col-sm-6 checkCodeId">
+						<input type="text" name="checkCodeId" class="form-control inputxt" maxlength="4" id="chedkcode" datatype="*"  nullmsg="请输入验证码" errormsg="请输入验证码" >
+						<span class="input-group-addon " id="phone-checkCodeId">
+							<img id="yaoqing_captcha" src="/tool/captcha" onClick="reLoadCaptcha('yaoqing_captcha');">
+							<a onClick="reLoadCaptcha('yaoqing_captcha');" class="text-primary">刷新</a>
+						</span>
+					</div>
+					<div class="col-sm-3">
+					<span class="Validform_checktip">请输入验证码</span>
+					</div>
+			  	</div>
+				<div class="form-group" style="padding:0px 100px 20px 150px">
+					<button type="button" class="btn btn-primary" onclick="yaoqing()">发送邀请</button>
+				</div>
+				</form>
+			</div>
+		</div>
+	</div>
+</div>
+
 <!-- 底部 -->
 {{include "/common/bottom.html"}}
 
 <script type="text/javascript">
 $(function(){
+	$(".validForm").Validform();
 	$("#c_0,#c_1").click(function(){
 		var _v=$(this).attr("value")
 		checkContent("list_"+_v)
@@ -366,6 +410,12 @@ function outoClick(id){
 function toUrl(url){
 	window.location.href=url
 }
+function yaoqing(){
+	alert();
+}
+function reLoadCaptcha(id){
+	document.getElementById(id).src='/tool/captcha?rnd='+Math.random()
+}
 </script>
 </body>
 </html>