正在显示
9 个修改的文件
包含
66 行增加
和
9 行删除
| @@ -394,6 +394,20 @@ class SalesmanController extends AdminBaseController{ | @@ -394,6 +394,20 @@ class SalesmanController extends AdminBaseController{ | ||
| 394 | } | 394 | } |
| 395 | } | 395 | } |
| 396 | dump($data);die;*/ | 396 | dump($data);die;*/ |
| 397 | + if(!empty($data)){ | ||
| 398 | + foreach ($data as $key => $val){ | ||
| 399 | + if($val['type'] == 2){ | ||
| 400 | + $indent_good = Db::name('indent_goods') -> where('indent_id',$val['indent_id']) -> select() -> toArray(); | ||
| 401 | + $indent_goods = ''; | ||
| 402 | + foreach ($indent_good as $key1 => $val1){ | ||
| 403 | + $indent_goods .= $val1['book_name'].','; | ||
| 404 | + } | ||
| 405 | + $data[$key]['indent_good'] = $indent_goods; | ||
| 406 | + }else{ | ||
| 407 | + $data[$key]['indent_good'] = $val['book_name']; | ||
| 408 | + } | ||
| 409 | + } | ||
| 410 | + } | ||
| 397 | $this -> assign('data',$data); | 411 | $this -> assign('data',$data); |
| 398 | return $this -> fetch(); | 412 | return $this -> fetch(); |
| 399 | 413 |
| @@ -139,7 +139,23 @@ class UsersController extends AdminBaseController{ | @@ -139,7 +139,23 @@ class UsersController extends AdminBaseController{ | ||
| 139 | public function users_money(){ | 139 | public function users_money(){ |
| 140 | 140 | ||
| 141 | $uid = $this -> request -> param(); | 141 | $uid = $this -> request -> param(); |
| 142 | - $data = Db::name('money_income') -> where('uid',$uid['uid']) -> select(); | 142 | + $data = Db::name('money_income') -> where('uid',$uid['uid']) -> select() -> toArray(); |
| 143 | + if(!empty($data)){ | ||
| 144 | + foreach ($data as $key => $val){ | ||
| 145 | + if($val['type'] == 2){ | ||
| 146 | + $data[$key]['indent'] = Db::name('indent') -> where('id',$val['indent_id']) -> find(); | ||
| 147 | + $indent_good = Db::name('indent_goods') -> where('indent_id',$val['indent_id']) -> select() -> toArray(); | ||
| 148 | + $indent_goods = ''; | ||
| 149 | + foreach ($indent_good as $key1 => $val1){ | ||
| 150 | + $indent_goods .= $val1['book_name'].','; | ||
| 151 | + } | ||
| 152 | + $data[$key]['indent_good'] = $indent_goods; | ||
| 153 | + }else{ | ||
| 154 | + $data[$key]['indent'] = Db::name('indent') -> where('id',$val['indent_id']) -> find(); | ||
| 155 | + $data[$key]['indent_good'] = $val['book_name']; | ||
| 156 | + } | ||
| 157 | + } | ||
| 158 | + } | ||
| 143 | $this -> assign('data',$data); | 159 | $this -> assign('data',$data); |
| 144 | return $this -> fetch(); | 160 | return $this -> fetch(); |
| 145 | 161 |
| @@ -10,6 +10,9 @@ | @@ -10,6 +10,9 @@ | ||
| 10 | <thead> | 10 | <thead> |
| 11 | <tr> | 11 | <tr> |
| 12 | <th>收入时间</th> | 12 | <th>收入时间</th> |
| 13 | + <th>收入类别</th> | ||
| 14 | + <th>订单号</th> | ||
| 15 | + <th>书籍</th> | ||
| 13 | <th>金额</th> | 16 | <th>金额</th> |
| 14 | </tr> | 17 | </tr> |
| 15 | </thead> | 18 | </thead> |
| @@ -17,6 +20,17 @@ | @@ -17,6 +20,17 @@ | ||
| 17 | <volist name="data" id="vo"> | 20 | <volist name="data" id="vo"> |
| 18 | <tr> | 21 | <tr> |
| 19 | <td>{$vo.create_time|date="Y-m-d H:i:s",###}</td> | 22 | <td>{$vo.create_time|date="Y-m-d H:i:s",###}</td> |
| 23 | + <td> | ||
| 24 | + <if condition="$vo.type eq 1"> | ||
| 25 | + 平台收入 | ||
| 26 | + <else/> | ||
| 27 | + 团购收入 | ||
| 28 | + </if> | ||
| 29 | + </td> | ||
| 30 | + <td>{$vo.order_number}</td> | ||
| 31 | + <td> | ||
| 32 | + {$vo.indent_good} | ||
| 33 | + </td> | ||
| 20 | <td>{$vo.money}</td> | 34 | <td>{$vo.money}</td> |
| 21 | </tr> | 35 | </tr> |
| 22 | </volist> | 36 | </volist> |
| @@ -10,6 +10,9 @@ | @@ -10,6 +10,9 @@ | ||
| 10 | <thead> | 10 | <thead> |
| 11 | <tr> | 11 | <tr> |
| 12 | <th>收入时间</th> | 12 | <th>收入时间</th> |
| 13 | + <th>收入类别</th> | ||
| 14 | + <th>订单号</th> | ||
| 15 | + <th>书籍</th> | ||
| 13 | <th>金额</th> | 16 | <th>金额</th> |
| 14 | </tr> | 17 | </tr> |
| 15 | </thead> | 18 | </thead> |
| @@ -17,6 +20,17 @@ | @@ -17,6 +20,17 @@ | ||
| 17 | <volist name="data" id="vo"> | 20 | <volist name="data" id="vo"> |
| 18 | <tr> | 21 | <tr> |
| 19 | <td>{$vo.create_time|date="Y-m-d H:i:s",###}</td> | 22 | <td>{$vo.create_time|date="Y-m-d H:i:s",###}</td> |
| 23 | + <td> | ||
| 24 | + <if condition="$vo.type eq 1"> | ||
| 25 | + 平台收入 | ||
| 26 | + <else/> | ||
| 27 | + 团购收入 | ||
| 28 | + </if> | ||
| 29 | + </td> | ||
| 30 | + <td>{$vo.indent.order_number}</td> | ||
| 31 | + <td> | ||
| 32 | + {$vo.indent_good} | ||
| 33 | + </td> | ||
| 20 | <td>{$vo.money}</td> | 34 | <td>{$vo.money}</td> |
| 21 | </tr> | 35 | </tr> |
| 22 | </volist> | 36 | </volist> |
| @@ -91,7 +91,7 @@ | @@ -91,7 +91,7 @@ | ||
| 91 | </div> | 91 | </div> |
| 92 | <!-- 小标题 --> | 92 | <!-- 小标题 --> |
| 93 | <div class="xiaoyuan_tuangou"> | 93 | <div class="xiaoyuan_tuangou"> |
| 94 | - <div class="in_campust2">超值特卖，团购立减100元！</div> | 94 | + <div class="in_campust2">限量优惠天天抢</div> |
| 95 | <div class="in_campusTitle3"> | 95 | <div class="in_campusTitle3"> |
| 96 | 更多 | 96 | 更多 |
| 97 | <a href="{:url('Index/salesman_goods')}"> | 97 | <a href="{:url('Index/salesman_goods')}"> |
| @@ -94,11 +94,11 @@ | @@ -94,11 +94,11 @@ | ||
| 94 | <!--<div class="myorder_bottom2_2">查看订单</div>--> | 94 | <!--<div class="myorder_bottom2_2">查看订单</div>--> |
| 95 | <!--</a>--> | 95 | <!--</a>--> |
| 96 | <elseif condition="$vo.state eq 5"/> | 96 | <elseif condition="$vo.state eq 5"/> |
| 97 | - <if condition="$vo.is_courier eq 2"> | 97 | + |
| 98 | <a href="{:url('logistics/index',array('indent_id'=>$vo['id']))}"> | 98 | <a href="{:url('logistics/index',array('indent_id'=>$vo['id']))}"> |
| 99 | <div class="myorder_bottom2_2">查看物流</div> | 99 | <div class="myorder_bottom2_2">查看物流</div> |
| 100 | </a> | 100 | </a> |
| 101 | - </if> | 101 | + |
| 102 | <div class="myorder_bottom2_2 delivery" data-id="{$vo.id}">确认收货</div> | 102 | <div class="myorder_bottom2_2 delivery" data-id="{$vo.id}">确认收货</div> |
| 103 | <elseif condition="$vo.state eq 3"/> | 103 | <elseif condition="$vo.state eq 3"/> |
| 104 | <!--<div class="myorder_bottom2_2">去评价</div>--> | 104 | <!--<div class="myorder_bottom2_2">去评价</div>--> |
| @@ -88,18 +88,16 @@ | @@ -88,18 +88,16 @@ | ||
| 88 | <p>分类</p> | 88 | <p>分类</p> |
| 89 | </li> | 89 | </li> |
| 90 | </a> | 90 | </a> |
| 91 | - <a href="w_shopping_cart.html"> | 91 | + <a href="{:url('Shopcart/shop_cart')}"> |
| 92 | <li> | 92 | <li> |
| 93 | <img src="__TMPL__/public/assets/images/17.png" alt="" /> | 93 | <img src="__TMPL__/public/assets/images/17.png" alt="" /> |
| 94 | <p>购物车</p> | 94 | <p>购物车</p> |
| 95 | </li> | 95 | </li> |
| 96 | </a> | 96 | </a> |
| 97 | - <a href="log_one.html"> | ||
| 98 | <li> | 97 | <li> |
| 99 | <img src="__TMPL__/public/assets/images/19.png" alt="" /> | 98 | <img src="__TMPL__/public/assets/images/19.png" alt="" /> |
| 100 | <p style="color:#FF7700;">我的</p> | 99 | <p style="color:#FF7700;">我的</p> |
| 101 | </li> | 100 | </li> |
| 102 | - </a> | ||
| 103 | </ul> | 101 | </ul> |
| 104 | </div> | 102 | </div> |
| 105 | <script src="__TMPL__/public/assets/js/jquery.js"></script> | 103 | <script src="__TMPL__/public/assets/js/jquery.js"></script> |
| @@ -148,7 +148,7 @@ | @@ -148,7 +148,7 @@ | ||
| 148 | $.post("{:url('Shopcart/shop_cart_pay')}",{id:goods_id,myprice:myprice},function(data){ | 148 | $.post("{:url('Shopcart/shop_cart_pay')}",{id:goods_id,myprice:myprice},function(data){ |
| 149 | obj = JSON.parse(data); | 149 | obj = JSON.parse(data); |
| 150 | if(obj.type == 3){ | 150 | if(obj.type == 3){ |
| 151 | - alert('业务员商品和平台商品不能同时购买！'); | 151 | + alert('团购商品和热销商品请分别付款'); |
| 152 | }else if(obj.type == 1){ | 152 | }else if(obj.type == 1){ |
| 153 | window.location.href = "{:url('Orderpage/order_page')}?indet_id="+obj.indet_id; | 153 | window.location.href = "{:url('Orderpage/order_page')}?indet_id="+obj.indet_id; |
| 154 | }else if(obj.type == 2){ | 154 | }else if(obj.type == 2){ |
| @@ -1566,11 +1566,12 @@ cursor: pointer; | @@ -1566,11 +1566,12 @@ cursor: pointer; | ||
| 1566 | padding: 0.14rem 0 0.08rem 0!important; | 1566 | padding: 0.14rem 0 0.08rem 0!important; |
| 1567 | cursor: pointer; | 1567 | cursor: pointer; |
| 1568 | display: flex; | 1568 | display: flex; |
| 1569 | - justify-content: space-around; | 1569 | + /*justify-content: space-around;*/ |
| 1570 | align-items: center | 1570 | align-items: center |
| 1571 | } | 1571 | } |
| 1572 | 1572 | ||
| 1573 | .log_five_handle_one { | 1573 | .log_five_handle_one { |
| 1574 | + width: 25%; | ||
| 1574 | display: flex; | 1575 | display: flex; |
| 1575 | flex-direction: column; | 1576 | flex-direction: column; |
| 1576 | cursor: pointer; | 1577 | cursor: pointer; |
-
请 注册 或 登录 后发表评论