anyv / xkeasy · 提交

转到一个项目

作者 anyv
提交 c9d477c1f3c68c7f228f69acad4d0e546e3f875a 1 个父辈 c91df542
1 个管道 的构建 通过 耗费 4 秒

5

内嵌 并排对比
正在显示 10 个修改的文件 包含 27 行增加 和 33 行删除
... ... @@ -42,6 +42,10 @@ class SalesmangoodsController extends AdminBaseController{
public function salesman_edit(){
if($this -> request -> isPost()){
if($_POST['money'] > $_POST['price']){
$this -> error('佣金不能大于售价');
}
if(!empty($_POST['det_img'])){
$_POST['det_img'] = json_encode($_POST['det_img']);
$_POST['det_name'] = json_encode($_POST['det_name']);
... ... @@ -57,7 +61,6 @@ class SalesmangoodsController extends AdminBaseController{
$data = Db::name('goods') -> where('id',$id['id']) -> find();
if(!empty($data['det_img'])){
$data['det_img'] = json_decode($data['det_img'],true);
$data['det_img'] = explode(',',$data['det_img']);
$data['det_name'] = json_decode($data['det_name'],true);
foreach ($data['det_img'] as $key => $val){
$data['more'][$key]['url'] = $data['det_img'][$key];
... ...
... ... @@ -54,6 +54,10 @@ class GoodsdetailsController extends WeChatBaseController{
}
$data = Db::name('goods') -> alias('a') -> field("a.*,b.name") -> join('classification b','a.classify_id = b.id','LEFT') -> where('a.id',$goods_id['goods_id']) -> find();
//当商品不存在时跳转到首页
if(empty($data)){
$this -> redirect("Index/index");
}
$this -> assign('price',$data['price']);
$price = explode('.',$data['price']);
$pricing = explode('.',$data['pricing']);
... ...
... ... @@ -546,7 +546,7 @@ class PersonalcenterController extends WeChatBaseController{
if(empty($res)){
$res = null;
}
$this -> assign('res',$res);
// $this -> assign('res',$res);
//搜索老师用户
$teacher_avatar = Db::name('user') -> where('id',$uid) -> find();
if(!empty($get['startime']) && !empty($get['endtime'])){
... ... @@ -575,7 +575,11 @@ class PersonalcenterController extends WeChatBaseController{
if(empty($my_res)){
$my_res = null;
}
$this -> assign('my_res',$my_res);
$aaaa = array_merge($res,$my_res);
$bb = array_column($aaaa,'create_time');
$cc = array_multisort($bb,SORT_DESC,$aaaa);
$this -> assign('res',$aaaa);
// $this -> assign('my_res',$my_res);
return $this -> fetch();
}
... ...
... ... @@ -11,7 +11,7 @@
</head>
<style>
.de_main4ParaCon p{
width: 2.9rem;
/*width: 2.9rem;*/
font-size: 0.28rem;
cursor: pointer;
margin-bottom: 0.08rem;
... ...
... ... @@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>学考无忧-业务员商城</title>
<title>学考无忧-校园团购</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/base.css">
</head>
... ... @@ -16,7 +16,7 @@
<a href="javascript:history.back(-1)">
<img class="ad_topImg" src="__TMPL__/public/assets/images/left2.png" alt="">
</a>
<p style="color:white">业务员商城</p>
<p style="color:white">校园团购</p>
</div>
<div class="in_hot_shop se_con" style="margin-top:0.28rem">
<volist name="salesman_goods" id="vo">
... ...
... ... @@ -190,7 +190,7 @@
</if>
<elseif condition="$data.state eq 5 || $data.state eq 3 || $data.state eq 2"/>
<!--<div class="pay_bottom2_2">售后咨询</div>-->
<div class="pay_bottom2_2">售后咨询</div>
<elseif condition="$data.state eq 4"/>
<div class="myorder_bottom2_1 cancel_order" data-id="{$data.id}">取消订单</div>
<a href="{:url('portal/pay/index',array('id'=>$data['id']))}">
... ...
... ... @@ -101,24 +101,7 @@
<div class="recordNum">佣金+{$vo.total_money}</div>
</li>
</volist>
<volist name="my_res" id="vo">
<li>
<div class="recordImg">
<img src="{$vo.avatar}" alt="">
</div>
<div class="recordTxt">
<div class="recordTxt1 one-txt-cut">{$vo.user_name}购买了{$vo.book_name}</div>
<if condition="$vo.indent_type eq 1">
<div class="recordTxt2">平台订单</div>
</if>
<if condition="$vo.indent_type eq 2">
<div class="recordTxt2">业务员订单</div>
</if>
<p class="recordTxt3">{$vo.create_time|date="Y-m-d H:i:s",###}</p>
</div>
<div class="recordNum">佣金+{$vo.total_money}</div>
</li>
</volist>
</ul>
</div>
<!-- 底部更多 -->
... ...
... ... @@ -119,19 +119,19 @@
</a>
</li>
<li>
<a href="{:url('Order/get_all',array('state'=>3))}">
<a href="{:url('Order/get_all',array('state'=>5))}">
<div class="w_my_leftImg">
<img src="__TMPL__/public/assets/images/44.png" alt="" />
<img src="__TMPL__/public/assets/images/45.png" alt="" />
</div>
<p class="w_my_leftTxt">已完成</p>
<p class="w_my_leftTxt">已发货</p>
</a>
</li>
<li>
<a href="{:url('Order/get_all',array('state'=>5))}">
<a href="{:url('Order/get_all',array('state'=>3))}">
<div class="w_my_leftImg">
<img src="__TMPL__/public/assets/images/45.png" alt="" />
<img src="__TMPL__/public/assets/images/44.png" alt="" />
</div>
<p class="w_my_leftTxt">已发货</p>
<p class="w_my_leftTxt">已完成</p>
</a>
</li>
</ul>
... ...
... ... @@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>学考无忧-收获地址</title>
<title>学考无忧-收货地址</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/base.css">
</head>
... ...
... ... @@ -14,7 +14,7 @@
<!-- 顶部 -->
<div class="ad_top top_navBg">
<img class="ad_topImg" src="__TMPL__/public/assets/images/left2.png" alt="" />
<h1>收货地址</h1>
<h1>购物车</h1>
<p>管理</p>
</div>
<div class="shopping_cartBox">
... ...