合并分支 'wangxiaogang' 到 'master'

更改订单列表dom结构



查看合并请求 !122

@@ -85,7 +85,7 @@ class OrderSalesmanController extends WeChatBaseController
             $where['school'] = ['eq',$param['school']];
             $where['school'] = ['eq',$param['school']];
         }
         }
         if(!empty($param['grade'])){
         if(!empty($param['grade'])){
-            $param['grade'] = explode('-',$param['grade']);
+            $param['grade'] = explode(' - ',$param['grade']);
             $where['grade'] = ['eq',$param['grade'][0]];
             $where['grade'] = ['eq',$param['grade'][0]];
             $where['class'] = ['eq',$param['grade'][1]];
             $where['class'] = ['eq',$param['grade'][1]];
         }
         }

@@ -370,7 +370,17 @@
     <input type="hidden" id="grade" value=""/>
     <input type="hidden" id="grade" value=""/>
     <input type="hidden" id="is_courier" value="1"/>
     <input type="hidden" id="is_courier" value="1"/>
 </div>
 </div>
-<div class="shuju_zongshu">搜索结果为<span class="count">{:count($data)}</span>条</div>
+<php>$arr2 = [];</php>
+<foreach name="$data" item="vo">
+    <if condition="$vo.state eq 2">
+        <php>$arr2[] = $vo;</php>
+        <elseif condition="$vo.state eq 5" />
+        <php>$arr5[] = $vo;</php>
+        <elseif condition="$vo.state eq 3" />
+        <php>$arr3[] = $vo;</php>
+    </if>
+</foreach>
+<div class="shuju_zongshu">搜索结果为<span class="count">{:count($arr2)}</span>条</div>
 <!-- 列表内容 -->
 <!-- 列表内容 -->
 <div>
 <div>
     <!--未发货-->
     <!--未发货-->

@@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
      */
      */
     public function checkWeChatUserLogin()
     public function checkWeChatUserLogin()
     {
     {
-        /*$user = Db::name('user')->where('id',2)->find();
-        cmf_update_current_user($user);*/
+        $user = Db::name('user')->where('id',2)->find();
+        cmf_update_current_user($user);
         $userId = cmf_get_current_user_id();
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {
         if (empty($userId)) {
             $config = [
             $config = [