anyv / xkeasy · 提交

转到一个项目

作者 王晓刚
提交 0f4eb18b488677574731ba5a8c812a19a306f94c 2 个父辈 31c57c18 2d4f5020
1 个管道 的构建 通过 耗费 0 秒

合并分支 'wangxiaogang' 到 'master' 

去除收货地址为空的订单



查看合并请求 !118
内嵌 并排对比
正在显示 1 个修改的文件 包含 38 行增加 和 16 行删除
... ... @@ -65,25 +65,47 @@
<!-- 地址 -->
<div class="order_address">
<!-- 有地址 -->
<a href="">
<div class="order_addressYes">
<div class="or_addressYesImg1">
<img src="__TMPL__/public/assets/images/38.png" alt=""/>
</div>
<div class="or_addressYesTxt1">
<div class="or_addressYesTxt2">
<div class="or_addressName">{$data.address.name}</div>
<p class="or_addressPhone">{$data.phone}</p>
<if condition="$data.is_courier eq 1">
<a href="">
<div class="order_addressYes">
<div class="or_addressYesImg1">
<img src="__TMPL__/public/assets/images/38.png" alt=""/>
</div>
<div class="or_addressYesTxt1">
<div class="or_addressYesTxt2">
<div class="or_addressName">{$data.name}</div>
<p class="or_addressPhone">{$data.phone}</p>
</div>
<p class="or_address_detailed">
{$data.school}{$data.grade}{$data.class}
</p>
</div>
<div class="or_addressYesImg2">
<img src="__TMPL__/public/assets/images/29.png" alt=""/>
</div>
<p class="or_address_detailed">
{$data.address.region}{$data.address.detailed}
</p>
</div>
<div class="or_addressYesImg2">
<img src="__TMPL__/public/assets/images/29.png" alt=""/>
</a>
<else />
<a href="">
<div class="order_addressYes">
<div class="or_addressYesImg1">
<img src="__TMPL__/public/assets/images/38.png" alt=""/>
</div>
<div class="or_addressYesTxt1">
<div class="or_addressYesTxt2">
<div class="or_addressName">{$data.address.name}</div>
<p class="or_addressPhone">{$data.address.phone}</p>
</div>
<p class="or_address_detailed">
{$data.address.region}{$data.address.detailed}
</p>
</div>
<div class="or_addressYesImg2">
<img src="__TMPL__/public/assets/images/29.png" alt=""/>
</div>
</div>
</div>
</a>
</a>
</if>
</div>
<!-- 订单信息 -->
<div class="order_news">
... ...