From 3a6eeb4f5444599be6e7cd6fb1bf3911b9a60681 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 2 May 2018 19:10:40 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9store?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=88=E5=BC=80=E5=8F=91=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/store/controller/Order.php | 22 +++++++-------
application/store/view/order/address.html | 10 +++----
application/store/view/order/index.html | 35 ++++++++++++++---------
3 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/application/store/controller/Order.php b/application/store/controller/Order.php
index 11f9afd5e..c484bace3 100644
--- a/application/store/controller/Order.php
+++ b/application/store/controller/Order.php
@@ -74,15 +74,15 @@ class Order extends BasicAdmin
// =============== 收货地址过滤 ===============
$expressWhere = [];
if (isset($get['express_title']) && $get['express_title'] !== '') {
- $expressWhere[] = ['real_express_title|express_title', 'like', "%{$get['express_title']}%"];
+ $expressWhere[] = ['send_company_title|company_title', 'like', "%{$get['express_title']}%"];
}
- foreach (['real_express_no', 'express_province', 'express_city', 'express_area', 'express_username', 'express_phone'] as $field) {
+ foreach (['send_no', 'username', 'phone', 'province', 'city', 'area', 'address'] as $field) {
if (isset($get[$field]) && $get[$field] !== '') {
$expressWhere[] = [$field, 'like', "%{$get[$field]}%"];
}
}
if (isset($get['send_status']) && $get['send_status'] !== '') {
- $expressWhere[] = empty($get['send_status']) ? ['real_express_no', 'eq', ''] : ['real_express_no', 'neq', ''];
+ $expressWhere[] = empty($get['send_status']) ? ['send_no', 'eq', ''] : ['send_no', 'neq', ''];
}
if (!empty($expressWhere)) {
$sql = Db::name('StoreOrderExpress')->field('order_no')->where($expressWhere)->buildSql(true);
@@ -138,14 +138,14 @@ class Order extends BasicAdmin
return $this->fetch('', $orderExpress);
}
$data = [
- 'order_no' => $order_no,
- 'express_username' => $this->request->post('express_username'),
- 'express_phone' => $this->request->post('express_phone'),
- 'express_province' => $this->request->post('form_express_province'),
- 'express_city' => $this->request->post('form_express_city'),
- 'express_area' => $this->request->post('form_express_area'),
- 'express_address' => $this->request->post('express_address'),
- 'express_desc' => $this->request->post('express_desc'),
+ 'order_no' => $order_no,
+ 'username' => $this->request->post('express_username'),
+ 'phone' => $this->request->post('express_phone'),
+ 'province' => $this->request->post('form_express_province'),
+ 'city' => $this->request->post('form_express_city'),
+ 'area' => $this->request->post('form_express_area'),
+ 'address' => $this->request->post('express_address'),
+ 'desc' => $this->request->post('express_desc'),
];
if (DataService::save('StoreOrderExpress', $data, 'order_no')) {
$this->success('收货地址修改成功！', '');
diff --git a/application/store/view/order/address.html b/application/store/view/order/address.html
index 1260c3f40..c20559109 100644
--- a/application/store/view/order/address.html
+++ b/application/store/view/order/address.html
@@ -3,7 +3,7 @@
<div class="layui-form-item">
<label class="layui-form-label">收货人姓名</label>
<div class="layui-input-block">
- <input class="layui-input" required placeholder="请输入收货人姓名" title="请输入收货人姓名" name="express_username" value="{$express_username}">
+ <input class="layui-input" required placeholder="请输入收货人姓名" title="请输入收货人姓名" name="username" value="{$username}">
</div>
</div>
@@ -11,7 +11,7 @@
<div class="layui-form-item">
<label class="layui-form-label">收货人手机</label>
<div class="layui-input-block">
- <input class="layui-input" pattern="^1\d{10}$" required placeholder="请输入收货人手机" title="请输入收货人手机" name="express_phone" value="{$express_phone}">
+ <input class="layui-input" pattern="^1\d{10}$" required placeholder="请输入收货人手机" title="请输入收货人手机" name="phone" value="{$phone}">
</div>
</div>
@@ -33,14 +33,14 @@
<div class="layui-form-item">
<label class="layui-form-label">详细地址</label>
<div class="layui-input-block">
- <textarea required placeholder="请输入详细地址" title="请输入详细地址" name="express_address" class="layui-textarea">{$express_address|default=""}</textarea>
+ <textarea required placeholder="请输入详细地址" title="请输入详细地址" name="address" class="layui-textarea">{$address|default=""}</textarea>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
- <textarea required placeholder="请输入备注" title="请输入备注" name="express_desc" class="layui-textarea">{$express_desc|default=""}</textarea>
+ <textarea required placeholder="请输入备注" title="请输入备注" name="desc" class="layui-textarea">{$desc|default=""}</textarea>
</div>
</div>
@@ -54,7 +54,7 @@
<script>
require(['pcasunzips'], function () {
- new PCAS('form_express_province', 'form_express_city', 'form_express_area', '{$express_province}', '{$express_city}', '{$express_area}');
+ new PCAS('form_express_province', 'form_express_city', 'form_express_area', '{$province}', '{$city}', '{$area}');
});
</script>
</form>
diff --git a/application/store/view/order/index.html b/application/store/view/order/index.html
index 802fec81f..fa51b1d26 100644
--- a/application/store/view/order/index.html
+++ b/application/store/view/order/index.html
@@ -108,49 +108,56 @@
<div class="layui-form-item layui-inline">
<label class="layui-form-label">物流公司</label>
<div class="layui-input-inline">
- <input name="express_title" value="{$Think.get.express_title}" placeholder="请输入物流公司" class="layui-input">
+ <input name="company_title" value="{$Think.get.company_title}" placeholder="请输入物流公司" class="layui-input">
</div>
</div>
<div class="layui-form-item layui-inline">
<label class="layui-form-label">快递单号</label>
<div class="layui-input-inline">
- <input name="real_express_no" value="{$Think.get.real_express_no}" placeholder="请输入快递单号" class="layui-input">
+ <input name="send_no" value="{$Think.get.send_no}" placeholder="请输入快递单号" class="layui-input">
</div>
</div>
<div class="layui-form-item layui-inline">
<label class="layui-form-label">收货姓名</label>
<div class="layui-input-inline">
- <input name="express_username" value="{$Think.get.express_username}" placeholder="请输入收货姓名" class="layui-input">
+ <input name="username" value="{$Think.get.username}" placeholder="请输入收货姓名" class="layui-input">
</div>
</div>
<div class="layui-form-item layui-inline">
<label class="layui-form-label">收货手机</label>
<div class="layui-input-inline">
- <input name="express_phone" value="{$Think.get.express_phone}" placeholder="请输入收货手机" class="layui-input">
+ <input name="phone" value="{$Think.get.phone}" placeholder="请输入收货手机" class="layui-input">
</div>
</div>
<div class="layui-form-item layui-inline">
<label class="layui-form-label">收货省份</label>
<div class="layui-input-inline">
- <input name="express_province" value="{$Think.get.express_province}" placeholder="请输入收货省份" class="layui-input">
+ <input name="province" value="{$Think.get.province}" placeholder="请输入收货省份" class="layui-input">
</div>
</div>
<div class="layui-form-item layui-inline">
<label class="layui-form-label">收货城市</label>
<div class="layui-input-inline">
- <input name="express_city" value="{$Think.get.express_city}" placeholder="请输入收货城市" class="layui-input">
+ <input name="city" value="{$Think.get.city}" placeholder="请输入收货城市" class="layui-input">
</div>
</div>
<div class="layui-form-item layui-inline">
<label class="layui-form-label">收货区域</label>
<div class="layui-input-inline">
- <input name="express_area" value="{$Think.get.express_area}" placeholder="请输入收货区域" class="layui-input">
+ <input name="area" value="{$Think.get.area}" placeholder="请输入收货区域" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item layui-inline">
+ <label class="layui-form-label">详细地址</label>
+ <div class="layui-input-inline">
+ <input name="address" value="{$Think.get.address}" placeholder="请输入详细地址" class="layui-input">
</div>
</div>
@@ -248,23 +255,23 @@
{if empty($vo.express)}
<span class="color-desc">无发货信息</span>
{else}
- 快递公司：{$vo.express.real_express_title|default=$vo.express.express_title}
- {if !empty($vo.express.real_express_title)}
+ 快递公司：{$vo.express.real_company_title|default=$vo.express.company_title}
+ {if !empty($vo.express.real_company_title)}
<!--<span class="color-desc">{$vo.express.real_express_at|format_datetime|default='未发货'}</span>-->
- {if $vo.express.real_express_title neq $vo.express.express_title}
- <s class="color-desc">{$vo.express.express_title}</s>
+ {if $vo.express.real_company_title neq $vo.express.company_title}
+ <s class="color-desc">{$vo.express.company_title}</s>
{/if}
{/if}
<br>
快递单号：{$vo.express.real_express_no|default='<span class="layui-badge layui-bg-blue">未发货</span>'|raw}
<!--{if auth('store/deliver/tracking') and !empty($vo.express.real_express_no)}-->
- <a data-modal="{:url('store/deliver/tracking')}?express_code={$vo.express.real_express_code}&express_no={$vo.express.real_express_no}&express_title={$vo.express.real_express_title}" data-title="追踪物流">查看</a>
+ <a data-modal="{:url('store/deliver/tracking')}?express_code={$vo.express.real_express_code}&express_no={$vo.express.real_express_no}&company_title={$vo.express.real_company_title}" data-title="追踪物流">查看</a>
<!--{elseif auth('store/deliver/express') and $vo.status eq 2 and $vo.is_pay eq 1}-->
<a data-title="快速发货" data-modal="{:url('store/deliver/express')}?order_no={$vo.order_no}">快速发货</a>
<!--{/if}-->
<br>
- 收货信息：{$vo.express.express_username} {$vo.express.express_phone}<br>
- 收货地址：{$vo.express.express_province}{$vo.express.express_city}{$vo.express.express_area}{$vo.express.express_address}
+ 收货信息：{$vo.express.username} {$vo.express.phone}<br>
+ 收货地址：{$vo.express.province}{$vo.express.city}{$vo.express.area}{$vo.express.address}
{if auth('store/order/address')}<a data-title="修改收货人信息" data-modal="{:url('order/address')}?order_no={$vo.order_no}">修改</a>{/if}
{/if}
{if !empty($vo.express.real_express_at)}<br>发货时间：{$vo.express.real_express_at|format_datetime}{/if}