From bee15bc4404482612a3669e5465ed25e70e42887 Mon Sep 17 00:00:00 2001
From: anyv <anyu@bronet.cn>
Date: Tue, 4 Jun 2019 16:05:06 +0800
Subject: [PATCH] 4

---
 app/portal/controller/IndexController.php                  | 33 ++++++++++++++++++++++++++++++++-
 public/themes/simpleboot3/portal/index/salesman_goods.html | 41 +++++++++++++++++++++++++++++------------
 2 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/app/portal/controller/IndexController.php b/app/portal/controller/IndexController.php
index 3dc6850..03e0975 100644
--- a/app/portal/controller/IndexController.php
+++ b/app/portal/controller/IndexController.php
@@ -172,7 +172,7 @@ class IndexController extends WeChatBaseController
         $this -> assign('data_goods',$data_goods);
         //推荐新品
         if($limit_num != 0){
-            $data_goods_recommend_new = Db::name('goods') -> alias('a') -> field('a.*,b.name') -> join('classification b','a.classify_id = b.id','LEFT') -> where("recommend_new=1 and type = 1") -> limit($limit_num) -> select() -> toArray();
+            $data_goods_recommend_new = Db::name('goods') -> alias('a') -> field('a.*,b.name') -> join('classification b','a.classify_id = b.id','LEFT') -> where("recommend_new=1 and is_out = 1 and type = 1") -> limit($limit_num) -> select() -> toArray();
         }else{
             $data_goods_recommend_new = null;
         }
@@ -307,6 +307,37 @@ class IndexController extends WeChatBaseController
      */
     public function salesman_goods(){
 
+        $uid = cmf_get_current_user_id();
+        $user = Db::name('my_user') -> where('uid',$uid) -> find();
+        if($user['status'] == 0 || $user['status'] == 1 || $user['status'] == 5 || $user['status'] == 6){
+            $salesman_goods = null;
+        }elseif ($user['status'] == 2){
+            $salesman_goods = Db::name('goods') -> where('uid',$uid) -> select() -> toArray();
+        }elseif ($user['status'] == 3){
+            $salesman_id = Db::name('my_user') -> where('id',$user['pid']) -> find();
+            $salesman_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> select() -> toArray();
+        }elseif ($user['status'] == 4){
+            $teacher_id = Db::name('my_user') -> where('id',$user['pid']) -> find();
+            $salesman_id = Db::name('my_user') -> where('id',$teacher_id['pid']) -> find();
+            $salesman_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> select() -> toArray();
+        }
+        if(!empty($salesman_goods)){
+            foreach ($salesman_goods as $key => $val){
+                $price = explode('.',$salesman_goods[$key]['price']);
+                $salesman_goods[$key]['price0'] = $price[0];
+                $salesman_goods[$key]['price1'] = $price[1];
+            }
+        }
+        $this -> assign('salesman_goods',$salesman_goods);
+        $goods = Db::name('goods') -> where("type = 1 and is_out = 1 and recommend_new = 1") -> select() -> toArray();
+        if(!empty($goods)){
+            foreach($goods as $key => $val){
+                $price = explode('.',$goods[$key]['price']);
+                $goods[$key]['price0'] = $price[0];
+                $goods[$key]['price1'] = $price[1];
+            }
+        }
+        $this -> assign('goods',$goods);
         return $this -> fetch();
 
     }
diff --git a/public/themes/simpleboot3/portal/index/salesman_goods.html b/public/themes/simpleboot3/portal/index/salesman_goods.html
index 9b4666c..91ebf18 100644
--- a/public/themes/simpleboot3/portal/index/salesman_goods.html
+++ b/public/themes/simpleboot3/portal/index/salesman_goods.html
@@ -19,19 +19,36 @@
     <h1>收货地址</h1>
 </div>
 <div class="in_hot_shop se_con" style="margin-top:0.28rem">
-    <div class="in_hotLi">
-        <a>
-            <div class="in_hotImg">
-                <img src="__TMPL__/public/assets/images/9.png" alt="">
-            </div>
-            <div class="in_hotText">
-                <div class="in_hotName txt-cut">小学英语五年级下 册好用不贵经济实...</div>
-                <div class="in_cam_shopPrice">
-                    <div class="in_hotPrice1">¥<span>265</span>.00</div>
+    <volist name="salesman_goods" id="vo">
+        <div class="in_hotLi">
+            <a href="{:url('Goodsdetails/Goods_details',array('goods_id'=>$vo.id))}">
+                <div class="in_hotImg">
+                    <img src="{:cmf_get_image_url($vo.show_img)}" alt="">
                 </div>
-            </div>
-        </a>
-    </div>
+                <div class="in_hotText">
+                    <div class="in_hotName txt-cut">{$vo.book_name}</div>
+                    <div class="in_cam_shopPrice">
+                        <div class="in_hotPrice1">¥<span>{$vo.price0}</span>.{$vo.price1}</div>
+                    </div>
+                </div>
+            </a>
+        </div>
+    </volist>
+    <volist name="goods" id="vo">
+        <div class="in_hotLi">
+            <a href="{:url('Goodsdetails/Goods_details',array('goods_id'=>$vo.id))}">
+                <div class="in_hotImg">
+                    <img src="{:cmf_get_image_url($vo.show_img)}" alt="">
+                </div>
+                <div class="in_hotText">
+                    <div class="in_hotName txt-cut">{$vo.book_name}</div>
+                    <div class="in_cam_shopPrice">
+                        <div class="in_hotPrice1">¥<span>{$vo.price0}</span>.{$vo.price1}</div>
+                    </div>
+                </div>
+            </a>
+        </div>
+    </volist>
 </div>
 <!-- 底部更多 -->
 <div class="in_what">—— 已经到底了哦 ——</div>
--
libgit2 0.24.0