更新

SooonerHotel/App/Lib/Action/Sp/ConfAction.class.php

@@ -46,6 +46,7 @@ class ConfAction extends CommonAction{
         $data['sp_id'] = I("sp_id");
         $data['remark'] = I("remark");
         $data['status'] = I("status");
+        $data['v'] = I("v");
         
 		if($id){
             $data['id'] = $id;

SooonerHotel/App/Lib/Action/Sp/SpAction.class.php

@@ -52,6 +52,7 @@ class SpAction extends CommonAction{
         $data['mobile'] = I("mobile");
         $data['remark'] = I("remark");
         $data['status'] = I("status");
+        $data['push_type'] = I("push_type");
                 
 		if($id){
             $data['id'] = $id;

SooonerHotel/App/Tpl/Sp/zh-cn/Conf/add.html

@@ -41,6 +41,12 @@ body{padding:20px}
             <input type="text" class="form-control" id="inputEmail3" placeholder="请输入配置类型code" name="type_code" value="{$info.type_code}">
         </div>
     </div>
+    <div class="form-group">
+        <label for="inputEmail3" class="col-sm-2 control-label">配置值</label>
+        <div class="col-sm-6">
+            <input type="text" class="form-control" id="inputEmail3" placeholder="请输入配置值" name="v" value="{$info.v}">
+        </div>
+    </div>
     <div class="form-group">
         <label for="inputPassword3" class="col-sm-2 control-label">备注</label>
         <div class="col-sm-9">

SooonerHotel/App/Tpl/Sp/zh-cn/Conf/index.html

@@ -66,9 +66,10 @@ onRowContextMenu : onRowContextMenu
 	<thead>
 		<tr>
             <th data-options="field:'name',width:40" sortable="true">配置名称</th>
-			<th data-options="field:'type_code',width:20">配置类型code</th>
-            <th data-options="field:'sp_name',width:40">合作方</th>
-            <th data-options="field:'remark',width:40">备注</th>
+			<th data-options="field:'type_code',width:30">配置类型code</th>
+            <th data-options="field:'v',width:60">配置值</th>
+            <th data-options="field:'sp_name',width:20">合作方</th>
+            <th data-options="field:'remark',width:20">备注</th>
 			<th data-options="field:'addtime',width:20" sortable="true">创建时间</th>
             <th data-options="field:'updatetime',width:20" sortable="true">更新时间</th>
 			<th data-options="field:'status'" sortable="true" align="center">状态</th>

SooonerHotel/App/Tpl/Sp/zh-cn/Sp/add.html

@@ -42,6 +42,17 @@ body{padding:20px}
             <input type="text" class="form-control" id="inputEmail3" placeholder="请输入手机号" name="mobile" value="{$info.mobile}">
         </div>
     </div>
+    <div class="form-group">
+        <label for="inputPassword3" class="col-sm-2 control-label">是否推送</label>
+        <div class="col-sm-9">
+            <label class="radio-inline">
+            <input type="radio" name="push_type" id="optionsRadios4"  value="1"> 推送
+            </label>
+            <label class="radio-inline">
+            <input type="radio" name="push_type" id="optionsRadios4"  value="0" checked="checked"> 不推送
+            </label>
+        </div>
+    </div>
     <div class="form-group">
         <label for="inputPassword3" class="col-sm-2 control-label">备注</label>
         <div class="col-sm-9">
@@ -119,6 +130,7 @@ $().ready(function(){
     $("select[id='province_select'] option[value='"+province_id+"']").attr("selected",true);
     $("select[name='region_id'] option[value='{$info.region_id}']").attr("selected",true);
     $("input[name='status'][value='{$info.status}']").attr("checked",true);
+    $("input[name='push_type'][value='{$info.push_type}']").attr("checked",true);
     </if>
 });
 </script>

SooonerHotel/App/Tpl/Sp/zh-cn/Sp/index.html

@@ -67,6 +67,8 @@ onRowContextMenu : onRowContextMenu
 			<th data-options="field:'addtime',width:30" sortable="true">创建时间</th>
             <th data-options="field:'updatetime',width:30" sortable="true">更新时间</th>
             <th data-options="field:'status'" sortable="true" align="center">状态</th>
+            <th data-options="field:'push_type'" sortable="true" align="center"  formatter="PushTypeAction">是否推送</th>
+			<th data-options="field:'push_offset'" sortable="true" align="center">推送时间</th>
 			<th field="action" align="center" formatter="InputAction">操作</th>
 		</tr>
 	</thead>
@@ -100,7 +102,13 @@ function onRowContextMenu(e, rowIndex, rowData){
 function InputAction(value, row, index) {
     return'<a href="javascript:void(0)" id="mb' + index + '" class="easyui-menubutton" menu="#mm1" iconCls="icon-list" onmouseover="setSelectRow(' + index + ')">'+this.title+'</a>';            
 }
-
+function PushTypeAction(value, row, index) {
+    if(value==1){
+        return "推送";
+    }else{
+        return "不推送";
+    }
+}
 function setSelectRow(index) {
 	$('#dg').datagrid('unselectAll');
 	$('#dg').datagrid('selectRow', index);