刘朕 / qiaohu · 提交

转到一个项目

作者 刘朕
提交 48918f5e5e8b79c0bead1b6f7049e60ecbb30e75 1 个父辈 21572fa7
1 个管道 的构建 通过 耗费 0 秒

渠道关闭提示页面，字段管理优化

内嵌 并排对比
正在显示 9 个修改的文件 包含 123 行增加 和 19 行删除
@@ -125,6 +125,9 @@ class OrderOptionController extends AdminBaseController @@ -125,6 +125,9 @@ class OrderOptionController extends AdminBaseController
125 } 125 }
126 $post['values'] = str_replace('，', ',', trim($post['values'])); 126 $post['values'] = str_replace('，', ',', trim($post['values']));
127 } 127 }
  128 + if(empty($post['is_show'])) {
  129 + $post['is_show'] = 0;
  130 + }
128 $result = $this->order_option_model->addOption($post); 131 $result = $this->order_option_model->addOption($post);
129 if (!$result) { 132 if (!$result) {
130 $this->error('添加失败'); 133 $this->error('添加失败');
@@ -186,6 +189,9 @@ class OrderOptionController extends AdminBaseController @@ -186,6 +189,9 @@ class OrderOptionController extends AdminBaseController
186 } 189 }
187 $post['values'] = str_replace('，', ',', trim($post['values'])); 190 $post['values'] = str_replace('，', ',', trim($post['values']));
188 } 191 }
  192 + if(empty($post['is_show'])) {
  193 + $post['is_show'] = 0;
  194 + }
189 $result = $this->order_option_model->editOption($post); 195 $result = $this->order_option_model->editOption($post);
190 if (!$result) { 196 if (!$result) {
191 $this->error('修改失败'); 197 $this->error('修改失败');
@@ -14,17 +14,19 @@ class OrderOptionValidate extends Validate @@ -14,17 +14,19 @@ class OrderOptionValidate extends Validate
14 { 14 {
15 15
16 protected $rule = [ 16 protected $rule = [
17 - 'name' => 'require',  
18 - 'icon' => 'require',  
19 - 'sort' => 'require|number|between:1,11', 17 + 'name' => 'require',
  18 + 'icon' => 'require',
  19 + 'sort' => 'require|number|between:1,11',
  20 + 'is_show' => 'in:0,1',
20 ]; 21 ];
21 22
22 protected $message = [ 23 protected $message = [
23 - 'name.require' => '名称不能为空',  
24 - 'icon.require' => '图标不能为空',  
25 - 'sort.require' => '类型不能为空',  
26 - 'sort.number' => '类型必须为数字',  
27 - 'sort.between' => '类型值必须在1-11之间', 24 + 'name.require' => '名称不能为空',
  25 + 'icon.require' => '图标不能为空',
  26 + 'sort.require' => '类型不能为空',
  27 + 'sort.number' => '类型必须为数字',
  28 + 'sort.between' => '类型值必须在1-11之间',
  29 + 'is_show.between' => '用户是否可见值必须在0-1之间',
28 ]; 30 ];
29 31
30 // protected $scene = [ 32 // protected $scene = [
@@ -148,16 +148,18 @@ class OrderController extends HomeBaseController @@ -148,16 +148,18 @@ class OrderController extends HomeBaseController
148 $orderInfo['options'] = json_decode($orderInfo['options'],true); 148 $orderInfo['options'] = json_decode($orderInfo['options'],true);
149 foreach ($orderInfo['options'] as $k=>$v) { 149 foreach ($orderInfo['options'] as $k=>$v) {
150 $optionsInfo = $this->singleData($this->option_table,['id'=>$v['id']]); 150 $optionsInfo = $this->singleData($this->option_table,['id'=>$v['id']]);
151 - $v['name'] = $optionsInfo['name'];  
152 - $v['html'] = $this->form_model($v);  
153 - if($k <= 5) {  
154 - $orderInfo['groupA'][] = $v;  
155 - } elseif ($k <= 11) {  
156 - $orderInfo['groupB'][] = $v;  
157 - } elseif ($k <= 17) {  
158 - $orderInfo['groupC'][] = $v;  
159 - } else {  
160 - $orderInfo['groupD'][] = $v; 151 + if($optionsInfo['is_show'] == 1) {
  152 + $v['name'] = $optionsInfo['name'];
  153 + $v['html'] = $this->form_model($v);
  154 + if($k <= 5) {
  155 + $orderInfo['groupA'][] = $v;
  156 + } elseif ($k <= 11) {
  157 + $orderInfo['groupB'][] = $v;
  158 + } elseif ($k <= 17) {
  159 + $orderInfo['groupC'][] = $v;
  160 + } else {
  161 + $orderInfo['groupD'][] = $v;
  162 + }
161 } 163 }
162 } 164 }
163 $this->assign('orderInfo',$orderInfo); 165 $this->assign('orderInfo',$orderInfo);
@@ -52,7 +52,7 @@ class RegisterController extends HomeBaseController @@ -52,7 +52,7 @@ class RegisterController extends HomeBaseController
52 if(!empty($token)) { 52 if(!empty($token)) {
53 $channel = Db::name('Channel')->where(['token'=>$token,'delete_time'=>0])->find(); 53 $channel = Db::name('Channel')->where(['token'=>$token,'delete_time'=>0])->find();
54 if(!$channel) { 54 if(!$channel) {
55 - $this->error('该渠道已停止注册'); 55 + return $this->fetch(":close");
56 } 56 }
57 Session::set('channel',$channel['id']); 57 Session::set('channel',$channel['id']);
58 } 58 }
@@ -44,6 +44,16 @@ @@ -44,6 +44,16 @@
44 <p class="help-block">多取值范围之间用英文逗号隔开</p> 44 <p class="help-block">多取值范围之间用英文逗号隔开</p>
45 </td> 45 </td>
46 </tr> 46 </tr>
  47 + <tr>
  48 + <th>用户是否可见<span class="form-required">*</span></th>
  49 + <td>
  50 + <div class="checkbox">
  51 + <label>
  52 + <input type="checkbox" name="is_show" value="1" checked> 可见
  53 + </label>
  54 + </div>
  55 + </td>
  56 + </tr>
47 </table> 57 </table>
48 <div class="form-group"> 58 <div class="form-group">
49 <div class="col-sm-offset-2 col-sm-10"> 59 <div class="col-sm-offset-2 col-sm-10">
@@ -45,6 +45,16 @@ @@ -45,6 +45,16 @@
45 <p class="help-block">多取值范围之间用英文逗号隔开</p> 45 <p class="help-block">多取值范围之间用英文逗号隔开</p>
46 </td> 46 </td>
47 </tr> 47 </tr>
  48 + <tr>
  49 + <th>用户是否可见<span class="form-required">*</span></th>
  50 + <td>
  51 + <div class="checkbox">
  52 + <label>
  53 + <input type="checkbox" name="is_show" value="1" <eq name="is_show" value="1">checked</eq>> 可见
  54 + </label>
  55 + </div>
  56 + </td>
  57 + </tr>
48 </table> 58 </table>
49 <div class="form-group"> 59 <div class="form-group">
50 <div class="col-sm-offset-2 col-sm-10"> 60 <div class="col-sm-offset-2 col-sm-10">
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
42 <th>字段名称</th> 42 <th>字段名称</th>
43 <th>字段类型</th> 43 <th>字段类型</th>
44 <th>取值范围（部分类型使用）</th> 44 <th>取值范围（部分类型使用）</th>
  45 + <th>用户是否可见</th>
45 <th width="130">更新时间</th> 46 <th width="130">更新时间</th>
46 <th width="130">发布时间</th> 47 <th width="130">发布时间</th>
47 <th width="90">操作</th> 48 <th width="90">操作</th>
@@ -57,6 +58,7 @@ @@ -57,6 +58,7 @@
57 <td>{$vo.name}</td> 58 <td>{$vo.name}</td>
58 <td>{$typeList[$vo.sort]}</td> 59 <td>{$typeList[$vo.sort]}</td>
59 <td><if condition="$vo['sort'] eq 4 or $vo['sort'] eq 5 or $vo['sort'] eq 7">{$vo.values}</if></td> 60 <td><if condition="$vo['sort'] eq 4 or $vo['sort'] eq 5 or $vo['sort'] eq 7">{$vo.values}</if></td>
  61 + <td><eq name="vo.is_show" value="0">否</eq><eq name="vo.is_show" value="1">是</eq></td>
60 <td>{:date('Y-m-d H:i',$vo.create_time)}</td> 62 <td>{:date('Y-m-d H:i',$vo.create_time)}</td>
61 <td>{:date('Y-m-d H:i',$vo.update_time)}</td> 63 <td>{:date('Y-m-d H:i',$vo.update_time)}</td>
62 <td> 64 <td>
@@ -73,6 +75,7 @@ @@ -73,6 +75,7 @@
73 <th>字段名称</th> 75 <th>字段名称</th>
74 <th>字段类型</th> 76 <th>字段类型</th>
75 <th>取值范围（部分类型使用）</th> 77 <th>取值范围（部分类型使用）</th>
  78 + <th>用户是否可见</th>
76 <th width="130">更新时间</th> 79 <th width="130">更新时间</th>
77 <th width="130">发布时间</th> 80 <th width="130">发布时间</th>
78 <th width="90">操作</th> 81 <th width="90">操作</th>
  1 +<!DOCTYPE html>
  2 +<html>
  3 +
  4 +<head>
  5 + <meta charset="UTF-8">
  6 + <include file="public@head_common"/>
  7 + <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/augly.css" />
  8 + <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/pay/my_pay.css" />
  9 + <title>渠道注册</title>
  10 + <style type="text/css">
  11 + .public_title {
  12 + text-align: center;
  13 + color: #222222;
  14 + font-size: .36rem;
  15 + font-weight: bold;
  16 + line-height: .6rem;
  17 + }
  18 + .public_word {
  19 + text-align: center;
  20 + color: #666666;
  21 + font-size: .3rem;
  22 + line-height: .6rem;
  23 + }
  24 + .btn {
  25 + margin-top: 0.2rem;
  26 + }
  27 + </style>
  28 +</head>
  29 +
  30 +<body>
  31 +<div class="header">
  32 + <div class="return">
  33 + <span class="back_href">
  34 + <i class="iconfont icon-jiantou-copy"></i>返回
  35 + </span>
  36 + </div>
  37 + 渠道注册
  38 +</div>
  39 +<div class="test_num"></div>
  40 +<div class="header_place"></div>
  41 +<!--banner-->
  42 +<div class="banner">
  43 + <img src="__TMPL__/public/mobile/images/banner@2x_14.png" />
  44 +</div>
  45 +
  46 +<div class="see_order">
  47 + <div class="public_title">对不起，该注册通道已关闭</div>
  48 + <div class="public_word">请您用其他方式注册</div>
  49 +
  50 + <div class="btn">
  51 + 返回首页
  52 + </div>
  53 +</div>
  54 +
  55 +<div class="bottom_icon position_a">
  56 + <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
  57 + <p class="bottom_text">{$site_info.site_name}</p>
  58 +</div>
  59 +<script src="__TMPL__/public/mobile/js/jquery-2.1.0.js" type="text/javascript" charset="utf-8"></script>
  60 +<script src="__TMPL__/public/mobile/js/swiper-4.3.5.min.js" type="text/javascript" charset="utf-8"></script>
  61 +<script type="text/javascript">
  62 + $('.btn').click(function(){
  63 + window.location.href = "{:url('portal/Index/index')}";
  64 + });
  65 + $('.return').click(function(){
  66 + window.location.href = "{:url('portal/Index/index')}";
  67 + });
  68 +</script>
  69 +</body>
  70 +
  71 +</html>