王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 64e75bafcafe90b5c23f4ddb90b15e44a0ae4cbd 1 个父辈 b1803adb
1 个管道 的构建 通过 耗费 12 秒

商户申请

内嵌 并排对比
正在显示 8 个修改的文件 包含 175 行增加 和 99 行删除
@@ -55,17 +55,26 @@ class Goods extends Backend @@ -55,17 +55,26 @@ class Goods extends Backend
55 return $this->selectpage(); 55 return $this->selectpage();
56 } 56 }
57 list($where, $sort, $order, $offset, $limit) = $this->buildparams(); 57 list($where, $sort, $order, $offset, $limit) = $this->buildparams();
  58 + //去除余额不足的广告
  59 + $goods = Db::name('goods')->where(['admin_deletetime'=>0])->select();
  60 + $hide_goods_ids = [];
  61 + foreach($goods as $key => $g){
  62 + $money = Db::name('admin')->where(['id'=>$g['admin_id']])->value('money');
  63 + if($money<$g['exp']){
  64 + $hide_goods_ids[] = $g['id'];
  65 + }
  66 + }
58 $total = $this->model 67 $total = $this->model
59 ->with(['admin']) 68 ->with(['admin'])
60 ->where($where) 69 ->where($where)
61 - ->where(['admin_deletetime'=>0]) 70 + ->where(['admin_deletetime'=>0,'goods.id'=>['not in',$hide_goods_ids]])
62 ->order($sort, $order) 71 ->order($sort, $order)
63 ->count(); 72 ->count();
64 73
65 $list = $this->model 74 $list = $this->model
66 ->with(['admin']) 75 ->with(['admin'])
67 ->where($where) 76 ->where($where)
68 - ->where(['admin_deletetime'=>0]) 77 + ->where(['admin_deletetime'=>0,'goods.id'=>['not in',$hide_goods_ids]])
69 ->order($sort, $order) 78 ->order($sort, $order)
70 ->limit($offset, $limit) 79 ->limit($offset, $limit)
71 ->select(); 80 ->select();
@@ -55,17 +55,26 @@ class GoodsAudit extends Backend @@ -55,17 +55,26 @@ class GoodsAudit extends Backend
55 return $this->selectpage(); 55 return $this->selectpage();
56 } 56 }
57 list($where, $sort, $order, $offset, $limit) = $this->buildparams(); 57 list($where, $sort, $order, $offset, $limit) = $this->buildparams();
  58 + //去除余额不足的广告
  59 + $goods = Db::name('goods')->where(['admin_deletetime'=>0])->select();
  60 + $hide_goods_ids = [];
  61 + foreach($goods as $key => $g){
  62 + $money = Db::name('admin')->where(['id'=>$g['admin_id']])->value('money');
  63 + if($money<$g['exp']){
  64 + $hide_goods_ids[] = $g['id'];
  65 + }
  66 + }
58 $total = $this->model 67 $total = $this->model
59 ->with(['admin']) 68 ->with(['admin'])
60 ->where($where) 69 ->where($where)
61 - ->where(['goods_audit.status'=>'1','admin_deletetime'=>0,'admin_is_up'=>1,'user_deletetime'=>0]) 70 + ->where(['goods_audit.status'=>'1','admin_deletetime'=>0,'admin_is_up'=>1,'user_deletetime'=>0,'goods_audit.id'=>['not in',$hide_goods_ids]])
62 ->order($sort, $order) 71 ->order($sort, $order)
63 ->count(); 72 ->count();
64 73
65 $list = $this->model 74 $list = $this->model
66 ->with(['admin']) 75 ->with(['admin'])
67 ->where($where) 76 ->where($where)
68 - ->where(['goods_audit.status'=>'1','admin_deletetime'=>0,'admin_is_up'=>1,'user_deletetime'=>0]) 77 + ->where(['goods_audit.status'=>'1','admin_deletetime'=>0,'admin_is_up'=>1,'user_deletetime'=>0,'goods_audit.id'=>['not in',$hide_goods_ids]])
69 ->order($sort, $order) 78 ->order($sort, $order)
70 ->limit($offset, $limit) 79 ->limit($offset, $limit)
71 ->select(); 80 ->select();
@@ -218,7 +218,7 @@ @@ -218,7 +218,7 @@
218 </dd> 218 </dd>
219 <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd> 219 <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
220 <!--请注意 dd和textarea间不能存在其它任何元素，实际开发中textarea应该添加个hidden进行隐藏--> 220 <!--请注意 dd和textarea间不能存在其它任何元素，实际开发中textarea应该添加个hidden进行隐藏-->
221 - <textarea name="row[question]" class="form-control" cols="30" rows="5">[{"question_type":"","question_name":"","question_answer":"","option":""}]</textarea> 221 + <textarea name="row[question]" class="form-control hidden" cols="30" rows="5">[{"question_type":"","question_name":"","question_answer":"","option":""}]</textarea>
222 </dl> 222 </dl>
223 <script id="questiontpl" type="text/html"> 223 <script id="questiontpl" type="text/html">
224 <dd class="form-inline"> 224 <dd class="form-inline">
@@ -239,7 +239,7 @@ @@ -239,7 +239,7 @@
239 </dd> 239 </dd>
240 <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd> 240 <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
241 <!--请注意 dd和textarea间不能存在其它任何元素，实际开发中textarea应该添加个hidden进行隐藏--> 241 <!--请注意 dd和textarea间不能存在其它任何元素，实际开发中textarea应该添加个hidden进行隐藏-->
242 - <textarea name="row[question]" class="form-control" cols="30" rows="5">{$row.question}</textarea> 242 + <textarea name="row[question]" class="form-control hidden" cols="30" rows="5">{$row.question}</textarea>
243 </dl> 243 </dl>
244 <script id="questiontpl" type="text/html"> 244 <script id="questiontpl" type="text/html">
245 <dd class="form-inline"> 245 <dd class="form-inline">
1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> 1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
2 2
3 <div class="form-group"> 3 <div class="form-group">
4 - <label class="control-label col-xs-12 col-sm-2">{:__('Goods_name')}:</label>  
5 - <div class="col-xs-12 col-sm-8">  
6 - <input id="c-goods_name" data-rule="required" class="form-control" name="row[goods_name]" type="text" value="{$row.goods_name|htmlentities}">  
7 - </div>  
8 - </div>  
9 - <div class="form-group">  
10 - <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label> 4 + <label class="control-label col-xs-12 col-sm-2">{:__('广告类型')}:</label>
11 <div class="col-xs-12 col-sm-8"> 5 <div class="col-xs-12 col-sm-8">
12 -  
13 - <select id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]"> 6 +
  7 + <div class="radio">
14 {foreach name="typeList" item="vo"} 8 {foreach name="typeList" item="vo"}
15 - <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option> 9 + <label class="type" for="row[type]-{$key}"><input class="type" id="row[type]-{$key}" name="row[type]" type="radio" value="{$key}" {in name="key" value="$row['type']"}checked{/in} /> {$vo}</label>
16 {/foreach} 10 {/foreach}
17 - </select> 11 + </div>
18 12
19 </div> 13 </div>
20 </div> 14 </div>
21 <div class="form-group"> 15 <div class="form-group">
22 - <label class="control-label col-xs-12 col-sm-2">{:__('Video')}:</label>  
23 - <div class="col-xs-12 col-sm-8">  
24 - <input id="c-video" class="form-control" name="row[video]" type="text" value="{$row.video|htmlentities}">  
25 - </div>  
26 - </div>  
27 - <div class="form-group">  
28 - <label class="control-label col-xs-12 col-sm-2">{:__('Voice')}:</label> 16 + <label class="control-label col-xs-12 col-sm-2">{:__('Goods_name')}:</label>
29 <div class="col-xs-12 col-sm-8"> 17 <div class="col-xs-12 col-sm-8">
30 - <input id="c-voice" class="form-control" name="row[voice]" type="text" value="{$row.voice|htmlentities}"> 18 + <input id="c-goods_name" data-rule="required" class="form-control" name="row[goods_name]" type="text" value="{$row.goods_name}">
31 </div> 19 </div>
32 </div> 20 </div>
33 - <div class="form-group">  
34 - <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label> 21 + <div class="form-group video" style="display: none;">
  22 + <label class="control-label col-xs-12 col-sm-2">{:__('Video')}:</label>
35 <div class="col-xs-12 col-sm-8"> 23 <div class="col-xs-12 col-sm-8">
36 - <textarea id="c-content" class="form-control editor" rows="5" name="row[content]" cols="50">{$row.content|htmlentities}</textarea> 24 + <!--<input id="c-video" class="form-control" name="row[video]" type="text">-->
  25 + <div class="input-group">
  26 + <input id="c-video" class="form-control" size="50" name="row[video]" type="text" value="{$row.video}">
  27 + <div class="input-group-addon no-border no-padding">
  28 + <span><button type="button" id="plupload-video" class="btn btn-danger plupload" data-input-id="c-video" data-mimetype="mp4,avi,flv,wmv" data-multiple="true" data-preview-id="p-video"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  29 + <span><button type="button" id="fachoose-video" class="btn btn-primary fachoose" data-input-id="c-video" data-mimetype="mp4,avi,flv,wmv" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  30 + </div>
  31 + <span class="msg-box n-right" for="c-video"></span>
  32 + </div>
  33 + <ul class="row list-inline plupload-preview" id="p-video"></ul>
  34 + <!--<div class="input-group">
  35 + <input id="c-video" class="form-control" size="50" name="row[video]" type="text">
  36 + <div class="input-group-addon no-border no-padding">
  37 + <span><button type="button" id="plupload-video" class="btn btn-danger plupload" data-input-id="c-video" data-mimetype="mp4,avi,flv,wmv" data-multiple="false" data-preview-id="p-video"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  38 + <span><button type="button" id="fachoose-video" class="btn btn-primary fachoose" data-input-id="c-video" data-mimetype="mp4,avi,flv,wmv" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  39 + </div>
  40 + <span class="msg-box n-right" for="c-video"></span>
  41 + </div>
  42 + <ul class="row list-inline plupload-preview" id="p-video"></ul>-->
37 </div> 43 </div>
38 </div> 44 </div>
39 - <div class="form-group">  
40 - <label class="control-label col-xs-12 col-sm-2">{:__('View_time')}:</label> 45 + <div class="form-group voice" style="display: none;">
  46 + <label class="control-label col-xs-12 col-sm-2">{:__('Voice')}:</label>
41 <div class="col-xs-12 col-sm-8"> 47 <div class="col-xs-12 col-sm-8">
42 - <input id="c-view_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[view_time]" type="text" value="{:$row.view_time?datetime($row.view_time):''}"> 48 + <!--<input id="c-voice" class="form-control" name="row[voice]" type="text">-->
  49 + <div class="input-group">
  50 + <input id="c-voice" class="form-control" size="50" name="row[voice]" type="text" value="{$row.voice}">
  51 + <div class="input-group-addon no-border no-padding">
  52 + <span><button type="button" id="plupload-voice" class="btn btn-danger plupload" data-input-id="c-voice" data-mimetype="mp3" data-multiple="true" data-preview-id="p-voice"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  53 + <span><button type="button" id="fachoose-voice" class="btn btn-primary fachoose" data-input-id="c-voice" data-mimetype="mp3" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  54 + </div>
  55 + <span class="msg-box n-right" for="c-voice"></span>
  56 + </div>
  57 + <ul class="row list-inline plupload-preview" id="p-voice"></ul>
43 </div> 58 </div>
44 </div> 59 </div>
45 - <div class="form-group">  
46 - <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label> 60 + <div class="form-group content2">
  61 + <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
47 <div class="col-xs-12 col-sm-8"> 62 <div class="col-xs-12 col-sm-8">
48 - <input id="c-start_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[start_time]" type="text" value="{:$row.start_time?datetime($row.start_time):''}"> 63 + <textarea id="c-content" class="form-control editor" rows="5" name="row[content]" cols="50">{$row.content}</textarea>
49 </div> 64 </div>
50 </div> 65 </div>
51 - <div class="form-group">  
52 - <label class="control-label col-xs-12 col-sm-2">{:__('End_time')}:</label> 66 + <div class="form-group view_time">
  67 + <label class="control-label col-xs-12 col-sm-2">{:__('最短观看时间')}:</label>
53 <div class="col-xs-12 col-sm-8"> 68 <div class="col-xs-12 col-sm-8">
54 - <input id="c-end_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[end_time]" type="text" value="{:$row.end_time?datetime($row.end_time):''}"> 69 + <input id="c-view_time" class="form-control" name="row[view_time]" type="number" value="{$row.view_time}">
55 </div> 70 </div>
56 </div> 71 </div>
57 <div class="form-group"> 72 <div class="form-group">
58 - <label class="control-label col-xs-12 col-sm-2">{:__('Sex')}:</label> 73 + <label class="control-label col-xs-12 col-sm-2">{:__('限制性别')}:</label>
59 <div class="col-xs-12 col-sm-8"> 74 <div class="col-xs-12 col-sm-8">
60 -  
61 - <select id="c-sex" class="form-control selectpicker" name="row[sex]"> 75 +
  76 + <div class="radio">
62 {foreach name="sexList" item="vo"} 77 {foreach name="sexList" item="vo"}
63 - <option value="{$key}" {in name="key" value="$row.sex"}selected{/in}>{$vo}</option> 78 + <label for="row[sex]-{$key}"><input id="row[sex]-{$key}" name="row[sex]" type="radio" value="{$key}" {in name="key" value="$row['sex']"}checked{/in} /> {$vo}</label>
64 {/foreach} 79 {/foreach}
65 - </select> 80 + </div>
66 81
67 </div> 82 </div>
68 </div> 83 </div>
69 <div class="form-group"> 84 <div class="form-group">
70 <label class="control-label col-xs-12 col-sm-2">{:__('Min_age')}:</label> 85 <label class="control-label col-xs-12 col-sm-2">{:__('Min_age')}:</label>
71 <div class="col-xs-12 col-sm-8"> 86 <div class="col-xs-12 col-sm-8">
72 - <input id="c-min_age" class="form-control" name="row[min_age]" type="number" value="{$row.min_age|htmlentities}"> 87 + <input id="c-min_age" class="form-control" name="row[min_age]" type="number" value="{$row.min_age}">
73 </div> 88 </div>
74 </div> 89 </div>
75 <div class="form-group"> 90 <div class="form-group">
76 <label class="control-label col-xs-12 col-sm-2">{:__('Max_age')}:</label> 91 <label class="control-label col-xs-12 col-sm-2">{:__('Max_age')}:</label>
77 <div class="col-xs-12 col-sm-8"> 92 <div class="col-xs-12 col-sm-8">
78 - <input id="c-max_age" class="form-control" name="row[max_age]" type="number" value="{$row.max_age|htmlentities}"> 93 + <input id="c-max_age" class="form-control" name="row[max_age]" type="number" value="{$row.max_age}">
79 </div> 94 </div>
80 </div> 95 </div>
81 <div class="form-group"> 96 <div class="form-group">
  97 + <label class="control-label col-xs-12 col-sm-2">{:__('地址')}:</label>
  98 + <div class="col-xs-12 col-sm-8">
  99 + <input id="c-area" data-toggle="addresspicker" data-input-id="c-area" data-lat-id="c-latitude" data-lng-id="c-longitude" class="form-control" name="row[area]" value="{$row.area}" type="text" readonly="true">
  100 + </div>
  101 + </div>
  102 + <!--<div class="form-group">
82 <label class="control-label col-xs-12 col-sm-2">{:__('Province')}:</label> 103 <label class="control-label col-xs-12 col-sm-2">{:__('Province')}:</label>
83 <div class="col-xs-12 col-sm-8"> 104 <div class="col-xs-12 col-sm-8">
84 - <input id="c-province" data-rule="required" class="form-control" name="row[province]" type="text" value="{$row.province|htmlentities}"> 105 + <input id="c-province" data-rule="required" class="form-control" name="row[province]" type="text">
85 </div> 106 </div>
86 </div> 107 </div>
87 <div class="form-group"> 108 <div class="form-group">
88 <label class="control-label col-xs-12 col-sm-2">{:__('City')}:</label> 109 <label class="control-label col-xs-12 col-sm-2">{:__('City')}:</label>
89 <div class="col-xs-12 col-sm-8"> 110 <div class="col-xs-12 col-sm-8">
90 - <div class='control-relative'><input id="c-city" data-rule="required" class="form-control" data-toggle="city-picker" name="row[city]" type="text" value="{$row.city|htmlentities}"></div> 111 + <input id="c-city" data-rule="required" class="form-control" name="row[city]" type="text">
91 </div> 112 </div>
92 </div> 113 </div>
93 <div class="form-group"> 114 <div class="form-group">
94 <label class="control-label col-xs-12 col-sm-2">{:__('County')}:</label> 115 <label class="control-label col-xs-12 col-sm-2">{:__('County')}:</label>
95 <div class="col-xs-12 col-sm-8"> 116 <div class="col-xs-12 col-sm-8">
96 - <input id="c-county" data-rule="required" class="form-control" name="row[county]" type="text" value="{$row.county|htmlentities}"> 117 + <input id="c-county" data-rule="required" class="form-control" name="row[county]" type="text">
97 </div> 118 </div>
98 </div> 119 </div>
99 <div class="form-group"> 120 <div class="form-group">
100 <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label> 121 <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
101 <div class="col-xs-12 col-sm-8"> 122 <div class="col-xs-12 col-sm-8">
102 - <input id="c-address" data-rule="required" class="form-control" name="row[address]" type="text" value="{$row.address|htmlentities}"> 123 + <input id="c-address" data-rule="required" class="form-control" name="row[address]" type="text">
103 </div> 124 </div>
104 - </div>  
105 - <div class="form-group"> 125 + </div>-->
  126 + <div class="form-group hidden" readonly="true">
106 <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label> 127 <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
107 <div class="col-xs-12 col-sm-8"> 128 <div class="col-xs-12 col-sm-8">
108 - <input id="c-longitude" data-rule="required" class="form-control" name="row[longitude]" type="text" value="{$row.longitude|htmlentities}"> 129 + <input id="c-longitude" class="form-control" name="row[longitude]" type="text" value="{$row.longitude}">
109 </div> 130 </div>
110 </div> 131 </div>
111 - <div class="form-group"> 132 + <div class="form-group hidden" readonly="true">
112 <label class="control-label col-xs-12 col-sm-2">{:__('Latitude')}:</label> 133 <label class="control-label col-xs-12 col-sm-2">{:__('Latitude')}:</label>
113 <div class="col-xs-12 col-sm-8"> 134 <div class="col-xs-12 col-sm-8">
114 - <input id="c-latitude" data-rule="required" class="form-control" name="row[latitude]" type="text" value="{$row.latitude|htmlentities}"> 135 + <input id="c-latitude" class="form-control" name="row[latitude]" type="text" value="{$row.latitude}">
115 </div> 136 </div>
116 </div> 137 </div>
117 <div class="form-group"> 138 <div class="form-group">
118 <label class="control-label col-xs-12 col-sm-2">{:__('Distance')}:</label> 139 <label class="control-label col-xs-12 col-sm-2">{:__('Distance')}:</label>
119 <div class="col-xs-12 col-sm-8"> 140 <div class="col-xs-12 col-sm-8">
120 - <input id="c-distance" class="form-control" name="row[distance]" type="number" value="{$row.distance|htmlentities}"> 141 + <input id="c-distance" class="form-control" name="row[distance]" type="number" value="{$row.distance}">
  142 + <p class="text-warning">0为不限</p>
121 </div> 143 </div>
122 </div> 144 </div>
123 <div class="form-group"> 145 <div class="form-group">
124 - <label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label> 146 + <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>
125 <div class="col-xs-12 col-sm-8"> 147 <div class="col-xs-12 col-sm-8">
126 - <input id="c-url" class="form-control" name="row[url]" type="text" value="{$row.url|htmlentities}"> 148 + <input id="c-start_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[start_time]" type="text" value="{:date('Y-m-d',$row['start_time'])}">
127 </div> 149 </div>
128 </div> 150 </div>
129 <div class="form-group"> 151 <div class="form-group">
130 - <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label> 152 + <label class="control-label col-xs-12 col-sm-2">{:__('End_time')}:</label>
131 <div class="col-xs-12 col-sm-8"> 153 <div class="col-xs-12 col-sm-8">
132 -  
133 - <div class="radio">  
134 - {foreach name="statusList" item="vo"}  
135 - <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label>  
136 - {/foreach}  
137 - </div>  
138 - 154 + <input id="c-end_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[end_time]" type="text" value="{:date('Y-m-d',$row['end_time'])}">
139 </div> 155 </div>
140 </div> 156 </div>
141 <div class="form-group"> 157 <div class="form-group">
142 - <label class="control-label col-xs-12 col-sm-2">{:__('Exp')}:</label> 158 + <label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>
143 <div class="col-xs-12 col-sm-8"> 159 <div class="col-xs-12 col-sm-8">
144 - <input id="c-exp" data-rule="required" class="form-control" name="row[exp]" type="number" value="{$row.exp|htmlentities}"> 160 + <input id="c-url" class="form-control" name="row[url]" type="text" value="{$row.url}">
145 </div> 161 </div>
146 </div> 162 </div>
147 <div class="form-group"> 163 <div class="form-group">
148 - <label class="control-label col-xs-12 col-sm-2">{:__('View')}:</label> 164 + <label class="control-label col-xs-12 col-sm-2">{:__('Exp')}:</label>
149 <div class="col-xs-12 col-sm-8"> 165 <div class="col-xs-12 col-sm-8">
150 - <input id="c-view" class="form-control" name="row[view]" type="number" value="{$row.view|htmlentities}"> 166 + <input id="c-exp" class="form-control" name="row[exp]" type="number" value="{$row.exp}">
151 </div> 167 </div>
152 </div> 168 </div>
  169 + <!--<div class="form-group">
  170 + <label class="control-label col-xs-12 col-sm-2">{:__('View')}:</label>
  171 + <div class="col-xs-12 col-sm-8">
  172 + <input id="c-view" class="form-control" name="row[view]" type="number" value="0">
  173 + </div>
  174 + </div>-->
153 <div class="form-group"> 175 <div class="form-group">
154 <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label> 176 <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
155 <div class="col-xs-12 col-sm-8"> 177 <div class="col-xs-12 col-sm-8">
156 <div class="input-group"> 178 <div class="input-group">
157 - <input id="c-images" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}"> 179 + <input id="c-images" class="form-control" size="50" name="row[images]" type="text" value="{$row.images}">
158 <div class="input-group-addon no-border no-padding"> 180 <div class="input-group-addon no-border no-padding">
159 <span><button type="button" id="plupload-images" class="btn btn-danger plupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span> 181 <span><button type="button" id="plupload-images" class="btn btn-danger plupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
160 <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span> 182 <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -165,57 +187,84 @@ @@ -165,57 +187,84 @@
165 </div> 187 </div>
166 </div> 188 </div>
167 <div class="form-group"> 189 <div class="form-group">
168 - <label class="control-label col-xs-12 col-sm-2">{:__('User_is_up')}:</label> 190 + <label class="control-label col-xs-12 col-sm-2">{:__('商户端上架状态')}:</label>
169 <div class="col-xs-12 col-sm-8"> 191 <div class="col-xs-12 col-sm-8">
170 -  
171 - <select id="c-user_is_up" class="form-control selectpicker" name="row[user_is_up]"> 192 +
  193 + <div class="radio">
172 {foreach name="userIsUpList" item="vo"} 194 {foreach name="userIsUpList" item="vo"}
173 - <option value="{$key}" {in name="key" value="$row.user_is_up"}selected{/in}>{$vo}</option> 195 + <label for="row[user_is_up]-{$key}"><input id="row[user_is_up]-{$key}" name="row[user_is_up]" type="radio" value="{$key}" {in name="key" value="$row.user_is_up"}checked{/in} /> {$vo}</label>
174 {/foreach} 196 {/foreach}
175 - </select>  
176 - 197 + </div>
177 </div> 198 </div>
178 </div> 199 </div>
179 <div class="form-group"> 200 <div class="form-group">
180 - <label class="control-label col-xs-12 col-sm-2">{:__('Admin_is_up')}:</label> 201 + <label class="control-label col-xs-12 col-sm-2">{:__('管理端上架状态')}:</label>
181 <div class="col-xs-12 col-sm-8"> 202 <div class="col-xs-12 col-sm-8">
182 -  
183 - <select id="c-admin_is_up" class="form-control selectpicker" name="row[admin_is_up]"> 203 +
  204 + <div class="radio">
184 {foreach name="adminIsUpList" item="vo"} 205 {foreach name="adminIsUpList" item="vo"}
185 - <option value="{$key}" {in name="key" value="$row.admin_is_up"}selected{/in}>{$vo}</option> 206 + <label for="row[admin_is_up]-{$key}"><input id="row[admin_is_up]-{$key}" name="row[admin_is_up]" type="radio" value="{$key}" {in name="key" value="$row.admin_is_up"}checked{/in} /> {$vo}</label>
186 {/foreach} 207 {/foreach}
187 - </select>  
188 -  
189 - </div>  
190 - </div>  
191 - <div class="form-group">  
192 - <label class="control-label col-xs-12 col-sm-2">{:__('User_deletetime')}:</label>  
193 - <div class="col-xs-12 col-sm-8">  
194 - <input id="c-user_deletetime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[user_deletetime]" type="text" value="{:$row.user_deletetime?datetime($row.user_deletetime):''}">  
195 - </div>  
196 - </div>  
197 - <div class="form-group">  
198 - <label class="control-label col-xs-12 col-sm-2">{:__('Admin_deletetime')}:</label>  
199 - <div class="col-xs-12 col-sm-8">  
200 - <input id="c-admin_deletetime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[admin_deletetime]" type="text" value="{:$row.admin_deletetime?datetime($row.admin_deletetime):''}"> 208 + </div>
201 </div> 209 </div>
202 </div> 210 </div>
203 <div class="form-group"> 211 <div class="form-group">
204 - <label class="control-label col-xs-12 col-sm-2">{:__('Question')}:</label> 212 + <label class="control-label col-xs-12 col-sm-2">{:__('审核状态')}:</label>
205 <div class="col-xs-12 col-sm-8"> 213 <div class="col-xs-12 col-sm-8">
206 - <textarea id="c-question" class="form-control " rows="5" name="row[question]" cols="50">{$row.question|htmlentities}</textarea> 214 +
  215 + <div class="radio">
  216 + {foreach name="statusList" item="vo"}
  217 + <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label>
  218 + {/foreach}
  219 + </div>
207 </div> 220 </div>
208 </div> 221 </div>
  222 + <!--<a href="" title="添加" class="dialogit">添加</a>-->
209 <div class="form-group"> 223 <div class="form-group">
210 - <label class="control-label col-xs-12 col-sm-2">{:__('Area')}:</label> 224 + <label class="control-label col-xs-12 col-sm-2">{:__('题')}:</label>
211 <div class="col-xs-12 col-sm-8"> 225 <div class="col-xs-12 col-sm-8">
212 - <input id="c-area" class="form-control" name="row[area]" type="text" value="{$row.area|htmlentities}"> 226 + <!--<a href="" title="添加" class="dialogit btn btn-success btn-embossed">添加</a>-->
  227 + <!--<div id="toolbar" class="toolbar">
  228 + <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('question/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
  229 + </div>
  230 + <table id="table" class="table table-striped table-bordered table-hover table-nowrap">
  231 +
  232 + </table>-->
  233 + <dl class="fieldlist" data-template="questiontpl" data-name="row[question]">
  234 + <dd>
  235 + <ins>{:__('问题类型')}</ins>
  236 + <ins>{:__('问题')}</ins>
  237 + <ins>{:__('正确答案')}</ins>
  238 + <ins>{:__('选项')}<span class="text-warning">多个选项使用英文格式逗号隔开</span></ins>
  239 + </dd>
  240 + <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
  241 + <!--请注意 dd和textarea间不能存在其它任何元素，实际开发中textarea应该添加个hidden进行隐藏-->
  242 + <textarea name="row[question]" class="form-control hidden" cols="30" rows="5">{$row.question}</textarea>
  243 + </dl>
  244 + <script id="questiontpl" type="text/html">
  245 + <dd class="form-inline">
  246 + <ins>
  247 + <select class="form-control" data-live-search="true" name="<%=name%>[<%=index%>][question_type]" style="width: 100%">
  248 + <option value="" >请选择</option>
  249 + <option value="2" <%if(row.question_type==2){%>selected<%}%> >选择题</option>
  250 + <option value="1" <%if(row.question_type==1){%>selected<%}%> >填空题</option>
  251 + </select>
  252 + </ins>
  253 + <ins><input type="text" name="<%=name%>[<%=index%>][question_name]" class="form-control" value="<%=row.question_name%>" placeholder="问题"/></ins>
  254 + <ins><input type="text" name="<%=name%>[<%=index%>][question_answer]" class="form-control" value="<%=row.question_answer%>" placeholder="正确答案"/></ins>
  255 + <ins><input type="text" name="<%=name%>[<%=index%>][option]" class="form-control" value="<%=row.option%>" placeholder="选项"/></ins>
  256 + <!--下面的两个按钮务必保留-->
  257 + <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span>
  258 + <!--<span class="btn btn-sm btn-primary btn-dragsort"><i class="fa fa-arrows"></i></span>-->
  259 + </dd>
  260 + </script>
213 </div> 261 </div>
214 </div> 262 </div>
215 <div class="form-group layer-footer"> 263 <div class="form-group layer-footer">
216 <label class="control-label col-xs-12 col-sm-2"></label> 264 <label class="control-label col-xs-12 col-sm-2"></label>
217 <div class="col-xs-12 col-sm-8"> 265 <div class="col-xs-12 col-sm-8">
218 <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button> 266 <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
  267 + <!--<input type="hidden" name="ids" value="{$row.id}"/>-->
219 <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button> 268 <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
220 </div> 269 </div>
221 </div> 270 </div>
@@ -218,7 +218,7 @@ @@ -218,7 +218,7 @@
218 </dd> 218 </dd>
219 <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd> 219 <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
220 <!--请注意 dd和textarea间不能存在其它任何元素，实际开发中textarea应该添加个hidden进行隐藏--> 220 <!--请注意 dd和textarea间不能存在其它任何元素，实际开发中textarea应该添加个hidden进行隐藏-->
221 - <textarea name="row[question]" class="form-control" cols="30" rows="5">[{"question_type":"","question_name":"","question_answer":"","option":""}]</textarea> 221 + <textarea name="row[question]" class="form-control hidden" cols="30" rows="5">[{"question_type":"","question_name":"","question_answer":"","option":""}]</textarea>
222 </dl> 222 </dl>
223 <script id="questiontpl" type="text/html"> 223 <script id="questiontpl" type="text/html">
224 <dd class="form-inline"> 224 <dd class="form-inline">
@@ -217,7 +217,7 @@ @@ -217,7 +217,7 @@
217 </dd> 217 </dd>
218 <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd> 218 <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
219 <!--请注意 dd和textarea间不能存在其它任何元素，实际开发中textarea应该添加个hidden进行隐藏--> 219 <!--请注意 dd和textarea间不能存在其它任何元素，实际开发中textarea应该添加个hidden进行隐藏-->
220 - <textarea name="row[question]" class="form-control" cols="30" rows="5">{$row.question}</textarea> 220 + <textarea name="row[question]" class="form-control hidden" cols="30" rows="5">{$row.question}</textarea>
221 </dl> 221 </dl>
222 <script id="questiontpl" type="text/html"> 222 <script id="questiontpl" type="text/html">
223 <dd class="form-inline"> 223 <dd class="form-inline">
@@ -33,6 +33,15 @@ class Index extends WechatBase @@ -33,6 +33,15 @@ class Index extends WechatBase
33 $goods_ids[] = $value['goods_id']; 33 $goods_ids[] = $value['goods_id'];
34 } 34 }
35 } 35 }
  36 + //去除余额不足的广告
  37 + $goods = Db::name('goods')->where(['admin_deletetime'=>0])->select();
  38 + $goods_ids = [];
  39 + foreach($goods as $key => $g){
  40 + $money = Db::name('admin')->where(['id'=>$g['admin_id']])->value('money');
  41 + if($money<$g['exp']){
  42 + $goods_ids[] = $g['id'];
  43 + }
  44 + }
36 $goodsModel = new Goods(); 45 $goodsModel = new Goods();
37 $data = $goodsModel->selectPageData(['id'=>['not in',$goods_ids]],1,5); 46 $data = $goodsModel->selectPageData(['id'=>['not in',$goods_ids]],1,5);
38 foreach($data as $key => $vo){ 47 foreach($data as $key => $vo){