najixian / xt_dc_admin · Commits

Go to a project

Commit acb6139206debff70e323fec044ed9b5dea222ba

Authored by teemitop
1 parent c6eaed17
build: skipped

代理商页面调整

Inline Side-by-side
Showing 2 changed files with 8 additions and 81 deletions
@@ -17,15 +17,15 @@ class Area extends Common @@ -17,15 +17,15 @@ class Area extends Common
17 if(Request::isAjax()){ 17 if(Request::isAjax()){
18 $data = Request::except('file'); 18 $data = Request::except('file');
19 $key= input('post.key') ? input('post.key') : ""; 19 $key= input('post.key') ? input('post.key') : "";
20 - $channel = @$key['channel'] ? @$key['channel'] : 1;  
21 20
  21 + $keywords= @$key['id'] ? @$key['id'] : '';
  22 +
  23 + $channel = @$key['channel'] ? @$key['channel'] : 1;
22 $address = @$key['address'] ? @$key['address'] : ''; 24 $address = @$key['address'] ? @$key['address'] : '';
23 - $prov = @$key['prov'] ? @$key['prov'] : '';  
24 - $city = @$key['city'] ? @$key['city'] : '';  
25 - $area = @$key['area'] ? @$key['area'] : '';  
26 25
27 26
28 - $limit = '&x='.$data["page"].'&y='.$data["limit"].'&account='.session('username').'&channel=4&address='.$address.'&prov='.$prov.'&city='.$city.'&area='.$area; 27 + $limit = '&x='.$data["page"].'&y='.$data["limit"].'&keywords='.$keywords.'&account='.session('username').'&channel='.$channel.'&address='.$address;
  28 +
29 //获取运营人员列表 29 //获取运营人员列表
30 $list= file_get_contents(ON_LINE.'App.Agent.getSellerList'.$limit); 30 $list= file_get_contents(ON_LINE.'App.Agent.getSellerList'.$limit);
31 $array = json_decode($list,TRUE); 31 $array = json_decode($list,TRUE);
@@ -3,17 +3,6 @@ @@ -3,17 +3,6 @@
3 <fieldset class="layui-elem-field layui-field-title"> 3 <fieldset class="layui-elem-field layui-field-title">
4 <legend>{:$title}</legend> 4 <legend>{:$title}</legend>
5 </fieldset> 5 </fieldset>
6 - <blockquote class="layui-elem-quote">  
7 - <a href="{:url('Seller/sellerList')}" class="layui-btn layui-btn-sm layui-btn-danger">  
8 - <i class="fa fa-file-image-o"></i> 商家信息列表  
9 - </a>  
10 - <a href="{:url('Template/uploadFile')}" class="layui-btn layui-btn-sm">  
11 - <i class="fa fa-file-image-o"></i> GIF图片、短视频上传  
12 - </a>  
13 - <a href="{:url('Template/Vegetable')}" class="layui-btn layui-btn-sm">  
14 - <i class="fa fa-file-image-o"></i> 菜品库管理  
15 - </a>  
16 - </blockquote>  
17 6
18 <div class="demoTable"> 7 <div class="demoTable">
19 商家名称：<div class="layui-inline"> 8 商家名称：<div class="layui-inline">
@@ -33,26 +22,6 @@ @@ -33,26 +22,6 @@
33 </select> 22 </select>
34 </div> 23 </div>
35 </div> 24 </div>
36 - 选择地区:  
37 - <div class="layui-input-inline">  
38 - <form class="layui-form">  
39 - <div class="layui-input-inline">  
40 - <select name="provid" id="provid" lay-filter="provid">  
41 - <option value="">请选择省</option>  
42 - </select>  
43 - </div>  
44 - <div class="layui-input-inline">  
45 - <select name="cityid" id="cityid" lay-filter="cityid">  
46 - <option value="">请选择市</option>  
47 - </select>  
48 - </div>  
49 - <div class="layui-input-inline">  
50 - <select name="areaid" id="areaid" lay-filter="areaid">  
51 - <option value="">请选择县/区</option>  
52 - </select>  
53 - </div>  
54 - </form>  
55 - </div>  
56 25
57 <button class="layui-btn" id="search" data-type="reload">搜索</button> 26 <button class="layui-btn" id="search" data-type="reload">搜索</button>
58 <!-- 备注: 人均消费(130)、店铺评分(4.9,最高5分)、停车场(0/1 无/有)开启单元格编辑 --> 27 <!-- 备注: 人均消费(130)、店铺评分(4.9,最高5分)、停车场(0/1 无/有)开启单元格编辑 -->
@@ -63,24 +32,10 @@ @@ -63,24 +32,10 @@
63 {include file="common/foot"/} 32 {include file="common/foot"/}
64 33
65 <script src="/static/common/js/jquery.2.1.1.min.js"></script> 34 <script src="/static/common/js/jquery.2.1.1.min.js"></script>
66 -<script type="text/javascript" src="/static/city/data.js"></script>  
67 -<script type="text/javascript" src="/static/city/province.js"></script>  
68 -<script type="text/javascript">  
69 - var defaults = {  
70 - s1: 'provid',  
71 - s2: 'cityid',  
72 - s3: 'areaid',  
73 - v1: null,  
74 - v2: null,  
75 - v3: null  
76 - };  
77 -</script>  
78 35
79 <script type="text/html" id="action"> 36 <script type="text/html" id="action">
80 <a class="layui-btn {{ 0==d.status?'':'layui-btn-danger'}} layui-btn-xs" lay-event="stop">{{ 0==d.status?'启用':'停用'}}</a> 37 <a class="layui-btn {{ 0==d.status?'':'layui-btn-danger'}} layui-btn-xs" lay-event="stop">{{ 0==d.status?'启用':'停用'}}</a>
81 <a href="{:url('area/sellerconfig')}?id={{d.id}}&name={{d.sellername}}" class="layui-btn layui-btn-xs">配置</a> 38 <a href="{:url('area/sellerconfig')}?id={{d.id}}&name={{d.sellername}}" class="layui-btn layui-btn-xs">配置</a>
82 - <!--<a href="{:url('Template/configMer')}?id={{d.id}}&name={{d.sellername}}" class="layui-btn layui-btn-xs">配置菜品</a>-->  
83 - <!--<a href="{:url('Basicinfo/smsRecharge')}?id={{d.id}}&name={{d.sellername}}" class="layui-btn layui-btn-xs">短信充值</a>-->  
84 </script> 39 </script>
85 <script> 40 <script>
86 layui.use(['table','form'], function() { 41 layui.use(['table','form'], function() {
@@ -181,25 +136,6 @@ @@ -181,25 +136,6 @@
181 }); 136 });
182 }); 137 });
183 138
184 - //监听行双击事件  
185 - /*table.on('rowDouble(list)', function(obj){  
186 - //table.on('row(list)', function(obj){ 双击事件  
187 - //console.log(obj.tr) //得到当前行元素对象  
188 - console.log(obj.data) //得到当前行数据  
189 - layer.open({  
190 - type: 2,  
191 - title: obj.data.sellername,  
192 - shadeClose: true,  
193 - shade: 0.8,  
194 - area: ['90%', '90%'],  
195 - content: '{:url("sellerdetail")}?sid='+obj.data.id //iframe的url  
196 - success:function(dom){  
197 - let $iframeDom=$(dom[0]).find("iframe").eq(0).contents();  
198 - $iframeDom.find("#test").html("我是从父级传来的值哟……")  
199 - }  
200 - });  
201 - });*/  
202 -  
203 //搜索 139 //搜索
204 $('#search').on('click', function() { 140 $('#search').on('click', function() {
205 var key = $('#key').val(); 141 var key = $('#key').val();
@@ -212,10 +148,7 @@ @@ -212,10 +148,7 @@
212 where:{ 148 where:{
213 key: key, 149 key: key,
214 address: $('#address').val(), 150 address: $('#address').val(),
215 - channel: $('#channel').val(),  
216 - prov: $("#provid").find("option:selected").text(),  
217 - city: $("#cityid").find("option:selected").text(),  
218 - area: $("#areaid").find("option:selected").text() 151 + channel: $('#channel').val()
219 } 152 }
220 }); 153 });
221 }); 154 });
@@ -224,10 +157,7 @@ @@ -224,10 +157,7 @@
224 reload: function(){ 157 reload: function(){
225 var key = $('#key'); 158 var key = $('#key');
226 var channel = $('#channel'); 159 var channel = $('#channel');
227 - var address = $('#address');  
228 - var prov = $("#provid").find("option:selected").text();  
229 - var city = $("#cityid").find("option:selected").text();  
230 - var area = $("#areaid").find("option:selected").text() 160 + var address = $('#address')
231 //执行重载 161 //执行重载
232 table.reload('testReload', { 162 table.reload('testReload', {
233 page: { 163 page: {
@@ -237,10 +167,7 @@ @@ -237,10 +167,7 @@
237 key: { 167 key: {
238 id: key.val(), 168 id: key.val(),
239 channel: channel.val(), 169 channel: channel.val(),
240 - address: address.val(),  
241 - prov: prov,  
242 - city: city,  
243 - area: area 170 + address: address.val()
244 } 171 }
245 } 172 }
246 }); 173 });