update

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

@@ -35,7 +35,7 @@ class SpAction extends CommonAction{
             $this->info = $info;
 		}
         $sp_lists = $spModel->where("`status`=0")->select();
-        $conf_type_lists = $confTypeModel->join(" A left join sh_sp_config B on A.`code` = B.type_code and B.sp_id = $id ")->field("A.id,A.`name`,A.`code`,B.`v`")->select();
+        $conf_type_lists = $confTypeModel->join(" A left join sh_sp_config B on A.`code` = B.type_code and B.sp_id = $id ")->field("A.id,A.`name`,A.remark,A.`code`,A.`v` default_v,B.`v`")->select();
         $region_lists = $regionModel->where("pid = 1 and `status`=0")->select();
         $region_city_lists = $regionModel->where("pid > 1 and `status`=0")->select();
         $this->sp_lists = $sp_lists;

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

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

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

@@ -57,7 +57,7 @@ body{padding:20px}
     <div class="form-group">
         <label for="inputPassword3" class="col-sm-4 control-label">{$item.name}</label>
         <div class="col-sm-6">
-            <input type="text" class="form-control" id="inputEmail3" placeholder="请输入{$item.name}" name="conf[{$item.code}][{$item.name}]" value="{$item.v}">
+            <input type="text" class="form-control" id="inputEmail3" placeholder="请输入{$item.name}【{$item.remark}】" name="conf[{$item.code}][{$item.name}]" value="{$item['v']?$item['v']:$item['default_v']}">
         </div>
     </div>
     </volist>

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

@@ -61,7 +61,7 @@ onRowContextMenu : onRowContextMenu
 		<tr>
             <th data-options="field:'name',width:20" sortable="true">合作方名称</th>
 			<th data-options="field:'code',width:20">合作方代码</th>
-            <th data-options="field:'email',width:20">邮箱</th>
+            <th data-options="field:'email',width:40">邮箱</th>
             <th data-options="field:'mobile',width:20">手机号</th>
             <th data-options="field:'remark',width:40">备注</th>
 			<th data-options="field:'addtime',width:30" sortable="true">创建时间</th>
@@ -143,12 +143,12 @@ function enable(status){
 	 }
 }
 function add(){
-	pop(800,600,true,'dg','datagrid','/Sp/Sp/add/')
+	pop(900,600,true,'dg','datagrid','/Sp/Sp/add/')
 }
 function edit(){
 	var row = $('#dg').datagrid('getSelected');
 	 if (row){
-		 pop(800,600,true,'dg','datagrid','/Sp/Sp/add/id/'+row.id);
+		 pop(900,600,true,'dg','datagrid','/Sp/Sp/add/id/'+row.id);
 	 }else{
 		 $.messager.alert('提示', '请选择要操作的记录！','info');
 	 }

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

@@ -30,6 +30,12 @@ body{padding:20px}
             <input type="text" class="form-control" id="inputEmail3" placeholder="请输入配置类型代码" name="code" value="{$info.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/Type/index.html

@@ -61,6 +61,7 @@ onRowContextMenu : onRowContextMenu
 		<tr>
             <th data-options="field:'name',width:40" sortable="true">配置类型</th>
 			<th data-options="field:'code',width:20">配置类型代码</th>
+            <th data-options="field:'v',width:20">配置默认值</th>
             <th data-options="field:'remark',width:40">备注</th>
 			<th data-options="field:'addtime',width:20" sortable="true">创建时间</th>
             <th data-options="field:'updatetime',width:20" sortable="true">更新时间</th>