diff --git a/app/admin/controller/SalesmanorderController.php b/app/admin/controller/SalesmanorderController.php
index 1fa5e38..aaa89d9 100644
--- a/app/admin/controller/SalesmanorderController.php
+++ b/app/admin/controller/SalesmanorderController.php
@@ -56,14 +56,14 @@ class SalesmanorderController extends AdminBaseController{
foreach($data_school as $key => $val){
$school[$key] = $val['school'];
}
- $uid = Db::name('user') -> select();
- foreach($uid as $key => $val){
+ $uid = Db::name('my_user') -> alias('a') -> join('user b','a.uid = b.id','LEFT') -> where('a.status = 2') -> select();
+ /* foreach($uid as $key => $val){
$sales[$key]['uid'] = $val['id'];
$sales[$key]['name'] = $val['user_nickname'];
- }
+ }*/
$this -> assign('data_arr',$data);
$this -> assign('school',$school);
- $this -> assign('sales',$sales);
+ $this -> assign('sales',$uid);
$this -> assign('money',$money);
$this -> assign('data',$data_arr['data']);
return $this -> fetch();
@@ -77,8 +77,16 @@ class SalesmanorderController extends AdminBaseController{
$id = $this -> request -> param();
$data = Db::name('indent') -> where('id',$id['id']) -> find();
+ if(!empty($data['indent_address'])){
+ $address = Db::name('address') -> where("id",$data['indent_address']) -> find();
+ $address_detailed = explode(',',$address['detailed']);
+ $address_region = $address['region'].$address_detailed[0].$address_detailed[1];
+ }else{
+ $address_region = '';
+ }
$data_content = Db::name('indent_goods') -> where('indent_id',$id['id']) -> select();
$this -> assign('data',$data);
+ $this -> assign('address_region',$address_region);
$this -> assign('data_content',$data_content);
return $this -> fetch();
diff --git a/app/portal/controller/IndexController.php b/app/portal/controller/IndexController.php
index 6cfcf5b..7b51eec 100644
--- a/app/portal/controller/IndexController.php
+++ b/app/portal/controller/IndexController.php
@@ -381,14 +381,14 @@ class IndexController extends WeChatBaseController
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) -> order("sort desc") -> select() -> toArray();
+ $salesman_goods = Db::name('goods') -> where('uid',$uid) -> where('is_out',1) -> order("sort desc") -> 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']) -> order("sort desc") -> select() -> toArray();
+ $salesman_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> where('is_out',1) -> order("sort desc") -> 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']) -> order("sort desc") -> select() -> toArray();
+ $salesman_goods = Db::name('goods') -> where('uid',$salesman_id['uid']) -> where('is_out',1) -> order("sort desc") -> select() -> toArray();
}
if(!empty($salesman_goods)){
foreach ($salesman_goods as $key => $val){
diff --git a/app/portal/controller/OrderpageController.php b/app/portal/controller/OrderpageController.php
index 4326112..cb7c1d4 100644
--- a/app/portal/controller/OrderpageController.php
+++ b/app/portal/controller/OrderpageController.php
@@ -276,7 +276,7 @@ class OrderpageController extends WeChatBaseController{
$data[$key]['detailed'] = $detailed[0].$detailed[1];
}
}
- $this -> assign('indent_id',$indent_id['indent_id']);
+ $this -> assign('indent_id',$indent_id['indet_id']);
$this -> assign('data',$data);
return $this -> fetch();
diff --git a/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html b/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html
index ad0f377..bde6d20 100644
--- a/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html
+++ b/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html
@@ -34,7 +34,7 @@
<select name="uid" class="form-control">
<option value="">全部</option>
<volist name="sales" id="vo">
- <option value="{$vo.uid}">{$vo.name}</option>
+ <option value="{$vo.uid}">{$vo.user_nickname}</option>
</volist>
</select>
学校:
diff --git a/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_show.html b/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_show.html
index 53d0d4d..1d9c790 100644
--- a/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_show.html
+++ b/public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_show.html
@@ -26,7 +26,7 @@
</if>
</h4>
<h4>买家留言：{$data.leave_word}</h4>
- <h4>收货地址：{$data.indent_address}</h4>
+ <h4>收货地址：{$address_region}</h4>
</div>
</div>
</body>
diff --git a/public/themes/simpleboot3/portal/index/search_salesman_goods.html b/public/themes/simpleboot3/portal/index/search_salesman_goods.html
index 7f0f681..1252480 100644
--- a/public/themes/simpleboot3/portal/index/search_salesman_goods.html
+++ b/public/themes/simpleboot3/portal/index/search_salesman_goods.html
@@ -81,7 +81,7 @@
for(var i=0;i<data_arr.length;i++){
show_img = data_arr[i].show_img;
url = "{:url('Goodsdetails/Goods_details')}?goods_id="+data_arr[i].id;
- $('.se_con').append("<div class='in_hotLi'><a href='"+url+"'><div class='in_hotImg'><img src='"+show_img+"'></div><div class='in_hotText'><div class='in_hotName txt-cut'><span>"+data_arr[i].grade+"</span>"+data_arr[i].book_name+"</div><div class='in_cam_shopPrice'><div class='in_hotPrice1'>￥<span>"+data_arr[i].price0+"</span>."+data_arr[i].price1+"</div></div></div></a></div>");
+ $('.se_con').append("<div class='in_hotLi'><a href='"+url+"'><div class='in_hotImg'><img src='"+show_img+"'></div><div class='in_hotText'><div class='in_hotName txt-cut'><span>"+data_arr[i].grade+"</span>"+data_arr[i].book_name+"</div><div class='in_cam_shopPrice'><div class='in_hotPrice1'>￥<span>"+data_arr[i].price0+"</span>."+data_arr[i].price1+"</div><div class='in_cam_shopY'>￥"+data_arr[i].pricing+"</div></div></div></a></div>");
}
});
}
@@ -108,7 +108,7 @@
for(var i=0;i<data_arr.length;i++){
show_img = data_arr[i].show_img;
url = "{:url('Goodsdetails/Goods_details')}?goods_id="+data_arr[i].id;
- $('.se_con').append("<div class='in_hotLi'><a href='"+url+"'><div class='in_hotImg'><img src='"+show_img+"'></div><div class='in_hotText'><div class='in_hotName txt-cut'><span>"+data_arr[i].grade+"</span>"+data_arr[i].book_name+"</div><div class='in_cam_shopPrice'><div class='in_hotPrice1'>￥<span>"+data_arr[i].price0+"</span>."+data_arr[i].price1+"</div></div></div></a></div>");
+ $('.se_con').append("<div class='in_hotLi'><a href='"+url+"'><div class='in_hotImg'><img src='"+show_img+"'></div><div class='in_hotText'><div class='in_hotName txt-cut'><span>"+data_arr[i].grade+"</span>"+data_arr[i].book_name+"</div><div class='in_cam_shopPrice'><div class='in_hotPrice1'>￥<span>"+data_arr[i].price0+"</span>."+data_arr[i].price1+"</div><div class='in_cam_shopY'>￥"+data_arr[i].pricing+"</div></div></div></a></div>");
}
});
}
@@ -124,7 +124,7 @@
for(var i=0;i<data_arr.length;i++){
show_img = data_arr[i].show_img;
url = "{:url('Goodsdetails/Goods_details')}?goods_id="+data_arr[i].id;
- $('.se_con').append("<div class='in_hotLi'><a href='"+url+"'><div class='in_hotImg'><img src='"+show_img+"'></div><div class='in_hotText'><div class='in_hotName txt-cut'><span>"+data_arr[i].grade+"</span>"+data_arr[i].book_name+"</div><div class='in_cam_shopPrice'><div class='in_hotPrice1'>￥<span>"+data_arr[i].price0+"</span>."+data_arr[i].price1+"</div></div></div></a></div>");
+ $('.se_con').append("<div class='in_hotLi'><a href='"+url+"'><div class='in_hotImg'><img src='"+show_img+"'></div><div class='in_hotText'><div class='in_hotName txt-cut'><span>"+data_arr[i].grade+"</span>"+data_arr[i].book_name+"</div><div class='in_cam_shopPrice'><div class='in_hotPrice1'>￥<span>"+data_arr[i].price0+"</span>."+data_arr[i].price1+"</div><div class='in_cam_shopY'>￥"+data_arr[i].pricing+"</div></div></div></a></div>");
}
});
}
@@ -140,7 +140,7 @@
for(var i=0;i<data_arr.length;i++){
show_img = data_arr[i].show_img;
url = "{:url('Goodsdetails/Goods_details')}?goods_id="+data_arr[i].id;
- $('.se_con').append("<div class='in_hotLi'><a href='"+url+"'><div class='in_hotImg'><img src='"+show_img+"'></div><div class='in_hotText'><div class='in_hotName txt-cut'><span>"+data_arr[i].grade+"</span>"+data_arr[i].book_name+"</div><div class='in_cam_shopPrice'><div class='in_hotPrice1'>￥<span>"+data_arr[i].price0+"</span>."+data_arr[i].price1+"</div></div></div></a></div>");
+ $('.se_con').append("<div class='in_hotLi'><a href='"+url+"'><div class='in_hotImg'><img src='"+show_img+"'></div><div class='in_hotText'><div class='in_hotName txt-cut'><span>"+data_arr[i].grade+"</span>"+data_arr[i].book_name+"</div><div class='in_cam_shopPrice'><div class='in_hotPrice1'>￥<span>"+data_arr[i].price0+"</span>."+data_arr[i].price1+"</div><div class='in_cam_shopY'>￥"+data_arr[i].pricing+"</div></div></div></a></div>");
}
});
}
diff --git a/public/uploads/20190617/4715634714c79bea7aa71eac0962de92.png b/public/uploads/20190617/4715634714c79bea7aa71eac0962de92.png
new file mode 100644
index 0000000..77eb2e9
Binary files /dev/null and b/public/uploads/20190617/4715634714c79bea7aa71eac0962de92.png differ
diff --git a/public/uploads/20190617/ead11a6dc760b4c9a6d8713cb1d403c5.png b/public/uploads/20190617/ead11a6dc760b4c9a6d8713cb1d403c5.png
new file mode 100644
index 0000000..82759ac
Binary files /dev/null and b/public/uploads/20190617/ead11a6dc760b4c9a6d8713cb1d403c5.png differ