diff --git a/app/portal/controller/LoadController.php b/app/portal/controller/LoadController.php
index 056f63b..0b8cc3c 100644
--- a/app/portal/controller/LoadController.php
+++ b/app/portal/controller/LoadController.php
@@ -50,11 +50,14 @@ class LoadController extends HomeBaseController
foreach($result['Data'] as $key => $vo){
$indent = $indentModel->findData(['logistic_code'=>$vo['LogisticCode']]);
if(!empty($indent)){
- if($vo['State'] >=1 && $vo['State'] != 4){
+ if($vo['State'] ==1 || $vo['State'] == 2){
if($indent['state'] == 2){
$indentModel->updateData(['id'=>$indent['id']],['state'=>5]);
}
}
+ if($vo['State'] == 3){
+ $indentModel->updateData(['id'=>$indent['id']],['state'=>3]);
+ }
}
}
$bird = config('bird');
diff --git a/app/portal/controller/OrderSalesmanController.php b/app/portal/controller/OrderSalesmanController.php
new file mode 100644
index 0000000..ab9fb32
--- /dev/null
+++ b/app/portal/controller/OrderSalesmanController.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019/6/9
+ * Time: 15:34
+ */
+
+namespace app\portal\controller;
+
+
+use app\portal\model\IndentGoodsModel;
+use app\portal\model\IndentModel;
+use cmf\controller\WeChatBaseController;
+use think\Db;
+
+class OrderSalesmanController extends WeChatBaseController
+{
+ protected $user_id;
+ public function _initialize(){
+ $user_id = cmf_get_current_user_id();
+ $this->user_id = $user_id;
+ $my_user = Db::name('my_user')->where(['uid'=>$user_id])->find();
+ if(empty($my_user)){
+ $this->error('查无此人','','','');
+ }
+ if($my_user['status'] != 2){
+ $this->error('您还不是业务员那','','','');
+ }
+ }
+ public function get_all(){
+ $param = $this->request->param();
+ if(!empty($param['is_courier'])){
+ $where['is_courier'] = ['eq',$param['is_courier']];
+ }
+ $user_id = $this->user_id;
+ $where['salesman_uid'] = ['eq',$user_id];
+ $where['indent_type'] = ['eq',2];
+ $where['state'] = ['neq',4];
+ $indentModel = new IndentModel();
+ $data = $indentModel->selectData($where);
+ $indentGoodsModel = new IndentGoodsModel();
+ foreach($data as $key => $vo){
+ $indent_goods = $indentGoodsModel->selectData(['indent_id'=>$vo['id']]);
+ $data[$key]['indent_goods'] = $indent_goods;
+ }
+ $school = Db::name('school')->where('uid',$user_id)->order('create_time desc')->select();
+ $this->assign('school',$school);
+ $this->assign('data',$data);
+ return $this->fetch();
+ }
+ public function getGradeClass(){
+ $school_id = $this->request->param('school_id',0,'intval');
+ if(empty($school_id)){
+ $this->error('缺少必要参数');
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/public/themes/simpleboot3/portal/order_salesman/get_all.html b/public/themes/simpleboot3/portal/order_salesman/get_all.html
new file mode 100644
index 0000000..8f9d40c
--- /dev/null
+++ b/public/themes/simpleboot3/portal/order_salesman/get_all.html
@@ -0,0 +1,481 @@
+<!DOCTYPE html>
+<html lang="en">
+
+ <head>
+ <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>
+ <link rel="stylesheet" href="__TMPL__/public/assets/css/mui.min.css" />
+ <link rel="stylesheet" href="__TMPL__/public/assets/css/mui.picker.min.css" />
+ <link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css" />
+ <link rel="stylesheet" href="__TMPL__/public/assets/css/log.css" />
+ </head>
+
+ <body>
+ <div class="tx_mask_school">
+ <div class="tx_maskCon_school">
+ <div class="three_model_school">
+ <div class="three_model_school_title">
+ 选择学校-班级
+ </div>
+ <div class="three_model_school_tab">
+ <div class="three_model_school_left three_model_school_hover word_color">
+ 学校
+ </div>
+ <div class="three_model_school_left">
+ 班级
+ </div>
+ </div>
+ <div>
+ <div class="three_model_school_data there_university" style="display: block;">
+ <foreach name="$school" item="s">
+ <div class="three_model_school_name <if condition='$key eq 0'>there_unActive</if> school" data-id="{$s.id}">{$s.school}</div>
+ </foreach>
+ </div>
+ <div class="three_model_school_data there_class">
+ <div class="three_model_school_name">G1-11</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 弹窗 -->
+ <div class="tx_mask">
+ <div class="tx_maskCon">
+ <div class="tx_maskConImg">
+ <img src="__TMPL__/public/assets/images/90.png" alt="" />
+ </div>
+ <div class="tx_maskCon2">
+ <div class="log_three_model">
+ <div class="log_three_model_one">
+ <div class="log_three_model_left">配送时间</div>
+ <div class="log_psong">
+ <input type="" name="" id="" value="" placeholder="请输入开始配送时间" />
+ </div>
+ </div>
+ <div class="log_three_model_one">
+ <div class="log_three_model_left">配送时间</div>
+ <div class="log_psong">
+ <input type="" name="" id="" value="" placeholder="请输入结束配送时间" />
+ </div>
+ </div>
+ <div class="log_three_model_one" style="padding-bottom: 0;">
+ <div class="log_three_model_left" style="margin-top: -0.3rem;">单号</div>
+ <div class="log_three_model_right">
+ <input type="text" placeholder="请输入快递单号" />
+ </div>
+ </div>
+ </div>
+ <!-- 确定 -->
+ <div class="tx_maskOk">确定</div>
+ </div>
+ </div>
+ </div>
+ <div class="tx_maskone">
+ <div class="tx_maskCon">
+ <div class="tx_maskConImg">
+ <img src="__TMPL__/public/assets/images/91.png" alt="" />
+ </div>
+ <div class="tx_maskCon2">
+ <div class="log_three_model">
+ <div class="log_three_model_one">
+ <div class="log_three_model_left">配送时间</div>
+ <div class="log_psong">
+ <input type="" name="" id="" value="" placeholder="请输入开始配送时间" />
+ </div>
+ </div>
+ <div class="log_three_model_one">
+ <div class="log_three_model_left">配送时间</div>
+ <div class="log_psong">
+ <input type="" name="" id="" value="" placeholder="请输入结束配送时间" />
+ </div>
+ </div>
+ </div>
+ <!-- 确定 -->
+ <div class="tx_maskOk">确定</div>
+ </div>
+ </div>
+ </div>
+ <div class="log_top_co">
+ <!-- 顶部 -->
+ <div class=" order_top log_top_co">
+ <a href="">
+ <img src="__TMPL__/public/assets/images/left.png" alt="" />
+ </a>
+ <p>订单管理</p>
+ </div>
+ </div>
+ <!-- tab切换 -->
+ <div class="log_three_tab">
+ <div class="log_three_tab_one log_three_tab_two word_color">未发货</div>
+ <div class="log_three_tab_one">已发货</div>
+ <div class="log_three_tab_one">已完成</div>
+ </div>
+ <!-- 下拉框 -->
+ <div class="log_three_select">
+ <div class="log_three_select_one log_three_select_school">
+ <div class="log_three_select_title log_three_select_school2">
+ 请选择学校/班级
+ </div>
+ <div class="log_three_select_img">
+ <img src="__TMPL__/public/assets/images/75.png" alt="" />
+ </div>
+ </div>
+ <div class="log_three_select_one log_three_select_peisong">
+ <div class="log_three_select_title">
+ 统一配送
+ </div>
+ <div class="log_three_select_img">
+ <img src="__TMPL__/public/assets/images/75.png" alt="" />
+ </div>
+ </div>
+ <div class="log_three_select_one log_three_select_btn search">
+ 搜索
+ </div>
+ </div>
+ <!-- 列表内容 -->
+ <div>
+ <!--未发货-->
+ <div class="log_three_list_contant" style="display: block;">
+ <foreach name="$data" item="vo">
+ <if condition="$vo.state eq 2">
+ <div class="log_three_list">
+ <div class="log_three_list_top">
+ <div class="log_three_list_top_left">
+ <div class="log_three_list_top_lo">
+ <img src="__TMPL__/public/assets/images/fangkuang.png" alt="" />
+ </div>
+ <div class="log_three_list_top_lt">
+ <div class="log_three_zhongbiao">
+ <img src="__TMPL__/public/assets/images/52.png" alt="" />
+ </div>
+ <div class="log_three_shijian">
+ {:date('Y-m-d H:i:s',$vo['create_time'])}
+ </div>
+ </div>
+ </div>
+ <div class="log_three_list_top_right">
+ <if condition="$vo.state eq 2">
+ 待发货
+ <elseif condition="$vo.state eq 5"/>
+ 已发货
+ <elseif condition="$vo.state eq 3"/>
+ 已完成
+ </if>
+ </div>
+ </div>
+ <foreach name="$vo.indent_goods" item="i_g">
+ <div class="log_three_list_center">
+ <div class="log_three_list_center_left">
+ <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" />
+ </div>
+ <div class="log_three_list_center_right">
+ <div class="log_three_center_one">
+ {$i_g.book_name}
+ </div>
+ <div class="log_three_center_two">×{$i_g.number}</div>
+ <div class="log_three_center_three"><span>￥</span>{$i_g.price*$i_g.number}</div>
+ </div>
+ </div>
+ </foreach>
+ <!-- 立即发货 -->
+ <div class="log_three_bottom_btn">
+ <if condition="$vo.state eq 2">
+ <div class="log_three_bottom" data-indent-id="{$vo.id}" data-id="{$vo.is_courier}">
+ 立即发货
+ </div>
+ <elseif condition="$vo.state eq 5"/>
+ <if condition="$vo.is_courier eq 2">
+ <div class="log_three_bottom" data-indent-id="{$vo.id}">
+ 查看物流
+ </div>
+ </if>
+ <elseif condition="$vo.state eq 3"/>
+ <div class="log_three_bottom" data-indent-id="{$vo.id}">
+ 已完成啦
+ </div>
+ </if>
+ </div>
+ </div>
+ </if>
+ </foreach>
+ </div>
+ <!--已发货-->
+ <div class="log_three_list_contant">
+ <foreach name="$data" item="vo">
+ <if condition="$vo.state eq 5">
+ <div class="log_three_list">
+ <div class="log_three_list_top">
+ <div class="log_three_list_top_left">
+ <div class="log_three_list_top_lo">
+ <img src="__TMPL__/public/assets/images/fangkuang.png" alt="" />
+ </div>
+ <div class="log_three_list_top_lt">
+ <div class="log_three_zhongbiao">
+ <img src="__TMPL__/public/assets/images/52.png" alt="" />
+ </div>
+ <div class="log_three_shijian">
+ {:date('Y-m-d H:i:s',$vo['create_time'])}
+ </div>
+ </div>
+ </div>
+ <div class="log_three_list_top_right">
+ <if condition="$vo.state eq 2">
+ 代发货
+ <elseif condition="$vo.state eq 5"/>
+ 已发货
+ <elseif condition="$vo.state eq 3"/>
+ 已完成
+ </if>
+ </div>
+ </div>
+ <foreach name="$vo.indent_goods" item="i_g">
+ <div class="log_three_list_center">
+ <div class="log_three_list_center_left">
+ <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" />
+ </div>
+ <div class="log_three_list_center_right">
+ <div class="log_three_center_one">
+ {$i_g.book_name}
+ </div>
+ <div class="log_three_center_two">×{$i_g.number}</div>
+ <div class="log_three_center_three"><span>￥</span>{$i_g.price*$i_g.number}</div>
+ </div>
+ </div>
+ </foreach>
+ <!-- 立即发货 -->
+ <div class="log_three_bottom_btn">
+ <if condition="$vo.state eq 2">
+ <div class="log_three_bottom" data-indent-id="{$vo.id}" data-id="{$vo.is_courier}">
+ 立即发货
+ </div>
+ <elseif condition="$vo.state eq 5"/>
+ <if condition="$vo.is_courier eq 2">
+ <div class="log_three_bottom" data-indent-id="{$vo.id}">
+ 查看物流
+ </div>
+ </if>
+ <elseif condition="$vo.state eq 3"/>
+ <div class="log_three_bottom" data-indent-id="{$vo.id}">
+ 已完成啦
+ </div>
+ </if>
+ </div>
+ </div>
+ </if>
+ </foreach>
+ </div>
+
+ <!--已完成-->
+ <div class="log_three_list_contant">
+ <foreach name="$data" item="vo">
+ <if condition="$vo.state eq 3">
+ <div class="log_three_list">
+ <div class="log_three_list_top">
+ <div class="log_three_list_top_left">
+ <div class="log_three_list_top_lo">
+ <img src="__TMPL__/public/assets/images/fangkuang.png" alt="" />
+ </div>
+ <div class="log_three_list_top_lt">
+ <div class="log_three_zhongbiao">
+ <img src="__TMPL__/public/assets/images/52.png" alt="" />
+ </div>
+ <div class="log_three_shijian">
+ {:date('Y-m-d H:i:s',$vo['create_time'])}
+ </div>
+ </div>
+ </div>
+ <div class="log_three_list_top_right">
+ <if condition="$vo.state eq 2">
+ 代发货
+ <elseif condition="$vo.state eq 5"/>
+ 已发货
+ <elseif condition="$vo.state eq 3"/>
+ 已完成
+ </if>
+ </div>
+ </div>
+ <foreach name="$vo.indent_goods" item="i_g">
+ <div class="log_three_list_center">
+ <div class="log_three_list_center_left">
+ <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" />
+ </div>
+ <div class="log_three_list_center_right">
+ <div class="log_three_center_one">
+ {$i_g.book_name}
+ </div>
+ <div class="log_three_center_two">×{$i_g.number}</div>
+ <div class="log_three_center_three"><span>￥</span>{$i_g.price*$i_g.number}</div>
+ </div>
+ </div>
+ </foreach>
+ <!-- 立即发货 -->
+ <div class="log_three_bottom_btn">
+ <if condition="$vo.state eq 2">
+ <div class="log_three_bottom" data-indent-id="{$vo.id}" data-id="{$vo.is_courier}">
+ 立即发货
+ </div>
+ <elseif condition="$vo.state eq 5"/>
+ <if condition="$vo.is_courier eq 2">
+ <div class="log_three_bottom" data-indent-id="{$vo.id}">
+ 查看物流
+ </div>
+ </if>
+ <elseif condition="$vo.state eq 3"/>
+ <div class="log_three_bottom" data-indent-id="{$vo.id}">
+ 已完成啦
+ </div>
+ </if>
+ </div>
+ </div>
+ </if>
+ </foreach>
+ </div>
+ </div>
+ <!-- 底部按钮 -->
+ <div class="log_three_list_fixed">
+ <div class="log_three_fixed_left">
+ <div class="log_three_fixed_left_one">
+ <img src="__TMPL__/public/assets/images/fangkuang.png" alt="" />
+ </div>
+ <div class="log_three_fixed_left_two">
+ 全选
+ </div>
+ </div>
+ <div class="log_three_fixed_right">
+ 统一发货
+ </div>
+ </div>
+ <script src="__TMPL__/public/assets/js/jquery.js"></script>
+ <script src="__TMPL__/public/assets/js/base.js"></script>
+ <script src="__TMPL__/public/assets/js/mui.min.js"></script>
+ <script src="__TMPL__/public/assets/js/mui.picker.min.js"></script>
+ <script src="__TMPL__/public/assets/js/city.data-3.js"></script>
+ <script>
+ // 选择学校
+ $(".three_model_school_left").click(function() {
+ var indexs = $(this).index();
+ console.log(indexs);
+ $(".three_model_school_data").eq(indexs).css("display", "block").siblings().css("display", "none");
+ });
+
+ $(".log_three_tab_one").click(function() {
+ var tabIndex = $(this).index();
+ $(this).addClass("log_three_tab_two").addClass("word_color").siblings().removeClass("log_three_tab_two").removeClass("word_color");
+ $('.log_three_list_contant').eq(tabIndex).css('display', 'block').siblings().css('display', 'none');
+ });
+ $(".three_model_school_tab>div").click(function() {
+ $(this).addClass("three_model_school_hover").addClass("word_color").siblings().removeClass("three_model_school_hover").removeClass("word_color");
+ });
+
+ $(".log_three_list_top_lo").click(function() {
+ if($(this).find("img").attr("src") == "__TMPL__/public/assets/images/fangkuang.png") {
+ $(this).find("img").attr("src", "__TMPL__/public/assets/images/xuanzhong (1).png");
+ } else {
+ $(this).find("img").attr("src", "__TMPL__/public/assets/images/fangkuang.png");
+ }
+ });
+ $(".log_three_fixed_left_one").click(function() {
+ if(
+ $(this)
+ .find("img")
+ .attr("src") == "__TMPL__/public/assets/images/fangkuang.png"
+ ) {
+ $(this)
+ .find("img")
+ .attr("src", "__TMPL__/public/assets/images/xuanzhong (1).png");
+ $(".log_three_list_top_lo")
+ .find("img")
+ .attr("src", "__TMPL__/public/assets/images/xuanzhong (1).png");
+ } else {
+ $(this)
+ .find("img")
+ .attr("src", "__TMPL__/public/assets/images/fangkuang.png");
+ $(".log_three_list_top_lo")
+ .find("img")
+ .attr("src", "__TMPL__/public/assets/images/fangkuang.png");
+ }
+ });
+
+ $(".log_three_select_peisong").click(function() {
+ $(".tx_mask").css({
+ display: "block"
+ });
+ });
+ var index = $(".log_three_bottom").index();
+ $(".log_three_bottom").click(function() {
+ console.log(index);
+ $(".tx_maskone").css({
+ display: "block"
+ });
+ });
+
+ $(".tx_maskOk").click(function() {
+ $(".tx_maskone").css({
+ display: "none"
+ });
+ $(".tx_mask").css({
+ display: "none"
+ });
+ });
+
+ //学校/弹窗
+ $(".log_three_select_school").click(function() {
+ $(".tx_mask_school").css({
+ display: "block"
+ });
+ });
+ // tab 大学
+ var $xuexiao
+ $(".there_university div").click(function() {
+ var index = $(this).index();
+ $(this).addClass("there_unActive").siblings().removeClass("there_unActive");
+ if($(this).hasClass("there_unActive")) {
+ $xuexiao = $(this).attr('data-id');
+ console.log($xuexiao);
+ $(".there_university").hide();
+ $(".there_class").show();
+ $('.three_model_school_left').eq(0).removeClass('word_color').removeClass('three_model_school_hover');
+ $('.three_model_school_left').eq(1).addClass('word_color').addClass('three_model_school_hover');
+ }
+ });
+ $('.there_class div').click(function() {
+ console.log($xuexiao)
+ var index2 = $(this).index();
+ $(this).addClass("there_unActive").siblings().removeClass("there_unActive");
+ if($xuexiao == undefined) {
+ alert('请选择学校')
+ } else if($(this).hasClass("there_unActive")) {
+ var banji = $(this).text();
+ $('.log_three_select_school2').text($xuexiao + ' ' + "—" + ' ' + banji);
+ $(".log_three_select_school2").css("color","#333")
+ $(".tx_mask_school").hide();
+ }
+ })
+ // 关闭弹窗
+ $(document).mouseup(function(e) {
+ var _con = $('.tx_maskCon_school');
+ if(!_con.is(e.target) && _con.has(e.target).length === 0) {
+ $('.tx_mask_school').hide()
+ }
+ })
+ $(function(){
+ $('.school').click(function(){
+ var school_id = $(this).attr('data-id');
+ console.log(school_id);
+ $.ajax({
+ 'url':"{order_salesman/getGradeClass}",
+ 'type':'GET',
+ 'data':{'school_id':school_id},
+ success:(function(data){
+ console.log(data);
+ })
+ })
+ })
+
+ })
+ </script>
+ </body>
+
+</html>
\ No newline at end of file