游戏规则

src/main/java/com/minpay/shouhuo/GameSetupManageAction.java

@@ -181,6 +181,7 @@ public class GameSetupManageAction implements IMINAction {
 			throw new MINBusinessException("此用户没有权限，此操作");
 		}
 		VmGameRule vmGameRule = new VmGameRule();
+		vmGameRule.setId(id);
 		vmGameRule.setRewardGrade(rewardGrade);
 		vmGameRule.setRewardAmtRatio(rewardAmtRatio);
 		vmGameRule.setName(name);
@@ -198,6 +199,7 @@ public class GameSetupManageAction implements IMINAction {
 			}
 			vmGameRule.setExtractRatio(extractRatio);
 		}
+		vmGameRule.setRewardType(rewardGrade);
 		Service.lookup(IMINDataBaseService.class).updateByPrimaryKeySelective(VmGameRuleMapper.class, vmGameRule);
 		String logInfo = user.getName()+"-编辑游戏规则:" + id;
 		Service.lookup(ILogService.class).logging(session, logInfo);
@@ -206,7 +208,7 @@ public class GameSetupManageAction implements IMINAction {
 	@MINValidator(value = MODIFY_GAME_SETUP)
 	public MINActionResult modifyGameSetupValidator(
 			@MINParam(key = "id",regex = RegexUtil.NOT_NULL, error = "数据异常") String id,
-			@MINParam(key = "name",regex = RegexUtil.AMOUNT_NOTNULL, error = "名称不能为空") String name,
+			@MINParam(key = "name",regex = RegexUtil.NOT_NULL, error = "名称不能为空") String name,
 			MINSession session) throws MINBusinessException {
 		MINActionResult res = new MINActionResult();
 		return res;

src/main/webapp/admin/gameSetupManage/addGameSetup.html

@@ -154,7 +154,6 @@
 		});
 		//监听提交
 		form.on('submit(demo1)', function(data) {
-			alert(JSON.stringify(data.field));
 			$.request({
 				action : '../../GameSetupManageAction/addGameSetup',
 				data :  data.field ,

src/main/webapp/admin/gameSetupManage/editSetupDetail.html

@@ -14,35 +14,41 @@
 </fieldset>
 <form class="layui-form" action="">
 	<div style="padding-bottom:60px; ">
+		<div class="layui-form-item">
+			<label class="layui-form-label">编号</label>
+			<div class="layui-input-block">
+				<input type="text" name="id" id="id" placeholder="请输入编号" disabled="disabled" autocomplete="off" class="layui-input">
+			</div>
+		</div>
 
 		<div class="layui-form-item">
 			<div class="layui-inline">
 				<label class="layui-form-label" style = "width: 150px;">*游戏名称:</label>
 				<div class="layui-input-inline">
-					<input type="tel"  readonly=" readonly" name="name" id = "name" maxlength="20" lay-verify="name"  placeholder="请输入游戏名称"autocomplete="off" class="layui-input">
+					<input type="tel"     name="name" id = "name" maxlength="20" lay-verify="name"  placeholder="请输入游戏名称"autocomplete="off" class="layui-input">
 				</div>
 			</div>
 		</div>
 		<div class="layui-form-item layui-form-text">
 			<label class="layui-form-label">游戏规则说明:</label>
 			<div class="layui-input-block">
-				<textarea name="desc" id = "desc"  readonly=" readonly" placeholder="请输入游戏规则" class="layui-textarea"></textarea>
+				<textarea name="desc" id = "desc"     placeholder="请输入游戏规则" class="layui-textarea"></textarea>
 			</div>
 		</div>
 		<div class="layui-form-item">
 			<div class="layui-inline">
 				<label class="layui-form-label" style = "width: 150px;">支付宝订单号:</label>
 				<div class="layui-input-inline">
-					<input type="tel" readonly=" readonly" name="alipayid" id = "alipayid" maxlength="20" lay-verify="alipayid"  placeholder="请输入支付宝订单号"autocomplete="off" class="layui-input">
+					<input type="tel"    name="alipayid" id = "alipayid" maxlength="20" lay-verify="alipayid"  placeholder="请输入支付宝订单号"autocomplete="off" class="layui-input">
 				</div>
 			</div>
 		</div>
 		<div class="layui-form-item">
 			<label class="layui-form-label">游戏类型</label>
 			<div class="layui-input-block">
-				<input type="radio" name="type" value="0" title="幸运购" checked="" lay-filter="type" >
-				<input type="radio" name="type" value="1" title="游戏购" lay-filter="type" >
-				<input type="radio" name="type" value="2" title="超级大彩蛋" lay-filter="type" >
+				<input type="radio" name="type" value="0" title="幸运购" checked="" lay-filter="type" disabled>
+				<input type="radio" name="type" value="1" title="游戏购" lay-filter="type" disabled>
+				<input type="radio" name="type" value="2" title="超级大彩蛋" lay-filter="type" disabled>
 			</div>
 		</div>
 		<div style="display:none;" id="rewardGame">
@@ -50,7 +56,7 @@
 				<div class="layui-inline">
 					<label class="layui-form-label" style = "width: 150px;">*彩蛋等级:</label>
 					<div class="layui-input-inline">
-						<input readonly=" readonly" type="tel" name="rewardGrade" id = "rewardGrade" maxlength="20" lay-verify="rewardGrade"  placeholder="请输入彩蛋等级"autocomplete="off" class="layui-input">
+						<input    type="tel" name="rewardGrade" id = "rewardGrade" maxlength="20" lay-verify="rewardGrade"  placeholder="请输入彩蛋等级"autocomplete="off" class="layui-input">
 					</div>
 				</div>
 			</div>
@@ -58,7 +64,7 @@
 				<div class="layui-inline">
 					<label class="layui-form-label" style = "width: 150px;">*中奖金额占比:</label>
 					<div class="layui-input-inline">
-						<input readonly=" readonly" type="tel" name="rewardAmtRatio" id = "rewardAmtRatio" maxlength="20" lay-verify="rewardAmtRatio"  placeholder="请输入中奖金额占比"autocomplete="off" class="layui-input">
+						<input    type="tel" name="rewardAmtRatio" id = "rewardAmtRatio" maxlength="20" lay-verify="rewardAmtRatio"  placeholder="请输入中奖金额占比"autocomplete="off" class="layui-input">
 					</div>
 				</div>
 			</div>
@@ -66,27 +72,33 @@
 			<div class="layui-form-item">
 				<label class="layui-form-label">彩蛋奖池类型</label>
 				<div class="layui-input-block">
-					<input type="radio" name="rewardType" value="0" title="自定义奖池金额" checked=""  disabled>
-					<input type="radio" name="rewardType" value="1" title="按支付金额百分比抽取"  disabled>
+					<input type="radio" name="rewardType"   lay-filter="rewardType"  value="0" title="自定义奖池金额" checked="" >
+					<input type="radio" name="rewardType" lay-filter="rewardType" value="1" title="按支付金额百分比抽取" >
 				</div>
 			</div>
-			<div class="layui-form-item">
+			<div class="layui-form-item" style="display:none;" id ="jackpotAmta">
 				<div class="layui-inline">
 					<label class="layui-form-label" style = "width: 150px;">*奖池金额:</label>
 					<div class="layui-input-inline">
-						<input readonly=" readonly" type="tel" name="jackpotAmt" id = "jackpotAmt" maxlength="20" lay-verify="jackpotAmt"  placeholder="请输入奖池金额"autocomplete="off" class="layui-input">
+						<input    type="tel" name="jackpotAmt" id = "jackpotAmt" maxlength="20" lay-verify="jackpotAmt"  autocomplete="off" class="layui-input">
 					</div>
 				</div>
 			</div>
-			<div class="layui-form-item">
+			<div class="layui-form-item" style="display:none;" id ="extractRatioa">
 				<div class="layui-inline">
 					<label class="layui-form-label" style = "width: 150px;">*抽取比例:</label>
 					<div class="layui-input-inline">
-						<input type="tel" readonly=" readonly" name="extractRatio" id = "extractRatio" maxlength="20" lay-verify="extractRatio"  placeholder="请输入抽取比例"autocomplete="off" class="layui-input">
+						<input type="tel"    name="extractRatio" id = "extractRatio" maxlength="20" lay-verify="extractRatio"  autocomplete="off" class="layui-input">
 					</div>
 				</div>
 			</div>
 		</div>
+		<div class="layui-form-item box-button" >
+			<div class="layui-input-block">
+				<button class="layui-btn" lay-submit="" lay-filter="demo1">提交</button>
+				<button  class="layui-btn"  id="cancel" onclick = "testNewPage()">取消</button>
+			</div>
+		</div>
 	</div>
 </form>
 <script src="../../js/min-loader-next.js"></script>
@@ -100,13 +112,26 @@
 
 		if(index =="type"){ //游戏类型
 
-
 			if(item == '0'){
 				$("#rewardGame").css("display","none");
+				$("[name='type']:eq(0)").prop("checked",true);
 			}else if(item == '1'){
 				$("#rewardGame").css("display","none");
+				$("[name='type']:eq(1)").prop("checked",true);
 			}else if(item == '2'){
 				$("#rewardGame").css("display","block");//显示div
+				$("[name='type']:eq(2)").prop("checked",true);
+			}
+
+		}if(index =="rewardType"){ //游戏类型
+			if(item == '0'){
+				$("[name='rewardType']:eq(0)").prop("checked",true);
+				$("#jackpotAmta").css("display","block");
+
+			}else if(item == '1'){
+				$("[name='rewardType']:eq(1)").prop("checked",true);
+				$("#extractRatioa").css("display","block");
+
 			}
 		}else{
 			$("#"+index+"").val(item);
@@ -140,13 +165,12 @@
 		});
 		//监听提交
 		form.on('submit(demo1)', function(data) {
-			alert(JSON.stringify(data.field));
 			$.request({
-				action : '../../GameSetupManageAction/addGameSetup',
+				action : '../../GameSetupManageAction/modifyGameSetup',
 				data :  data.field ,
 				success : function(data) {
 					layer.alert('保存成功!',  function(){
-						deleteTabPage('101006-01');
+						deleteTabPage('101006-03');
 					});
 				},
 				error : function(data) {
@@ -170,6 +194,17 @@
 			}
 		})
 
+		layui.form.on('radio(rewardType)', function(data){
+			var value = data.value;
+			if(value == '0'){
+				$("#jackpotAmta").css("display","block");
+				$("#extractRatioa").css("display","none");
+			}else if(value == '1'){
+				$("#extractRatioa").css("display","block");
+				$("#jackpotAmta").css("display","none");
+			}
+		})
+
 	});
 </script>
 </body>

src/main/webapp/admin/gameSetupManage/gameSetupManage.html

@@ -214,13 +214,13 @@
 	}
 	//添加游戏规则
 	$(document).on('click','#addGameSetup',function(){
-		openMainTabPage('101006-01', ' 增加操作员', 'gameSetupManage/addGameSetup.html', '', '101006', reLoadFun);
+		openMainTabPage('101006-01', ' 增加', 'gameSetupManage/addGameSetup.html', '', '101006', reLoadFun);
 	});
 	//编辑
 	function editDetail(data) {
 	    // 寄存当前数据
 	    layui.sessionData("ROW_DATA", {key:"NOW_ROW", value:data});
-    	openMainTabPage('315002-02', ' 编辑操作员', 'gameSetupManage/editUser.html', '', '315002', reLoadFun);
+    	openMainTabPage('101006-03', ' 编辑', 'gameSetupManage/editSetupDetail.html', '', '101006', reLoadFun);
 	}
 	function changeSelectCon(index, t, type, dateValue){
 		if (type == "date") {