anyv / xkeasy · 提交

转到一个项目

作者 anyv
提交 de6827118b12c09db33a11b6cc88fdfa5a073371 2 个父辈 d558be07 1f7a207f
1 个管道 的构建 通过 耗费 2 秒

Merge branch 'master' of http://114.215.101.231:8099/anyv/xkeasy

内嵌 并排对比
正在显示 3 个修改的文件 包含 56 行增加 和 2 行删除
... ... @@ -9,6 +9,7 @@
namespace app\portal\controller;
use app\portal\model\AddressModel;
use app\portal\model\IndentGoodsModel;
use app\portal\model\IndentModel;
use cmf\controller\WeChatBaseController;
... ... @@ -171,6 +172,11 @@ class OrderSalesmanController extends WeChatBaseController
}
$indentGoodsModel = new IndentGoodsModel();
$indent_goods = $indentGoodsModel->selectData(['indent_id'=>$indent['id']]);
if(!empty($indent['indent_address'])){
$addressModel = new AddressModel();
$indent_address = $addressModel->findData(['id'=>$indent['indent_address']]);
$indent['indent_address'] = $indent_address;
}
$indent['indent_goods'] = $indent_goods;
$this->assign('data',$indent);
return $this->fetch();
... ...
... ... @@ -123,6 +123,52 @@
<div class="log_four_input_title" style="margin-bottom: 0.2rem;">
地址信息
</div>
<if condition="$data.is_courier eq 2">
<div class="log_four_input_one">
<div class="log_four_input_one_left">
姓名
</div>
<div class="log_four_input_one_center">
<div id="city_text">{$data.indent_address.name}</div>
</div>
<div class="log_four_input_one_right">
<img src="__TMPL__/public/assets/images/29.png" alt=""/>
</div>
</div>
<div class="log_four_input_one">
<div class="log_four_input_one_left">
电话
</div>
<div class="log_four_input_one_center">
<div id="city_text">{$data.indent_address.phone}</div>
</div>
<div class="log_four_input_one_right">
<img src="__TMPL__/public/assets/images/29.png" alt=""/>
</div>
</div>
<div class="log_four_input_one">
<div class="log_four_input_one_left">
地址
</div>
<div class="log_four_input_one_center">
<div id="city_text">{$data.indent_address.region}</div>
</div>
<div class="log_four_input_one_right">
<img src="__TMPL__/public/assets/images/29.png" alt=""/>
</div>
</div>
<div class="log_four_input_one">
<div class="log_four_input_one_left">
详细地址
</div>
<div class="log_four_input_one_center">
<div id="city_text">{$data.indent_address.detailed}</div>
</div>
<div class="log_four_input_one_right">
<img src="__TMPL__/public/assets/images/29.png" alt=""/>
</div>
</div>
<else />
<div class="log_four_input_one">
<div class="log_four_input_one_left">
地区
... ... @@ -175,6 +221,8 @@
<div id="city_text">{$data.phone}</div>
</div>
</div>
</if>
</div>
<!-- 订单信息 -->
... ...
... ... @@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
*/
public function checkWeChatUserLogin()
{
/*$user = Db::name('user')->where('id',2)->find();
cmf_update_current_user($user);*/
$user = Db::name('user')->where('id',5)->find();
cmf_update_current_user($user);
$userId = cmf_get_current_user_id();
if (empty($userId)) {
$config = [
... ...