najixian / xt_dc_admin · Commits

Go to a project

Commit 08168752f4e44c4a87987e871ba1eb13412bdce9

Authored by teemitop
1 parent e3d7b884
build: skipped

bug修复

Inline Side-by-side
Showing 2 changed files with 30 additions and 4 deletions
@@ -313,9 +313,9 @@ class Seller extends Common @@ -313,9 +313,9 @@ class Seller extends Common
313 foreach($array['data'][0]['data'] as $key=>$value){ 313 foreach($array['data'][0]['data'] as $key=>$value){
314 if(!empty($value['activity'])){ 314 if(!empty($value['activity'])){
315 foreach ($value['activity'] as $k => $v) { 315 foreach ($value['activity'] as $k => $v) {
316 - $str[] = $v['id'].'、'.$v['title']; 316 + $str[$key][] = $v['id'].'、'.$v['title'];
317 } 317 }
318 - $array['data'][0]['data'][$key]['activity'] = implode('<br/>', $str); 318 + $array['data'][0]['data'][$key]['activity'] = implode('<br/>', $str[$key]);
319 //$array['data'][0]['data'][$key]['activity'] = implode('<br/>', array_column($value['activity'], 'title')); 319 //$array['data'][0]['data'][$key]['activity'] = implode('<br/>', array_column($value['activity'], 'title'));
320 } 320 }
321 } 321 }
@@ -15,7 +15,20 @@ @@ -15,7 +15,20 @@
15 </div> 15 </div>
16 <input type="hidden" name='id' value="{$data.id}"> 16 <input type="hidden" name='id' value="{$data.id}">
17 {if $data.type eq 2} 17 {if $data.type eq 2}
18 - 18 + <div class="layui-form-item" id="title_tag" style="display:none">
  19 + <label class="layui-form-label">活动标题</label>
  20 + <div class="layui-input-block">
  21 + <div class="layui-form-mid" id="first_html">&nbsp;&nbsp;满</div>
  22 + <div class="layui-input-inline" style="width: 100px;">
  23 + <input type="text" name="max_num" autocomplete="off" class="layui-input" value="{$data.max_num}">
  24 + </div>
  25 + <div class="layui-form-mid" id="mid_html">元，立享</div>
  26 + <div class="layui-input-inline" style="width: 100px;">
  27 + <input type="text" name="min_num" autocomplete="off" class="layui-input" value="{$data.min_num}">
  28 + </div>
  29 + <div class="layui-form-mid" id="last_html">折</div>
  30 + </div>
  31 + </div>
19 {elseif $data.type eq 3} 32 {elseif $data.type eq 3}
20 <div class="layui-form-item" id="title_tag"> 33 <div class="layui-form-item" id="title_tag">
21 <label class="layui-form-label">活动标题</label> 34 <label class="layui-form-label">活动标题</label>
@@ -47,7 +60,20 @@ @@ -47,7 +60,20 @@
47 </div> 60 </div>
48 </div> 61 </div>
49 {elseif $data.type eq 5} 62 {elseif $data.type eq 5}
50 - 63 + <div class="layui-form-item" id="title_tag" style="display:none">
  64 + <label class="layui-form-label">活动标题</label>
  65 + <div class="layui-input-block">
  66 + <div class="layui-form-mid" id="first_html">&nbsp;&nbsp;满</div>
  67 + <div class="layui-input-inline" style="width: 100px;">
  68 + <input type="text" name="max_num" autocomplete="off" class="layui-input" value="{$data.max_num}">
  69 + </div>
  70 + <div class="layui-form-mid" id="mid_html">元，立减</div>
  71 + <div class="layui-input-inline" style="width: 100px;">
  72 + <input type="text" name="min_num" autocomplete="off" class="layui-input" value="{$data.min_num}">
  73 + </div>
  74 + <div class="layui-form-mid" id="last_html">元</div>
  75 + </div>
  76 + </div>
51 {else} 77 {else}
52 <div class="layui-form-item" id="title_tag"> 78 <div class="layui-form-item" id="title_tag">
53 <label class="layui-form-label">活动标题</label> 79 <label class="layui-form-label">活动标题</label>