Commit bf5175b2 by 朱继来

调整

parent 635bfdd5
...@@ -18,26 +18,16 @@ ...@@ -18,26 +18,16 @@
<dd style="width:auto !important;"> <dd style="width:auto !important;">
<div class="droplist" data-default="{{$condition['order_type']}}" id="order_type" name="order_type"> <div class="droplist" data-default="{{$condition['order_type']}}" id="order_type" name="order_type">
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li class="order_type_tab" data-val="">会员账号</li> <li class="order_type_tab active" data-val="">订单编号</li>
<li class="order_type_tab" data-val="4">会员ID</li> <li class="order_type_tab" data-val="1">会员账号</li>
<li class="order_type_tab" data-val="4">会员ID</li>
<li class="order_type_tab" data-val="2">型号名称</li>
</ul> </ul>
</div> </div>
</dd> </dd>
<dd class="order_contain"><input type="text" name="order_contain" value="{{$condition['order_contain']}}" placeholder="请输入内容"></dd> <dd class="order_contain"><input type="text" name="order_contain" value="{{$condition['order_contain']}}" placeholder="请输入内容"></dd>
</dl> </dl>
<dl> <dl>
<dt>订单编号:</dt>
<dd>
<input type="text" name="order_sn" value="{{$condition['order_sn']}}" placeholder="请输入订单编号">
</dd>
</dl>
<dl>
<dt>型号名称:</dt>
<dd>
<input type="text" name="goods_name" value="{{$condition['goods_name']}}" placeholder="请输入型号名称">
</dd>
</dl>
<dl>
<dt>创建日期: </dt> <dt>创建日期: </dt>
<dd style="width:auto !important;"> <dd style="width:auto !important;">
<input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" /> <input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" />
...@@ -148,6 +138,18 @@ ...@@ -148,6 +138,18 @@
</dl> </dl>
@endif @endif
<dl>
<dt>adtag来源:</dt>
<dd>
<input type="text" name="order_source_adtag" value="{{$condition['order_source_adtag']}}" placeholder="请输入内容">
</dd>
</dl>
<dl>
<dt>ptag来源:</dt>
<dd>
<input type="text" name="order_source_ptag" value="{{$condition['order_source_ptag']}}" placeholder="请输入内容">
</dd>
</dl>
@if ($username != 'vpadmin@ichunt.com') @if ($username != 'vpadmin@ichunt.com')
<dl> <dl>
<dt>同步状态:</dt> <dt>同步状态:</dt>
...@@ -254,18 +256,7 @@ ...@@ -254,18 +256,7 @@
<td class="show-list"><?php print_r(App\Http\Controllers\getAccountName($v['user_id'])); ?></td> <td class="show-list"><?php print_r(App\Http\Controllers\getAccountName($v['user_id'])); ?></td>
<td class="show-list"> <td class="show-list">
@if ($v['order_type'] == 1) @if ($v['order_type'] == 1)
<p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}" style="width: 200px;"> <p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}" style="width: 200px;">{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}</p>
<?php
$company_name = App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id']);
$mb_strlen = mb_strlen($company_name);
if ($mb_strlen > 8) {
echo mb_substr($company_name, 0, 8).'...'; // 截取8个字符
} else {
echo $company_name;
}
?>
</p>
@endif @endif
</td> </td>
<td class="show-list">{{$v['order_sn']}}</td> <td class="show-list">{{$v['order_sn']}}</td>
......
...@@ -18,8 +18,10 @@ ...@@ -18,8 +18,10 @@
<dd style="width:auto !important;"> <dd style="width:auto !important;">
<div class="droplist" data-default="{{$condition['order_type']}}" id="order_type" name="order_type"> <div class="droplist" data-default="{{$condition['order_type']}}" id="order_type" name="order_type">
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li class="order_type_tab" data-val="">会员账号</li> <li class="order_type_tab active" data-val="">订单编号</li>
<li class="order_type_tab" data-val="1">会员账号</li>
<li class="order_type_tab" data-val="4">会员ID</li> <li class="order_type_tab" data-val="4">会员ID</li>
<li class="order_type_tab" data-val="2">型号名称</li>
<li class="order_type_tab" data-val="3">发票抬头</li> <li class="order_type_tab" data-val="3">发票抬头</li>
</ul> </ul>
</div> </div>
...@@ -27,18 +29,6 @@ ...@@ -27,18 +29,6 @@
<dd class="order_contain"><input type="text" name="order_contain" value="{{$condition['order_contain']}}" placeholder="请输入内容"></dd> <dd class="order_contain"><input type="text" name="order_contain" value="{{$condition['order_contain']}}" placeholder="请输入内容"></dd>
</dl> </dl>
<dl> <dl>
<dt>订单编号:</dt>
<dd>
<input type="text" name="order_sn" value="{{$condition['order_sn']}}" placeholder="请输入订单编号">
</dd>
</dl>
<dl>
<dt>型号名称:</dt>
<dd>
<input type="text" name="goods_name" value="{{$condition['goods_name']}}" placeholder="请输入型号名称">
</dd>
</dl>
<dl>
<dt>创建日期: </dt> <dt>创建日期: </dt>
<dd style="width:auto !important;"> <dd style="width:auto !important;">
<input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" /> <input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" />
...@@ -256,18 +246,7 @@ ...@@ -256,18 +246,7 @@
</td> </td>
<td class="show-list"> <td class="show-list">
@if ($v['order_type'] == 1) @if ($v['order_type'] == 1)
<p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}" style="width: 200px;"> <p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}" style="width: 200px;">{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}</p>
<?php
$company_name = App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id']);
$mb_strlen = mb_strlen($company_name);
if ($mb_strlen > 8) {
echo mb_substr($company_name, 0, 8).'...'; // 截取8个字符
} else {
echo $company_name;
}
?>
</p>
@endif @endif
</td> </td>
<td class="show-list">{{$v['order_sn']}}</td> <td class="show-list">{{$v['order_sn']}}</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment